Skip to content

Commit 4e1a641

Browse files
arobengitster
authored andcommitted
mingw: fix launching of externals from Unicode paths
If Git were installed in a path containing non-ASCII characters, commands such as `git am` and `git submodule`, which are implemented as externals, would fail to launch with the following error: > fatal: 'am' appears to be a git command, but we were not > able to execute it. Maybe git-am is broken? This was due to lookup_prog not being Unicode-aware. It was somehow missed in 85faec9 (Win32: Unicode file name support (except dirent), 2012-03-15). Note that the only problem in this function was calling `GetFileAttributes()` instead of `GetFileAttributesW()`. The calls to `access()` were fine because `access()` is a macro which resolves to `mingw_access()`, which already handles Unicode correctly. But `lookup_prog()` was changed to use `_waccess()` directly so that we only convert the path to UTF-16 once. To make things work correctly, we have to maintain UTF-8 and UTF-16 versions in tandem in `lookup_prog()`. Signed-off-by: Adam Roben <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 745f681 commit 4e1a641

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

compat/mingw.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,14 +1161,21 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,
11611161
int isexe, int exe_only)
11621162
{
11631163
char path[MAX_PATH];
1164+
wchar_t wpath[MAX_PATH];
11641165
snprintf(path, sizeof(path), "%.*s\\%s.exe", dirlen, dir, cmd);
11651166

1166-
if (!isexe && access(path, F_OK) == 0)
1167+
if (xutftowcs_path(wpath, path) < 0)
1168+
return NULL;
1169+
1170+
if (!isexe && _waccess(wpath, F_OK) == 0)
11671171
return xstrdup(path);
1168-
path[strlen(path)-4] = '\0';
1169-
if ((!exe_only || isexe) && access(path, F_OK) == 0)
1170-
if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
1172+
wpath[wcslen(wpath)-4] = '\0';
1173+
if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) {
1174+
if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY)) {
1175+
path[strlen(path)-4] = '\0';
11711176
return xstrdup(path);
1177+
}
1178+
}
11721179
return NULL;
11731180
}
11741181

0 commit comments

Comments
 (0)