mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-24 01:15:29 +02:00
Code Issues Wiki Activity

fixed bug #75685

Browse source
This commit is contained in:
David Inglis 2004-10-05 23:50:17 +00:00
parent 5bd3694555
commit 83c6521896
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -235,12 +235,14 @@ public class BuildInfoFactory {
protected Map decodeMap(String value) {
Map map = new HashMap();
StringBuffer envStr = new StringBuffer(value);
String escapeChars = "|\\";
char escapeChar = '\\';
try {
while (envStr.length() > 0) {
int ndx = 0;
while (ndx < envStr.length() ) {
if (envStr.charAt(ndx) == '|') {
if (envStr.charAt(ndx - 1) == '\\') { // escaped '|' - remove '\' and continue on.
if (escapeChars.indexOf(envStr.charAt(ndx)) != -1) {
if (envStr.charAt(ndx - 1) == escapeChar) { // escaped '|' - remove '\' and continue on.
envStr.deleteCharAt(ndx - 1);
} else {
break;
@ -252,7 +254,7 @@ public class BuildInfoFactory {
int lndx = 0;
while (lndx < line.length() ) {
if (line.charAt(lndx) == '=') {
if (line.charAt(lndx - 1) == '\\') { // escaped '=' - remove '\' and continue on.
if (line.charAt(lndx - 1) == escapeChar) { // escaped '=' - remove '\' and continue on.
line.deleteCharAt(lndx - 1);
} else {
break;
@ -273,19 +275,19 @@ public class BuildInfoFactory {
Iterator entries = values.entrySet().iterator();
while (entries.hasNext()) {
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(escapeChars((String) entry.getValue(), "|")); //$NON-NLS-1$
str.append(escapeChars((String) entry.getValue(), "|\\", '\\')); //$NON-NLS-1$
str.append("|"); //$NON-NLS-1$
}
return str.toString();
}
protected String escapeChars(String string, String escapeChars) {
protected String escapeChars(String string, String escapeChars, char escapeChar) {
StringBuffer str = new StringBuffer(string);
for(int i = 0; i < str.length(); i++) {
if ( escapeChars.indexOf(str.charAt(i)) != -1 ) {
str.insert(i, '\\');
if ( escapeChars.indexOf(str.charAt(i)) != -1) {
str.insert(i, escapeChar);
i++;
}
}