This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH] Cygwin: make path_conv::isdevice() return false on socket files
- From: Ken Brown <kbrown at cornell dot edu>
- To: "cygwin-patches at cygwin dot com" <cygwin-patches at cygwin dot com>
- Date: Thu, 18 Jul 2019 20:02:10 +0000
- Subject: [PATCH] Cygwin: make path_conv::isdevice() return false on socket files
- Arc-authentication-results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=cornell.edu;dmarc=pass action=none header.from=cornell.edu;dkim=pass header.d=cornell.edu;arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WpNMcwcivXXJSEiFp5l8Ixrrnak7AX8aNYghh8lNCE8=; b=bYt1EuBsO8IPDnN7EEtpd8EKm75y9k85Y1A3AUjYxIf6BUhy+JTCDhvLd/kyTaZtdBKKVzWmZCKXGHmuINl19RzQlc3LmPwDoyTPxbY6XrjsP7la+bB5E53xbt7i5oGEE5yAT6PACJP6m6LM1FZjxL79NJkBSQwphtMb1uJbLHlgmMpvn8NihjfYaC3v8UHOY3fosAA/s8LVKl5MCUt10eHbk/afl2jE/9AESkEgN68gCRhrAiAhoFimqnFGhDbW76/XfZuavQ/ela/KMKFNhWipdsefGXQr6IGuGT3qU5U7fJH++yPsLHXTyPiDYUK2aAhqlo18UR9sY7D4/SRXaw==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZiuUvavlIpcvqukwzg38DUA9dsP2FDTrlXMoYWUxu5LbrYprEucu06OjBp5z9PQ5UTS9hXE9OO9gKFvoUtQhrcIZPCCWtbnsh+VezONrbc5D+gW83xQrmUdSSKuBjN5QUb4NEuIs85n3CkMxKGFk+mFtPEgf+MNIVX2vsTdMB3zdjMKv9stMnRhulZdKl5c2UL5yrgRXqQtceVF19T8qNNfHAdsyj3VzF9qFoFFHEvxJ2As1Mv6dw5/QClzHnAfUwFaRcSw74HJQuEqPULE8zKT4hpcIj0Ok6PDvSgSrZSRMn4KXFE1KPtDbovUPIJuaNz0DZ9bZYKJJy2iPtOttrA==
As a result, socket files are no longer treated as lnk special files.
This prevents rename() from adding ".lnk" when renaming a socket file.
Remove a redundant !pc.issocket() from fhandler_disk_file::link().
---
winsup/cygwin/fhandler_disk_file.cc | 4 ++--
winsup/cygwin/path.h | 2 +-
winsup/cygwin/release/3.0.8 | 3 +++
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 193192762..fe4ee6971 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1190,10 +1190,10 @@ fhandler_disk_file::link (const char *newpath)
char new_buf[nlen + 5];
if (!newpc.error)
{
- /* If the original file is a lnk special file (except for sockets),
+ /* If the original file is a lnk special file,
and if the original file has a .lnk suffix, add one to the hardlink
as well. */
- if (pc.is_lnk_special () && !pc.issocket ()
+ if (pc.is_lnk_special ()
&& RtlEqualUnicodePathSuffix (pc.get_nt_native_path (),
&ro_u_lnk, TRUE))
{
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h
index 0c94c6152..5571218bd 100644
--- a/winsup/cygwin/path.h
+++ b/winsup/cygwin/path.h
@@ -179,7 +179,7 @@ class path_conv
int issymlink () const {return path_flags & PATH_SYMLINK;}
int is_lnk_symlink () const {return path_flags & PATH_LNK;}
int is_known_reparse_point () const {return path_flags & PATH_REP;}
- int isdevice () const {return dev.not_device (FH_FS) && dev.not_device (FH_FIFO);}
+ int isdevice () const {return dev.not_device (FH_FS) && dev.not_device (FH_FIFO) && !issocket ();}
int isfifo () const {return dev.is_device (FH_FIFO);}
int isspecial () const {return dev.not_device (FH_FS);}
int iscygdrive () const {return dev.is_device (FH_CYGDRIVE);}
diff --git a/winsup/cygwin/release/3.0.8 b/winsup/cygwin/release/3.0.8
index e3734c9b7..11d11db6f 100644
--- a/winsup/cygwin/release/3.0.8
+++ b/winsup/cygwin/release/3.0.8
@@ -11,3 +11,6 @@ Bug Fixes
- Fix a hang when opening a FIFO with O_PATH.
Addresses: https://cygwin.com/ml/cygwin-developers/2019-06/msg00001.html
+
+- Don't append ".lnk" when renaming a socket file.
+ Addresses: https://cygwin.com/ml/cygwin/2019-07/msg00139.html
--
2.21.0