[PATCH 1/2] Rename WSYM_sysfile to WSM_default
Jon Turney
jon.turney@dronecode.org.uk
Thu Jul 29 17:20:11 GMT 2021
Rename WSYM_sysfile to WSM_default, since it selects more than just
sysfile with magic cookie now.
---
winsup/cygwin/globals.cc | 4 ++--
winsup/cygwin/path.cc | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/winsup/cygwin/globals.cc b/winsup/cygwin/globals.cc
index 3b25c2803..066026421 100644
--- a/winsup/cygwin/globals.cc
+++ b/winsup/cygwin/globals.cc
@@ -53,7 +53,7 @@ enum exit_states
"winsymlinks" setting of the CYGWIN environment variable. */
enum winsym_t
{
- WSYM_sysfile = 0,
+ WSYM_default = 0,
WSYM_lnk,
WSYM_native,
WSYM_nativestrict,
@@ -71,7 +71,7 @@ bool ignore_case_with_glob;
bool pipe_byte;
bool reset_com;
bool wincmdln;
-winsym_t allow_winsymlinks = WSYM_sysfile;
+winsym_t allow_winsymlinks = WSYM_default;
bool disable_pcon;
bool NO_COPY in_forkee;
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 1869fb8c8..cd029c5b4 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2013,7 +2013,7 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
/* Don't try native symlinks on FSes not supporting reparse points. */
else if ((wsym_type == WSYM_native || wsym_type == WSYM_nativestrict)
&& !(win32_newpath.fs_flags () & FILE_SUPPORTS_REPARSE_POINTS))
- wsym_type = WSYM_sysfile;
+ wsym_type = WSYM_default;
/* Attach .lnk suffix when shortcut is requested. */
if (wsym_type == WSYM_lnk && !win32_newpath.exists ()
@@ -2059,9 +2059,9 @@ symlink_worker (const char *oldpath, path_conv &win32_newpath, bool isdevice)
__leave;
}
/* Otherwise, fall back to default symlink type. */
- wsym_type = WSYM_sysfile;
+ wsym_type = WSYM_default;
fallthrough;
- case WSYM_sysfile:
+ case WSYM_default:
if (win32_newpath.fs_flags () & FILE_SUPPORTS_REPARSE_POINTS)
{
res = symlink_wsl (oldpath, win32_newpath);
--
2.32.0
More information about the Cygwin-patches
mailing list