From af4c7b33d25513d2382f470740d70b2209ad5db8 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 31 Mar 2021 02:33:45 +0100 Subject: [PATCH] Reorganize folder structure to make cmake happy. --- setter/CMakeLists.txt | 9 ------- setter/src/CMakeLists.txt | 5 ++++ setter/src/unix/CMakeLists.txt | 28 ++++++++++----------- setter/src/unix/attr.c | 6 ++--- setter/src/{ => unix}/bsd/CMakeLists.txt | 0 setter/src/{ => unix}/bsd/attr.c | 2 +- setter/src/{ => unix}/bsd/attr.h | 0 setter/src/{ => unix}/bsd/bsd.h | 0 setter/src/{ => unix}/bsd/xattr.c | 2 +- setter/src/{ => unix}/bsd/xattr.h | 0 setter/src/{ => unix}/darwin/CMakeLists.txt | 0 setter/src/{ => unix}/darwin/attr.c | 2 +- setter/src/{ => unix}/darwin/attr.h | 0 setter/src/{ => unix}/darwin/carbon.c | 2 +- setter/src/{ => unix}/darwin/carbon.h | 0 setter/src/{ => unix}/darwin/darwin.h | 0 setter/src/{ => unix}/darwin/os.c | 2 +- setter/src/{ => unix}/darwin/rsrcfork.c | 0 setter/src/{ => unix}/darwin/rsrcfork.h | 0 setter/src/{ => unix}/darwin/sparse.c | 4 +-- setter/src/{ => unix}/darwin/volume.c | 2 +- setter/src/{ => unix}/darwin/volume.h | 0 setter/src/{ => unix}/darwin/xattr.c | 2 +- setter/src/{ => unix}/darwin/xattr.h | 0 setter/src/{ => unix}/linux/CMakeLists.txt | 0 setter/src/{ => unix}/linux/attr.c | 2 +- setter/src/{ => unix}/linux/attr.h | 0 setter/src/{ => unix}/linux/linux.h | 0 setter/src/{ => unix}/linux/sparse.c | 4 +-- setter/src/{ => unix}/linux/volume.c | 2 +- setter/src/{ => unix}/linux/volume.h | 0 setter/src/{ => unix}/linux/xattr.c | 2 +- setter/src/{ => unix}/linux/xattr.h | 0 setter/src/unix/os.c | 2 +- setter/src/unix/rsrcfork.c | 2 +- setter/src/unix/sparse.c | 4 +-- setter/src/unix/volume.c | 6 ++--- setter/src/unix/xattr.c | 6 ++--- 38 files changed, 46 insertions(+), 50 deletions(-) rename setter/src/{ => unix}/bsd/CMakeLists.txt (100%) rename setter/src/{ => unix}/bsd/attr.c (99%) rename setter/src/{ => unix}/bsd/attr.h (100%) rename setter/src/{ => unix}/bsd/bsd.h (100%) rename setter/src/{ => unix}/bsd/xattr.c (99%) rename setter/src/{ => unix}/bsd/xattr.h (100%) rename setter/src/{ => unix}/darwin/CMakeLists.txt (100%) rename setter/src/{ => unix}/darwin/attr.c (99%) rename setter/src/{ => unix}/darwin/attr.h (100%) rename setter/src/{ => unix}/darwin/carbon.c (99%) rename setter/src/{ => unix}/darwin/carbon.h (100%) rename setter/src/{ => unix}/darwin/darwin.h (100%) rename setter/src/{ => unix}/darwin/os.c (99%) rename setter/src/{ => unix}/darwin/rsrcfork.c (100%) rename setter/src/{ => unix}/darwin/rsrcfork.h (100%) rename setter/src/{ => unix}/darwin/sparse.c (98%) rename setter/src/{ => unix}/darwin/volume.c (99%) rename setter/src/{ => unix}/darwin/volume.h (100%) rename setter/src/{ => unix}/darwin/xattr.c (99%) rename setter/src/{ => unix}/darwin/xattr.h (100%) rename setter/src/{ => unix}/linux/CMakeLists.txt (100%) rename setter/src/{ => unix}/linux/attr.c (99%) rename setter/src/{ => unix}/linux/attr.h (100%) rename setter/src/{ => unix}/linux/linux.h (100%) rename setter/src/{ => unix}/linux/sparse.c (98%) rename setter/src/{ => unix}/linux/volume.c (99%) rename setter/src/{ => unix}/linux/volume.h (100%) rename setter/src/{ => unix}/linux/xattr.c (99%) rename setter/src/{ => unix}/linux/xattr.h (100%) diff --git a/setter/CMakeLists.txt b/setter/CMakeLists.txt index bea1717..c13327c 100644 --- a/setter/CMakeLists.txt +++ b/setter/CMakeLists.txt @@ -33,13 +33,4 @@ message("Detected system processor: ${CMAKE_SYSTEM_PROCESSOR}") add_subdirectory(src) -add_subdirectory(src/macos) -add_subdirectory(src/dos) -add_subdirectory(src/win32) - -add_subdirectory(src/unix) -add_subdirectory(src/darwin) -add_subdirectory(src/linux) -add_subdirectory(src/bsd) - diff --git a/setter/src/CMakeLists.txt b/setter/src/CMakeLists.txt index 85f88ac..6ec8c1e 100644 --- a/setter/src/CMakeLists.txt +++ b/setter/src/CMakeLists.txt @@ -25,3 +25,8 @@ set(MAIN_SOURCES main.c main.h log.c log.h) add_library(core ${MAIN_SOURCES}) + +add_subdirectory(macos) +add_subdirectory(dos) +add_subdirectory(win32) +add_subdirectory(unix) diff --git a/setter/src/unix/CMakeLists.txt b/setter/src/unix/CMakeLists.txt index 6868c2c..a098fca 100644 --- a/setter/src/unix/CMakeLists.txt +++ b/setter/src/unix/CMakeLists.txt @@ -33,14 +33,6 @@ CHECK_SYMBOL_EXISTS(statfs "sys/statfs.h" HAVE_SYS_STATFS) CHECK_SYMBOL_EXISTS(statfs "sys/mount.h" HAVE_SYS_MOUNT) CHECK_SYMBOL_EXISTS(statvfs "sys/statvfs.h" HAVE_SYS_STATVFS) -# NetBSD >= 3.0 -if(HAVE_SYS_STATVFS) - message("-- Found statvfs in sys/statvfs.h") - add_definitions(-DHAVE_SYS_STATVFS_H) - 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) -endif() - # Linux and FreeBSD if(HAVE_SYS_STATFS) message("-- Found statfs in sys/statfs.h") @@ -48,15 +40,19 @@ if(HAVE_SYS_STATFS) 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_namemax" "sys/statfs.h" HAVE_STATFS_NAMEMAX) -endif() - -# Darwin and most other BSDs -if(HAVE_SYS_MOUNT) +elseif(HAVE_SYS_MOUNT) # Darwin and most other BSDs message("-- Found statfs in 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_fstypename" "sys/mount.h" HAVE_STATFS_FTYPENAME) - CHECK_STRUCT_HAS_MEMBER("struct statfs" "f_namemax" "sys/mount.h" HAVE_STATFS_NAMEMAX) + 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) + endif() +elseif(HAVE_SYS_STATVFS) # NetBSD >= 3.0 + message("-- Found statvfs in sys/statvfs.h") + add_definitions(-DHAVE_SYS_STATVFS_H) + 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) endif() if(HAVE_STATFS_FNAMELEN) @@ -76,4 +72,8 @@ 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 time.h) -add_library(unix ${UNIX_SOURCES}) \ No newline at end of file +add_library(unix ${UNIX_SOURCES}) + +add_subdirectory(darwin) +add_subdirectory(linux) +add_subdirectory(bsd) diff --git a/setter/src/unix/attr.c b/setter/src/unix/attr.c index 5cf68c8..8c08d66 100644 --- a/setter/src/unix/attr.c +++ b/setter/src/unix/attr.c @@ -25,11 +25,11 @@ Copyright (C) 2011-2021 Natalia Portillo #include "../include/defs.h" #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux) -#include "../linux/linux.h" +#include "linux/linux.h" #elif defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -#include "../bsd/bsd.h" +#include "bsd/bsd.h" #endif void FileAttributes(const char* path) diff --git a/setter/src/bsd/CMakeLists.txt b/setter/src/unix/bsd/CMakeLists.txt similarity index 100% rename from setter/src/bsd/CMakeLists.txt rename to setter/src/unix/bsd/CMakeLists.txt diff --git a/setter/src/bsd/attr.c b/setter/src/unix/bsd/attr.c similarity index 99% rename from setter/src/bsd/attr.c rename to setter/src/unix/bsd/attr.c index 29e5d13..d1ceec1 100644 --- a/setter/src/bsd/attr.c +++ b/setter/src/unix/bsd/attr.c @@ -28,7 +28,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "attr.h" -#include "../log.h" +#include "../../log.h" void BsdFileAttributes(const char* path) { diff --git a/setter/src/bsd/attr.h b/setter/src/unix/bsd/attr.h similarity index 100% rename from setter/src/bsd/attr.h rename to setter/src/unix/bsd/attr.h diff --git a/setter/src/bsd/bsd.h b/setter/src/unix/bsd/bsd.h similarity index 100% rename from setter/src/bsd/bsd.h rename to setter/src/unix/bsd/bsd.h diff --git a/setter/src/bsd/xattr.c b/setter/src/unix/bsd/xattr.c similarity index 99% rename from setter/src/bsd/xattr.c rename to setter/src/unix/bsd/xattr.c index f17adc6..cb24cf2 100644 --- a/setter/src/bsd/xattr.c +++ b/setter/src/unix/bsd/xattr.c @@ -30,7 +30,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "xattr.h" -#include "../log.h" +#include "../../log.h" void BsdExtendedAttributes(const char* path) { diff --git a/setter/src/bsd/xattr.h b/setter/src/unix/bsd/xattr.h similarity index 100% rename from setter/src/bsd/xattr.h rename to setter/src/unix/bsd/xattr.h diff --git a/setter/src/darwin/CMakeLists.txt b/setter/src/unix/darwin/CMakeLists.txt similarity index 100% rename from setter/src/darwin/CMakeLists.txt rename to setter/src/unix/darwin/CMakeLists.txt diff --git a/setter/src/darwin/attr.c b/setter/src/unix/darwin/attr.c similarity index 99% rename from setter/src/darwin/attr.c rename to setter/src/unix/darwin/attr.c index efb25d9..396487e 100644 --- a/setter/src/darwin/attr.c +++ b/setter/src/unix/darwin/attr.c @@ -28,7 +28,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "attr.h" -#include "../log.h" +#include "../../log.h" void DarwinFileAttributes(const char* path) { diff --git a/setter/src/darwin/attr.h b/setter/src/unix/darwin/attr.h similarity index 100% rename from setter/src/darwin/attr.h rename to setter/src/unix/darwin/attr.h diff --git a/setter/src/darwin/carbon.c b/setter/src/unix/darwin/carbon.c similarity index 99% rename from setter/src/darwin/carbon.c rename to setter/src/unix/darwin/carbon.c index 5279aca..1628300 100644 --- a/setter/src/darwin/carbon.c +++ b/setter/src/unix/darwin/carbon.c @@ -9,7 +9,7 @@ #include "carbon.h" -#include "../log.h" +#include "../../log.h" #include "rsrcfork.h" #pragma clang diagnostic push diff --git a/setter/src/darwin/carbon.h b/setter/src/unix/darwin/carbon.h similarity index 100% rename from setter/src/darwin/carbon.h rename to setter/src/unix/darwin/carbon.h diff --git a/setter/src/darwin/darwin.h b/setter/src/unix/darwin/darwin.h similarity index 100% rename from setter/src/darwin/darwin.h rename to setter/src/unix/darwin/darwin.h diff --git a/setter/src/darwin/os.c b/setter/src/unix/darwin/os.c similarity index 99% rename from setter/src/darwin/os.c rename to setter/src/unix/darwin/os.c index ed6d5c1..73d79fb 100644 --- a/setter/src/darwin/os.c +++ b/setter/src/unix/darwin/os.c @@ -28,7 +28,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include "../log.h" +#include "../../log.h" void DarwinGetOsInfo() { diff --git a/setter/src/darwin/rsrcfork.c b/setter/src/unix/darwin/rsrcfork.c similarity index 100% rename from setter/src/darwin/rsrcfork.c rename to setter/src/unix/darwin/rsrcfork.c diff --git a/setter/src/darwin/rsrcfork.h b/setter/src/unix/darwin/rsrcfork.h similarity index 100% rename from setter/src/darwin/rsrcfork.h rename to setter/src/unix/darwin/rsrcfork.h diff --git a/setter/src/darwin/sparse.c b/setter/src/unix/darwin/sparse.c similarity index 98% rename from setter/src/darwin/sparse.c rename to setter/src/unix/darwin/sparse.c index 51c969f..649c615 100644 --- a/setter/src/darwin/sparse.c +++ b/setter/src/unix/darwin/sparse.c @@ -29,8 +29,8 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include "../include/consts.h" -#include "../log.h" +#include "../../include/consts.h" +#include "../../log.h" int DarwinSparse(const char* path) { diff --git a/setter/src/darwin/volume.c b/setter/src/unix/darwin/volume.c similarity index 99% rename from setter/src/darwin/volume.c rename to setter/src/unix/darwin/volume.c index 041918f..5fb6b3a 100644 --- a/setter/src/darwin/volume.c +++ b/setter/src/unix/darwin/volume.c @@ -28,7 +28,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "volume.h" -#include "../log.h" +#include "../../log.h" void DarwinPrintStatfsFlags(uint32_t flags) { diff --git a/setter/src/darwin/volume.h b/setter/src/unix/darwin/volume.h similarity index 100% rename from setter/src/darwin/volume.h rename to setter/src/unix/darwin/volume.h diff --git a/setter/src/darwin/xattr.c b/setter/src/unix/darwin/xattr.c similarity index 99% rename from setter/src/darwin/xattr.c rename to setter/src/unix/darwin/xattr.c index 5a8c760..c5adbe6 100644 --- a/setter/src/darwin/xattr.c +++ b/setter/src/unix/darwin/xattr.c @@ -30,7 +30,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "xattr.h" -#include "../log.h" +#include "../../log.h" void DarwinExtendedAttributes(const char* path) { diff --git a/setter/src/darwin/xattr.h b/setter/src/unix/darwin/xattr.h similarity index 100% rename from setter/src/darwin/xattr.h rename to setter/src/unix/darwin/xattr.h diff --git a/setter/src/linux/CMakeLists.txt b/setter/src/unix/linux/CMakeLists.txt similarity index 100% rename from setter/src/linux/CMakeLists.txt rename to setter/src/unix/linux/CMakeLists.txt diff --git a/setter/src/linux/attr.c b/setter/src/unix/linux/attr.c similarity index 99% rename from setter/src/linux/attr.c rename to setter/src/unix/linux/attr.c index 8e78596..919825e 100644 --- a/setter/src/linux/attr.c +++ b/setter/src/unix/linux/attr.c @@ -32,7 +32,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "attr.h" -#include "../log.h" +#include "../../log.h" #include "linux.h" void LinuxFileAttributes(const char* path) diff --git a/setter/src/linux/attr.h b/setter/src/unix/linux/attr.h similarity index 100% rename from setter/src/linux/attr.h rename to setter/src/unix/linux/attr.h diff --git a/setter/src/linux/linux.h b/setter/src/unix/linux/linux.h similarity index 100% rename from setter/src/linux/linux.h rename to setter/src/unix/linux/linux.h diff --git a/setter/src/linux/sparse.c b/setter/src/unix/linux/sparse.c similarity index 98% rename from setter/src/linux/sparse.c rename to setter/src/unix/linux/sparse.c index 03cbace..f54de8b 100644 --- a/setter/src/linux/sparse.c +++ b/setter/src/unix/linux/sparse.c @@ -22,7 +22,7 @@ Aaru Data Preservation Suite Copyright (C) 2011-2021 Natalia Portillo *****************************************************************************/ -#include "../include/consts.h" +#include "../../include/consts.h" #define _GNU_SOURCE #include #include @@ -32,7 +32,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include #include -#include "../log.h" +#include "../../log.h" #include "linux.h" void LinuxSparse(const char* path) diff --git a/setter/src/linux/volume.c b/setter/src/unix/linux/volume.c similarity index 99% rename from setter/src/linux/volume.c rename to setter/src/unix/linux/volume.c index 2a316f5..4b1bdd3 100644 --- a/setter/src/linux/volume.c +++ b/setter/src/unix/linux/volume.c @@ -26,7 +26,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "volume.h" -#include "../log.h" +#include "../../log.h" void LinuxPrintStatfsFlags(__fsword_t flags) { diff --git a/setter/src/linux/volume.h b/setter/src/unix/linux/volume.h similarity index 100% rename from setter/src/linux/volume.h rename to setter/src/unix/linux/volume.h diff --git a/setter/src/linux/xattr.c b/setter/src/unix/linux/xattr.c similarity index 99% rename from setter/src/linux/xattr.c rename to setter/src/unix/linux/xattr.c index 9efe099..cfbc2ac 100644 --- a/setter/src/linux/xattr.c +++ b/setter/src/unix/linux/xattr.c @@ -34,7 +34,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "xattr.h" -#include "../log.h" +#include "../../log.h" #include "linux.h" void LinuxExtendedAttributes(const char* path) diff --git a/setter/src/linux/xattr.h b/setter/src/unix/linux/xattr.h similarity index 100% rename from setter/src/linux/xattr.h rename to setter/src/unix/linux/xattr.h diff --git a/setter/src/unix/os.c b/setter/src/unix/os.c index e5e8da9..4e2e3b8 100644 --- a/setter/src/unix/os.c +++ b/setter/src/unix/os.c @@ -23,7 +23,7 @@ Copyright (C) 2011-2021 Natalia Portillo *****************************************************************************/ #if defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #else #include #include diff --git a/setter/src/unix/rsrcfork.c b/setter/src/unix/rsrcfork.c index e553ce3..0d98347 100644 --- a/setter/src/unix/rsrcfork.c +++ b/setter/src/unix/rsrcfork.c @@ -25,7 +25,7 @@ Copyright (C) 2011-2021 Natalia Portillo #include "../include/defs.h" #if defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #endif void ResourceFork(const char* path) diff --git a/setter/src/unix/sparse.c b/setter/src/unix/sparse.c index ca8c2b4..9afc48b 100644 --- a/setter/src/unix/sparse.c +++ b/setter/src/unix/sparse.c @@ -27,9 +27,9 @@ Copyright (C) 2011-2021 Natalia Portillo #include -#include "../linux/linux.h" +#include "linux/linux.h" #elif defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #endif #include diff --git a/setter/src/unix/volume.c b/setter/src/unix/volume.c index a058d8c..4b1feaa 100644 --- a/setter/src/unix/volume.c +++ b/setter/src/unix/volume.c @@ -44,11 +44,11 @@ Copyright (C) 2011-2021 Natalia Portillo #include "volume.h" #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux) -#include "../linux/linux.h" +#include "linux/linux.h" #elif defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -#include "../bsd/bsd.h" +#include "bsd/bsd.h" #endif void GetVolumeInfo(const char* path, size_t* clusterSize) diff --git a/setter/src/unix/xattr.c b/setter/src/unix/xattr.c index 4577fb8..9a250d7 100644 --- a/setter/src/unix/xattr.c +++ b/setter/src/unix/xattr.c @@ -25,11 +25,11 @@ Copyright (C) 2011-2021 Natalia Portillo #include "../include/defs.h" #if defined(__linux__) || defined(__LINUX__) || defined(__gnu_linux) -#include "../linux/linux.h" +#include "linux/linux.h" #elif defined(__APPLE__) && defined(__MACH__) -#include "../darwin/darwin.h" +#include "darwin/darwin.h" #elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) -#include "../bsd/bsd.h" +#include "bsd/bsd.h" #endif void ExtendedAttributes(const char* path)