Skip to content

Commit 007ede4

Browse files
committed
mingw: do resolve symlinks in getcwd()
As pointed out in #1676, the `git rev-parse --is-inside-work-tree` command currently fails when the current directory's path contains symbolic links. The underlying reason for this bug is that `getcwd()` is supposed to resolve symbolic links, but our `mingw_getcwd()` implementation did not. We do have all the building blocks for that, though: the `GetFinalPathByHandleW()` function will resolve symbolic links. However, we only called that function if `GetLongPathNameW()` failed, for historical reasons: the latter function was supported for a long time, but the former API function was introduced only with Windows Vista, and we used to support also Windows XP. With that support having been dropped, we are free to call the symbolic link-resolving function right away. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f8b122e commit 007ede4

File tree

1 file changed

+7
-11
lines changed

1 file changed

+7
-11
lines changed

compat/mingw.c

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,18 +1141,16 @@ char *mingw_getcwd(char *pointer, int len)
11411141
{
11421142
wchar_t cwd[MAX_PATH], wpointer[MAX_PATH];
11431143
DWORD ret = GetCurrentDirectoryW(ARRAY_SIZE(cwd), cwd);
1144+
HANDLE hnd;
11441145

11451146
if (!ret || ret >= ARRAY_SIZE(cwd)) {
11461147
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
11471148
return NULL;
11481149
}
1149-
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1150-
if (!ret && GetLastError() == ERROR_ACCESS_DENIED) {
1151-
HANDLE hnd = CreateFileW(cwd, 0,
1152-
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
1153-
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
1154-
if (hnd == INVALID_HANDLE_VALUE)
1155-
return NULL;
1150+
hnd = CreateFileW(cwd, 0,
1151+
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL,
1152+
OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL);
1153+
if (hnd != INVALID_HANDLE_VALUE) {
11561154
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
11571155
CloseHandle(hnd);
11581156
if (!ret || ret >= ARRAY_SIZE(wpointer))
@@ -1161,13 +1159,11 @@ char *mingw_getcwd(char *pointer, int len)
11611159
return NULL;
11621160
return pointer;
11631161
}
1164-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1165-
return NULL;
1166-
if (GetFileAttributesW(wpointer) == INVALID_FILE_ATTRIBUTES) {
1162+
if (GetFileAttributesW(cwd) == INVALID_FILE_ATTRIBUTES) {
11671163
errno = ENOENT;
11681164
return NULL;
11691165
}
1170-
if (xwcstoutf(pointer, wpointer, len) < 0)
1166+
if (xwcstoutf(pointer, cwd, len) < 0)
11711167
return NULL;
11721168
convert_slashes(pointer);
11731169
return pointer;

0 commit comments

Comments
 (0)