[newlib-cygwin] Cygwin: path_conv: nobody cares if a path had symlinks after the fact

Corinna Vinschen corinna@sourceware.org
Sun Jan 6 17:06:00 GMT 2019


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=844a1b4fe40db93e266cd7045c3b5c443b5d703a

commit 844a1b4fe40db93e266cd7045c3b5c443b5d703a
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Sat Jan 5 11:31:52 2019 +0100

    Cygwin: path_conv: nobody cares if a path had symlinks after the fact
    
    remove set_has_symlinks/has_symlinks/PATH_HAS_SYMLINKS.  Nobody's
    asking for this information.
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

Diff:
---
 winsup/cygwin/path.cc | 5 -----
 winsup/cygwin/path.h  | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 3cb46c9..ee15dec 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -652,7 +652,6 @@ path_conv::check (const char *src, unsigned opt,
   char *THIS_path = tp.c_get ();
   symlink_info sym;
   bool need_directory = 0;
-  bool saw_symlinks = 0;
   bool add_ext = false;
   bool is_relpath;
   char *tail, *path_end;
@@ -1007,7 +1006,6 @@ path_conv::check (const char *src, unsigned opt,
 		 these operations again on the newly derived path. */
 	      else if (symlen > 0)
 		{
-		  saw_symlinks = 1;
 		  if (component == 0 && !need_directory
 		      && (!(opt & PC_SYM_FOLLOW)
 			  || (is_known_reparse_point ()
@@ -1228,9 +1226,6 @@ path_conv::check (const char *src, unsigned opt,
 	    }
 	}
 
-      if (saw_symlinks)
-	set_has_symlinks ();
-
       if (opt & PC_OPEN)
 	path_flags |= PATH_OPEN;
 
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h
index 309247d..3f84da2 100644
--- a/winsup/cygwin/path.h
+++ b/winsup/cygwin/path.h
@@ -83,7 +83,6 @@ enum path_types
   PATH_LNK		= 0x01000000,
   PATH_TEXT		= 0x02000000,
   PATH_REP		= 0x04000000,
-  PATH_HAS_SYMLINKS	= 0x10000000,
   PATH_SOCKET		= 0x40000000
 };
 
@@ -168,7 +167,6 @@ class path_conv
     return (path_flags & PATH_SPARSE)
 	   && (fs_flags () & FILE_SUPPORTS_SPARSE_FILES);
   }
-  int has_symlinks () const {return path_flags & PATH_HAS_SYMLINKS;}
   int has_dos_filenames_only () const {return path_flags & PATH_DOS;}
   int has_buggy_reopen () const {return fs.has_buggy_reopen ();}
   int has_buggy_fileid_dirinfo () const {return fs.has_buggy_fileid_dirinfo ();}
@@ -232,7 +230,6 @@ class path_conv
   }
 
   void set_symlink (DWORD n) {path_flags |= PATH_SYMLINK; symlink_length = n;}
-  void set_has_symlinks () {path_flags |= PATH_HAS_SYMLINKS;}
   void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : PATH_NOTEXEC;}
 
   void __reg3 check (const UNICODE_STRING *upath, unsigned opt = PC_SYM_FOLLOW,



More information about the Cygwin-cvs mailing list