mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2024-11-21 19:42:14 +00:00
Merge remote-tracking branch
'origin/GP-5015_d-millar_spaces_fix--SQUASHED' into patch (Closes #6999)
This commit is contained in:
commit
968a57a7ce
@ -5,7 +5,7 @@
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
@ -132,33 +132,27 @@ public class ShellUtils {
|
||||
if (args.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
StringBuilder line = new StringBuilder(args.get(0));
|
||||
StringBuilder line = new StringBuilder(genreateArgument(args.get(0)));
|
||||
for (int i = 1; i < args.size(); i++) {
|
||||
String a = args.get(i);
|
||||
if (a.contains(" ")) {
|
||||
if (a.contains("\"")) {
|
||||
if (a.contains("'")) {
|
||||
line.append(" \"");
|
||||
line.append(a.replace("\"", "\\\""));
|
||||
line.append("\"");
|
||||
continue;
|
||||
}
|
||||
line.append(" '");
|
||||
line.append(a);
|
||||
line.append("'");
|
||||
continue;
|
||||
}
|
||||
line.append(" \"");
|
||||
line.append(a);
|
||||
line.append("\"");
|
||||
continue;
|
||||
}
|
||||
line.append(" ");
|
||||
line.append(a);
|
||||
line.append(" " + genreateArgument(a));
|
||||
}
|
||||
return line.toString();
|
||||
}
|
||||
|
||||
public static String genreateArgument(String a) {
|
||||
if (a.contains(" ")) {
|
||||
if (a.contains("\"")) {
|
||||
if (a.contains("'")) {
|
||||
return "\"" + a.replace("\"", "\\\"") + "\"";
|
||||
}
|
||||
return "'" + a + "'";
|
||||
}
|
||||
return "\"" + a + "\"";
|
||||
}
|
||||
return a;
|
||||
}
|
||||
|
||||
public static String generateEnvBlock(Map<String, String> env) {
|
||||
return env.entrySet()
|
||||
.stream()
|
||||
|
Loading…
Reference in New Issue
Block a user