From 85dc67887b7973790f63719d5a3b994bb980e790 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Tue, 28 Dec 2010 10:07:58 -0700 Subject: mountlist: fix local drive detection on cygwin * lib/mountlist.c (ME_REMOTE) [__CYGWIN__]: Provide implementation that works for cygwin. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ lib/mountlist.c | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/ChangeLog b/ChangeLog index 021102c7f2..f9aff45eb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-12-29 Eric Blake + + mountlist: fix local drive detection on cygwin + * lib/mountlist.c (ME_REMOTE) [__CYGWIN__]: Provide implementation + that works for cygwin. + 2010-12-29 Paul Eggert ftoastr, snprintf: ftoastr + snprintf module diff --git a/lib/mountlist.c b/lib/mountlist.c index 996b71a1f9..126f43ddc8 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -156,6 +156,30 @@ || strcmp (Fs_type, "ignore") == 0) #endif +#ifdef __CYGWIN__ +# include +# 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 `//'). */ -- cgit v1.2.1