Skip to content

Commit c5ae21b

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 27567cd commit c5ae21b

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
@@ -783,7 +783,24 @@ int mingw_chdir(const char *dirname)
783783
wchar_t wdirname[MAX_LONG_PATH];
784784
if (xutftowcs_long_path(wdirname, dirname) < 0)
785785
return -1;
786-
result = _wchdir(wdirname);
786+
787+
if (has_symlinks) {
788+
HANDLE hnd = CreateFileW(wdirname, 0,
789+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
790+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
791+
if (hnd == INVALID_HANDLE_VALUE) {
792+
errno = err_win_to_posix(GetLastError());
793+
return -1;
794+
}
795+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
796+
errno = err_win_to_posix(GetLastError());
797+
CloseHandle(hnd);
798+
return -1;
799+
}
800+
CloseHandle(hnd);
801+
}
802+
803+
result = _wchdir(normalize_ntpath(wdirname));
787804
current_directory_len = GetCurrentDirectoryW(0, NULL);
788805
return result;
789806
}

0 commit comments

Comments
 (0)