Skip to content

Commit d579591

Browse files
committed
Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2 parents 01d5eb1 + 2203b1d commit d579591

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

compat/mingw.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,13 @@ char *mingw_getcwd(char *pointer, int len)
10961096
if (hnd != INVALID_HANDLE_VALUE) {
10971097
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
10981098
CloseHandle(hnd);
1099-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1100-
return NULL;
1099+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1100+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1101+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1102+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1103+
return NULL;
1104+
}
1105+
}
11011106
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
11021107
return NULL;
11031108
return pointer;

0 commit comments

Comments
 (0)