Skip to content

Commit 0801424

Browse files
kbleesdscho
authored andcommitted
Win32: mingw_chdir: change to symlink-resolved directory
If symlinks are enabled, resolve all symlinks when changing directories, as required by POSIX. Note: Git's real_path() function bases its link resolution algorithm on this property of chdir(). Unfortunately, the current directory on Windows is limited to only MAX_PATH (260) characters. Therefore using symlinks and long paths in combination may be problematic. Signed-off-by: Karsten Blees <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 08d9b82 commit 0801424

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

compat/mingw.c

+18-1
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,24 @@ int mingw_chdir(const char *dirname)
801801
wchar_t wdirname[MAX_LONG_PATH];
802802
if (xutftowcs_long_path(wdirname, dirname) < 0)
803803
return -1;
804-
result = _wchdir(wdirname);
804+
805+
if (has_symlinks) {
806+
HANDLE hnd = CreateFileW(wdirname, 0,
807+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
808+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
809+
if (hnd == INVALID_HANDLE_VALUE) {
810+
errno = err_win_to_posix(GetLastError());
811+
return -1;
812+
}
813+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
814+
errno = err_win_to_posix(GetLastError());
815+
CloseHandle(hnd);
816+
return -1;
817+
}
818+
CloseHandle(hnd);
819+
}
820+
821+
result = _wchdir(normalize_ntpath(wdirname));
805822
current_directory_len = GetCurrentDirectoryW(0, NULL);
806823
return result;
807824
}

0 commit comments

Comments
 (0)