From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 387B639484B0; Fri, 30 Jul 2021 14:49:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 387B639484B0 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Rename WSYM_sysfile to WSYM_default X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 26d6595f5406a290b1558cde169a710b2eb34938 X-Git-Newrev: 66eefa25f24c441d4e3b96da18c09a9fd3eec01f Message-Id: <20210730144951.387B639484B0@sourceware.org> Date: Fri, 30 Jul 2021 14:49:51 +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: Fri, 30 Jul 2021 14:49:51 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=66eefa25f24c441d4e3b96da18c09a9fd3eec01f commit 66eefa25f24c441d4e3b96da18c09a9fd3eec01f Author: Jon Turney Date: Sat Jul 17 15:47:34 2021 +0100 Cygwin: Rename WSYM_sysfile to WSYM_default Rename WSYM_sysfile to WSYM_default, since it selects more than just sysfile with magic cookie now. Diff: --- 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);