mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-23 17:05:26 +02:00
Code Issues Wiki Activity

fixed buggy encoding/decoding of environment strings

Browse source
This commit is contained in:
David Inglis 2004-08-20 19:27:21 +00:00
parent f599a0998b
commit 8abbfa146e
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
View file

@ -234,19 +234,34 @@ public class BuildInfoFactory {
protected Map decodeMap(String value) { protected Map decodeMap(String value) {
Map map = new HashMap(); Map map = new HashMap();
StringBuffer envStr = new StringBuffer(value);
try { try {
while (value != null && value.length() > 0) { while (envStr.length() > 0) {
int ndx = 0; int ndx = 0;
while (value.charAt(ndx) != '|' || (ndx != 0 && value.charAt(ndx - 1) == '\\')) { while (ndx < envStr.length() ) {
if (envStr.charAt(ndx) == '|') {
if (envStr.charAt(ndx - 1) == '\\') { // escaped '|' - remove '\' and continue on.
envStr.deleteCharAt(ndx - 1);
} else {
break;
}
}
ndx++; ndx++;
} }
StringBuffer line = new StringBuffer(value.substring(0, ndx)); StringBuffer line = new StringBuffer(envStr.substring(0, ndx));
int lndx = 0; int lndx = 0;
while (line.charAt(lndx) != '=' || (lndx != 0 && line.charAt(lndx - 1) == '\\')) { while (lndx < line.length() ) {
if (line.charAt(lndx) == '=') {
if (line.charAt(lndx - 1) == '\\') { // escaped '=' - remove '\' and continue on.
line.deleteCharAt(lndx - 1);
} else {
break;
}
}
lndx++; lndx++;
} }
map.put(line.substring(0, lndx), line.substring(lndx + 1)); map.put(line.substring(0, lndx), line.substring(lndx + 1));
value = value.substring(ndx+1); envStr.delete(0, ndx+1);
} }
} catch (StringIndexOutOfBoundsException e) { } catch (StringIndexOutOfBoundsException e) {
} }
@ -260,7 +275,7 @@ public class BuildInfoFactory {
Entry entry = (Entry) entries.next(); Entry entry = (Entry) entries.next();
str.append(escapeChars((String) entry.getKey(), "=|")); //$NON-NLS-1$ str.append(escapeChars((String) entry.getKey(), "=|")); //$NON-NLS-1$
str.append("="); //$NON-NLS-1$ str.append("="); //$NON-NLS-1$
str.append(escapeChars((String) entry.getValue(), "=|)")); //$NON-NLS-1$ str.append(escapeChars((String) entry.getValue(), "|")); //$NON-NLS-1$
str.append("|"); //$NON-NLS-1$ str.append("|"); //$NON-NLS-1$
} }
return str.toString(); return str.toString();
@ -269,8 +284,9 @@ public class BuildInfoFactory {
protected String escapeChars(String string, String escapeChars) { protected String escapeChars(String string, String escapeChars) {
StringBuffer str = new StringBuffer(string); StringBuffer str = new StringBuffer(string);
for(int i = 0; i < str.length(); i++) { for(int i = 0; i < str.length(); i++) {
if ( escapeChars.indexOf(str.charAt(i)) != -1) { if ( escapeChars.indexOf(str.charAt(i)) != -1 ) {
str.insert(i-1, '\\'); str.insert(i, '\\');
i++;
} }
} }
return str.toString(); return str.toString();
@ -361,7 +377,7 @@ public class BuildInfoFactory {
} }
protected String getString(String name) { protected String getString(String name) {
return (String) args.get(name); return args.get(name) != null ? (String)args.get(name) : "";
} }
protected String getBuilderID() { protected String getBuilderID() {