Add string escape for classpath with spaces

graalvm · Mar 18, 2022 · 064ac27 · 064ac27
1 parent 79bb32e
commit 064ac27
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java b/common/utils/src/main/java/org/graalvm/buildtools/utils/NativeImageUtils.java
@@ -115,7 +115,7 @@ public List<String> build() {
                 return convertToArgsFile(options
                         .stream()
                         .map(CliOption::getOptions)
-                        .map(args -> String.join(" ", args))
+                        .map(args -> args.stream().map(NativeImageUtils::escapeArg).collect(Collectors.joining(" ")))
                         .collect(Collectors.toList())
                 );
             } else {
@@ -126,6 +126,14 @@ public List<String> build() {
         }
     }
 
+    private static String escapeArg(String arg) {
+        arg = arg.replace("\\", "\\\\");
+        if (arg.contains(" ")) {
+            arg = "\"" + arg + "\"";
+        }
+        return arg;
+    }
+
     private static final class CliOption {
         private final List<String> options;