Ticket #1642: mc-fstype.diff

configure.ac

@@ -142 +142 @@
 
 AC_PROG_INSTALL
 AC_CHECK_HEADERS([unistd.h string.h memory.h grp.h limits.h malloc.h \
-        stdlib.h termios.h utime.h fcntl.h pwd.h sys/statfs.h sys/vfs.h sys/time.h \
+        stdlib.h termios.h utime.h fcntl.h pwd.h \
+        sys/statfs.h sys/statvfs.h sys/vfs.h sys/time.h \
         sys/timeb.h sys/select.h sys/ioctl.h stropts.h arpa/inet.h \
         security/pam_misc.h sys/socket.h sys/sysmacros.h sys/types.h \
         sys/mkdev.h wchar.h wctype.h])
@@ -198 +199 @@
 dnl This is from GNU fileutils, check aclocal.m4 for more information
 dnl
 AC_GET_FS_INFO
+AC_CHECK_MEMBERS([struct statvfs.f_fstypename, struct statvfs.f_basetype],,,[
+AC_INCLUDES_DEFAULT
+#include <sys/statvfs.h>
+])
 
 dnl
 dnl Missing typedefs and replacements

src/filegui.c

@@ -55 +55 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#if defined (__FreeBSD__)
+#if (STAT_STATVFS \
+     && (HAVE_STRUCT_STATVFS_F_BASETYPE || HAVE_STRUCT_STATVFS_F_FSTYPENAME))
+#   define USE_STATVFS 1
+#   include <sys/statvfs.h>
+#   define STRUCT_STATFS struct statvfs
+#   define STATFS statvfs
+#elif HAVE_STATFS && !STAT_STATFS4
+#   define USE_STATFS 1
+#   if HAVE_SYS_VFS_H
+#      include <sys/vfs.h>
+#   elif HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H
 #      include <sys/param.h>
-#endif
-#if defined(__APPLE__) || defined (__FreeBSD__)
 #      include <sys/mount.h>
-#elif defined (__NetBSD__)
-#      include <sys/param.h>
-#else
-#      ifdef HAVE_VFS
-#           include <sys/vfs.h>
-#      else
-#           include <sys/statfs.h>
-#      endif
+#   elif HAVE_SYS_STATFS_H
+#      include <sys/statfs.h>
+#   endif
+#   define STRUCT_STATFS struct statfs
+#   define STATFS statfs
 #endif
 
 #include <unistd.h>
@@ -164 +169 @@
 static int
 filegui__check_attrs_on_fs(const char *fs_path)
 {
-    struct statfs stfs;
+#if USE_STATFS || USE_STATVFS
+    STRUCT_STATFS stfs;
 
-    if (statfs(fs_path, &stfs)!=0)
+    if (STATFS(fs_path, &stfs)!=0)
         return 1;
 
+# ifdef __linux__
     switch ((filegui_nonattrs_fs_t) stfs.f_type)
     {
     case MSDOS_SUPER_MAGIC:
@@ -181 +188 @@
         return 0;
         break;
     }
+# elif HAVE_STRUCT_STATFS_F_FSTYPENAME || HAVE_STRUCT_STATVFS_F_FSTYPENAME
+    if (!strcmp(stfs.f_fstypename, "msdos")
+        || !strcmp(stfs.f_fstypename, "msdosfs")
+        || !strcmp(stfs.f_fstypename, "ntfs")
+        || !strcmp(stfs.f_fstypename, "procfs")
+        || !strcmp(stfs.f_fstypename, "smbfs")
+        || strstr(stfs.f_fstypename, "fusefs"))
+        return 0;
+# elif HAVE_STRUCT_STATVFS_F_BASETYPE
+    if (!strcmp(stfs.f_basetype, "pcfs")
+        || !strcmp(stfs.f_basetype, "ntfs")
+        || !strcmp(stfs.f_basetype, "proc")
+        || !strcmp(stfs.f_basetype, "smbfs")
+        || !strcmp(stfs.f_basetype, "fuse"))
+        return 0;
+# endif
+#endif /* USE_STATFS || USE_STATVFS */
+
     return 1;
 }