Skip to content

Commit 0b18aac

Browse files
committed
Merge branch 'ar/mingw-run-external-with-non-ascii-path' into jch
Windows update. * ar/mingw-run-external-with-non-ascii-path: mingw: fix launching of externals from Unicode paths
2 parents c6189d6 + 4e1a641 commit 0b18aac

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)