Skip to content

Commit 1aabe57

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 d89320e commit 1aabe57

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
@@ -922,7 +922,24 @@ int mingw_chdir(const char *dirname)
922922
wchar_t wdirname[MAX_LONG_PATH];
923923
if (xutftowcs_long_path(wdirname, dirname) < 0)
924924
return -1;
925-
result = _wchdir(wdirname);
925+
926+
if (has_symlinks) {
927+
HANDLE hnd = CreateFileW(wdirname, 0,
928+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
929+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
930+
if (hnd == INVALID_HANDLE_VALUE) {
931+
errno = err_win_to_posix(GetLastError());
932+
return -1;
933+
}
934+
if (!GetFinalPathNameByHandleW(hnd, wdirname, ARRAY_SIZE(wdirname), 0)) {
935+
errno = err_win_to_posix(GetLastError());
936+
CloseHandle(hnd);
937+
return -1;
938+
}
939+
CloseHandle(hnd);
940+
}
941+
942+
result = _wchdir(normalize_ntpath(wdirname));
926943
current_directory_len = GetCurrentDirectoryW(0, NULL);
927944
return result;
928945
}

0 commit comments

Comments
 (0)