-
Notifications
You must be signed in to change notification settings - Fork 491
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2594 from jeremyd2019/msys2-runtime-native-inner-…
…links msys2-runtime: add patch for native inner links
- Loading branch information
Showing
4 changed files
with
225 additions
and
4 deletions.
There are no files selected for viewing
34 changes: 34 additions & 0 deletions
34
msys2-runtime/0046-Revert-Cygwin-Handle-virtual-drives-as-non-symlinks.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| From 64a769a67a94d8d6f1dc262a33e50fccbb404d23 Mon Sep 17 00:00:00 2001 | ||
| From: Jeremy Drake <cygwin@jdrake.com> | ||
| Date: Sat, 29 May 2021 13:17:08 -0700 | ||
| Subject: [PATCH 46/N] Revert "Cygwin: Handle virtual drives as non-symlinks" | ||
|
|
||
| This reverts commit c8949d04001e3dbc03651475b6cd1c5623400835. | ||
| --- | ||
| winsup/cygwin/path.cc | 9 +++++++-- | ||
| 1 file changed, 7 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc | ||
| index 85605cf..68b0a8d 100644 | ||
| --- a/winsup/cygwin/path.cc | ||
| +++ b/winsup/cygwin/path.cc | ||
| @@ -3665,9 +3665,14 @@ restart: | ||
|
|
||
| subst X: C:\foo\bar | ||
|
|
||
| - Treat it as a normal file. */ | ||
| + Treat it like a symlink. This is required to tell an | ||
| + lstat caller that the "drive" is actually pointing | ||
| + somewhere else, thus, it's a symlink in POSIX speak. */ | ||
| if (upath.Length == 14) /* \??\X:\ */ | ||
| - goto file_not_symlink; | ||
| + { | ||
| + fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; | ||
| + path_flags |= PATH_SYMLINK; | ||
| + } | ||
| /* For final paths differing in inner path components return | ||
| length as negative value. This informs path_conv::check | ||
| to skip realpath handling on the last path component. */ | ||
| -- | ||
| 2.32.0.windows.2 | ||
|
|
123 changes: 123 additions & 0 deletions
123
msys2-runtime/0047-Cygwin-respect-PC_SYM_FOLLOW-and-PC_SYM_NOFOLLOW_REP.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| From 54d3664fe0e78823128ea39ffff8a22b52a1e71a Mon Sep 17 00:00:00 2001 | ||
| From: Jeremy Drake <cygwin@jdrake.com> | ||
| Date: Sat, 29 May 2021 11:48:11 -0700 | ||
| Subject: [PATCH 47/N] Cygwin: respect PC_SYM_FOLLOW and PC_SYM_NOFOLLOW_REP | ||
| with inner links. | ||
|
|
||
| The new GetFinalPathNameW handling for native symlinks in inner path | ||
| components is disabled if caller doesn't want to follow symlinks, or | ||
| doesn't want to follow reparse points. | ||
| --- | ||
| winsup/cygwin/path.cc | 86 ++++++++++++++++++++++--------------------- | ||
| 1 file changed, 44 insertions(+), 42 deletions(-) | ||
|
|
||
| diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc | ||
| index 68b0a8d..67124bb 100644 | ||
| --- a/winsup/cygwin/path.cc | ||
| +++ b/winsup/cygwin/path.cc | ||
| @@ -723,9 +723,10 @@ path_conv::check (const char *src, unsigned opt, | ||
| int symlen = 0; | ||
|
|
||
| /* Make sure to check certain flags on last component only. */ | ||
| - for (unsigned pc_flags = opt & (PC_NO_ACCESS_CHECK | PC_KEEP_HANDLE); | ||
| + for (unsigned pc_flags = opt & (PC_NO_ACCESS_CHECK | PC_KEEP_HANDLE | ||
| + | PC_SYM_FOLLOW | PC_SYM_NOFOLLOW_REP); | ||
| ; | ||
| - pc_flags = 0) | ||
| + pc_flags = opt & (PC_SYM_FOLLOW | PC_SYM_NOFOLLOW_REP)) | ||
| { | ||
| const suffix_info *suff; | ||
| char *full_path; | ||
| @@ -3640,48 +3641,49 @@ restart: | ||
| goto file_not_symlink; | ||
| } | ||
| #endif /* __i386__ */ | ||
| - { | ||
| - PWCHAR fpbuf = tp.w_get (); | ||
| - DWORD ret; | ||
| + if ((pc_flags & (PC_SYM_FOLLOW | PC_SYM_NOFOLLOW_REP)) == PC_SYM_FOLLOW) | ||
| + { | ||
| + PWCHAR fpbuf = tp.w_get (); | ||
| + DWORD ret; | ||
|
|
||
| - ret = GetFinalPathNameByHandleW (h, fpbuf, NT_MAX_PATH, 0); | ||
| - if (ret) | ||
| - { | ||
| - UNICODE_STRING fpath; | ||
| + ret = GetFinalPathNameByHandleW (h, fpbuf, NT_MAX_PATH, 0); | ||
| + if (ret) | ||
| + { | ||
| + UNICODE_STRING fpath; | ||
|
|
||
| - RtlInitCountedUnicodeString (&fpath, fpbuf, ret * sizeof (WCHAR)); | ||
| - fpbuf[1] = L'?'; /* \\?\ --> \??\ */ | ||
| - if (!RtlEqualUnicodeString (&upath, &fpath, !!ci_flag)) | ||
| - { | ||
| - issymlink = true; | ||
| - /* upath.Buffer is big enough and unused from this point on. | ||
| - Reuse it here, avoiding yet another buffer allocation. */ | ||
| - char *nfpath = (char *) upath.Buffer; | ||
| - sys_wcstombs (nfpath, NT_MAX_PATH, fpbuf); | ||
| - res = posixify (nfpath); | ||
| - | ||
| - /* If the incoming path consisted of a drive prefix only, | ||
| - we just handle a virtual drive, created with, e.g. | ||
| - | ||
| - subst X: C:\foo\bar | ||
| - | ||
| - Treat it like a symlink. This is required to tell an | ||
| - lstat caller that the "drive" is actually pointing | ||
| - somewhere else, thus, it's a symlink in POSIX speak. */ | ||
| - if (upath.Length == 14) /* \??\X:\ */ | ||
| - { | ||
| - fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; | ||
| - path_flags |= PATH_SYMLINK; | ||
| - } | ||
| - /* For final paths differing in inner path components return | ||
| - length as negative value. This informs path_conv::check | ||
| - to skip realpath handling on the last path component. */ | ||
| - else | ||
| - res = -res; | ||
| - break; | ||
| - } | ||
| - } | ||
| - } | ||
| + RtlInitCountedUnicodeString (&fpath, fpbuf, ret * sizeof (WCHAR)); | ||
| + fpbuf[1] = L'?'; /* \\?\ --> \??\ */ | ||
| + if (!RtlEqualUnicodeString (&upath, &fpath, !!ci_flag)) | ||
| + { | ||
| + issymlink = true; | ||
| + /* upath.Buffer is big enough and unused from this point on. | ||
| + Reuse it here, avoiding yet another buffer allocation. */ | ||
| + char *nfpath = (char *) upath.Buffer; | ||
| + sys_wcstombs (nfpath, NT_MAX_PATH, fpbuf); | ||
| + res = posixify (nfpath); | ||
| + | ||
| + /* If the incoming path consisted of a drive prefix only, | ||
| + we just handle a virtual drive, created with, e.g. | ||
| + | ||
| + subst X: C:\foo\bar | ||
| + | ||
| + Treat it like a symlink. This is required to tell an | ||
| + lstat caller that the "drive" is actually pointing | ||
| + somewhere else, thus, it's a symlink in POSIX speak. */ | ||
| + if (upath.Length == 14) /* \??\X:\ */ | ||
| + { | ||
| + fileattr &= ~FILE_ATTRIBUTE_DIRECTORY; | ||
| + path_flags |= PATH_SYMLINK; | ||
| + } | ||
| + /* For final paths differing in inner path components return | ||
| + length as negative value. This informs path_conv::check | ||
| + to skip realpath handling on the last path component. */ | ||
| + else | ||
| + res = -res; | ||
| + break; | ||
| + } | ||
| + } | ||
| + } | ||
|
|
||
| /* Normal file. */ | ||
| file_not_symlink: | ||
| -- | ||
| 2.32.0.windows.2 | ||
|
|
55 changes: 55 additions & 0 deletions
55
msys2-runtime/0048-Cygwin-make-option-for-native-inner-link-handling.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| From b671a59da80fa1db6115e3275149f9639681453a Mon Sep 17 00:00:00 2001 | ||
| From: Jeremy Drake <github@jdrake.com> | ||
| Date: Thu, 22 Jul 2021 11:59:16 -0700 | ||
| Subject: [PATCH 48/N] Cygwin: make option for native inner link handling. | ||
|
|
||
| This code has been causing issues with SUBST and mapped network drives, | ||
| so add an option (defaulted to on) which can be used to disable it where | ||
| needed. MSYS=nonativeinnerlinks | ||
| --- | ||
| winsup/cygwin/environ.cc | 1 + | ||
| winsup/cygwin/globals.cc | 1 + | ||
| winsup/cygwin/path.cc | 3 ++- | ||
| 3 files changed, 4 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc | ||
| index e1dbba3..91e3e9c 100644 | ||
| --- a/winsup/cygwin/environ.cc | ||
| +++ b/winsup/cygwin/environ.cc | ||
| @@ -127,6 +127,7 @@ static struct parse_thing | ||
| {"disable_pcon", {&disable_pcon}, setbool, NULL, {{false}, {true}}}, | ||
| {"enable_pcon", {&disable_pcon}, setnegbool, NULL, {{true}, {false}}}, | ||
| {"winjitdebug", {&winjitdebug}, setbool, NULL, {{false}, {true}}}, | ||
| + {"nativeinnerlinks", {&nativeinnerlinks}, setbool, NULL, {{false}, {true}}}, | ||
| {NULL, {0}, setdword, 0, {{0}, {0}}} | ||
| }; | ||
|
|
||
| diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc | ||
| index a729e70..a144a98 100644 | ||
| --- a/winsup/cygwin/globals.cc | ||
| +++ b/winsup/cygwin/globals.cc | ||
| @@ -75,6 +75,7 @@ bool wincmdln = true; | ||
| winsym_t allow_winsymlinks = WSYM_deepcopy; | ||
| bool disable_pcon = true; | ||
| bool winjitdebug = false; | ||
| +bool nativeinnerlinks = true; | ||
|
|
||
| bool NO_COPY in_forkee; | ||
|
|
||
| diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc | ||
| index 67124bb..2cf8c93 100644 | ||
| --- a/winsup/cygwin/path.cc | ||
| +++ b/winsup/cygwin/path.cc | ||
| @@ -3641,7 +3641,8 @@ restart: | ||
| goto file_not_symlink; | ||
| } | ||
| #endif /* __i386__ */ | ||
| - if ((pc_flags & (PC_SYM_FOLLOW | PC_SYM_NOFOLLOW_REP)) == PC_SYM_FOLLOW) | ||
| + if (nativeinnerlinks | ||
| + && (pc_flags & (PC_SYM_FOLLOW | PC_SYM_NOFOLLOW_REP)) == PC_SYM_FOLLOW) | ||
| { | ||
| PWCHAR fpbuf = tp.w_get (); | ||
| DWORD ret; | ||
| -- | ||
| 2.32.0.windows.2 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters