Skip to content

Commit 339d3ee

Browse files
committed
mingw: support spawning programs containing spaces in their names
The CreateProcessW() function does not really support spaces in its first argument, lpApplicationName. But it supports passing NULL as lpApplicationName, which makes it figure out the application from the (possibly quoted) first argument of lpCommandLine. Let's use that trick (if we are certain that the first argument matches the executable's path) to support launching programs whose path contains spaces. This fixes https://github.com/git-for-windows/git/issue/692 Signed-off-by: Johannes Schindelin <[email protected]>
1 parent c7f4d21 commit 339d3ee

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

compat/mingw.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1271,7 +1271,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
12711271
si.hStdError = winansi_get_osfhandle(fherr);
12721272

12731273
/* executables and the current directory don't support long paths */
1274-
if (xutftowcs_path(wcmd, cmd) < 0)
1274+
if (*argv && !strcmp(cmd, *argv))
1275+
wcmd[0] = L'\0';
1276+
else if (xutftowcs_path(wcmd, cmd) < 0)
12751277
return -1;
12761278
if (dir && xutftowcs_path(wdir, dir) < 0)
12771279
return -1;
@@ -1310,8 +1312,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
13101312
wenvblk = make_environment_block(deltaenv);
13111313

13121314
memset(&pi, 0, sizeof(pi));
1313-
ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags,
1314-
wenvblk, dir ? wdir : NULL, &si, &pi);
1315+
ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
1316+
flags, wenvblk, dir ? wdir : NULL, &si, &pi);
13151317

13161318
free(wenvblk);
13171319
free(wargs);

0 commit comments

Comments
 (0)