Skip to content

Commit a5ebcee

Browse files
kbleesvdye
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 1625348 commit a5ebcee

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

compat/mingw.c

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,24 @@ int mingw_chdir(const char *dirname)
753753
wchar_t wdirname[MAX_LONG_PATH];
754754
if (xutftowcs_long_path(wdirname, dirname) < 0)
755755
return -1;
756-
result = _wchdir(wdirname);
756+
757+
if (has_symlinks) {
758+
HANDLE hnd = CreateFileW(wdirname, 0,
759+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
760+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
761+
if (hnd == INVALID_HANDLE_VALUE) {
762+
errno = err_win_to_posix(GetLastError());
763+
return -1;
764+
}
765+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
766+
errno = err_win_to_posix(GetLastError());
767+
CloseHandle(hnd);
768+
return -1;
769+
}
770+
CloseHandle(hnd);
771+
}
772+
773+
result = _wchdir(normalize_ntpath(wdirname));
757774
current_directory_len = GetCurrentDirectoryW(0, NULL);
758775
return result;
759776
}

0 commit comments

Comments
 (0)