mountlist: fix local drive detection on cygwin

* lib/mountlist.c (ME_REMOTE) [__CYGWIN__]: Provide implementation
that works for cygwin.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 021102c7f2e9df0ddb61de370458504ab46bd518..f9aff45eb47b6f77e6096473ea1c3fbc477a1257 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-29  Eric Blake  <eblake@redhat.com>
+
+       mountlist: fix local drive detection on cygwin
+       * lib/mountlist.c (ME_REMOTE) [__CYGWIN__]: Provide implementation
+       that works for cygwin.
+
 2010-12-29  Paul Eggert  <eggert@cs.ucla.edu>
 
        ftoastr, snprintf: ftoastr + snprintf module

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 996b71a1f97ed069ffba019ac7c3a293093fd8fc..126f43ddc82baef9c5e8f7c47d540362446428b8 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -156,6 +156,30 @@
      || strcmp (Fs_type, "ignore") == 0)
 #endif
 
+#ifdef __CYGWIN__
+# include <windows.h>
+# define ME_REMOTE me_remote
+/* All cygwin mount points include `:' or start with `//'; so it
+   requires a native Windows call to determine remote disks.  */
+static bool
+me_remote (char const *fs_name, char const *fs_type _GL_UNUSED)
+{
+  if (fs_name[0] && fs_name[1] == ':')
+    {
+      char const drive[3] = { fs_name[0], ':', '\0' };
+      switch (GetDriveType (drive))
+        {
+        case DRIVE_REMOVABLE:
+        case DRIVE_FIXED:
+        case DRIVE_CDROM:
+        case DRIVE_RAMDISK:
+          return false;
+        }
+    }
+  return true;
+}
+#endif
+
 #ifndef ME_REMOTE
 /* A file system is `remote' if its Fs_name contains a `:'
    or if (it is of type (smbfs or cifs) and its Fs_name starts with `//').  */