global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-27 02:48:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'fix-externals' into HEAD

Browse Source
This commit is contained in:
Johannes Schindelin
2017-03-20 22:43:14 +01:00
parent 645a6f707b 545bd93f85
commit b64e5b8087
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
compat/mingw.c
View File

@@ -1035,14 +1035,21 @@ static void free_path_split(char **path)
static char *lookup_prog(const char *dir, const char *cmd, int isexe, int exe_only)
{
char path[MAX_PATH];
snprintf(path, sizeof(path), "%s/%s.exe", dir, cmd);
wchar_t wpath[MAX_PATH];
snprintf(path, sizeof(path), "%s\\%s.exe", dir, cmd);
if (!isexe && access(path, F_OK) == 0)
if (xutftowcs_path(wpath, path) < 0)
return NULL;
if (!isexe && _waccess(wpath, F_OK) == 0)
return xstrdup(path);
path[strlen(path)-4] = '\0';
if ((!exe_only || isexe) && access(path, F_OK) == 0)
if (!(GetFileAttributes(path) & FILE_ATTRIBUTE_DIRECTORY))
wpath[wcslen(wpath)-4] = '\0';
if ((!exe_only || isexe) && _waccess(wpath, F_OK) == 0) {
if (!(GetFileAttributesW(wpath) & FILE_ATTRIBUTE_DIRECTORY)) {
path[strlen(path)-4] = '\0';
return xstrdup(path);
}
}
return NULL;
}