mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 22:52:11 +02:00
Code Issues Wiki Activity

Bug 513505. Escape arguments for CDT standalone.

Browse source 
Change-Id: I2119321ea9c4227d23b30f9177889ee24a6b5bbb
Signed-off-by: Brendan Dahl <bdahl@mozilla.com>
This commit is contained in:
Brendan Dahl 2017-04-05 13:50:56 -07:00 • committed by Gerrit Code Review @ Eclipse.org
parent a44996a200
commit a4ed678552
1 changed files with 46 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
debug/org.eclipse.cdt.debug.application/src/org/eclipse/cdt/debug/application/ApplicationWorkbenchWindowAdvisor.java
View file

@ -130,6 +130,50 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
return result; return result;
} }
private void appendChar(StringBuilder builder, int repeat, char c) {
for (int i = 0; i < repeat; i++) {
builder.append(c);
}
}
private boolean needsEscaping(String input) {
for (int i = 0; i < input.length(); i++) {
char c = input.charAt(i);
if (c == ' ' || c == '\t' || c == '\n' || c == '\r' || c == '"') {
return true;
}
}
return false;
}
private String escapeArg(String arg) {
if (!arg.isEmpty() && !needsEscaping(arg)) {
return arg;
}
StringBuilder buffer = new StringBuilder();
buffer.append('"');
for (int i = 0; i < arg.length(); i++) {
int numberOfBackslashes = 0;
while (i < arg.length() && arg.charAt(i) == '\\') {
i++;
numberOfBackslashes++;
}
if (i == arg.length()) {
appendChar(buffer, numberOfBackslashes * 2, '\\');
break;
} else if (arg.charAt(i) == '"') {
appendChar(buffer, numberOfBackslashes * 2 + 1, '\\');
buffer.append(arg.charAt(i));
} else {
appendChar(buffer, numberOfBackslashes * 2, '\\');
buffer.append(arg.charAt(i));
}
}
buffer.append('"');
return buffer.toString();
}
public class PostWindowCreateRunnable implements IRunnableWithProgress { public class PostWindowCreateRunnable implements IRunnableWithProgress {
@Override @Override
@ -198,10 +242,10 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
StringBuilder argBuffer = new StringBuilder(); StringBuilder argBuffer = new StringBuilder();
// Remaining values are arguments to the executable // Remaining values are arguments to the executable
if (i < args.length) if (i < args.length)
argBuffer.append(args[i++]); argBuffer.append(escapeArg(args[i++]));
while (i < args.length) { while (i < args.length) {
argBuffer.append(" "); //$NON-NLS-1$ argBuffer.append(" "); //$NON-NLS-1$
argBuffer.append(args[i++]); argBuffer.append(escapeArg(args[i++]));
} }
arguments = argBuffer.toString(); arguments = argBuffer.toString();
} }