From d79a78e5c8d88fc7f38c396a3d25c376766c769a Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Wed, 30 Jul 2008 14:41:59 +0000
Subject: 	* fhandler_disk_file.cc (fhandler_base::fstat_by_name): Check
 for 	file systems incapable of handling FileIdBothDirectoryInformation 
 correctly. 	(fhandler_disk_file::opendir): Ditto. 	* path.cc
 (fs_info::update): Always clear at the start. 	Rearrange to make certain
 tests only on non-Samba, non-NFS remote 	drives. 	Add test for
 file systems known to be incapable of handling 
 FileIdBothDirectoryInformation correctly.  Right now that's just 
 "UNIXFS". 	* path.h (struct fs_info): Add has_buggy_fileid_dirinfo flag
 and 	accessor methods. 	(class path_conv): Add
 has_buggy_fileid_dirinfo method.

---
 winsup/cygwin/path.cc | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'winsup/cygwin/path.cc')

diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 4729bc999..66e174771 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -389,6 +389,7 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
   } ffvi_buf;
   UNICODE_STRING fsname, testname;
 
+  clear ();
   if (in_vol)
     vol = in_vol;
   else
@@ -420,7 +421,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
 	{
 	  debug_printf ("Cannot access path %S, status %08lx",
 			attr.ObjectName, status);
-	  clear ();
 	  NtClose (vol);
 	  return false;
 	}
@@ -450,8 +450,6 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
     {
       debug_printf ("Cannot get volume attributes (%S), %08lx",
 		    attr.ObjectName, status);
-      has_buggy_open (false);
-      flags (0);
       if (!in_vol)
 	NtClose (vol);
       return false;
@@ -506,23 +504,38 @@ fs_info::update (PUNICODE_STRING upath, HANDLE in_vol)
 	is_samba (RtlEqualUnicodeString (&fsname, &testname, FALSE)
 		  && FS_IS_SAMBA);
 
-      is_netapp (!is_samba ()
-		 && RtlEqualUnicodeString (&fsname, &testname, FALSE)
-		 && FS_IS_NETAPP_DATAONTAP);
+      if (!is_samba ())
+        {
+	  is_netapp (RtlEqualUnicodeString (&fsname, &testname, FALSE)
+		     && FS_IS_NETAPP_DATAONTAP);
+
+	  RtlInitUnicodeString (&testname, L"NFS");
+	  is_nfs (RtlEqualUnicodeString (&fsname, &testname, FALSE));
+
+	  if (!is_nfs ())
+	    {
+	      /* Known remote file systems which can't handle calls to
+	         NtQueryDirectoryFile(FileIdBothDirectoryInformation) */
+	      RtlInitUnicodeString (&testname, L"UNIXFS");
+	      has_buggy_fileid_dirinfo (RtlEqualUnicodeString (&fsname,
+							       &testname,
+							       FALSE));
+
+	      /* Known remote file systems with buggy open calls.  Further
+		 explanation in fhandler.cc (fhandler_disk_file::open). */
+	      RtlInitUnicodeString (&testname, L"SUNWNFS");
+	      has_buggy_open (RtlEqualUnicodeString (&fsname, &testname,
+						     FALSE));
+	    }
+	}
     }
   is_ntfs (RtlEqualUnicodeString (&fsname, &testname, FALSE)
 	   && !is_samba () && !is_netapp ());
-  RtlInitUnicodeString (&testname, L"NFS");
-  is_nfs (RtlEqualUnicodeString (&fsname, &testname, FALSE));
   is_cdrom (ffdi.DeviceType == FILE_DEVICE_CD_ROM);
 
   has_acls (flags () & FS_PERSISTENT_ACLS);
   hasgood_inode (((flags () & FILE_PERSISTENT_ACLS) && !is_netapp ())
 		 || is_nfs ());
-  /* Known file systems with buggy open calls. Further explanation
-     in fhandler.cc (fhandler_disk_file::open). */
-  RtlInitUnicodeString (&testname, L"SUNWNFS");
-  has_buggy_open (RtlEqualUnicodeString (&fsname, &testname, FALSE));
   /* Case sensitivity is supported if FILE_CASE_SENSITIVE_SEARCH is set,
      except on Samba which handles Windows clients case insensitive.
      NFS doesn't set the FILE_CASE_SENSITIVE_SEARCH flag but is case
-- 
cgit v1.2.3