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 old Linux statfs.

Browse Source
This commit is contained in:
Natalia Portillo
2021-05-11 21:39:27 +01:00
parent a4b045ff9c
commit aed413edff
4 changed files with 54 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setter/projects/make/dflybsd/Makefile
View File

@@ -58,7 +58,7 @@ LFLAGS =
# Compiler flags. This needs the definitions on how to find statfs.h as there is no autodetection # Compiler flags. This needs the definitions on how to find statfs.h as there is no autodetection
# BSD 2.11 defines statfs to be in sys/mount.h # BSD 2.11 defines statfs to be in sys/mount.h
CFLAGS = -DHAVE_SYS_MOUNT_H -DHAVE_STATFS_FTYPENAME -DHAVE_STATFS_FTYPE -DNEED_SYS_TYPES_H CFLAGS = -DHAVE_SYS_MOUNT_H -DHAVE_STATFS_TYPENAME -DHAVE_STATFS_TYPE -DNEED_SYS_TYPES_H
all: fssetter all: fssetter

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

@@ -22,8 +22,8 @@
# Copyright (C) 2011-2021 Natalia Portillo # Copyright (C) 2011-2021 Natalia Portillo
# *****************************************************************************/ # *****************************************************************************/
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^(([^k].*)?BSD|DragonFly)$" ) if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "^(([^k].*)?BSD|DragonFly)$")
return() return()
endif() endif()
include(CheckIncludeFile) include(CheckIncludeFile)
@@ -33,45 +33,58 @@ include(CheckStructHasMember)
CHECK_SYMBOL_EXISTS(statfs "sys/statfs.h" HAVE_SYS_STATFS) CHECK_SYMBOL_EXISTS(statfs "sys/statfs.h" HAVE_SYS_STATFS)
CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT) CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT)
CHECK_SYMBOL_EXISTS(statvfs "sys/statvfs.h" HAVE_SYS_STATVFS) CHECK_SYMBOL_EXISTS(statvfs "sys/statvfs.h" HAVE_SYS_STATVFS)
CHECK_SYMBOL_EXISTS(statfs "sys/vfs.h" HAVE_SYS_VFS)
if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") if(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
message("-- Forcing statfs in sys/mount.h due to OpenBSD") message("-- Forcing statfs in sys/mount.h due to OpenBSD")
add_sub_definitions(HAVE_SYS_MOUNT_H) add_sub_definitions(HAVE_SYS_MOUNT_H)
add_sub_definitions(NEED_SYS_TYPES_H) add_sub_definitions(NEED_SYS_TYPES_H)
set(HAVE_STATFS_FTYPENAME 1) add_sub_definitions(USE_STATFS_FLAGS)
set(HAVE_STATFS_TYPENAME 1)
set(HAVE_STATFS_NAMEMAX 1) set(HAVE_STATFS_NAMEMAX 1)
# Old Linux
elseif(HAVE_SYS_VFS)
message("-- Found statfs in sys/vfs.h")
add_sub_definitions(HAVE_SYS_VFS_H)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/vfs.h" HAVE_STATFS_NAMELEN)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/vfs.h" HAVE_STATFS_TYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/vfs.h" HAVE_STATFS_NAMEMAX)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_type" "sys/vfs.h" HAVE_STATFS_TYPE)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_flags" "sys/vfs.h" HAVE_STATFS_FLAGS)
# Linux and FreeBSD # Linux and FreeBSD
elseif(HAVE_SYS_STATFS) elseif(HAVE_SYS_STATFS)
message("-- Found statfs in sys/statfs.h") message("-- Found statfs in sys/statfs.h")
add_sub_definitions(HAVE_SYS_STATFS_H) add_sub_definitions(HAVE_SYS_STATFS_H)
add_sub_definitions(TEST) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/statfs.h" HAVE_STATFS_NAMELEN)
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_TYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/statfs.h" HAVE_STATFS_FTYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/statfs.h" HAVE_STATFS_NAMEMAX) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/statfs.h" HAVE_STATFS_NAMEMAX)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_type" "sys/statfs.h" HAVE_STATFS_FTYPE) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_type" "sys/statfs.h" HAVE_STATFS_TYPE)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_flags" "sys/statfs.h" HAVE_STATFS_FLAGS)
elseif(HAVE_SYS_MOUNT) # Darwin and most other BSDs elseif(HAVE_SYS_MOUNT) # Darwin and most other BSDs
message("-- Found statfs in sys/mount.h") message("-- Found statfs in sys/mount.h")
add_sub_definitions(HAVE_SYS_MOUNT_H) add_sub_definitions(HAVE_SYS_MOUNT_H)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/mount.h" HAVE_STATFS_FNAMELEN) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namelen" "sys/mount.h" HAVE_STATFS_NAMELEN)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/mount.h" HAVE_STATFS_FTYPENAME) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_fstypename" "sys/mount.h" HAVE_STATFS_TYPENAME)
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # It's giving false positives sometimes if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") # It's giving false positives sometimes
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/mount.h" HAVE_STATFS_NAMEMAX) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/mount.h" HAVE_STATFS_NAMEMAX)
endif() endif()
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_type" "sys/mount.h" HAVE_STATFS_FTYPE) CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_type" "sys/mount.h" HAVE_STATFS_TYPE)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_flags" "sys/mount.h" HAVE_STATFS_FLAGS)
elseif(HAVE_SYS_STATVFS) # NetBSD >= 3.0 elseif(HAVE_SYS_STATVFS) # NetBSD >= 3.0
message("-- Found statvfs in sys/statvfs.h") message("-- Found statvfs in sys/statvfs.h")
add_sub_definitions(HAVE_SYS_STATVFS_H) add_sub_definitions(HAVE_SYS_STATVFS_H)
CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_namemax" "sys/statvfs.h" HAVE_STATFS_NAMEMAX) CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_namemax" "sys/statvfs.h" HAVE_STATFS_NAMEMAX)
CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_fstypename" "sys/statvfs.h" HAVE_STATFS_FTYPENAME) CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_fstypename" "sys/statvfs.h" HAVE_STATFS_TYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_type" "sys/statvfs.h" HAVE_STATFS_FTYPE) CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_type" "sys/statvfs.h" HAVE_STATFS_TYPE)
CHECK_STRUCT_HAS_MEMBER("struct statvfs" "f_flags" "sys/statvfs.h" HAVE_STATFS_FLAGS)
endif() endif()
if(HAVE_STATFS_FNAMELEN) if(HAVE_STATFS_NAMELEN)
message("-- statfs has f_namelen member") message("-- statfs has f_namelen member")
add_sub_definitions(USE_STATFS_FNAMELEN) add_sub_definitions(USE_STATFS_NAMELEN)
endif() endif()
if(HAVE_STATFS_FTYPENAME) if(HAVE_STATFS_TYPENAME)
message("-- statfs has f_fstypename member") message("-- statfs has f_fstypename member")
add_sub_definitions(USE_STATFS_FTYPENAME) add_sub_definitions(USE_STATFS_FTYPENAME)
endif() endif()
@@ -81,6 +94,16 @@ if(HAVE_STATFS_NAMEMAX)
add_sub_definitions(USE_STATFS_NAMEMAX) add_sub_definitions(USE_STATFS_NAMEMAX)
endif() endif()
if(HAVE_STATFS_TYPE)
message("-- statfs has f_type member")
add_sub_definitions(USE_STATFS_FLAGS)
endif()
if(HAVE_STATFS_FLAGS)
message("-- statfs has f_flags member")
add_sub_definitions(USE_STATFS_FLAGS)
endif()
add_subdirectory(darwin) add_subdirectory(darwin)
add_subdirectory(linux) add_subdirectory(linux)
add_subdirectory(bsd) add_subdirectory(bsd)

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

