Skip to content

Commit 1f25d01

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
Merge pull request #2488 from bmueller84/master
mingw: fix fatal error working on mapped network drives on Windows
2 parents bfe1fcb + bf57c1e commit 1f25d01

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
@@ -1273,8 +1273,13 @@ char *mingw_getcwd(char *pointer, int len)
12731273
return NULL;
12741274
ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
12751275
CloseHandle(hnd);
1276-
if (!ret || ret >= ARRAY_SIZE(wpointer))
1277-
return NULL;
1276+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1277+
ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
1278+
if (!ret || ret >= ARRAY_SIZE(wpointer)) {
1279+
errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
1280+
return NULL;
1281+
}
1282+
}
12781283
if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
12791284
return NULL;
12801285
return pointer;

0 commit comments

Comments
 (0)