Skip to content

Commit 2662830

Browse files
committed
Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2 parents 841f907 + b39b28c commit 2662830

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
@@ -1255,8 +1255,13 @@ char *mingw_getcwd(char *pointer, int len)
12551255
if (hnd != INVALID_HANDLE_VALUE) {
12561256
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
12571257
CloseHandle(hnd);
1258-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1259-
return NULL;
1258+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1259+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1260+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1261+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1262+
return NULL;
1263+
}
1264+
}
12601265
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
12611266
return NULL;
12621267
return pointer;

0 commit comments

Comments
 (0)