Skip to content

Commit 6e62857

Browse files
arobendscho
authored andcommitted
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 2ee5a1a. 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 I changed lookup_prog to use _waccess directly so that we only convert the path to UTF-16 once. Signed-off-by: Adam Roben <[email protected]>
1 parent 7b03edb commit 6e62857

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

compat/mingw.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -998,14 +998,20 @@ static void free_path_split(char **path)
998998
static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_only)
999999
{
10001000
char path[MAX_PATH];
1001+
wchar_t wpath[MAX_PATH];
10011002
snprintf(path, sizeof(path), "%s\\%s.exe", dir, cmd);
10021003

1003-
if (!isexe && access(path, F_OK) == 0)
1004+
if (xutftowcs_path(wpath, path) < 0)
1005+
return NULL;
1006+
1007+
if (!isexe && _waccess(wpath, F_OK) == 0)
10041008
return xstrdup(path);
10051009
path[strlen(path)-4] = '\0';
1006-
if ((!exe_only || isexe) && access(path, F_OK) == 0)
1007-
if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
1010+
if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) {
1011+
1012+
if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY))
10081013
return xstrdup(path);
1014+
}
10091015
return NULL;
10101016
}
10111017

0 commit comments

Comments
 (0)