aaru-dps/fstester
1
0
Fork 0
mirror of https://github.com/aaru-dps/fstester.git synced 2025-12-16 19:24:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for f_fstypename from statfs(2).

Browse Source
This commit is contained in:
Natalia Portillo
2021-03-15 02:12:53 +00:00
parent 851c331cd3
commit 8bbcebc843
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
setter/src/unix/CMakeLists.txt
View File

@@ -36,20 +36,26 @@ CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT)
if(HAVE_SYS_STATFS) if(HAVE_SYS_STATFS)
message("-- Found statfs in sys/statfs.h") message("-- Found statfs in sys/statfs.h")
add_definitions(-DHAVE_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() endif()
# Darwin and most other BSDs # Darwin and most other BSDs
if(HAVE_SYS_MOUNT) if(HAVE_SYS_MOUNT)
message("-- Found statfs in sys/mount.h") message("-- Found statfs in sys/mount.h")
add_definitions(-DHAVE_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() endif()
if(HAVE_STATFS_FNAMELEN) if(HAVE_STATFS_FNAMELEN)
message("-- statfs has f_namelen member") message("-- statfs has f_namelen member")
add_definitions(-DUSE_STATFS_FNAMELEN) 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() 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) 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)

9
setter/src/unix/volume.c
View File

@@ -22,9 +22,8 @@ Aaru Data Preservation Suite
Copyright (C) 2011-2021 Natalia Portillo Copyright (C) 2011-2021 Natalia Portillo
*****************************************************************************/ *****************************************************************************/
#include <stddef.h>
#include <errno.h> #include <errno.h>
#include <stddef.h>
#include <stdio.h> #include <stdio.h>
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
@@ -32,8 +31,8 @@ Copyright (C) 2011-2021 Natalia Portillo
#endif #endif
#if defined(HAVE_SYS_MOUNT_H) #if defined(HAVE_SYS_MOUNT_H)
#include <sys/param.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/param.h>
#endif #endif
#include "../include/defs.h" #include "../include/defs.h"
@@ -56,6 +55,9 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
log_write("Volume information:\n"); log_write("Volume information:\n");
log_write("\tPath: %s\n", path); log_write("\tPath: %s\n", path);
#ifdef USE_STATFS_FTYPENAME
log_write("\tFilesystem: %s\n", buf.f_fstypename);
#else
log_write("\tFilesystem: "); log_write("\tFilesystem: ");
switch(buf.f_type) 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); default: log_write("unknown type -> 0x%lX", buf.f_type);
} }
log_write("\n"); log_write("\n");
#endif
log_write("\tBytes per block: %ld\n", buf.f_bsize); 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); log_write("\tVolume size: %llu bytes\n", ((unsigned long long)buf.f_blocks) * buf.f_bsize);