From 8bbcebc843539d15f9bf8197268e2b022c0bc24c Mon Sep 17 00:00:00 2001
From: Natalia Portillo <claunia@claunia.com>
Date: Mon, 15 Mar 2021 02:12:53 +0000
Subject: [PATCH] Add support for f_fstypename from statfs(2).

---
 setter/src/unix/CMakeLists.txt | 12 +++++++++---
 setter/src/unix/volume.c       |  9 ++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/setter/src/unix/CMakeLists.txt b/setter/src/unix/CMakeLists.txt
index 8b137cc..abcb020 100644
--- a/setter/src/unix/CMakeLists.txt
+++ b/setter/src/unix/CMakeLists.txt
@@ -36,20 +36,26 @@ CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT)
 if(HAVE_SYS_STATFS)
     message("-- Found statfs in sys/statfs.h")
     add_definitions(-DHAVE_SYS_STATFS_H)
-    CHECK_STRUCT_HAS_MEMBER(statfs "f_namelen" "sys/statfs.h" HAVE_STATFS_FNAMELEN)
+    CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/statfs.h" HAVE_STATFS_FNAMELEN)
+    CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/statfs.h" HAVE_STATFS_FTYPENAME)
 endif()
 
 # Darwin and most other BSDs
 if(HAVE_SYS_MOUNT)
     message("-- Found statfs in sys/mount.h")
     add_definitions(-DHAVE_SYS_MOUNT_H)
-    CHECK_STRUCT_HAS_MEMBER(statfs "f_namelen" "sys/statfs.h" HAVE_STATFS_FNAMELEN)
+    CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/mount.h" HAVE_STATFS_FNAMELEN)
+    CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/mount.h" HAVE_STATFS_FTYPENAME)
 endif()
 
 if(HAVE_STATFS_FNAMELEN)
     message("-- statfs has f_namelen member")
     add_definitions(-DUSE_STATFS_FNAMELEN)
-    CHECK_STRUCT_HAS_MEMBER(statfs "f_namelen" "sys/statfs.h" HAVE_STATFS_FNAMELEN)
+endif()
+
+if(HAVE_STATFS_FTYPENAME)
+    message("-- statfs has f_fstypename member")
+    add_definitions(-DUSE_STATFS_FTYPENAME)
 endif()
 
 set(UNIX_SOURCES attr.c deleted.c dirdepth.c filename.c files.c frag.c links.c os.c perms.c rsrcfork.c sparse.c time.c volume.c xattr.c)
diff --git a/setter/src/unix/volume.c b/setter/src/unix/volume.c
index 0b4cb65..07b55ea 100644
--- a/setter/src/unix/volume.c
+++ b/setter/src/unix/volume.c
@@ -22,9 +22,8 @@ Aaru Data Preservation Suite
 Copyright (C) 2011-2021 Natalia Portillo
 *****************************************************************************/
 
-#include <stddef.h>
-
 #include <errno.h>
+#include <stddef.h>
 #include <stdio.h>
 
 #ifdef HAVE_SYS_STAT_H
@@ -32,8 +31,8 @@ Copyright (C) 2011-2021 Natalia Portillo
 #endif
 
 #if defined(HAVE_SYS_MOUNT_H)
-#include <sys/param.h>
 #include <sys/mount.h>
+#include <sys/param.h>
 #endif
 
 #include "../include/defs.h"
@@ -56,6 +55,9 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
     log_write("Volume information:\n");
     log_write("\tPath: %s\n", path);
 
+#ifdef USE_STATFS_FTYPENAME
+    log_write("\tFilesystem: %s\n", buf.f_fstypename);
+#else
     log_write("\tFilesystem: ");
     switch(buf.f_type)
     {
@@ -143,6 +145,7 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
         default: log_write("unknown type -> 0x%lX", buf.f_type);
     }
     log_write("\n");
+#endif
 
     log_write("\tBytes per block: %ld\n", buf.f_bsize);
     log_write("\tVolume size: %llu bytes\n", ((unsigned long long)buf.f_blocks) * buf.f_bsize);