Skip to content

Commit e2a48ec

Browse files
committed
Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2 parents 6188a0d + 2469d5f commit e2a48ec

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
@@ -1142,8 +1142,13 @@ char *mingw_getcwd(char *pointer, int len)
11421142
if (hnd != INVALID_HANDLE_VALUE) {
11431143
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
11441144
CloseHandle(hnd);
1145-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1146-
return NULL;
1145+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1146+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1147+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1148+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1149+
return NULL;
1150+
}
1151+
}
11471152
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
11481153
return NULL;
11491154
return pointer;

0 commit comments

Comments
 (0)