From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 765B4388E821; Mon, 14 Mar 2022 12:55:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 765B4388E821 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: path: Add fallback for DFS mounted drive. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/master X-Git-Oldrev: af8a7c13b516c77c1e6092157e23ca26db44b1af X-Git-Newrev: 7df94e3b4ff3335d21cd3069d3f73818cd44dd74 Message-Id: <20220314125545.765B4388E821@sourceware.org> Date: Mon, 14 Mar 2022 12:55:45 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2022 12:55:45 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D7df94e3b4ff= 3335d21cd3069d3f73818cd44dd74 commit 7df94e3b4ff3335d21cd3069d3f73818cd44dd74 Author: Takashi Yano Date: Fri Mar 11 17:26:30 2022 +0900 Cygwin: path: Add fallback for DFS mounted drive. =20 - If UNC path for DFS is mounted to a drive with drive letter, the error "Too many levels of symbolic links" occurs when accessing to that drive. This is because GetDosDeviceW() returns unexpected string such as "\Device\Mup\DfsClient\;Z:000000000003fb89\dfsserver \dfs\linkname" for the mounted UNC path "\??\UNC\fileserver\share". This patch adds a workaround for this issue. =20 Addresses: https://cygwin.com/pipermail/cygwin/2022-March/250979.html Diff: --- winsup/cygwin/path.cc | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 4ad4e0821..eceafbbcf 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -3527,7 +3527,7 @@ restart: int remlen =3D QueryDosDeviceW (drive, remote, MAX_PATH); if (remlen < 3) goto file_not_symlink; /* fallback */ - remlen -=3D 2; + remlen -=3D 2; /* Two L'\0' */ =20 if (remote[remlen - 1] =3D=3D L'\\') remlen--; @@ -3535,20 +3535,27 @@ restart: UNICODE_STRING rpath; RtlInitCountedUnicodeString (&rpath, remote, remlen * sizeof (WCHAR)); + const USHORT uncp_len =3D + ro_u_uncp.Length / sizeof (WCHAR) - 1; if (RtlEqualUnicodePathPrefix (&rpath, &ro_u_uncp, TRUE)) - remlen -=3D 6; + { + remlen -=3D uncp_len; + p =3D remote + uncp_len; + } else if ((p =3D wcschr (remote, L';')) && p + 3 < remote + remlen && wcsncmp (p + 1, drive, 2) =3D=3D 0 && (p =3D wcschr (p + 3, L'\\'))) - remlen -=3D p - remote - 1; + remlen -=3D p - remote; else goto file_not_symlink; /* fallback */ + if (wcsncasecmp (fpath.Buffer + uncp_len, p, remlen)) + goto file_not_symlink; /* fallback (not expected) */ /* Hackfest */ fpath.Buffer[4] =3D drive[0]; /* Drive letter */ fpath.Buffer[5] =3D L':'; - WCHAR *to =3D fpath.Buffer + 6; - WCHAR *from =3D to + remlen; + WCHAR *to =3D fpath.Buffer + 6; /* Next to L':' */ + WCHAR *from =3D fpath.Buffer + uncp_len + remlen; memmove (to, from, (wcslen (from) + 1) * sizeof (WCHAR)); fpath.Length -=3D (from - to) * sizeof (WCHAR);