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

Use f_namemax if available in statfs(2).

Browse Source
This commit is contained in:
Natalia Portillo
2021-03-15 02:52:56 +00:00
parent 1e0b0109f0
commit 5eba1d374b
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@ endif()
include(CheckSymbolExists) include(CheckSymbolExists)
include(CheckStructHasMember) include(CheckStructHasMember)
CHECK_SYMBOL_EXISTS("struct statfs" "sys/statfs.h" HAVE_SYS_STATFS) CHECK_SYMBOL_EXISTS(statfs "sys/statfs.h" HAVE_SYS_STATFS)
CHECK_SYMBOL_EXISTS("struct statfs" "sys/mount.h" HAVE_SYS_MOUNT) CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT)
# Linux and FreeBSD # Linux and FreeBSD
if(HAVE_SYS_STATFS) if(HAVE_SYS_STATFS)
@@ -38,6 +38,7 @@ if(HAVE_SYS_STATFS)
add_definitions(-DHAVE_SYS_STATFS_H) add_definitions(-DHAVE_SYS_STATFS_H)
CHECK_STRUCT_HAS_MEMBER("struct 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) 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)
endif() endif()
# Darwin and most other BSDs # Darwin and most other BSDs
@@ -46,6 +47,7 @@ if(HAVE_SYS_MOUNT)
add_definitions(-DHAVE_SYS_MOUNT_H) add_definitions(-DHAVE_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_FNAMELEN)
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_FTYPENAME)
CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/mount.h" HAVE_STATFS_NAMEMAX)
endif() endif()
if(HAVE_STATFS_FNAMELEN) if(HAVE_STATFS_FNAMELEN)
@@ -58,6 +60,11 @@ if(HAVE_STATFS_FTYPENAME)
add_definitions(-DUSE_STATFS_FTYPENAME) add_definitions(-DUSE_STATFS_FTYPENAME)
endif() endif()
if(HAVE_STATFS_NAMEMAX)
message("-- statfs has f_namemax member")
add_definitions(-DUSE_STATFS_NAMEMAX)
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)
add_library(unix ${UNIX_SOURCES}) add_library(unix ${UNIX_SOURCES})

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

@@ -151,8 +151,10 @@ 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);
#if defined(USE_STATFS_FNAMELEN) #ifdef USE_STATFS_FNAMELEN
log_write("\tMaximum component length: %ld\n", buf.f_namelen); log_write("\tMaximum component length: %ld\n", buf.f_namelen);
#elif USE_STATFS_NAMEMAX
log_write("\tMaximum component length: %ld\n", buf.f_namemax);
#endif #endif
if(buf.f_flags) if(buf.f_flags)