From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 1/3] Rename WSYM_sysfile to WSM_default
Date: Mon, 19 Jul 2021 17:31:32 +0100 [thread overview]
Message-ID: <20210719163134.9230-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20210719163134.9230-1-jon.turney@dronecode.org.uk>
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
next prev parent reply other threads:[~2021-07-19 16:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-19 16:31 [PATCH 0/3] Add more winsymlinks values Jon Turney
2021-07-19 16:31 ` Jon Turney [this message]
2021-07-19 16:31 ` [PATCH 2/3] Add winsymlinks:magic Jon Turney
2021-07-19 16:31 ` [PATCH 3/3] Add winsymlinks:wslstrict Jon Turney
2021-07-21 8:19 ` [PATCH 0/3] Add more winsymlinks values Corinna Vinschen
2021-07-21 10:24 ` Christian Franke
2021-07-22 8:03 ` Corinna Vinschen
2021-07-22 13:53 ` Jon Turney
2021-07-22 14:21 ` Corinna Vinschen
2021-07-28 19:55 ` Jon Turney
2021-07-29 10:23 ` Corinna Vinschen
2021-07-29 10:40 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210719163134.9230-2-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).