global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-19 06:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'externals-unicode-paths' of git://github.com/aroben/git into devel

Browse Source 
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2012-06-05 13:11:18 -05:00
parent 3b0a714d33 7ebac8cb94
commit 0f1fadf8c6
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
compat/mingw.c
View File

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