Skip to content

Commit a7f8bad

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 5c5674d commit a7f8bad

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

12701270
/* executables and the current directory don't support long paths */
1271-
if (xutftowcs_path(wcmd, cmd) < 0)
1271+
if (*argv && !strcmp(cmd, *argv))
1272+
wcmd[0] = L'\0';
1273+
else if (xutftowcs_path(wcmd, cmd) < 0)
12721274
return -1;
12731275
if (dir && xutftowcs_path(wdir, dir) < 0)
12741276
return -1;
@@ -1307,8 +1309,8 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
13071309
wenvblk = make_environment_block(deltaenv);
13081310

13091311
memset(&pi, 0, sizeof(pi));
1310-
ret = CreateProcessW(wcmd, wargs, NULL, NULL, TRUE, flags,
1311-
wenvblk, dir ? wdir : NULL, &si, &pi);
1312+
ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
1313+
flags, wenvblk, dir ? wdir : NULL, &si, &pi);
13121314

13131315
free(wenvblk);
13141316
free(wargs);

0 commit comments

Comments
 (0)