Merge pull request #2488 from bmueller84/master

mingw: fix fatal error working on mapped network drives on Windows
git-for-windows · Oct 10, 2024 · f13abe7 · f13abe7
2 parents 8d5b925 + e066033
commit f13abe7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -1164,8 +1164,13 @@ char *mingw_getcwd(char *pointer, int len)
 	if (hnd != INVALID_HANDLE_VALUE) {
 		ret = GetFinalPathNameByHandleW(hnd, wpointer, ARRAY_SIZE(wpointer), 0);
 		CloseHandle(hnd);
-		if (!ret || ret >= ARRAY_SIZE(wpointer))
-			return NULL;
+		if (!ret || ret >= ARRAY_SIZE(wpointer)) {
+			ret = GetLongPathNameW(cwd, wpointer, ARRAY_SIZE(wpointer));
+			if (!ret || ret >= ARRAY_SIZE(wpointer)) {
+				errno = ret ? ENAMETOOLONG : err_win_to_posix(GetLastError());
+				return NULL;
+			}
+		}
 		if (xwcstoutf(pointer, normalize_ntpath(wpointer), len) < 0)
 			return NULL;
 		return pointer;