Skip to content

Commit b97c3f6

Browse files
kbleesGit for Windows Build Agent
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 5e11b3c commit b97c3f6

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

0 commit comments

Comments
 (0)