1 files changed, 20 insertions, 2 deletions
diff --git a/win32/mingw.c b/win32/mingw.c
index b1a8b9711..44356d6b0 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -1001,6 +1001,25 @@ int link(const char *oldpath, const char *newpath)
        return 0;
 }
+static char *normalize_ntpathA(char *buf)
+{
+        /* fix absolute path prefixes */
+        if (buf[0] == '\\') {
+                /* strip NT namespace prefixes */
+                if (!strncmp(buf, "\\??\\", 4) ||
+                    !strncmp(buf, "\\\\?\\", 4))
+                        buf += 4;
+                else if (!strncasecmp(buf, "\\DosDevices\\", 12))
+                        buf += 12;
+                /* replace remaining '...UNC\' with '\\' */
+                if (!strncasecmp(buf, "UNC\\", 4)) {
+                        buf += 2;
+                        *buf = '\\';
+                }
+        }
+        return buf;
+}
 static char *resolve_symlinks(char *path)
 {
        HANDLE h;
@@ -1022,8 +1041,7 @@ static char *resolve_symlinks(char *path)
                status = GetFinalPathNameByHandleA(h, path, MAX_PATH,
                                                        FILE_NAME_NORMALIZED|VOLUME_NAME_DOS);
                if (status != 0 && status < MAX_PATH) {
-                        /* skip '\\?\' prefix */
+                        ptr = normalize_ntpathA(path);
-                        ptr = (!strncmp(path, "\\\\?\\", 4)) ? (path + 4) : path;
                        goto end;
                }
        }

diff --git a/win32/mingw.c b/win32/mingw.c index b1a8b9711..44356d6b0 100644 --- a/win32/mingw.c +++ b/win32/mingw.c
@@ -1001,6 +1001,25 @@ int link(const char oldpath, const char newpath)
1001	return 0;	1001	return 0;
1002	}	1002	}
1003		1003
		1004	static char normalize_ntpathA(char buf)
		1005	{
		1006	/* fix absolute path prefixes */
		1007	if (buf[0] == '\\') {
		1008	/* strip NT namespace prefixes */
		1009	if (!strncmp(buf, "\\??\\", 4) \|\|
		1010	!strncmp(buf, "\\\\?\\", 4))
		1011	buf += 4;
		1012	else if (!strncasecmp(buf, "\\DosDevices\\", 12))
		1013	buf += 12;
		1014	/* replace remaining '...UNC\' with '\\' */
		1015	if (!strncasecmp(buf, "UNC\\", 4)) {
		1016	buf += 2;
		1017	*buf = '\\';
		1018	}
		1019	}
		1020	return buf;
		1021	}
		1022
1004	static char resolve_symlinks(char path)	1023	static char resolve_symlinks(char path)
1005	{	1024	{
1006	HANDLE h;	1025	HANDLE h;
@@ -1022,8 +1041,7 @@ static char resolve_symlinks(char path)
1022	status = GetFinalPathNameByHandleA(h, path, MAX_PATH,	1041	status = GetFinalPathNameByHandleA(h, path, MAX_PATH,
1023	FILE_NAME_NORMALIZED\|VOLUME_NAME_DOS);	1042	FILE_NAME_NORMALIZED\|VOLUME_NAME_DOS);
1024	if (status != 0 && status < MAX_PATH) {	1043	if (status != 0 && status < MAX_PATH) {
1025	/* skip '\\?\' prefix */	1044	ptr = normalize_ntpathA(path);
1026	ptr = (!strncmp(path, "\\\\?\\", 4)) ? (path + 4) : path;
1027	goto end;	1045	goto end;
1028	}	1046	}
1029	}	1047	}