Revert to previous version of escapeArg(). (#515)

This should fix Windows path escaping issues. Closes #511.

Author: fniephaus

common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java

@@ -105,21 +105,14 @@ public static List<String> convertToArgsFile(List<String> cliArgs, Path outputDi
  }
 
 
- /**
- * See https://github.com/oracle/graal/blob/f011d4d056a7ed78fe9669cc38062e6d09c14bed/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/NativeImage.java#L1447C47-L1447C60.
- */
  public static String escapeArg(String arg) {
- if (arg.isEmpty()) {
- return "''";
- }
- Matcher m = SAFE_SHELL_ARG.matcher(arg);
- if (m.matches()) {
- return arg;
+ if (!(arg.startsWith("\\Q") && arg.endsWith("\\E"))) {
+ arg = arg.replace("\\", "\\\\");
+ if (arg.contains(" ")) {
+ arg = "\"" + arg + "\"";
+ }
  }
- return "'" + arg
- .replace("'", "'\"'\"'")
- .replace("\\", "\\\\") /* for Windows paths */
- + "'";
+ return arg;
  }