Cygwin: socket files are not lnk special files
Change path_conv::is_lnk_special() so that it returns false on socket files. is_lnk_special() is called by rename2() in order to deal with special files (FIFOs and symlinks, for example) whose Win32 names usually have a ".lnk" suffix. Socket files do not fall into this category, and this change prevents ".lnk" from being appended erroneously when such files are renamed. Remove a now redundant !pc.issocket() from fhandler_disk_file::link().
This commit is contained in:
parent
af4d29e106
commit
73f819534d
|
@ -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))
|
||||
{
|
||||
|
|
|
@ -184,7 +184,9 @@ class path_conv
|
|||
int isspecial () const {return dev.not_device (FH_FS);}
|
||||
int iscygdrive () const {return dev.is_device (FH_CYGDRIVE);}
|
||||
int is_fs_special () const {return dev.is_fs_special ();}
|
||||
int is_lnk_special () const {return (isdevice () && is_fs_special ())
|
||||
|
||||
int is_lnk_special () const {return (isdevice () && is_fs_special ()
|
||||
&& !issocket ())
|
||||
|| isfifo () || is_lnk_symlink ();}
|
||||
#ifdef __WITH_AF_UNIX
|
||||
int issocket () const {return dev.is_device (FH_LOCAL)
|
||||
|
|
Loading…
Reference in New Issue