From e88d137c896d30a89161ac3f59ec36106fce13e0 Mon Sep 17 00:00:00 2001 From: Takashi Yano Date: Mon, 1 Aug 2022 09:02:23 +0900 Subject: [PATCH] Cygwin: path: Make some symlinks to /cygdrive/* work. - Previously, some symbolic links to /cygdrive/* (e.g. /cygdrive/C, /cygdrive/./c, /cygdrive//c, etc.) did not work. This patch fixes the issue. Addresses: https://cygwin.com/pipermail/cygwin/2022-July/251994.html --- winsup/cygwin/path.cc | 6 +++++- winsup/cygwin/release/3.3.6 | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index eceafbbcf..c5ceb1da4 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -1929,7 +1929,11 @@ symlink_wsl (const char *oldpath, path_conv &win32_newpath) cygdrive prefix is not "/", otherwise suffer random "/mnt" symlinks... */ if (mount_table->cygdrive_len > 1 && path_prefix_p (mount_table->cygdrive, oldpath, - mount_table->cygdrive_len, false)) + mount_table->cygdrive_len, false) + && (strlen (oldpath + mount_table->cygdrive_len - 1) < 2 + || (islower (oldpath[mount_table->cygdrive_len]) + && (oldpath[mount_table->cygdrive_len + 1] == '/' + || oldpath[mount_table->cygdrive_len + 1] == '\0')))) stpcpy (stpcpy (path_buf, "/mnt"), oldpath + mount_table->cygdrive_len - 1); else diff --git a/winsup/cygwin/release/3.3.6 b/winsup/cygwin/release/3.3.6 index 5fb59bf7d..078e6e520 100644 --- a/winsup/cygwin/release/3.3.6 +++ b/winsup/cygwin/release/3.3.6 @@ -31,3 +31,7 @@ Bug Fixes native apps if *.bat or *.cmd is executed directly from cygwin shell. Addresses: https://cygwin.com/pipermail/cygwin/2022-July/251993.html + +- Fix a problem that prevented some symbolic links to /cygdrive/C, + /cygdrive/./c, /cygdrive//c, etc. from working. + Addresses: https://cygwin.com/pipermail/cygwin/2022-July/251994.html