Skip to content

Commit 43b386e

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 09b1cc5 commit 43b386e

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
@@ -1287,7 +1287,9 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
12871287
si.hStdError = winansi_get_osfhandle(fherr);
12881288

12891289
/* executables and the current directory don't support long paths */
1290-
if (xutftowcs_path(wcmd, cmd) < 0)
1290+
if (*argv && !strcmp(cmd, *argv))
1291+
wcmd[0] = L'\0';
1292+
else if (xutftowcs_path(wcmd, cmd) < 0)
12911293
return -1;
12921294
if (dir && xutftowcs_path(wdir, dir) < 0)
12931295
return -1;
@@ -1326,8 +1328,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
13261328
wenvblk = make_environment_block(deltaenv);
13271329

13281330
memset(&pi, 0, sizeof(pi));
1329-
ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags,
1330-
wenvblk, dir ? wdir : NULL, &si, &pi);
1331+
ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
1332+
flags, wenvblk, dir ? wdir : NULL, &si, &pi);
13311333

13321334
free(wenvblk);
13331335
free(wargs);

0 commit comments

Comments
 (0)