public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin/cygwin-3_3-branch] Cygwin: path: Fix path conversion of virtual drive.
@ 2021-12-11 14:10 Takashi Yano
0 siblings, 0 replies; only message in thread
From: Takashi Yano @ 2021-12-11 14:10 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=c2f39a543e2b4a8a136a629fbf24fe75be57a26f
commit c2f39a543e2b4a8a136a629fbf24fe75be57a26f
Author: Takashi Yano <takashi.yano@nifty.ne.jp>
Date: Thu Dec 9 17:15:23 2021 +0900
Cygwin: path: Fix path conversion of virtual drive.
- The last change in path.cc introduced a bug that causes an error
when accessing a virtual drive which mounts UNC path such as
"\\server\share\dir" rather than "\\server\share". This patch
fixes the issue.
Diff:
---
winsup/cygwin/path.cc | 56 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 21 deletions(-)
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index eb1255849..5ab75f105 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -3507,29 +3507,43 @@ restart:
if (RtlEqualUnicodePathPrefix (&fpath, &ro_u_uncp, TRUE)
&& !RtlEqualUnicodePathPrefix (&upath, &ro_u_uncp, TRUE))
{
- /* ...get the remote path from the volume path name,
- replace remote path with drive letter, check again. */
+ /* ...get the remote path, replace remote path
+ with drive letter, check again. */
+ WCHAR drive[3] =
+ {(WCHAR) towupper (upath.Buffer[4]), L':', L'\0'};
WCHAR remote[MAX_PATH];
- fpbuf[1] = L'\\';
- BOOL r = GetVolumePathNameW (fpbuf, remote, MAX_PATH);
- fpbuf[1] = L'?';
- if (r)
- {
- int remlen = wcslen (remote);
- if (remote[remlen - 1] == L'\\')
- remlen--;
- /* Hackfest */
- fpath.Buffer[4] = upath.Buffer[4]; /* Drive letter */
- fpath.Buffer[5] = L':';
- WCHAR *to = fpath.Buffer + 6;
- WCHAR *from = to + remlen - 6;
- memmove (to, from,
- (wcslen (from) + 1) * sizeof (WCHAR));
- fpath.Length -= (from - to) * sizeof (WCHAR);
- if (RtlEqualUnicodeString (&upath, &fpath, !!ci_flag))
- goto file_not_symlink;
- }
+
+ int remlen = QueryDosDeviceW (drive, remote, MAX_PATH);
+ if (remlen < 3)
+ goto file_not_symlink; /* fallback */
+ remlen -= 2;
+
+ if (remote[remlen - 1] == L'\\')
+ remlen--;
+ WCHAR *p;
+ UNICODE_STRING rpath;
+ RtlInitCountedUnicodeString (&rpath, remote,
+ remlen * sizeof (WCHAR));
+ if (RtlEqualUnicodePathPrefix (&rpath, &ro_u_uncp, TRUE))
+ remlen -= 6;
+ else if ((p = wcschr (remote, L';'))
+ && p + 3 < remote + remlen
+ && wcsncmp (p + 1, drive, 2) == 0
+ && (p = wcschr (p + 3, L'\\')))
+ remlen -= p - remote - 1;
+ else
+ goto file_not_symlink; /* fallback */
+ /* Hackfest */
+ fpath.Buffer[4] = drive[0]; /* Drive letter */
+ fpath.Buffer[5] = L':';
+ WCHAR *to = fpath.Buffer + 6;
+ WCHAR *from = to + remlen;
+ memmove (to, from,
+ (wcslen (from) + 1) * sizeof (WCHAR));
+ fpath.Length -= (from - to) * sizeof (WCHAR);
+ if (RtlEqualUnicodeString (&upath, &fpath, !!ci_flag))
+ goto file_not_symlink;
}
issymlink = true;
/* upath.Buffer is big enough and unused from this point on.
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-12-11 14:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-11 14:10 [newlib-cygwin/cygwin-3_3-branch] Cygwin: path: Fix path conversion of virtual drive Takashi Yano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).