@matheusbsbs / matheus-bagliano / commits / 4e1a641ee3

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 85faec9d3a (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 <adam@roben.org> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Adam Roben committed Aug 24, 2019 at 15:38 UTC 4e1a641ee345bbc877ed82962e12c45f09b6617b

1 file changed +11 -4

compat/mingw.c

+11 -4

@@ -1161,14 +1161,21 @@ static char *lookup_prog(const char *dir, int dirlen, const char *cmd,

1161 int isexe, int exe_only)

1162 {

1163 char path[MAX_PATH];

1164 + wchar_t wpath[MAX_PATH];

1165 snprintf(path, sizeof(path), "%.*s\\%s.exe", dirlen, dir, cmd);

1166

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)

1171 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';

1176 return xstrdup(path);

1177 + }

1178 + }

1179 return NULL;

1180 }

1181