Merge pull request #4138 from patrickbkr/fix-win-proc-with-space

Fix calling programs with spaces in their path on Windows
rakudo · Dec 30, 2020 · 86fd7f6 · 86fd7f6
2 parents 63be83d + b3367e9
commit 86fd7f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/core.c/Proc/Async.pm6 b/src/core.c/Proc/Async.pm6
@@ -326,17 +326,19 @@ my class Proc::Async {
         # So it's not easily possible to do the quoting ourselves.
         # So the $!win-quote-args argument is ignored on JVM and we
         # just let Java do its magic.
-        my @quoted-args := @!args;
+        my @quoted-args := $!path, |@!args;
 #?endif
 #?if !jvm
         my @quoted-args;
         if Rakudo::Internals.IS-WIN {
-            @quoted-args.append($!win-verbatim-args
-                ?? @!args.join(' ')
-                !! self!win-quote-CommandLineToArgvW(@!args));
+            @quoted-args.append(
+                self!win-quote-CommandLineToArgvW($!path),
+                $!win-verbatim-args
+                    ?? @!args.join(' ')
+                    !! self!win-quote-CommandLineToArgvW(@!args));
         }
         else {
-            @quoted-args := @!args;
+            @quoted-args := $!path, |@!args;
         }
 #?endif
 
@@ -393,7 +395,7 @@ my class Proc::Async {
         nqp::bindkey($callbacks, 'stderr_fd', $!stderr-fd) if $!stderr-fd.DEFINITE;
 
         $!process_handle := nqp::spawnprocasync($scheduler.queue(:hint-affinity),
-            CLONE-LIST-DECONTAINERIZED($!path,@quoted-args),
+            CLONE-LIST-DECONTAINERIZED($!path, @quoted-args),
             $cwd.Str,
             CLONE-HASH-DECONTAINERIZED(%ENV),
             $callbacks,

diff --git a/tools/templates/NQP_REVISION b/tools/templates/NQP_REVISION
@@ -1 +1 @@
-2020.12-1-gde93c668c
+2020.12-4-gd65a8c109