(stat): Only root directory passed to GetDriveType. Allow RAM disk as well

as local fixed disk when w32-get-true-file-attributes is set to `local'.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9282748191a0dfca3aa807bbe9d8db2047a836bc..4a16ff32b11c35fe84ac08354917e12fb233ec0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * w32.c (stat): Only root directory passed to GetDriveType.  Allow
+       RAM disk as well as local fixed disk when
+       w32-get-true-file-attributes is set to `local'.
+
 2008-08-30  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * macterm.c [USE_CG_DRAWING] (mac_draw_cg_image):

diff --git a/src/w32.c b/src/w32.c
index aa6c21e44025b4df59ef2ec757f912cbca9eea2d..3c2fae73a4be237c4a3c94a2ca779523ff1bbee8 100644 (file)
--- a/src/w32.c
+++ b/src/w32.c
@@ -2390,6 +2390,8 @@ int
 stat (const char * path, struct stat * buf)
 {
   char *name, *r;
+  char drive_root[4];
+  UINT devtype;
   WIN32_FIND_DATA wfd;
   HANDLE fh;
   DWORD fake_inode;
@@ -2491,9 +2493,19 @@ stat (const char * path, struct stat * buf)
        }
     }
 
+  /* GetDriveType needs the root directory of NAME's drive.  */
+  if (!(strlen (name) >= 2 && IS_DEVICE_SEP (name[1])))
+    devtype = GetDriveType (NULL); /* use root of current diectory */
+  else
+    {
+      strncpy (drive_root, name, 3);
+      drive_root[3] = '\0';
+      devtype = GetDriveType (drive_root);
+    }
+
   if (!(NILP (Vw32_get_true_file_attributes)
        || (EQ (Vw32_get_true_file_attributes, Qlocal) &&
-           GetDriveType (name) != DRIVE_FIXED))
+           devtype != DRIVE_FIXED && devtype != DRIVE_RAMDISK))
       /* No access rights required to get info.  */
       && (fh = CreateFile (name, 0, 0, NULL, OPEN_EXISTING,
                           FILE_FLAG_BACKUP_SEMANTICS, NULL))