Skip to content

Commit fe176a0

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 0cb684a commit fe176a0

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
@@ -755,7 +755,24 @@ int mingw_chdir(const char *dirname)
755755
wchar_t wdirname[MAX_LONG_PATH];
756756
if (xutftowcs_long_path(wdirname, dirname) < 0)
757757
return -1;
758-
result = _wchdir(wdirname);
758+
759+
if (has_symlinks) {
760+
HANDLE hnd = CreateFileW(wdirname, 0,
761+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
762+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
763+
if (hnd == INVALID_HANDLE_VALUE) {
764+
errno = err_win_to_posix(GetLastError());
765+
return -1;
766+
}
767+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
768+
errno = err_win_to_posix(GetLastError());
769+
CloseHandle(hnd);
770+
return -1;
771+
}
772+
CloseHandle(hnd);
773+
}
774+
775+
result = _wchdir(normalize_ntpath(wdirname));
759776
current_directory_len = GetCurrentDirectoryW(0, NULL);
760777
return result;
761778
}

0 commit comments

Comments
 (0)