diff --git a/CMakeLists.txt b/CMakeLists.txt index efe91f626..dc33c998f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -469,6 +469,7 @@ set(LIBFASTFETCH_SRC src/modules/wm/wm.c src/modules/wmtheme/wmtheme.c src/modules/zpool/zpool.c + src/modules/modules.c src/options/display.c src/options/logo.c src/options/general.c @@ -480,9 +481,8 @@ set(LIBFASTFETCH_SRC src/util/init.c src/util/jsonconfig.c src/util/library.c - src/util/modules.c - src/util/netif/netif.c - src/util/networking/networking_common.c + src/util/netif.c + src/util/networking_common.c src/util/option.c src/util/parsing.c src/util/percent.c @@ -498,7 +498,7 @@ set(LIBFASTFETCH_SRC src/util/FFstrbuf.c src/util/kmod.c src/util/path.c - src/util/platform/FFPlatform.c + src/util/FFPlatform.c src/util/smbiosHelper.c ) @@ -579,11 +579,11 @@ if(LINUX) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_linux.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_linux.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(ANDROID) @@ -652,11 +652,11 @@ elseif(ANDROID) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_android.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_linux.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_linux.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(FreeBSD) @@ -733,12 +733,12 @@ elseif(FreeBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) if(DragonFly) @@ -826,12 +826,12 @@ elseif(NetBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(OpenBSD) @@ -908,12 +908,12 @@ elseif(OpenBSD) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_linux.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_bsd.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_bsd.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c src/util/smbiosHelper.c ) @@ -977,15 +977,15 @@ elseif(APPLE) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_apple.m src/detection/camera/camera_apple.m - src/util/io/io_unix.c - src/util/netif/netif_apple.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_apple.c + src/util/networking_linux.c src/util/processing_linux.c src/util/sysctl.c src/util/apple/cf_helpers.c src/util/apple/osascript.m src/util/apple/smc_temps.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_apple.c ) elseif(WIN32) @@ -1047,9 +1047,9 @@ elseif(WIN32) src/detection/de/de_nosupport.c src/detection/wmtheme/wmtheme_windows.c src/detection/camera/camera_windows.cpp - src/util/io/io_windows.c - src/util/netif/netif_windows.c - src/util/networking/networking_windows.c + src/util/io_windows.c + src/util/netif_windows.c + src/util/networking_windows.c src/util/processing_windows.c src/util/windows/getline.c src/util/windows/com.cpp @@ -1057,7 +1057,7 @@ elseif(WIN32) src/util/windows/unicode.c src/util/windows/wmi.cpp src/util/windows/version.c - src/util/platform/FFPlatform_windows.c + src/util/FFPlatform_windows.c src/util/binary_windows.c src/util/debug_windows.c ) @@ -1135,11 +1135,11 @@ elseif(SunOS) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_apple.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_apple.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) elseif(Haiku) @@ -1203,11 +1203,11 @@ elseif(Haiku) src/detection/wmtheme/wmtheme_nosupport.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_haiku.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_haiku.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c src/util/haiku/version.cpp ) @@ -1282,11 +1282,11 @@ elseif(GNU) src/detection/wmtheme/wmtheme_linux.c src/detection/camera/camera_nosupport.c src/util/dbus.c - src/util/io/io_unix.c - src/util/netif/netif_gnu.c - src/util/networking/networking_linux.c + src/util/io_unix.c + src/util/netif_gnu.c + src/util/networking_linux.c src/util/processing_linux.c - src/util/platform/FFPlatform_unix.c + src/util/FFPlatform_unix.c src/util/binary_linux.c ) endif() diff --git a/src/detection/battery/battery_bsd.c b/src/detection/battery/battery_bsd.c index c938cb365..2ce220780 100644 --- a/src/detection/battery/battery_bsd.c +++ b/src/detection/battery/battery_bsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include "battery.h" #include diff --git a/src/detection/battery/battery_haiku.c b/src/detection/battery/battery_haiku.c index 205d584e6..ea3a4515b 100644 --- a/src/detection/battery/battery_haiku.c +++ b/src/detection/battery/battery_haiku.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/battery/battery_linux.c b/src/detection/battery/battery_linux.c index 773af2a1c..9dc5aa138 100644 --- a/src/detection/battery/battery_linux.c +++ b/src/detection/battery/battery_linux.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/battery/battery_nbsd.c b/src/detection/battery/battery_nbsd.c index df4225683..e142050be 100644 --- a/src/detection/battery/battery_nbsd.c +++ b/src/detection/battery/battery_nbsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" diff --git a/src/detection/battery/battery_obsd.c b/src/detection/battery/battery_obsd.c index ad8369db1..ea40c6f2a 100644 --- a/src/detection/battery/battery_obsd.c +++ b/src/detection/battery/battery_obsd.c @@ -1,5 +1,5 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/battery/battery_windows.c b/src/detection/battery/battery_windows.c index e0f9425ef..bc9b2c227 100644 --- a/src/detection/battery/battery_windows.c +++ b/src/detection/battery/battery_windows.c @@ -1,6 +1,6 @@ #include "battery.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/nt.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" diff --git a/src/detection/bios/bios_bsd.c b/src/detection/bios/bios_bsd.c index cdf1767f0..6ea271cb7 100644 --- a/src/detection/bios/bios_bsd.c +++ b/src/detection/bios/bios_bsd.c @@ -2,7 +2,7 @@ #include "util/settings.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" const char* ffDetectBios(FFBiosResult* result) diff --git a/src/detection/bios/bios_linux.c b/src/detection/bios/bios_linux.c index 446371a25..f7fd2ddc3 100644 --- a/src/detection/bios/bios_linux.c +++ b/src/detection/bios/bios_linux.c @@ -1,5 +1,5 @@ #include "bios.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/bios/bios_windows.c b/src/detection/bios/bios_windows.c index 184a462dc..31dd51e39 100644 --- a/src/detection/bios/bios_windows.c +++ b/src/detection/bios/bios_windows.c @@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION }; } SYSTEM_BOOT_ENVIRONMENT_INFORMATION; #elif __OpenBSD__ -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/bluetooth/bluetooth_haiku.cpp b/src/detection/bluetooth/bluetooth_haiku.cpp index 4785a8f2c..6c7280840 100644 --- a/src/detection/bluetooth/bluetooth_haiku.cpp +++ b/src/detection/bluetooth/bluetooth_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "bluetooth.h" -#include "util/io/io.h" +#include "util/io.h" } #include diff --git a/src/detection/bluetooth/bluetooth_linux.c b/src/detection/bluetooth/bluetooth_linux.c index 3479d1428..42fed40cf 100644 --- a/src/detection/bluetooth/bluetooth_linux.c +++ b/src/detection/bluetooth/bluetooth_linux.c @@ -3,7 +3,7 @@ #ifdef FF_HAVE_DBUS #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" /* Example dbus reply, striped to only the relevant parts: array [ //root diff --git a/src/detection/bluetoothradio/bluetoothradio_linux.c b/src/detection/bluetoothradio/bluetoothradio_linux.c index 9bfc6c20b..1b3ec4ed5 100644 --- a/src/detection/bluetoothradio/bluetoothradio_linux.c +++ b/src/detection/bluetoothradio/bluetoothradio_linux.c @@ -3,7 +3,7 @@ #ifdef FF_HAVE_DBUS #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" /* Example dbus reply: array [ diff --git a/src/detection/bluetoothradio/bluetoothradio_windows.c b/src/detection/bluetoothradio/bluetoothradio_windows.c index 288d6255b..610602444 100644 --- a/src/detection/bluetoothradio/bluetoothradio_windows.c +++ b/src/detection/bluetoothradio/bluetoothradio_windows.c @@ -1,6 +1,6 @@ #include "bluetoothradio.h" #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/board/board_linux.c b/src/detection/board/board_linux.c index bd3a4a522..1afeeef21 100644 --- a/src/detection/board/board_linux.c +++ b/src/detection/board/board_linux.c @@ -1,5 +1,5 @@ #include "board.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/bootmgr/bootmgr_apple.c b/src/detection/bootmgr/bootmgr_apple.c index e9d1e90ec..3bedb95cc 100644 --- a/src/detection/bootmgr/bootmgr_apple.c +++ b/src/detection/bootmgr/bootmgr_apple.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/apple/cf_helpers.h" #include diff --git a/src/detection/bootmgr/bootmgr_bsd.c b/src/detection/bootmgr/bootmgr_bsd.c index 19d6db1b6..c16773a73 100644 --- a/src/detection/bootmgr/bootmgr_bsd.c +++ b/src/detection/bootmgr/bootmgr_bsd.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io/io.h" +#include "util/io.h" #ifdef __OpenBSD__ #include diff --git a/src/detection/bootmgr/bootmgr_linux.c b/src/detection/bootmgr/bootmgr_linux.c index 74e6cd242..e29fc0794 100644 --- a/src/detection/bootmgr/bootmgr_linux.c +++ b/src/detection/bootmgr/bootmgr_linux.c @@ -1,5 +1,5 @@ #include "bootmgr.h" -#include "util/io/io.h" +#include "util/io.h" #include "efi_helper.h" #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/" diff --git a/src/detection/bootmgr/bootmgr_windows.c b/src/detection/bootmgr/bootmgr_windows.c index 6f46f497f..21d527cc8 100644 --- a/src/detection/bootmgr/bootmgr_windows.c +++ b/src/detection/bootmgr/bootmgr_windows.c @@ -1,6 +1,6 @@ #include "bootmgr.h" #include "efi_helper.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/brightness/brightness_bsd.c b/src/detection/brightness/brightness_bsd.c index 07d7239db..de5d585a7 100644 --- a/src/detection/brightness/brightness_bsd.c +++ b/src/detection/brightness/brightness_bsd.c @@ -2,7 +2,7 @@ #if __has_include() -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/brightness/brightness_linux.c b/src/detection/brightness/brightness_linux.c index b24f0aef6..c52e36ff6 100644 --- a/src/detection/brightness/brightness_linux.c +++ b/src/detection/brightness/brightness_linux.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/brightness/brightness_obsd.c b/src/detection/brightness/brightness_obsd.c index ddae77163..95a3ac83d 100644 --- a/src/detection/brightness/brightness_obsd.c +++ b/src/detection/brightness/brightness_obsd.c @@ -1,5 +1,5 @@ #include "brightness.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/btrfs/btrfs_linux.c b/src/detection/btrfs/btrfs_linux.c index 5dc190741..41dc90e0c 100644 --- a/src/detection/btrfs/btrfs_linux.c +++ b/src/detection/btrfs/btrfs_linux.c @@ -1,6 +1,6 @@ #include "btrfs.h" -#include "util/io/io.h" +#include "util/io.h" #include enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") }; diff --git a/src/detection/camera/camera_apple.m b/src/detection/camera/camera_apple.m index 7549f9123..64d714d16 100644 --- a/src/detection/camera/camera_apple.m +++ b/src/detection/camera/camera_apple.m @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io/io.h" +#include "util/io.h" #import diff --git a/src/detection/camera/camera_linux.c b/src/detection/camera/camera_linux.c index 988c41293..fe93414a6 100644 --- a/src/detection/camera/camera_linux.c +++ b/src/detection/camera/camera_linux.c @@ -1,5 +1,5 @@ #include "camera.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/chassis/chassis_linux.c b/src/detection/chassis/chassis_linux.c index 93aa79e06..013fbca96 100644 --- a/src/detection/chassis/chassis_linux.c +++ b/src/detection/chassis/chassis_linux.c @@ -1,5 +1,5 @@ #include "chassis.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/smbiosHelper.h" #include diff --git a/src/detection/cpu/cpu.c b/src/detection/cpu/cpu.c index c10f04541..ee4ce360e 100644 --- a/src/detection/cpu/cpu.c +++ b/src/detection/cpu/cpu.c @@ -130,7 +130,7 @@ void ffCPUDetectByCpuid(FFCPUResult* cpu) // Worth noting: Apple M1 is marked as ARMv8.5-A on Wikipedia, but it lacks BTI (mandatory in v8.5) #ifdef __linux__ -#include "util/io/io.h" +#include "util/io.h" #include // #include diff --git a/src/detection/cpu/cpu_linux.c b/src/detection/cpu/cpu_linux.c index 9fc2287ec..4b3847244 100644 --- a/src/detection/cpu/cpu_linux.c +++ b/src/detection/cpu/cpu_linux.c @@ -1,5 +1,5 @@ #include "cpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/mallocHelper.h" diff --git a/src/detection/cpu/cpu_nbsd.c b/src/detection/cpu/cpu_nbsd.c index 6f115a930..8a773f849 100644 --- a/src/detection/cpu/cpu_nbsd.c +++ b/src/detection/cpu/cpu_nbsd.c @@ -1,6 +1,6 @@ #include "cpu.h" #include "util/sysctl.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/cpucache/cpucache_linux.c b/src/detection/cpucache/cpucache_linux.c index 07f650f61..844c6fd1e 100644 --- a/src/detection/cpucache/cpucache_linux.c +++ b/src/detection/cpucache/cpucache_linux.c @@ -1,5 +1,5 @@ #include "cpucache.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added) diff --git a/src/detection/cpuusage/cpuusage_linux.c b/src/detection/cpuusage/cpuusage_linux.c index 27c9f4b1f..7c42d86c9 100644 --- a/src/detection/cpuusage/cpuusage_linux.c +++ b/src/detection/cpuusage/cpuusage_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "detection/cpuusage/cpuusage.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/de/de_linux.c b/src/detection/de/de_linux.c index 51293b6f6..84d0b234f 100644 --- a/src/detection/de/de_linux.c +++ b/src/detection/de/de_linux.c @@ -1,7 +1,7 @@ #include "de.h" #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/parsing.h" #include "util/properties.h" diff --git a/src/detection/disk/disk_linux.c b/src/detection/disk/disk_linux.c index b54cd86c1..92a2e0527 100644 --- a/src/detection/disk/disk_linux.c +++ b/src/detection/disk/disk_linux.c @@ -1,6 +1,6 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_sunos.c b/src/detection/disk/disk_sunos.c index 42066fb2e..d35ae18a6 100644 --- a/src/detection/disk/disk_sunos.c +++ b/src/detection/disk/disk_sunos.c @@ -1,5 +1,5 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/disk/disk_windows.c b/src/detection/disk/disk_windows.c index b88289fa5..8fa5b9bdb 100644 --- a/src/detection/disk/disk_windows.c +++ b/src/detection/disk/disk_windows.c @@ -1,5 +1,5 @@ #include "disk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/thread.h" #include "util/windows/unicode.h" diff --git a/src/detection/diskio/diskio_linux.c b/src/detection/diskio/diskio_linux.c index 5b24620b8..e32c31c57 100644 --- a/src/detection/diskio/diskio_linux.c +++ b/src/detection/diskio/diskio_linux.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/diskio/diskio_windows.c b/src/detection/diskio/diskio_windows.c index 4cb17a351..f2e0f07fa 100644 --- a/src/detection/diskio/diskio_windows.c +++ b/src/detection/diskio/diskio_windows.c @@ -1,5 +1,5 @@ #include "diskio.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/displayserver/linux/displayserver_linux.c b/src/detection/displayserver/linux/displayserver_linux.c index d4da9c604..66977a1e7 100644 --- a/src/detection/displayserver/linux/displayserver_linux.c +++ b/src/detection/displayserver/linux/displayserver_linux.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #ifdef __FreeBSD__ diff --git a/src/detection/displayserver/linux/drm.c b/src/detection/displayserver/linux/drm.c index 7fbc427b0..b79513bc7 100644 --- a/src/detection/displayserver/linux/drm.c +++ b/src/detection/displayserver/linux/drm.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/displayserver/linux/wayland/wayland.c b/src/detection/displayserver/linux/wayland/wayland.c index ba2e95c77..1938ca49f 100644 --- a/src/detection/displayserver/linux/wayland/wayland.c +++ b/src/detection/displayserver/linux/wayland/wayland.c @@ -1,5 +1,5 @@ #include "../displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/edidHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/displayserver/linux/wmde.c b/src/detection/displayserver/linux/wmde.c index 8115ff57d..f7dae2f95 100644 --- a/src/detection/displayserver/linux/wmde.c +++ b/src/detection/displayserver/linux/wmde.c @@ -1,5 +1,5 @@ #include "displayserver_linux.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/dns/dns_apple.c b/src/detection/dns/dns_apple.c index 2061f77ff..a0831deef 100644 --- a/src/detection/dns/dns_apple.c +++ b/src/detection/dns/dns_apple.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/apple/cf_helpers.h" diff --git a/src/detection/dns/dns_linux.c b/src/detection/dns/dns_linux.c index 6b76479ec..51c36370c 100644 --- a/src/detection/dns/dns_linux.c +++ b/src/detection/dns/dns_linux.c @@ -1,6 +1,6 @@ #include "detection/dns/dns.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/dns/dns_windows.c b/src/detection/dns/dns_windows.c index b6eb792a7..9b96b3700 100644 --- a/src/detection/dns/dns_windows.c +++ b/src/detection/dns/dns_windows.c @@ -1,5 +1,5 @@ #include "detection/dns/dns.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/font/font_apple.m b/src/detection/font/font_apple.m index 2bd4de6ac..533afb940 100644 --- a/src/detection/font/font_apple.m +++ b/src/detection/font/font_apple.m @@ -1,5 +1,5 @@ #include "util/font.h" -#include "util/io/io.h" +#include "util/io.h" #include "font.h" #import diff --git a/src/detection/gamepad/gamepad_bsd.c b/src/detection/gamepad/gamepad_bsd.c index 1ad91b9fe..0a6f760a5 100644 --- a/src/detection/gamepad/gamepad_bsd.c +++ b/src/detection/gamepad/gamepad_bsd.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gamepad/gamepad_linux.c b/src/detection/gamepad/gamepad_linux.c index a6f685461..0d211b46d 100644 --- a/src/detection/gamepad/gamepad_linux.c +++ b/src/detection/gamepad/gamepad_linux.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path) diff --git a/src/detection/gamepad/gamepad_windows.c b/src/detection/gamepad/gamepad_windows.c index e0dae742d..8bbc3cd03 100644 --- a/src/detection/gamepad/gamepad_windows.c +++ b/src/detection/gamepad/gamepad_windows.c @@ -1,5 +1,5 @@ #include "gamepad.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/gpu/gpu_android.c b/src/detection/gpu/gpu_android.c index ba7d7dba2..1537fa5c1 100644 --- a/src/detection/gpu/gpu_android.c +++ b/src/detection/gpu/gpu_android.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/gpu/gpu_bsd.c b/src/detection/gpu/gpu_bsd.c index 570de2700..c7f534ab0 100644 --- a/src/detection/gpu/gpu_bsd.c +++ b/src/detection/gpu/gpu_bsd.c @@ -1,6 +1,6 @@ #include "gpu_driver_specific.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/gpu/gpu_drm.c b/src/detection/gpu/gpu_drm.c index 3fdda54ed..c80e818d1 100644 --- a/src/detection/gpu/gpu_drm.c +++ b/src/detection/gpu/gpu_drm.c @@ -5,7 +5,7 @@ #include #include -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/gpu/gpu_general.c b/src/detection/gpu/gpu_general.c index dce396e9c..8ed7d5175 100644 --- a/src/detection/gpu/gpu_general.c +++ b/src/detection/gpu/gpu_general.c @@ -2,7 +2,7 @@ #ifdef FF_HAVE_PCIACCESS -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include diff --git a/src/detection/gpu/gpu_haiku.c b/src/detection/gpu/gpu_haiku.c index 91a2f7e52..86f029016 100644 --- a/src/detection/gpu/gpu_haiku.c +++ b/src/detection/gpu/gpu_haiku.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/gpu/gpu_linux.c b/src/detection/gpu/gpu_linux.c index 6bd51a59c..f116ff4be 100644 --- a/src/detection/gpu/gpu_linux.c +++ b/src/detection/gpu/gpu_linux.c @@ -2,7 +2,7 @@ #include "detection/vulkan/vulkan.h" #include "detection/cpu/cpu.h" #include "detection/gpu/gpu_driver_specific.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" diff --git a/src/detection/gpu/gpu_nbsd.c b/src/detection/gpu/gpu_nbsd.c index c5857086d..7e42f67bb 100644 --- a/src/detection/gpu/gpu_nbsd.c +++ b/src/detection/gpu/gpu_nbsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gpu/gpu_obsd.c b/src/detection/gpu/gpu_obsd.c index e3600237c..50b9a8743 100644 --- a/src/detection/gpu/gpu_obsd.c +++ b/src/detection/gpu/gpu_obsd.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/gpu/gpu_pci.c b/src/detection/gpu/gpu_pci.c index 1a186b3f3..3116790a9 100644 --- a/src/detection/gpu/gpu_pci.c +++ b/src/detection/gpu/gpu_pci.c @@ -1,5 +1,5 @@ #include "gpu.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include diff --git a/src/detection/host/host_linux.c b/src/detection/host/host_linux.c index f2a850549..90536e746 100644 --- a/src/detection/host/host_linux.c +++ b/src/detection/host/host_linux.c @@ -1,5 +1,5 @@ #include "host.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/smbiosHelper.h" diff --git a/src/detection/initsystem/initsystem_haiku.c b/src/detection/initsystem/initsystem_haiku.c index 9e00b574a..1206b7927 100644 --- a/src/detection/initsystem/initsystem_haiku.c +++ b/src/detection/initsystem/initsystem_haiku.c @@ -1,7 +1,7 @@ #include "initsystem.h" #include "util/stringUtils.h" #include "util/haiku/version.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_bsd.c b/src/detection/keyboard/keyboard_bsd.c index 092eb42de..e77534ba6 100644 --- a/src/detection/keyboard/keyboard_bsd.c +++ b/src/detection/keyboard/keyboard_bsd.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/keyboard/keyboard_linux.c b/src/detection/keyboard/keyboard_linux.c index 657e5dfff..d339360b2 100644 --- a/src/detection/keyboard/keyboard_linux.c +++ b/src/detection/keyboard/keyboard_linux.c @@ -1,5 +1,5 @@ #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectKeyboard(FFlist* devices /* List of FFKeyboardDevice */) diff --git a/src/detection/keyboard/keyboard_windows.c b/src/detection/keyboard/keyboard_windows.c index fecf747e6..777b64bf5 100644 --- a/src/detection/keyboard/keyboard_windows.c +++ b/src/detection/keyboard/keyboard_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "keyboard.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/loadavg/loadavg_linux.c b/src/detection/loadavg/loadavg_linux.c index ec123c977..8e8c9a7c4 100644 --- a/src/detection/loadavg/loadavg_linux.c +++ b/src/detection/loadavg/loadavg_linux.c @@ -1,5 +1,5 @@ #include "detection/loadavg/loadavg.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/localip/localip_linux.c b/src/detection/localip/localip_linux.c index 50f045706..18251b89e 100644 --- a/src/detection/localip/localip_linux.c +++ b/src/detection/localip/localip_linux.c @@ -1,6 +1,6 @@ #include "localip.h" -#include "util/io/io.h" -#include "util/netif/netif.h" +#include "util/io.h" +#include "util/netif.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/detection/localip/localip_windows.c b/src/detection/localip/localip_windows.c index 9ca2aa5f9..399129410 100644 --- a/src/detection/localip/localip_windows.c +++ b/src/detection/localip/localip_windows.c @@ -1,7 +1,7 @@ #include #include -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" #include "util/debug.h" diff --git a/src/detection/media/media.c b/src/detection/media/media.c index dc5ce58e4..cb98ef51c 100644 --- a/src/detection/media/media.c +++ b/src/detection/media/media.c @@ -1,5 +1,5 @@ #include "media.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectMediaImpl(FFMediaResult* media, bool saveCover); diff --git a/src/detection/media/media_linux.c b/src/detection/media/media_linux.c index 35cf931c6..c965b154f 100644 --- a/src/detection/media/media_linux.c +++ b/src/detection/media/media_linux.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "detection/media/media.h" diff --git a/src/detection/memory/memory_linux.c b/src/detection/memory/memory_linux.c index 90bb34935..f2f80581f 100644 --- a/src/detection/memory/memory_linux.c +++ b/src/detection/memory/memory_linux.c @@ -1,5 +1,5 @@ #include "memory.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/mouse/mouse_bsd.c b/src/detection/mouse/mouse_bsd.c index 0f6507b52..e7ef78c3b 100644 --- a/src/detection/mouse/mouse_bsd.c +++ b/src/detection/mouse/mouse_bsd.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/mouse/mouse_linux.c b/src/detection/mouse/mouse_linux.c index 8d81384a3..a55fdc3d9 100644 --- a/src/detection/mouse/mouse_linux.c +++ b/src/detection/mouse/mouse_linux.c @@ -1,5 +1,5 @@ #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectMouse(FFlist* devices /* List of FFMouseDevice */) diff --git a/src/detection/mouse/mouse_windows.c b/src/detection/mouse/mouse_windows.c index 3ab2ff3e2..6d4105f7f 100644 --- a/src/detection/mouse/mouse_windows.c +++ b/src/detection/mouse/mouse_windows.c @@ -1,7 +1,7 @@ #define INITGUID #include "mouse.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/netio/netio_apple.c b/src/detection/netio/netio_apple.c index da1e850c5..d9bf8e7eb 100644 --- a/src/detection/netio/netio_apple.c +++ b/src/detection/netio/netio_apple.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_bsd.c b/src/detection/netio/netio_bsd.c index 2284dd22a..58234a1ea 100644 --- a/src/detection/netio/netio_bsd.c +++ b/src/detection/netio/netio_bsd.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/netio/netio_haiku.cpp b/src/detection/netio/netio_haiku.cpp index d2389d091..824652050 100644 --- a/src/detection/netio/netio_haiku.cpp +++ b/src/detection/netio/netio_haiku.cpp @@ -1,6 +1,6 @@ extern "C" { #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" } #include diff --git a/src/detection/netio/netio_linux.c b/src/detection/netio/netio_linux.c index ac552c912..48631d54a 100644 --- a/src/detection/netio/netio_linux.c +++ b/src/detection/netio/netio_linux.c @@ -1,7 +1,7 @@ #include "netio.h" -#include "util/io/io.h" -#include "util/netif/netif.h" +#include "util/io.h" +#include "util/netif.h" #include "util/stringUtils.h" #include diff --git a/src/detection/netio/netio_sunos.c b/src/detection/netio/netio_sunos.c index 3d06c8421..ca41b8e79 100644 --- a/src/detection/netio/netio_sunos.c +++ b/src/detection/netio/netio_sunos.c @@ -1,5 +1,5 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/stringUtils.h" #include diff --git a/src/detection/netio/netio_windows.c b/src/detection/netio/netio_windows.c index b97e761c2..196c6a086 100644 --- a/src/detection/netio/netio_windows.c +++ b/src/detection/netio/netio_windows.c @@ -1,6 +1,6 @@ #include "netio.h" -#include "util/netif/netif.h" +#include "util/netif.h" #include "util/mallocHelper.h" #include "util/windows/unicode.h" diff --git a/src/detection/opengl/opengl_haiku.cpp b/src/detection/opengl/opengl_haiku.cpp index ca0873822..679993d42 100644 --- a/src/detection/opengl/opengl_haiku.cpp +++ b/src/detection/opengl/opengl_haiku.cpp @@ -2,7 +2,7 @@ extern "C" { #include "opengl.h" -#include "util/io/io.h" +#include "util/io.h" #if FF_HAVE_EGL const char* ffOpenGLDetectByEGL(FFOpenGLResult* result); #endif diff --git a/src/detection/opengl/opengl_linux.c b/src/detection/opengl/opengl_linux.c index ba1c4386b..0e7a10631 100644 --- a/src/detection/opengl/opengl_linux.c +++ b/src/detection/opengl/opengl_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "opengl.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/opengl/opengl_shared.c b/src/detection/opengl/opengl_shared.c index 4dcfdebbb..b5f4c7703 100644 --- a/src/detection/opengl/opengl_shared.c +++ b/src/detection/opengl/opengl_shared.c @@ -25,7 +25,7 @@ void ffOpenGLHandleResult(FFOpenGLResult* result, __typeof__(&glGetString) ffglG } #if defined(FF_HAVE_EGL) || __has_include() -#include "util/io/io.h" +#include "util/io.h" #define EGL_EGL_PROTOTYPES 1 #define EGL_EGLEXT_PROTOTYPES 1 diff --git a/src/detection/os/os_apple.m b/src/detection/os/os_apple.m index 61e6c59e7..b73d1cdef 100644 --- a/src/detection/os/os_apple.m +++ b/src/detection/os/os_apple.m @@ -1,5 +1,5 @@ #include "os.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/sysctl.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/detection/os/os_linux.c b/src/detection/os/os_linux.c index f1ff2b2d2..20e3d9789 100644 --- a/src/detection/os/os_linux.c +++ b/src/detection/os/os_linux.c @@ -1,7 +1,7 @@ #include "os.h" #include "util/properties.h" #include "util/parsing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/os/os_sunos.c b/src/detection/os/os_sunos.c index c5964163b..d81101b28 100644 --- a/src/detection/os/os_sunos.c +++ b/src/detection/os/os_sunos.c @@ -1,5 +1,5 @@ #include "os.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectOSImpl(FFOSResult* os) { diff --git a/src/detection/packages/packages.c b/src/detection/packages/packages.c index fea48f6e2..e358e89d4 100644 --- a/src/detection/packages/packages.c +++ b/src/detection/packages/packages.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/packages/packages_apple.c b/src/detection/packages/packages_apple.c index 300a8a35c..141c46bc2 100644 --- a/src/detection/packages/packages_apple.c +++ b/src/detection/packages/packages_apple.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/packages/packages_haiku.c b/src/detection/packages/packages_haiku.c index 3f4d4eede..1cf739bd9 100644 --- a/src/detection/packages/packages_haiku.c +++ b/src/detection/packages/packages_haiku.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index d75e65ede..66560c267 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/properties.h" #include "util/settings.h" diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c index 440eaaf04..19c35e82e 100644 --- a/src/detection/packages/packages_nbsd.c +++ b/src/detection/packages/packages_nbsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_nix.c b/src/detection/packages/packages_nix.c index 60609bd82..b2fc99640 100644 --- a/src/detection/packages/packages_nix.c +++ b/src/detection/packages/packages_nix.c @@ -1,5 +1,5 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c index 41b29c8ac..07c2769f4 100644 --- a/src/detection/packages/packages_obsd.c +++ b/src/detection/packages/packages_obsd.c @@ -1,6 +1,6 @@ #include "packages.h" -#include "util/io/io.h" +#include "util/io.h" void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { diff --git a/src/detection/packages/packages_windows.c b/src/detection/packages/packages_windows.c index f78a8e952..40ee6227c 100644 --- a/src/detection/packages/packages_windows.c +++ b/src/detection/packages/packages_windows.c @@ -4,7 +4,7 @@ #include "util/path.h" #include "util/windows/unicode.h" #include "util/mallocHelper.h" -#include "util/io/io.h" +#include "util/io.h" #include #include "util/windows/nt.h" diff --git a/src/detection/physicaldisk/physicaldisk_haiku.c b/src/detection/physicaldisk/physicaldisk_haiku.c index 1b4dc5d23..2c024d72a 100644 --- a/src/detection/physicaldisk/physicaldisk_haiku.c +++ b/src/detection/physicaldisk/physicaldisk_haiku.c @@ -1,6 +1,6 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/physicaldisk/physicaldisk_linux.c b/src/detection/physicaldisk/physicaldisk_linux.c index 3f4846cfb..e0d4bc532 100644 --- a/src/detection/physicaldisk/physicaldisk_linux.c +++ b/src/detection/physicaldisk/physicaldisk_linux.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/physicaldisk/physicaldisk_windows.c b/src/detection/physicaldisk/physicaldisk_windows.c index 12d9b38ed..ed56b4a0f 100644 --- a/src/detection/physicaldisk/physicaldisk_windows.c +++ b/src/detection/physicaldisk/physicaldisk_windows.c @@ -1,5 +1,5 @@ #include "physicaldisk.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/unicode.h" #include diff --git a/src/detection/poweradapter/poweradapter_linux.c b/src/detection/poweradapter/poweradapter_linux.c index d1c496094..28cffe315 100644 --- a/src/detection/poweradapter/poweradapter_linux.c +++ b/src/detection/poweradapter/poweradapter_linux.c @@ -1,5 +1,5 @@ #include "poweradapter.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/processes/processes_linux.c b/src/detection/processes/processes_linux.c index c85c4b3bb..e8e69ad36 100644 --- a/src/detection/processes/processes_linux.c +++ b/src/detection/processes/processes_linux.c @@ -1,6 +1,6 @@ #include "processes.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" const char* ffDetectProcesses(uint32_t* result) diff --git a/src/detection/publicip/publicip.c b/src/detection/publicip/publicip.c index a1ec6a20e..27070bfa4 100644 --- a/src/detection/publicip/publicip.c +++ b/src/detection/publicip/publicip.c @@ -1,5 +1,5 @@ #include "publicip.h" -#include "util/networking/networking.h" +#include "util/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState states[2]; diff --git a/src/detection/sound/sound_bsd.c b/src/detection/sound/sound_bsd.c index 73a5ae42b..bc5abdf4d 100644 --- a/src/detection/sound/sound_bsd.c +++ b/src/detection/sound/sound_bsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/sysctl.h" #include diff --git a/src/detection/sound/sound_nbsd.c b/src/detection/sound/sound_nbsd.c index 792304c35..06240dede 100644 --- a/src/detection/sound/sound_nbsd.c +++ b/src/detection/sound/sound_nbsd.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/sound/sound_sunos.c b/src/detection/sound/sound_sunos.c index 0bfda3f02..760d1c7fd 100644 --- a/src/detection/sound/sound_sunos.c +++ b/src/detection/sound/sound_sunos.c @@ -1,5 +1,5 @@ #include "sound.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/swap/swap_linux.c b/src/detection/swap/swap_linux.c index 2c70d3064..5508c2889 100644 --- a/src/detection/swap/swap_linux.c +++ b/src/detection/swap/swap_linux.c @@ -1,6 +1,6 @@ #include "swap.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/detection/terminalfont/terminalfont.c b/src/detection/terminalfont/terminalfont.c index 3a6c5368e..5f320b5a4 100644 --- a/src/detection/terminalfont/terminalfont.c +++ b/src/detection/terminalfont/terminalfont.c @@ -1,5 +1,5 @@ #include "terminalfont.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/processing.h" #include "util/debug.h" diff --git a/src/detection/terminalfont/terminalfont_android.c b/src/detection/terminalfont/terminalfont_android.c index 8514d6579..14974080f 100644 --- a/src/detection/terminalfont/terminalfont_android.c +++ b/src/detection/terminalfont/terminalfont_android.c @@ -1,7 +1,7 @@ #include "fastfetch.h" #include "terminalfont.h" #include "detection/terminalshell/terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #ifdef FF_HAVE_FREETYPE #include "util/library.h" diff --git a/src/detection/terminalfont/terminalfont_linux.c b/src/detection/terminalfont/terminalfont_linux.c index 39b509bfe..59ecdd2ce 100644 --- a/src/detection/terminalfont/terminalfont_linux.c +++ b/src/detection/terminalfont/terminalfont_linux.c @@ -3,7 +3,7 @@ #include "util/settings.h" #include "util/properties.h" #include "util/parsing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/mallocHelper.h" #include "util/stringUtils.h" diff --git a/src/detection/terminalfont/terminalfont_windows.c b/src/detection/terminalfont/terminalfont_windows.c index 8065ceb29..a24df94a3 100644 --- a/src/detection/terminalfont/terminalfont_windows.c +++ b/src/detection/terminalfont/terminalfont_windows.c @@ -1,5 +1,5 @@ #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/windows/unicode.h" diff --git a/src/detection/terminalshell/terminalshell.c b/src/detection/terminalshell/terminalshell.c index 8e54995a7..96e04fa34 100644 --- a/src/detection/terminalshell/terminalshell.c +++ b/src/detection/terminalshell/terminalshell.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/path.h" diff --git a/src/detection/terminalshell/terminalshell_linux.c b/src/detection/terminalshell/terminalshell_linux.c index 3376ecbfe..7912dbb79 100644 --- a/src/detection/terminalshell/terminalshell_linux.c +++ b/src/detection/terminalshell/terminalshell_linux.c @@ -1,5 +1,5 @@ #include "terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/processing.h" #include "util/thread.h" diff --git a/src/detection/terminalshell/terminalshell_windows.c b/src/detection/terminalshell/terminalshell_windows.c index 177f4d273..fe2709785 100644 --- a/src/detection/terminalshell/terminalshell_windows.c +++ b/src/detection/terminalshell/terminalshell_windows.c @@ -1,5 +1,5 @@ #include "terminalshell.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/thread.h" #include "util/mallocHelper.h" diff --git a/src/detection/terminalsize/terminalsize_linux.c b/src/detection/terminalsize/terminalsize_linux.c index d74a4d933..183b61875 100644 --- a/src/detection/terminalsize/terminalsize_linux.c +++ b/src/detection/terminalsize/terminalsize_linux.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/detection/terminalsize/terminalsize_windows.c b/src/detection/terminalsize/terminalsize_windows.c index 8c05f05c2..f884499be 100644 --- a/src/detection/terminalsize/terminalsize_windows.c +++ b/src/detection/terminalsize/terminalsize_windows.c @@ -1,5 +1,5 @@ #include "terminalsize.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/terminaltheme/terminaltheme.c b/src/detection/terminaltheme/terminaltheme.c index f40a53675..80b62be3f 100644 --- a/src/detection/terminaltheme/terminaltheme.c +++ b/src/detection/terminaltheme/terminaltheme.c @@ -1,5 +1,5 @@ #include "terminaltheme.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/tpm/tpm_linux.c b/src/detection/tpm/tpm_linux.c index 593f76555..4bd8b32c1 100644 --- a/src/detection/tpm/tpm_linux.c +++ b/src/detection/tpm/tpm_linux.c @@ -1,5 +1,5 @@ #include "tpm.h" -#include "util/io/io.h" +#include "util/io.h" const char* ffDetectTPM(FFTPMResult* result) { diff --git a/src/detection/uptime/uptime_linux.c b/src/detection/uptime/uptime_linux.c index 6cfa770be..19def70c3 100644 --- a/src/detection/uptime/uptime_linux.c +++ b/src/detection/uptime/uptime_linux.c @@ -1,6 +1,6 @@ #include "uptime.h" #include "util/time.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/users/users_linux.c b/src/detection/users/users_linux.c index 29b18f09f..98e506d33 100644 --- a/src/detection/users/users_linux.c +++ b/src/detection/users/users_linux.c @@ -1,4 +1,4 @@ -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "fastfetch.h" #include "users.h" diff --git a/src/detection/users/users_obsd.c b/src/detection/users/users_obsd.c index 17390f4d3..6d67afeff 100644 --- a/src/detection/users/users_obsd.c +++ b/src/detection/users/users_obsd.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "users.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/detection/vulkan/vulkan.c b/src/detection/vulkan/vulkan.c index 969353e99..7e63a970d 100644 --- a/src/detection/vulkan/vulkan.c +++ b/src/detection/vulkan/vulkan.c @@ -4,7 +4,7 @@ #ifdef FF_HAVE_VULKAN #include "util/library.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/parsing.h" #include "util/stringUtils.h" diff --git a/src/detection/weather/weather.c b/src/detection/weather/weather.c index 9fb62cb77..128597f48 100644 --- a/src/detection/weather/weather.c +++ b/src/detection/weather/weather.c @@ -1,5 +1,5 @@ #include "weather.h" -#include "util/networking/networking.h" +#include "util/networking.h" #define FF_UNITIALIZED ((const char*)(uintptr_t) -1) static FFNetworkingState state; diff --git a/src/detection/wifi/wifi_bsd.c b/src/detection/wifi/wifi_bsd.c index 461e61186..6a0af8b4c 100644 --- a/src/detection/wifi/wifi_bsd.c +++ b/src/detection/wifi/wifi_bsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wifi/wifi_linux.c b/src/detection/wifi/wifi_linux.c index 53781e64e..953233809 100644 --- a/src/detection/wifi/wifi_linux.c +++ b/src/detection/wifi/wifi_linux.c @@ -1,6 +1,6 @@ #include "wifi.h" #include "util/dbus.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/processing.h" #include "util/properties.h" #include "util/stringUtils.h" diff --git a/src/detection/wifi/wifi_nbsd.c b/src/detection/wifi/wifi_nbsd.c index 3339cf395..e29ebfef0 100644 --- a/src/detection/wifi/wifi_nbsd.c +++ b/src/detection/wifi/wifi_nbsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #define COMPAT_FREEBSD_NET80211 1 diff --git a/src/detection/wifi/wifi_obsd.c b/src/detection/wifi/wifi_obsd.c index 830e984e5..46ee270bf 100644 --- a/src/detection/wifi/wifi_obsd.c +++ b/src/detection/wifi/wifi_obsd.c @@ -1,5 +1,5 @@ #include "wifi.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include diff --git a/src/detection/wm/wm_linux.c b/src/detection/wm/wm_linux.c index 7ebc43338..147f31321 100644 --- a/src/detection/wm/wm_linux.c +++ b/src/detection/wm/wm_linux.c @@ -1,7 +1,7 @@ #include "wm.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/binary.h" #include "util/path.h" #include "util/stringUtils.h" diff --git a/src/detection/wm/wm_windows.cpp b/src/detection/wm/wm_windows.cpp index 01acf5830..0d9c3335d 100644 --- a/src/detection/wm/wm_windows.cpp +++ b/src/detection/wm/wm_windows.cpp @@ -1,7 +1,7 @@ extern "C" { #include "wm.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/windows/version.h" #include "detection/terminalshell/terminalshell.h" } diff --git a/src/detection/wmtheme/wmtheme_linux.c b/src/detection/wmtheme/wmtheme_linux.c index adf3a66e0..738ed9c01 100644 --- a/src/detection/wmtheme/wmtheme_linux.c +++ b/src/detection/wmtheme/wmtheme_linux.c @@ -1,5 +1,5 @@ #include "wmtheme.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/properties.h" #include "util/parsing.h" #include "util/settings.h" diff --git a/src/fastfetch.c b/src/fastfetch.c index d7cfe540e..59f66b33d 100644 --- a/src/fastfetch.c +++ b/src/fastfetch.c @@ -3,7 +3,7 @@ #include "logo/logo.h" #include "util/commandoption.h" #include "util/init.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/jsonconfig.h" #include "util/time.h" #include "util/stringUtils.h" diff --git a/src/fastfetch.h b/src/fastfetch.h index bb5197d6c..eaecdbbc7 100644 --- a/src/fastfetch.h +++ b/src/fastfetch.h @@ -18,7 +18,7 @@ #include "util/arrayUtils.h" #include "util/FFstrbuf.h" #include "util/FFlist.h" -#include "util/platform/FFPlatform.h" +#include "util/FFPlatform.h" #include "util/unused.h" #include "options/logo.h" diff --git a/src/logo/image/image.c b/src/logo/image/image.c index eb070a0d4..f8b031ae0 100644 --- a/src/logo/image/image.c +++ b/src/logo/image/image.c @@ -1,5 +1,5 @@ #include "image.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/printing.h" #include "util/processing.h" #include "util/stringUtils.h" diff --git a/src/logo/logo.c b/src/logo/logo.c index 5b5390431..c24311124 100644 --- a/src/logo/logo.c +++ b/src/logo/logo.c @@ -1,5 +1,5 @@ #include "logo/logo.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/printing.h" #include "util/processing.h" #include "util/textModifier.h" diff --git a/src/util/modules.c b/src/modules/modules.c similarity index 100% rename from src/util/modules.c rename to src/modules/modules.c diff --git a/src/util/platform/FFPlatform.c b/src/util/FFPlatform.c similarity index 99% rename from src/util/platform/FFPlatform.c rename to src/util/FFPlatform.c index 9195e6ea4..37c23cb1f 100644 --- a/src/util/platform/FFPlatform.c +++ b/src/util/FFPlatform.c @@ -1,6 +1,6 @@ #include "FFPlatform_private.h" #include "util/stringUtils.h" -#include "util/io/io.h" +#include "util/io.h" #include "detection/version/version.h" void ffPlatformInit(FFPlatform* platform) diff --git a/src/util/platform/FFPlatform.h b/src/util/FFPlatform.h similarity index 100% rename from src/util/platform/FFPlatform.h rename to src/util/FFPlatform.h diff --git a/src/util/platform/FFPlatform_private.h b/src/util/FFPlatform_private.h similarity index 100% rename from src/util/platform/FFPlatform_private.h rename to src/util/FFPlatform_private.h diff --git a/src/util/platform/FFPlatform_unix.c b/src/util/FFPlatform_unix.c similarity index 99% rename from src/util/platform/FFPlatform_unix.c rename to src/util/FFPlatform_unix.c index 464077f52..4827df273 100644 --- a/src/util/platform/FFPlatform_unix.c +++ b/src/util/FFPlatform_unix.c @@ -1,7 +1,7 @@ #include "FFPlatform_private.h" #include "util/FFstrbuf.h" #include "util/stringUtils.h" -#include "util/io/io.h" +#include "util/io.h" #include "fastfetch_config.h" #include diff --git a/src/util/platform/FFPlatform_windows.c b/src/util/FFPlatform_windows.c similarity index 99% rename from src/util/platform/FFPlatform_windows.c rename to src/util/FFPlatform_windows.c index 26491031e..dc22900b1 100644 --- a/src/util/platform/FFPlatform_windows.c +++ b/src/util/FFPlatform_windows.c @@ -1,5 +1,5 @@ #include "FFPlatform_private.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/stringUtils.h" #include "util/windows/unicode.h" diff --git a/src/util/binary_apple.c b/src/util/binary_apple.c index 31d975fa9..0fca0c2b4 100644 --- a/src/util/binary_apple.c +++ b/src/util/binary_apple.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/binary_linux.c b/src/util/binary_linux.c index 6844ebb00..a39f4b54a 100644 --- a/src/util/binary_linux.c +++ b/src/util/binary_linux.c @@ -2,7 +2,7 @@ #if defined(FF_HAVE_ELF) || defined(__sun) || (defined(__FreeBSD__) && !defined(__DragonFly__)) || defined(__OpenBSD__) || defined(__NetBSD__) -#include "util/io/io.h" +#include "util/io.h" #include "util/library.h" #include "util/stringUtils.h" diff --git a/src/util/binary_windows.c b/src/util/binary_windows.c index d11ae8c0e..358f10f97 100644 --- a/src/util/binary_windows.c +++ b/src/util/binary_windows.c @@ -1,5 +1,5 @@ #include "binary.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/io/io.h b/src/util/io.h similarity index 100% rename from src/util/io/io.h rename to src/util/io.h diff --git a/src/util/io/io_unix.c b/src/util/io_unix.c similarity index 100% rename from src/util/io/io_unix.c rename to src/util/io_unix.c diff --git a/src/util/io/io_windows.c b/src/util/io_windows.c similarity index 100% rename from src/util/io/io_windows.c rename to src/util/io_windows.c diff --git a/src/util/jsonconfig.c b/src/util/jsonconfig.c index c606fe0a3..3c9334c5d 100644 --- a/src/util/jsonconfig.c +++ b/src/util/jsonconfig.c @@ -2,7 +2,7 @@ #include "util/color.h" #include "util/jsonconfig.h" #include "util/printing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/time.h" #include "util/stringUtils.h" #include "detection/version/version.h" diff --git a/src/util/kmod.c b/src/util/kmod.c index 38e819f85..1a64ceaa7 100644 --- a/src/util/kmod.c +++ b/src/util/kmod.c @@ -1,7 +1,7 @@ #include "kmod.h" #if __linux__ -#include "util/io/io.h" +#include "util/io.h" bool ffKmodLoaded(const char* modName) { diff --git a/src/util/netif/netif.c b/src/util/netif.c similarity index 100% rename from src/util/netif/netif.c rename to src/util/netif.c diff --git a/src/util/netif/netif.h b/src/util/netif.h similarity index 100% rename from src/util/netif/netif.h rename to src/util/netif.h diff --git a/src/util/netif/netif_apple.c b/src/util/netif_apple.c similarity index 99% rename from src/util/netif/netif_apple.c rename to src/util/netif_apple.c index 6452077ca..3e962a0da 100644 --- a/src/util/netif/netif_apple.c +++ b/src/util/netif_apple.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_bsd.c b/src/util/netif_bsd.c similarity index 99% rename from src/util/netif/netif_bsd.c rename to src/util/netif_bsd.c index e53c53641..da4a74934 100644 --- a/src/util/netif/netif_bsd.c +++ b/src/util/netif_bsd.c @@ -1,6 +1,6 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_gnu.c b/src/util/netif_gnu.c similarity index 97% rename from src/util/netif/netif_gnu.c rename to src/util/netif_gnu.c index a62a9a4a4..40dd162be 100644 --- a/src/util/netif/netif_gnu.c +++ b/src/util/netif_gnu.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/util/netif/netif_haiku.c b/src/util/netif_haiku.c similarity index 99% rename from src/util/netif/netif_haiku.c rename to src/util/netif_haiku.c index d5c5906ae..46f169dcf 100644 --- a/src/util/netif/netif_haiku.c +++ b/src/util/netif_haiku.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/netif/netif_linux.c b/src/util/netif_linux.c similarity index 99% rename from src/util/netif/netif_linux.c rename to src/util/netif_linux.c index 3427bead0..50ce084df 100644 --- a/src/util/netif/netif_linux.c +++ b/src/util/netif_linux.c @@ -1,5 +1,5 @@ #include "netif.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include "util/debug.h" diff --git a/src/util/netif/netif_windows.c b/src/util/netif_windows.c similarity index 100% rename from src/util/netif/netif_windows.c rename to src/util/netif_windows.c diff --git a/src/util/networking/networking.h b/src/util/networking.h similarity index 100% rename from src/util/networking/networking.h rename to src/util/networking.h diff --git a/src/util/networking/networking_common.c b/src/util/networking_common.c similarity index 99% rename from src/util/networking/networking_common.c rename to src/util/networking_common.c index aa6bd22e7..d799566eb 100644 --- a/src/util/networking/networking_common.c +++ b/src/util/networking_common.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/library.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/util/networking/networking_linux.c b/src/util/networking_linux.c similarity index 99% rename from src/util/networking/networking_linux.c rename to src/util/networking_linux.c index 068cfe3c5..f407d133a 100644 --- a/src/util/networking/networking_linux.c +++ b/src/util/networking_linux.c @@ -1,5 +1,5 @@ #include "fastfetch.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/time.h" #include "util/library.h" #include "util/stringUtils.h" diff --git a/src/util/networking/networking_windows.c b/src/util/networking_windows.c similarity index 99% rename from src/util/networking/networking_windows.c rename to src/util/networking_windows.c index afd426618..7f0d70699 100644 --- a/src/util/networking/networking_windows.c +++ b/src/util/networking_windows.c @@ -3,7 +3,7 @@ //Must be included after #include "fastfetch.h" -#include "util/networking/networking.h" +#include "util/networking.h" #include "util/stringUtils.h" #include "util/debug.h" diff --git a/src/util/path.c b/src/util/path.c index b6d6999e8..d9c9dadf7 100644 --- a/src/util/path.c +++ b/src/util/path.c @@ -1,6 +1,6 @@ #include "path.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #if !_WIN32 diff --git a/src/util/processing_linux.c b/src/util/processing_linux.c index ae8fcccb5..64e549066 100644 --- a/src/util/processing_linux.c +++ b/src/util/processing_linux.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/stringUtils.h" #include "util/mallocHelper.h" diff --git a/src/util/processing_windows.c b/src/util/processing_windows.c index e0bf519f4..142005224 100644 --- a/src/util/processing_windows.c +++ b/src/util/processing_windows.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/processing.h" -#include "util/io/io.h" +#include "util/io.h" #include #include diff --git a/src/util/properties.c b/src/util/properties.c index dd224a574..2b36b3dbe 100644 --- a/src/util/properties.c +++ b/src/util/properties.c @@ -1,6 +1,6 @@ #include "fastfetch.h" #include "util/properties.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/mallocHelper.h" #include diff --git a/src/util/settings.c b/src/util/settings.c index 6fcb6f25b..b6cf9e398 100644 --- a/src/util/settings.c +++ b/src/util/settings.c @@ -2,7 +2,7 @@ #include "util/settings.h" #include "util/library.h" #include "util/thread.h" -#include "util/io/io.h" +#include "util/io.h" #include diff --git a/src/util/smbiosHelper.c b/src/util/smbiosHelper.c index 848484af3..6a2585b2c 100644 --- a/src/util/smbiosHelper.c +++ b/src/util/smbiosHelper.c @@ -1,5 +1,5 @@ #include "smbiosHelper.h" -#include "util/io/io.h" +#include "util/io.h" #include "util/unused.h" #include "util/mallocHelper.h" #include "util/debug.h"