Chore: merges common/* into util/*

2026-09-13 02:42:09 +02:00 · 2026-01-05 16:19:47 +08:00
parent 8c86003220
commit 1e43e35857
428 changed files with 840 additions and 832 deletions
@@ -364,26 +364,6 @@ file(GENERATE OUTPUT logo_builtin.h CONTENT "${LOGO_BUILTIN_H}")
 #######################

 set(LIBFASTFETCH_SRC
-    src/common/commandoption.c
-    src/common/duration.c
-    src/common/font.c
-    src/common/format.c
-    src/common/frequency.c
-    src/common/init.c
-    src/common/jsonconfig.c
-    src/common/library.c
-    src/common/modules.c
-    src/common/netif/netif.c
-    src/common/networking/networking_common.c
-    src/common/option.c
-    src/common/parsing.c
-    src/common/percent.c
-    src/common/printing.c
-    src/common/properties.c
-    src/common/settings.c
-    src/common/size.c
-    src/common/temps.c
-    src/common/time.c
    src/detection/bluetoothradio/bluetoothradio.c
    src/detection/bootmgr/bootmgr.c
    src/detection/chassis/chassis.c
@@ -492,6 +472,26 @@ set(LIBFASTFETCH_SRC
    src/options/display.c
    src/options/logo.c
    src/options/general.c
+    src/util/commandoption.c
+    src/util/duration.c
+    src/util/font.c
+    src/util/format.c
+    src/util/frequency.c
+    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/option.c
+    src/util/parsing.c
+    src/util/percent.c
+    src/util/printing.c
+    src/util/properties.c
+    src/util/settings.c
+    src/util/size.c
+    src/util/temps.c
+    src/util/time.c
    src/util/edidHelper.c
    src/util/base64.c
    src/util/FFlist.c
@@ -504,11 +504,6 @@ set(LIBFASTFETCH_SRC

 if(LINUX)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_linux.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
        src/detection/battery/battery_linux.c
        src/detection/bios/bios_linux.c
        src/detection/board/board_linux.c
@@ -583,16 +578,16 @@ if(LINUX)
        src/detection/de/de_linux.c
        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/processing_linux.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
    )
 elseif(ANDROID)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_linux.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
        src/detection/battery/battery_android.c
        src/detection/bios/bios_android.c
        src/detection/bluetooth/bluetooth_nosupport.c
@@ -656,17 +651,16 @@ elseif(ANDROID)
        src/detection/de/de_linux.c
        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/processing_linux.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
    )
 elseif(FreeBSD)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
        src/detection/battery/battery_bsd.c
        src/detection/bios/bios_bsd.c
        src/detection/bluetoothradio/bluetoothradio_nosupport.c
@@ -738,6 +732,12 @@ elseif(FreeBSD)
        src/detection/de/de_linux.c
        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/processing_linux.c
+        src/util/sysctl.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
    )
@@ -754,12 +754,6 @@ elseif(FreeBSD)
    endif()
 elseif(NetBSD)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
        src/detection/battery/battery_nbsd.c
        src/detection/bios/bios_nbsd.c
        src/detection/bluetooth/bluetooth_bsd.c
@@ -831,17 +825,17 @@ elseif(NetBSD)
        src/detection/de/de_linux.c
        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/processing_linux.c
+        src/util/sysctl.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
    )
 elseif(OpenBSD)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_bsd.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
        src/detection/battery/battery_obsd.c
        src/detection/bios/bios_windows.c
        src/detection/bluetooth/bluetooth_nosupport.c
@@ -913,17 +907,18 @@ elseif(OpenBSD)
        src/detection/de/de_linux.c
        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/processing_linux.c
+        src/util/sysctl.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
        src/util/smbiosHelper.c
    )
 elseif(APPLE)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/io/io_unix.c
-        src/common/netif/netif_apple.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
-        src/common/sysctl.c
        src/detection/battery/battery_apple.c
        src/detection/bios/bios_apple.c
        src/detection/bluetooth/bluetooth_apple.m
@@ -982,6 +977,11 @@ 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/processing_linux.c
+        src/util/sysctl.c
        src/util/apple/cf_helpers.c
        src/util/apple/osascript.m
        src/util/apple/smc_temps.c
@@ -990,10 +990,6 @@ elseif(APPLE)
    )
 elseif(WIN32)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/io/io_windows.c
-        src/common/netif/netif_windows.c
-        src/common/networking/networking_windows.c
-        src/common/processing_windows.c
        src/detection/battery/battery_windows.c
        src/detection/bios/bios_windows.c
        src/detection/bluetooth/bluetooth_windows.c
@@ -1051,6 +1047,10 @@ 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/processing_windows.c
        src/util/windows/getline.c
        src/util/windows/com.cpp
        src/util/windows/registry.c
@@ -1063,11 +1063,6 @@ elseif(WIN32)
    )
 elseif(SunOS)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_apple.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
        src/detection/battery/battery_nosupport.c
        src/detection/bios/bios_windows.c
        src/detection/board/board_windows.c
@@ -1139,16 +1134,16 @@ elseif(SunOS)
        src/detection/de/de_linux.c
        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/processing_linux.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
    )
 elseif(Haiku)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_haiku.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
        src/detection/battery/battery_haiku.c
        src/detection/bios/bios_windows.c
        src/detection/board/board_windows.c
@@ -1207,17 +1202,17 @@ elseif(Haiku)
        src/detection/de/de_nosupport.c
        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/processing_linux.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
        src/util/haiku/version.cpp
    )
 elseif(GNU)
    list(APPEND LIBFASTFETCH_SRC
-        src/common/dbus.c
-        src/common/io/io_unix.c
-        src/common/netif/netif_gnu.c
-        src/common/networking/networking_linux.c
-        src/common/processing_linux.c
        src/detection/battery/battery_nosupport.c
        src/detection/bios/bios_nosupport.c
        src/detection/board/board_nosupport.c
@@ -1286,6 +1281,11 @@ elseif(GNU)
        src/detection/de/de_linux.c
        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/processing_linux.c
        src/util/platform/FFPlatform_unix.c
        src/util/binary_linux.c
   )
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
 #include "battery.h"
 #include "util/stringUtils.h"
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/processing.h"
+#include "util/properties.h"

 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "BatteryStatus"
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/sysctl.h"
+#include "util/io/io.h"
 #include "battery.h"

 #include <dev/acpica/acpiio.h>
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <private/device/power_managment.h>
 #include <sys/ioctl.h>
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 #include <dirent.h>
@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"

@@ -1,5 +1,5 @@
 #include "battery.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <machine/apmvar.h>
 #include <sys/ioctl.h>
@@ -1,6 +1,6 @@
 #include "battery.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/windows/nt.h"
 #include "util/windows/unicode.h"
 #include "util/mallocHelper.h"
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/settings.h"
+#include "util/settings.h"

 const char* ffDetectBios(FFBiosResult* bios)
 {
@@ -1,8 +1,8 @@
 #include "bios.h"

-#include "common/settings.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/settings.h"
+#include "util/sysctl.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectBios(FFBiosResult* result)
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"

 #include <stdlib.h>
@@ -1,5 +1,5 @@
 #include "bios.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectBios(FFBiosResult* bios)
@@ -28,7 +28,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
    };
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION;
 #elif __OpenBSD__
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <fcntl.h>
 #include <unistd.h>
@@ -1,6 +1,6 @@
 extern "C" {
 #include "bluetooth.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 }

 #include <bluetooth/LocalDevice.h>
@@ -2,8 +2,8 @@
 #include "util/stringUtils.h"

 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
-#include "common/io/io.h"
+#include "util/dbus.h"
+#include "util/io/io.h"

 /* Example dbus reply, striped to only the relevant parts:
 array [                                                     //root
@@ -1,5 +1,5 @@
 #include "bluetooth.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/windows/unicode.h"

 #include <windows.h>
@@ -1,5 +1,5 @@
 #include "bluetoothradio.h"
-#include "common/processing.h"
+#include "util/processing.h"

 #import <IOBluetooth/IOBluetooth.h>

@@ -2,8 +2,8 @@
 #include "util/stringUtils.h"

 #ifdef FF_HAVE_DBUS
-#include "common/dbus.h"
-#include "common/io/io.h"
+#include "util/dbus.h"
+#include "util/io/io.h"

 /* Example dbus reply:
 array [
@@ -1,6 +1,6 @@
 #include "bluetoothradio.h"
-#include "common/library.h"
-#include "common/io/io.h"
+#include "util/library.h"
+#include "util/io/io.h"
 #include "util/windows/unicode.h"

 #include <windows.h>
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/settings.h"
+#include "util/settings.h"

 const char* ffDetectBoard(FFBoardResult* board)
 {
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectBoard(FFBoardResult* result)
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"

 #include <stdlib.h>
@@ -1,5 +1,5 @@
 #include "board.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectBoard(FFBoardResult* board)
@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/apple/cf_helpers.h"

 #include <IOKit/IOKitLib.h>
@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #ifdef __OpenBSD__
    #include <dev/efi/efiio.h>
@@ -1,5 +1,5 @@
 #include "bootmgr.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "efi_helper.h"

 #define FF_EFIVARS_PATH_PREFIX "/sys/firmware/efi/efivars/"
@@ -1,6 +1,6 @@
 #include "bootmgr.h"
 #include "efi_helper.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <windows.h>

@@ -2,7 +2,7 @@

 #if __has_include(<sys/backlight.h>)

-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <sys/backlight.h>
 #include <sys/ioctl.h>
@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"

@@ -87,7 +87,7 @@ static const char* detectWithBacklight(FFlist* result)

 #ifdef FF_HAVE_DDCUTIL
 #include "detection/displayserver/displayserver.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"

 #include <ddcutil_macros.h>
@@ -1,6 +1,6 @@
 #include "brightness.h"

-#include "common/sysctl.h"
+#include "util/sysctl.h"

 const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
 {
@@ -1,5 +1,5 @@
 #include "brightness.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <dev/wscons/wsconsio.h>
 #include <sys/ioctl.h>
@@ -2,7 +2,7 @@ extern "C"
 {
 #include "brightness.h"
 #include "detection/displayserver/displayserver.h"
-#include "common/library.h"
+#include "util/library.h"
 }
 #include "util/windows/wmi.hpp"
 #include "util/windows/unicode.hpp"
@@ -1,6 +1,6 @@
 #include "btrfs.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include <fcntl.h>

 enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") };
@@ -1,7 +1,7 @@
 #include "camera.h"

-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/processing.h"
+#include "util/properties.h"

 #define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api"
 #define FF_TERMUX_API_PARAM "CameraInfo"
@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #import <AVFoundation/AVCaptureDevice.h>

@@ -1,5 +1,5 @@
 #include "camera.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <unistd.h>
 #include <fcntl.h>
@@ -1,6 +1,6 @@
 extern "C" {
 #include "camera.h"
-#include "common/library.h"
+#include "util/library.h"
 }
 #include "util/windows/com.hpp"
 #include "util/windows/unicode.hpp"
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectChassis(FFChassisResult* result)
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/smbiosHelper.h"

 #include <stdlib.h>
@@ -1,5 +1,5 @@
 #include "chassis.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectChassis(FFChassisResult* chassis)
@@ -1,6 +1,6 @@
-#include "common/processing.h"
-#include "util/FFstrbuf.h"
 #include "detection/command/command.h"
+#include "util/processing.h"
+#include "util/FFstrbuf.h"

 typedef struct FFCommandResultBundle
 {
@@ -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 "common/io/io.h"
+#include "util/io/io.h"
 #include <elf.h>
 // #include <asm/hwcap.h>

@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/apple/smc_temps.h"
 #include "util/stringUtils.h"

@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"

 #include <sys/param.h>
@@ -1,7 +1,7 @@
 #include "cpu.h"
-#include "common/io/io.h"
-#include "common/processing.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/processing.h"
+#include "util/properties.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/path.h"
@@ -200,7 +200,7 @@ static void detectNumaNodes(FFCPUResult* cpu)
 }

 #ifdef __ANDROID__
-#include "common/settings.h"
+#include "util/settings.h"

 static void detectQualcomm(FFCPUResult* cpu)
 {
@@ -1,6 +1,6 @@
 #include "cpu.h"
-#include "common/sysctl.h"
-#include "common/io/io.h"
+#include "util/sysctl.h"
+#include "util/io/io.h"

 #include <sys/envsys.h>
 #include <prop/proplib.h>
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"

 #include <errno.h>
@@ -1,5 +1,5 @@
 #include "cpu.h"
-#include "common/processing.h"
+#include "util/processing.h"
 #include "util/stringUtils.h"
 #include <kstat.h>

@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/stringUtils.h"

 const char* ffDetectCPUCache(FFCPUCacheResult* result)
@@ -1,5 +1,5 @@
 #include "cpucache.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 static const char* parseCpuCacheIndex(FFstrbuf* path, FFCPUCacheResult* result, FFstrbuf* buffer, FFstrbuf* added)
@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "common/time.h"
+#include "util/time.h"

 #include <stdint.h>

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <stdio.h>
 #include <inttypes.h>
@@ -1,10 +1,10 @@
 #include "cursor.h"

-#include "common/properties.h"
-#include "common/parsing.h"
-#include "common/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
+#include "util/properties.h"
+#include "util/parsing.h"
+#include "util/settings.h"
 #include "util/stringUtils.h"

 #include <stdlib.h>
@@ -1,11 +1,11 @@
 #include "de.h"

-#include "common/dbus.h"
-#include "common/io/io.h"
-#include "common/library.h"
-#include "common/parsing.h"
-#include "common/properties.h"
-#include "common/processing.h"
+#include "util/dbus.h"
+#include "util/io/io.h"
+#include "util/library.h"
+#include "util/parsing.h"
+#include "util/properties.h"
+#include "util/processing.h"
 #include "util/binary.h"
 #include "util/path.h"
 #include "detection/displayserver/displayserver.h"
@@ -1,6 +1,6 @@
 #include "disk.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 #include <limits.h>
@@ -1,5 +1,5 @@
 #include "disk.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 #include <sys/mntent.h>
@@ -1,6 +1,6 @@
 #include "disk.h"
-#include "common/io/io.h"
-#include "common/thread.h"
+#include "util/io/io.h"
+#include "util/thread.h"
 #include "util/windows/unicode.h"

 #include <windows.h>
@@ -1,6 +1,6 @@
 #include "diskio.h"

-#include "common/time.h"
+#include "util/time.h"

 const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options);

@@ -1,6 +1,6 @@
 #include "diskio.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"

 #include <ctype.h>
@@ -1,5 +1,5 @@
 #include "diskio.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/windows/unicode.h"

 #include <windows.h>
@@ -1,6 +1,6 @@
 #include "displayserver.h"
-#include "common/settings.h"
-#include "common/processing.h"
+#include "util/settings.h"
+#include "util/processing.h"
 #include "linux/displayserver_linux.h"

 #include <math.h>
@@ -1,9 +1,9 @@
 #include "displayserver_linux.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 #ifdef __FreeBSD__
-    #include "common/settings.h"
+    #include "util/settings.h"
 #endif

 static void getWMProtocolNameFromEnv(FFDisplayServerResult* result)
@@ -1,5 +1,5 @@
 #include "displayserver_linux.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"

@@ -110,7 +110,7 @@ static const char* drmParseSysfs(FFDisplayServerResult* result)

 #ifdef FF_HAVE_DRM

-#include "common/library.h"
+#include "util/library.h"

 #include <xf86drm.h>
 #include <xf86drmMode.h>
@@ -1,5 +1,5 @@
 #include "../displayserver_linux.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"

@@ -10,7 +10,7 @@

 #include <sys/socket.h>

-#include "common/properties.h"
+#include "util/properties.h"

 #include "wayland.h"
 #include "wlr-output-management-unstable-v1-client-protocol.h"
@@ -2,7 +2,7 @@

 #ifdef FF_HAVE_WAYLAND

-#include "common/library.h"
+#include "util/library.h"
 #include "util/stringUtils.h"

 #include <wayland-client.h>
@@ -1,6 +1,6 @@
 #include "displayserver_linux.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"

@@ -2,8 +2,8 @@

 #ifdef FF_HAVE_XCB_RANDR

-#include "common/library.h"
-#include "common/properties.h"
+#include "util/library.h"
+#include "util/properties.h"
 #include "util/edidHelper.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
@@ -2,8 +2,8 @@

 #ifdef FF_HAVE_XRANDR

-#include "common/library.h"
-#include "common/properties.h"
+#include "util/library.h"
+#include "util/properties.h"
 #include "util/edidHelper.h"
 #include "util/stringUtils.h"

@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/apple/cf_helpers.h"
@@ -1,6 +1,6 @@
 #include "detection/dns/dns.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"
 #include "util/debug.h"
@@ -1,5 +1,5 @@
 #include "detection/dns/dns.h"
-#include "common/netif/netif.h"
+#include "util/netif/netif.h"
 #include "util/mallocHelper.h"

 #include <ws2tcpip.h>
@@ -1,6 +1,6 @@
 #include "editor.h"
-#include "common/processing.h"
-#include "common/library.h"
+#include "util/processing.h"
+#include "util/library.h"
 #include "util/stringUtils.h"
 #include "util/path.h"
 #include "util/binary.h"
@@ -1,5 +1,5 @@
-#include "common/font.h"
-#include "common/io/io.h"
+#include "util/font.h"
+#include "util/io/io.h"
 #include "font.h"

 #import <AppKit/NSFont.h>
@@ -1,5 +1,5 @@
-#include "common/font.h"
-#include "common/parsing.h"
+#include "util/font.h"
+#include "util/parsing.h"
 #include "detection/displayserver/displayserver.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "font.h"
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <stdio.h>
 #include <fcntl.h>
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 static void detectGamepad(FFlist* devices, FFstrbuf* name, FFstrbuf* path)
@@ -1,5 +1,5 @@
 #include "gamepad.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"
 #include "util/windows/unicode.h"

@@ -1,7 +1,7 @@
 #include "gpu_driver_specific.h"

 #include "adl.h"
-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "util/debug.h"

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/stringUtils.h"

 #include <fcntl.h>
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"

-#include "common/io/io.h"
+#include "util/io/io.h"
 #include "util/mallocHelper.h"

 #include <sys/pciio.h>
@@ -36,7 +36,7 @@ static void fillGPUTypeGeneric(FFGPUResult* gpu)
 }

 #if FF_HAVE_DRM
-#include "common/library.h"
+#include "util/library.h"
 #include "util/stringUtils.h"

 #include <xf86drm.h>
@@ -5,8 +5,8 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>

-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "util/stringUtils.h"

@@ -2,8 +2,8 @@

 #ifdef FF_HAVE_PCIACCESS

-#include "common/io/io.h"
-#include "common/library.h"
+#include "util/io/io.h"
+#include "util/library.h"

 #include <pciaccess.h>

@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <private/drivers/poke.h>

@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"

-#include "common/library.h"
+#include "util/library.h"
 #include "util/mallocHelper.h"
 #include "igcl.h"

@@ -2,12 +2,12 @@
 #include "detection/vulkan/vulkan.h"
 #include "detection/cpu/cpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
-#include "common/io/io.h"
-#include "common/library.h"
-#include "modules/gpu/option.h"
+#include "util/io/io.h"
+#include "util/library.h"
 #include "util/FFstrbuf.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
+#include "modules/gpu/option.h"

 #include <inttypes.h>
 #include <stdint.h>
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"

-#include "common/library.h"
+#include "util/library.h"
 #include "mtml.h"

 struct FFMtmlData
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -1,6 +1,6 @@
 #include "gpu_driver_specific.h"

-#include "common/library.h"
+#include "util/library.h"
 #include "nvml.h"

 struct FFNvmlData {
@@ -1,5 +1,5 @@
 #include "gpu.h"
-#include "common/io/io.h"
+#include "util/io/io.h"

 #include <sys/param.h>
 #include <sys/ioctl.h>
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "common/io/io.h"
-#include "common/properties.h"
+#include "util/io/io.h"
+#include "util/properties.h"

 #include <stdlib.h>
 #ifdef __FreeBSD__
@@ -1,6 +1,6 @@
 #include "gpu.h"
-#include "common/library.h"
 #include "detection/gpu/gpu_driver_specific.h"
+#include "util/library.h"
 #include "util/windows/unicode.h"
 #include "util/windows/registry.h"
 #include "util/mallocHelper.h"
@@ -2,7 +2,7 @@

 #define INITGUID
 extern "C" {
-#include "common/library.h"
+#include "util/library.h"
 #include "detection/gpu/gpu.h"
 #include "detection/gpu/gpu_driver_specific.h"
 }
@@ -1,8 +1,8 @@
 #include "fastfetch.h"
+#include "util/properties.h"
+#include "util/thread.h"
+#include "util/settings.h"
 #include "detection/gtk_qt/gtk_qt.h"
-#include "common/properties.h"
-#include "common/thread.h"
-#include "common/settings.h"
 #include "detection/displayserver/displayserver.h"

 static inline bool allPropertiesSet(FFGTKResult* result)
@@ -1,9 +1,9 @@
 #include "fastfetch.h"
-#include "common/properties.h"
-#include "common/thread.h"
+#include "util/properties.h"
+#include "util/thread.h"
+#include "util/stringUtils.h"
 #include "detection/gtk_qt/gtk_qt.h"
 #include "detection/displayserver/displayserver.h"
-#include "util/stringUtils.h"

 #include <stdlib.h>
 #include <string.h>
@@ -1,5 +1,6 @@
 #include "host.h"
-#include "common/settings.h"
+#include "util/settings.h"
+
 #include <ctype.h>

 const char* ffDetectHost(FFHostResult* host)
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/apple/cf_helpers.h"

 #include <IOKit/IOKitLib.h>
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/settings.h"
+#include "util/settings.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectHost(FFHostResult* host)
@@ -1,6 +1,6 @@
 #include "host.h"
-#include "common/io/io.h"
-#include "common/processing.h"
+#include "util/io/io.h"
+#include "util/processing.h"
 #include "util/smbiosHelper.h"

 #include <stdlib.h>
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectHost(FFHostResult* host)
@@ -1,5 +1,5 @@
 #include "host.h"
-#include "common/sysctl.h"
+#include "util/sysctl.h"
 #include "util/smbiosHelper.h"

 const char* ffDetectHost(FFHostResult* host)
--- a/Show More
+++ b/Show More