Skip to content

Commit eb2a9e4

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 1f3edba commit eb2a9e4

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
@@ -671,7 +671,24 @@ int mingw_chdir(const char *dirname)
671671
wchar_t wdirname[MAX_LONG_PATH];
672672
if (xutftowcs_long_path(wdirname, dirname) < 0)
673673
return -1;
674-
result = _wchdir(wdirname);
674+
675+
if (has_symlinks) {
676+
HANDLE hnd = CreateFileW(wdirname, 0,
677+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
678+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
679+
if (hnd == INVALID_HANDLE_VALUE) {
680+
errno = err_win_to_posix(GetLastError());
681+
return -1;
682+
}
683+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
684+
errno = err_win_to_posix(GetLastError());
685+
CloseHandle(hnd);
686+
return -1;
687+
}
688+
CloseHandle(hnd);
689+
}
690+
691+
result = _wchdir(normalize_ntpath(wdirname));
675692
current_directory_len = GetCurrentDirectoryW(0, NULL);
676693
return result;
677694
}

0 commit comments

Comments
 (0)