@@ -22,11 +22,16 @@ Aaru Data Preservation Suite
Copyright (C) 2011-2021 Natalia Portillo Copyright (C) 2011-2021 Natalia Portillo
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_SYS_STATFS_H
#include <sys/statfs.h> #include <sys/statfs.h>
#elif defined(HAVE_SYS_VFS_H)
#include "volume.h" #include <sys/vfs.h>
#else
#warning statfs not found, will use custom redefinition of flags
#endif
#include "../../log.h" #include "../../log.h"
#include "volume.h"
void LinuxPrintStatfsFlags(__fsword_t flags) void LinuxPrintStatfsFlags(__fsword_t flags)
{ {

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

@@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo
#error Need to be compiled without -posix argument #error Need to be compiled without -posix argument
#endif #endif
#define HAVE_STATFS_FTYPE #define HAVE_STATFS_TYPE
#if NS_TARGET >= 42 // Rhapsody DR1 #if NS_TARGET >= 42 // Rhapsody DR1
#define NEED_SYS_TYPES_H #define NEED_SYS_TYPES_H
@@ -54,6 +54,10 @@ Copyright (C) 2011-2021 Natalia Portillo
#include <sys/statvfs.h> #include <sys/statvfs.h>
#endif #endif
#ifdef HAVE_SYS_VFS_H
#include <sys/vfs.h>
#endif
#if defined(HAVE_SYS_MOUNT_H) #if defined(HAVE_SYS_MOUNT_H)
#if defined(NEED_SYS_TYPES_H) #if defined(NEED_SYS_TYPES_H)
#include <sys/types.h> #include <sys/types.h>
@@ -101,7 +105,7 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
#ifdef USE_STATFS_FTYPENAME #ifdef USE_STATFS_FTYPENAME
log_write("\tFilesystem: %s\n", buf.f_fstypename); log_write("\tFilesystem: %s\n", buf.f_fstypename);
#elif defined HAVE_STATFS_FTYPE #elif defined(HAVE_STATFS_TYPE)
log_write("\tFilesystem: "); log_write("\tFilesystem: ");
switch(buf.f_type) switch(buf.f_type)
{ {
@@ -195,7 +199,7 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
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);
log_write("\tVolume free: %llu bytes\n", ((unsigned long long)buf.f_bfree) * buf.f_bsize); log_write("\tVolume free: %llu bytes\n", ((unsigned long long)buf.f_bfree) * buf.f_bsize);
#ifdef USE_STATFS_FNAMELEN #ifdef USE_STATFS_NAMELEN
log_write("\tMaximum component length: %ld\n", buf.f_namelen); log_write("\tMaximum component length: %ld\n", buf.f_namelen);
#elif USE_STATFS_NAMEMAX #elif USE_STATFS_NAMEMAX
log_write("\tMaximum component length: %ld\n", buf.f_namemax); log_write("\tMaximum component length: %ld\n", buf.f_namemax);
@@ -210,7 +214,7 @@ void GetVolumeInfo(const char* path, size_t* clusterSize)
log_write("\tFlags: 0x%08lX\n", buf.f_flag); log_write("\tFlags: 0x%08lX\n", buf.f_flag);
#endif #endif
} }
#elif !defined(__NeXT__) || (defined(NS_TARGET) && NS_TARGET >= 42) #elif(!defined(__NeXT__) || (defined(NS_TARGET) && NS_TARGET >= 42)) && defined(USE_STATFS_FLAGS)
if(buf.f_flags) if(buf.f_flags)
{ {
#if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux) #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux)