From: phumblet <phumblet>
Date: Sat, 2 Oct 2004 02:20:20 +0000 (+0000)
Subject: 2004-10-02  Pierre Humblet <pierre.humblet@ieee.org>
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b0f60758100e33b1527c8a53d5704dabec848268;p=pf3gnuchains%2Fpf3gnuchains3x.git

2004-10-02  Pierre Humblet <pierre.humblet@ieee.org>

	* path.h (enum path_types): Delete PATH_ISDISK.
	(path_conv::isdisk): Delete method.
	(path_conv::set_isdisk): Ditto.
	* path.cc (path_conv::check): Do not call set_isdisk.
	* uinfo.cc(pwdgrp::load): Do not call pc.isdisk.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c0b6fe8ad3..4c8e02f569 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,11 @@
+2004-10-02  Pierre Humblet <pierre.humblet@ieee.org>
+
+	* path.h (enum path_types): Delete PATH_ISDISK.
+	(path_conv::isdisk): Delete method.
+	(path_conv::set_isdisk): Ditto.
+	* path.cc (path_conv::check): Do not call set_isdisk.
+	* uinfo.cc(pwdgrp::load): Do not call pc.isdisk. 
+
 2004-09-28  Christopher Faylor  <cgf@timesys.com>
 
 	* fhandler_termios.cc (fhandler_termios::tcsetpgrp): Disallow attempts
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 94619366e4..3bd8d98347 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -839,7 +839,6 @@ out:
     {
       if (fs.update (path))
 	{
-	  set_isdisk ();
 	  debug_printf ("this->path(%s), has_acls(%d)", path, fs.has_acls ());
 	  if (fs.has_acls () && allow_ntsec && wincap.has_security ())
 	    set_exec (0);  /* We really don't know if this is executable or not here
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h
index 82e629dde7..c10cb9b586 100644
--- a/winsup/cygwin/path.h
+++ b/winsup/cygwin/path.h
@@ -64,7 +64,6 @@ enum path_types
   PATH_ALL_EXEC = (PATH_CYGWIN_EXEC | PATH_EXEC),
   PATH_LNK =	      0x01000000,
   PATH_TEXT =	      0x02000000,
-  PATH_ISDISK =	      0x04000000,
   PATH_HAS_SYMLINKS = 0x10000000,
   PATH_SOCKET =       0x40000000
 };
@@ -123,7 +122,6 @@ class path_conv
   device dev;
   bool case_clash;
 
-  int isdisk () const { return path_flags & PATH_ISDISK;}
   bool isremote () {return fs.is_remote_drive ();}
   int has_acls () const {return fs.has_acls (); }
   int has_symlinks () const {return path_flags & PATH_HAS_SYMLINKS;}
@@ -165,7 +163,6 @@ class path_conv
   void set_binary () {path_flags |= PATH_BINARY;}
   void set_symlink (DWORD n) {path_flags |= PATH_SYMLINK; symlink_length = n;}
   void set_has_symlinks () {path_flags |= PATH_HAS_SYMLINKS;}
-  void set_isdisk () {path_flags |= PATH_ISDISK; dev.devn = FH_FS;}
   void set_exec (int x = 1) {path_flags |= x ? PATH_EXEC : PATH_NOTEXEC;}
 
   void check (const char *src, unsigned opt = PC_SYM_FOLLOW,
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index a7d26780f9..757ca20002 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -511,7 +511,7 @@ pwdgrp::load (const char *posix_fname)
 
   paranoid_printf ("%s", posix_fname);
 
-  if (pc.error || !pc.exists () || !pc.isdisk () || pc.isdir ())
+  if (pc.error || !pc.exists () || pc.isdir ())
     {
       paranoid_printf ("strange path_conv problem");
       res = failed;