Skip to content

Commit eda740b

Browse files
committed
Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2 parents ad1fb3f + b358ec9 commit eda740b

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

0 commit comments

Comments
 (0)