Merge pull request #1425 from fastfetch-cli/dev

Release: v2.31.0

.codespellrc

@@ -2,4 +2,4 @@
 check-filenames =
 builtin = clear,rare,usage,informal
 skip = */.git,*/cmake-build-*,*/.idea,*/completions,*/presets,*/screenshots,*/tests,*/3rdparty,*/logo/ascii
-ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant
+ignore-words-list = iterm,compiletime,unknwn,pengwin,siduction,master,slave,sur,doas,conexant,ags

.github/workflows/ci.yml

@@ -272,50 +272,9 @@ jobs:
           name: fastfetch-musl-amd64
           path: ./fastfetch-*.*
 
-  musl-aarch64:
-    name: Musl-aarch64
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: setup alpine linux
-        uses: jirutka/setup-alpine@master
-        with:
-          branch: v3.19
-          arch: aarch64
-
-      - name: install dependencies
-        run: |
-          cat /etc/alpine-release
-          uname -a
-          apk add cmake samurai vulkan-loader-dev libxcb-dev wayland-dev libdrm-dev dconf-dev imagemagick-dev chafa-dev zlib-dev dbus-dev mesa-dev opencl-dev xfconf-dev sqlite-dev networkmanager-dev pulseaudio-dev ddcutil-dev elfutils-dev gcc g++
-        shell: alpine.sh --root {0}
-
-      - name: build
-        run: |
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr -DIS_MUSL=ON -GNinja .
-            cmake --build . --target package --verbose -j4
-        shell: alpine.sh {0}
-
-      - name: run
-        run: |
-            ./fastfetch --list-features
-            time ./fastfetch -c presets/ci.jsonc --stat false
-            time ./fastfetch -c presets/ci.jsonc --format json
-            time ./flashfetch
-            ldd fastfetch
-            ctest
-        shell: alpine.sh {0}
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-musl-aarch64
-          path: ./fastfetch-*.*
-
   macos-universal:
     name: macOS-universal
-    runs-on: macos-12
+    runs-on: macos-latest
     permissions:
       security-events: write
       contents: read
@@ -422,7 +381,7 @@ jobs:
           run: |
             uname -a
             sudo pkg update
-            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm libelf glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests
+            sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py311-requests chafa
             cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
@@ -438,6 +397,41 @@ jobs:
           name: fastfetch-freebsd-amd64
           path: ./fastfetch-*.*
 
+  dragonfly-amd64:
+    name: DragonFly-amd64
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: run VM
+        uses: vmactions/dragonflybsd-vm@v1
+        with:
+          usesh: yes
+          prepare: |
+            uname -a
+            pkg update
+            pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat py39-requests chafa libelf
+
+          run: |
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fastfetch-dragonfly-amd64
+          path: ./fastfetch-*.*
+
   openbsd-amd64:
     name: OpenBSD-amd64
     runs-on: ubuntu-latest
@@ -458,8 +452,8 @@ jobs:
           version: '7.5'
           run: |
             uname -a
-            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio
-            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
+            sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa pulseaudio py3-requests
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
             cmake --build . --target package --verbose -j4
             ./fastfetch --list-features
             time ./fastfetch -c presets/ci.jsonc --stat false
@@ -474,6 +468,42 @@ jobs:
           name: fastfetch-openbsd-amd64
           path: ./fastfetch-*.*
 
+  netbsd-amd64:
+    name: NetBSD-amd64
+    runs-on: ubuntu-latest
+    permissions:
+      security-events: write
+      contents: read
+    steps:
+      - name: checkout repository
+        uses: actions/checkout@v4
+
+      - name: run VM
+        uses: cross-platform-actions/action@master
+        with:
+          operating_system: netbsd
+          architecture: x86-64
+          cpu_count: 4
+          shell: bash
+          version: '10.0'
+          run: |
+            uname -a
+            sudo pkgin -y install cmake git pkgconf wayland vulkan-headers dconf dbus sqlite3 ImageMagick pulseaudio opencl-headers ocl-icd py312-requests
+            cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=ON .
+            cmake --build . --target package --verbose -j4
+            ./fastfetch --list-features
+            time ./fastfetch -c presets/ci.jsonc --stat false
+            time ./fastfetch -c presets/ci.jsonc --format json
+            time ./flashfetch
+            ldd fastfetch
+            ctest
+
+      - name: upload artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: fastfetch-netbsd-amd64
+          path: ./fastfetch-*.*
+
   windows-amd64:
     name: Windows-amd64
     runs-on: windows-latest
@@ -539,76 +569,6 @@ jobs:
           name: fastfetch-windows-amd64
           path: ./fastfetch-windows-amd64.*
 
-  windows-i686:
-    name: Windows-i686
-    runs-on: windows-latest
-    permissions:
-      security-events: write
-      contents: read
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: checkout repository
-        uses: actions/checkout@v4
-
-      - name: setup-msys2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: CLANG32
-          update: true
-          install: git p7zip mingw-w64-clang-i686-cmake mingw-w64-clang-i686-clang mingw-w64-clang-i686-vulkan-loader mingw-w64-clang-i686-vulkan-headers mingw-w64-clang-i686-opencl-icd mingw-w64-clang-i686-opencl-headers
-
-      - name: print msys version
-        run: uname -a
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
-        with:
-          languages: c, cpp
-
-      - name: configure project
-        run: env PKG_CONFIG_PATH=/clang32/lib/pkgconfig/:$PKG_CONFIG_PATH cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .
-
-      - name: build project
-        run: cmake --build . --verbose -j4
-
-      - name: perform CodeQL analysis
-        uses: github/codeql-action/analyze@v3
-
-      - name: copy necessary dlls
-        run: cp /clang32/bin/{OpenCL,vulkan-1}.dll .
-
-      - name: download amd_ags
-        run: curl -LO https://github.com/GPUOpen-LibrariesAndSDKs/AGS_SDK/raw/master/ags_lib/lib/amd_ags_x86.dll
-
-      - name: run fastfetch
-        run: time ./fastfetch -c presets/ci.jsonc --stat false
-
-      - name: run fastfetch --format json
-        run: time ./fastfetch -c presets/ci.jsonc --format json
-
-      - name: run flashfetch
-        run: time ./flashfetch
-
-      - name: print dependencies
-        run: ldd fastfetch
-
-      - name: run tests
-        run: ctest
-
-      - name: create zip archive
-        run: 7z a -tzip -mx9 -bd -y fastfetch-windows-i686.zip LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: create 7z archive
-        run: 7z a -t7z -mx9 -bd -y fastfetch-windows-i686.7z LICENSE *.dll fastfetch.exe flashfetch.exe presets
-
-      - name: upload artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: fastfetch-windows-i686
-          path: ./fastfetch-windows-i686.*
-
   release:
     if: github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'fastfetch-cli/fastfetch'
     name: Release
@@ -619,13 +579,13 @@ jobs:
       - linux-armv7
       - linux-riscv64
       - musl-amd64
-      - musl-aarch64
       - macos-universal
       - freebsd-amd64
       - openbsd-amd64
+      - netbsd-amd64
+      - dragonfly-amd64
       - sunos-amd64
       - windows-amd64
-      - windows-i686
     permissions:
       contents: write
     steps:

.gitignore

@@ -9,3 +9,4 @@ tags
 fastfetch.kdev4
 *.user
 *.user.*
+*.swp

CHANGELOG.md

@@ -1,3 +1,137 @@
+# 2.31.0
+
+Bugfixes:
+* Improve performance of media detection; fix musikcube detection (Media, Linux)
+    * After the change, `general.processingTimeout` will also control the timeout of dbus remote calls
+* Fix invalid variable names (#1408, Users)
+* Change physical size detection to use basic display parameters (#1406)
+* Fix possible sigfaults when detecting displays (#1393)
+* Fix Nvidia card type detection
+* Fix wl-restart parsing (#1422, WM, Linux)
+* Fix syntax error in completion file (#1421)
+* Fix hunging when using `ssh-agent` as command text (#1418, Command, macOS)
+
+Features:
+* Remove support of xcb & xlib and xrandr extension is always required (Display)
+* Support preferred resolution & refresh rate detection
+    * On macOS there is no preferred resolution reported and maximum available resolution is reported instead.
+    * `--display-format {preferred-width}x{preferred-height}@{preferred-refresh-rate}`
+* Report scale factor in custom format (Display)
+    * `--display-format {scale-factor}`
+* Detect current Wi-Fi channel and maximum frequency (Wifi)
+* Report processor package count (#1413, CPU)
+* Remove duplicate whitespaces in CPU name
+* Support sakura terminal version & font detection (Terminal / TerminalFont, Linux)
+
+Logo:
+* Fix LMDE
+* Update MidOS
+* Add Windows Server 2025
+
+# 2.30.1
+
+Bugfixes:
+* Fix the destination where `fastfetch.1` is generated (#1403)
+
+# 2.30.0
+
+Changes:
+* Percent: bar type must be enabled in `percent.type` before using percent bar in custom format
+
+Features:
+* Port to MidnightBSD; add mport package manager support
+* Support bluetooth battery detection for macOS and Windows (Bluetooth, macOS / Windows)
+* Support M4 model detection (Host, macOS)
+* Support CPU temperature detection on OpenBSD (CPU, OpenBSD)
+* Display Android icon in Android devices (OS, Android)
+* Support qi package manager detection (Packages, Linux)
+* Detect WM / DE by enumerating running processes (WM / DE, NetBSD)
+* Generate manual pages from `help.json` (Doc)
+* Detect marketing name of vivo smartphone (Host, Android)
+* Add txDrops detection if supported (NetIO, *BSD)
+* Support tilix version detection (Terminal, Linux)
+* Support percent type config in module level. Example: 
+
+```json
+{
+    "type": "memory",
+    "percent": {
+        "green": 20, // [0%, 20%) will be displayed in green
+        "yellow": 40, // [20, 40) will be displayed in yellow and [40, 100] will be displayed in red
+        "type": [ // Display percent value in monochrome bar, same as 10
+            "bar",
+            "bar-monochrome"
+        ]
+    }
+}
+```
+
+Bugfixes:
+* Don't display `()` in key if display name is not available (Display)
+* Fix & normalize bluetooth mac address detection (Bluetooth, macOS / Windows)
+* Don't print index in multi-battery devices (Battery)
+* Fix segfault in macOS (#1388, macOS)
+* Fix `CFStringGetCString() failed` errors (#1394, Media, macOS)
+* Fix CPU frequency detection on Apple M4 (#1394, CPU, macOS)
+* Fix exe path detection on macOS (Shell / Terminal, macOS)
+* Fix logo fails to load from symlinked files on macOS (#1395, Logo, macOS)
+* Fix 32-bit truncation (NetIO, macOS)
+
+Logos:
+* Fix Lilidog
+* Add MidnightBSD
+* Add Unifi
+* Add Cosmic DE
+* Update openSUSE Tumbleweed
+
+# 2.29.0
+
+Changes:
+* Due to [the upstream removal of MSYS2 CLANG32 environment](https://www.msys2.org/news/#2024-09-23-starting-to-drop-the-clang32-environment), we dropped fastfetch-windows-i686 support. v2.27.1 was the last version supporting it.
+    * Note: fastfetch built with MSVCRT has known bug that DateTime module doesn't work because of its bad support of [strftime](https://en.cppreference.com/w/c/chrono/strftime). Don't use it.
+
+Features:
+* Port to NetBSD and DragonFly BSD
+    * Fastfetch now supports all major BSD variants
+* Support DiskIO, NetIO, GPU and Users module on OpenBSD
+* Report SD8E SOC name (CPU, Android)
+* On Windows, try loading dlls from current exe path (Windows)
+    * Fix Media module when installed with winget
+
+Bugfixes:
+* Fix the VIM version detection on Ubuntu (Editor, Linux)
+* Improve performance of OS version detection on Proxmox (#1370, OS, Linux)
+
+Logo:
+* Update OpenSuse Tumbleweed
+* Add XCP-ng
+* Add SummitOS
+* Add Lilidog
+* Update PikaOS
+* Update OpenSUSE Leap
+* Update aperture
+
+# 2.28.0
+
+Features:
+* Add new module `Mouse` and `Keyboard` which display connected mice and keyboards
+* Support remaining time detection (Battery)
+* Report if AC is connected (Battery, Linux)
+* Report platform API used for display detection for debugging (Display)
+* Report Wine version when running in Wine (Kernel, Windows)
+* Add option `waitTime` in modules `CPUUsage`, `DiskIO` and `NetIO`
+
+Bugfixes:
+* Fix used memory size detection (Memory, OpenBSD)
+* Don't report invalid fragmentation percentage when fails to detect it (Zpool)
+* Fix unexpected errors when running fastfetch in parallel (#1346, Windows)
+* Don't report obviously invalid temperature values (PhysicalDisk, Linux)
+
+Logos:
+* Add eweOS
+* Add MidOS
+* Update XeroArch
+
 # 2.27.1
 
 Bugfixes:
@@ -8,7 +142,7 @@ Bugfixes:
 Changes:
 * We now print `"` instead of `″` when displaying diagonal length in inches, so that the character can be correctly displayed in Linux console (Display)
 * All detection code of `monitor` module is merged into `display` module. Now `monitor` just prints the same information as `display` with different format. Notably:
-    * The resolution reported by `monitor` module is now current resolution instead of native / maximum resolution. PPI is calcuated based on current resolution too.
+    * The resolution reported by `monitor` module is now current resolution instead of native / maximum resolution. PPI is calculated based on current resolution too.
     * The refresh rate reported by `monitor` module is the current refresh rate.
 
 Features:
@@ -24,7 +158,7 @@ Bugfixes:
 * Remove trailing newline in GPU name for Raspberry pi (#1303, GPU, Linux)
 * Fix a possible buffer overflow (GPU, Linux)
 * Fix CPU temp incorrectly reported as 0 celsius (#1308, CPU, Linux)
-* Corrently report `TPM device is not found` error (#1314, TPM, Windows)
+* Correctly report `TPM device is not found` error (#1314, TPM, Windows)
 * Fix errors when triggering shell completion with python3 uninstalled (#1310)
     * To package managers: as shell completion scripts of fastfetch use python3, it should be added as an optional dependency of fastfetch
 * Fix possible crashes when detecting term font of kitty (#1321, TerminalFont, Linux)

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
 
 project(fastfetch
-    VERSION 2.27.1
+    VERSION 2.31.0
     LANGUAGES C
     DESCRIPTION "Fast neofetch-like system information tool"
     HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
@@ -20,6 +20,14 @@ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
     set(FreeBSD TRUE CACHE BOOL "..." FORCE)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
     set(OpenBSD TRUE CACHE BOOL "..." FORCE)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "MidnightBSD")
+    set(FreeBSD TRUE CACHE BOOL "..." FORCE)
+    set(MidnightBSD TRUE CACHE BOOL "..." FORCE)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "NetBSD")
+    set(NetBSD TRUE CACHE BOOL "..." FORCE)
+elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
+    set(FreeBSD TRUE CACHE BOOL "..." FORCE)
+    set(DragonFly TRUE CACHE BOOL "..." FORCE)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")
     set(SunOS TRUE CACHE BOOL "..." FORCE)
 elseif(NOT APPLE AND NOT WIN32)
@@ -46,35 +54,34 @@ include(CheckIncludeFile)
 
 include(CMakeDependentOption)
 
-cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR FreeBSD OR OpenBSD OR WIN32 OR ANDROID OR SunOS" OFF)
-cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR FreeBSD OR OpenBSD" OFF)
-cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_XCB "Enable xcb" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_X11 "Enable x11" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_VULKAN "Enable vulkan" ON "LINUX OR APPLE OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR ANDROID OR SunOS" OFF)
+cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD" OFF)
+cmake_dependent_option(ENABLE_XCB_RANDR "Enable xcb-randr" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XRANDR "Enable xrandr" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DRM "Enable libdrm" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DRM_AMDGPU "Enable libdrm_amdgpu" ON "LINUX" OFF)
-cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX OR FreeBSD OR APPLE OR OpenBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_GIO "Enable gio-2.0" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DCONF "Enable dconf" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_DBUS "Enable dbus-1" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_XFCONF "Enable libxfconf-0" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_SQLITE3 "Enable sqlite3" ON "LINUX OR FreeBSD OR APPLE OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_RPM "Enable rpm" ON "LINUX" OFF)
-cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX OR FreeBSD OR OpenBSD OR APPLE OR WIN32 OR SunOS" OFF)
-cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR FreeBSD OR OpenBSD OR APPLE OR SunOS" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR APPLE OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR APPLE OR SunOS" OFF)
 cmake_dependent_option(ENABLE_CHAFA "Enable chafa" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
 cmake_dependent_option(ENABLE_ZLIB "Enable zlib" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
-cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR FreeBSD OR OpenBSD OR WIN32 OR SunOS" OFF)
-cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR FreeBSD OR OpenBSD OR SunOS" OFF)
-cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR FreeBSD OR OpenBSD OR WIN32 OR ANDROID OR SunOS" OFF)
+cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR SunOS" OFF)
+cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR ANDROID OR SunOS" OFF)
 cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
-cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR OpenBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR OpenBSD OR NetBSD OR SunOS" OFF)
 cmake_dependent_option(ENABLE_DDCUTIL "Enable ddcutil" ON "LINUX" OFF)
 cmake_dependent_option(ENABLE_DIRECTX_HEADERS "Enable DirectX headers for WSL" ON "LINUX" OFF)
-cmake_dependent_option(ENABLE_ELF "Enable libelf" ON "LINUX OR ANDROID" OFF)
+cmake_dependent_option(ENABLE_ELF "Enable libelf" ON "LINUX OR ANDROID OR DragonFly" OFF)
 cmake_dependent_option(ENABLE_THREADS "Enable multithreading" ON "Threads_FOUND" OFF)
 cmake_dependent_option(ENABLE_LIBZFS "Enable libzfs" ON "LINUX OR FreeBSD OR SunOS" OFF)
+cmake_dependent_option(ENABLE_PCIACCESS "Enable libpciaccess" ON "NetBSD OR OpenBSD OR SunOS" OFF)
 
 option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded) yyjson library" OFF)
 option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
@@ -247,6 +254,7 @@ endfunction(fastfetch_load_text)
 
 find_package(Python)
 if(Python_FOUND)
+    message(STATUS "Minifying 'help.json'")
     execute_process(COMMAND ${Python_EXECUTABLE} -c "import json,sys;json.dump(json.load(sys.stdin),sys.stdout,separators=(',',':'))"
                     INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/src/data/help.json"
                     OUTPUT_VARIABLE DATATEXT_JSON_HELP)
@@ -254,20 +262,39 @@ if(Python_FOUND)
         message(ERROR "DATATEXT_JSON_HELP is empty, which should not happen!")
     endif()
 else()
-    message(STATUS "Python3 is not found, 'help.json' will not be minified")
+    message(WARNING "Python3 is not found, 'help.json' will not be minified")
     file(READ "src/data/help.json" DATATEXT_JSON_HELP)
 endif()
 
-if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "fastfetch_pciids.c.inc")
+if(ENABLE_EMBEDDED_PCIIDS AND NOT EXISTS "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc")
     if(Python_FOUND)
+        message(STATUS "Generating 'fastfetch_pciids.c.inc'")
         execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-pciids.py"
-                        OUTPUT_FILE "fastfetch_pciids.c.inc")
+                        OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch_pciids.c.inc"
+                        RESULT_VARIABLE PYTHON_PCIIDS_RETCODE)
+        if(NOT PYTHON_PCIIDS_RETCODE EQUAL 0)
+            message(FATAL_ERROR "Failed to generate 'fastfetch_pciids.c.inc'")
+        endif()
     else()
-        message(STATUS "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated")
+        message(WARNING "Python3 is not found, 'fastfetch_pciids.c.inc' will not be generated")
         set(ENABLE_EMBEDDED_PCIIDS OFF)
     endif()
 endif()
 
+if(Python_FOUND)
+    message(STATUS "Generating 'fastfetch.1'")
+    execute_process(COMMAND ${Python_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/scripts/gen-man.py"
+                    OUTPUT_FILE "${PROJECT_BINARY_DIR}/fastfetch.1"
+                    RESULT_VARIABLE PYTHON_MANPAGE_RETCODE)
+        if(NOT PYTHON_MANPAGE_RETCODE EQUAL 0)
+            message(FATAL_ERROR "Failed to generate 'fastfetch.1'")
+        endif()
+else()
+    message(WARNING "Python3 is not found, use basic 'fastfetch.1.in' instead")
+    string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC)
+    configure_file(doc/fastfetch.1.in fastfetch.1 @ONLY)
+endif()
+
 fastfetch_encode_c_string("${DATATEXT_JSON_HELP}" DATATEXT_JSON_HELP)
 fastfetch_load_text(src/data/structure.txt DATATEXT_STRUCTURE)
 fastfetch_load_text(src/data/help_footer.txt DATATEXT_HELP_FOOTER)
@@ -280,9 +307,6 @@ if(APPLE)
     configure_file(src/util/apple/Info.plist.in Info.plist @ONLY)
 endif()
 
-string(TIMESTAMP FASTFETCH_BUILD_DATE "%d %B %Y" UTC)
-configure_file(doc/fastfetch.1.in fastfetch.1 @ONLY)
-
 ####################
 # Ascii image data #
 ####################
@@ -379,6 +403,7 @@ set(LIBFASTFETCH_SRC
     src/modules/initsystem/initsystem.c
     src/modules/gamepad/gamepad.c
     src/modules/kernel/kernel.c
+    src/modules/keyboard/keyboard.c
     src/modules/lm/lm.c
     src/modules/loadavg/loadavg.c
     src/modules/locale/locale.c
@@ -402,6 +427,7 @@ set(LIBFASTFETCH_SRC
     src/modules/sound/sound.c
     src/modules/swap/swap.c
     src/modules/media/media.c
+    src/modules/mouse/mouse.c
     src/modules/terminal/terminal.c
     src/modules/terminaltheme/terminaltheme.c
     src/modules/terminalfont/terminalfont.c
@@ -478,6 +504,7 @@ if(LINUX)
         src/detection/host/host_linux.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_linux.c
         src/detection/libc/libc_linux.c
         src/detection/lm/lm_linux.c
         src/detection/loadavg/loadavg_linux.c
@@ -486,6 +513,7 @@ if(LINUX)
         src/detection/gamepad/gamepad_linux.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_linux.c
+        src/detection/mouse/mouse_linux.c
         src/detection/netio/netio_linux.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
@@ -542,6 +570,7 @@ elseif(ANDROID)
         src/detection/host/host_android.c
         src/detection/icons/icons_nosupport.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_nosupport.c
         src/detection/libc/libc_android.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_linux.c
@@ -550,6 +579,7 @@ elseif(ANDROID)
         src/detection/gamepad/gamepad_nosupport.c
         src/detection/media/media_nosupport.c
         src/detection/memory/memory_linux.c
+        src/detection/mouse/mouse_nosupport.c
         src/detection/netio/netio_linux.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_android.c
@@ -622,6 +652,7 @@ elseif(FreeBSD)
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_bsd.c
         src/detection/libc/libc_bsd.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/locale/locale_linux.c
@@ -629,6 +660,7 @@ elseif(FreeBSD)
         src/detection/gamepad/gamepad_bsd.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_bsd.c
+        src/detection/mouse/mouse_bsd.c
         src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_linux.c
@@ -655,7 +687,7 @@ elseif(FreeBSD)
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
     )
-elseif(OpenBSD)
+elseif(NetBSD)
     list(APPEND LIBFASTFETCH_SRC
         src/common/dbus.c
         src/common/io/io_unix.c
@@ -664,15 +696,15 @@ elseif(OpenBSD)
         src/common/processing_linux.c
         src/common/sysctl.c
         src/detection/battery/battery_nosupport.c
-        src/detection/bios/bios_nosupport.c
-        src/detection/bluetooth/bluetooth_nosupport.c
-        src/detection/bluetoothradio/bluetoothradio_nosupport.c
-        src/detection/board/board_nosupport.c
+        src/detection/bios/bios_nbsd.c
+        src/detection/bluetooth/bluetooth_linux.c
+        src/detection/bluetoothradio/bluetoothradio_linux.c
+        src/detection/board/board_nbsd.c
         src/detection/bootmgr/bootmgr_nosupport.c
         src/detection/brightness/brightness_nosupport.c
         src/detection/btrfs/btrfs_nosupport.c
-        src/detection/chassis/chassis_nosupport.c
-        src/detection/cpu/cpu_obsd.c
+        src/detection/chassis/chassis_nbsd.c
+        src/detection/cpu/cpu_nbsd.c
         src/detection/cpucache/cpucache_nosupport.c
         src/detection/cpuusage/cpuusage_bsd.c
         src/detection/cursor/cursor_linux.c
@@ -680,7 +712,7 @@ elseif(OpenBSD)
         src/detection/dns/dns_linux.c
         src/detection/physicaldisk/physicaldisk_nosupport.c
         src/detection/physicalmemory/physicalmemory_nosupport.c
-        src/detection/diskio/diskio_nosupport.c
+        src/detection/diskio/diskio_nbsd.c
         src/detection/displayserver/linux/displayserver_linux.c
         src/detection/displayserver/linux/drm.c
         src/detection/displayserver/linux/wayland/wayland.c
@@ -695,12 +727,14 @@ elseif(OpenBSD)
         src/detection/displayserver/linux/xcb.c
         src/detection/displayserver/linux/xlib.c
         src/detection/font/font_linux.c
-        src/detection/gpu/gpu_nosupport.c
+        src/detection/gpu/gpu_general.c
+        src/detection/gpu/gpu_pci.c
         src/detection/gtk_qt/gtk.c
-        src/detection/host/host_obsd.c
-        src/detection/lm/lm_nosupport.c
+        src/detection/host/host_nbsd.c
+        src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_nosupport.c
         src/detection/libc/libc_nosupport.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/locale/locale_linux.c
@@ -708,7 +742,90 @@ elseif(OpenBSD)
         src/detection/gamepad/gamepad_nosupport.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_obsd.c
-        src/detection/netio/netio_nosupport.c
+        src/detection/mouse/mouse_nosupport.c
+        src/detection/netio/netio_bsd.c
+        src/detection/opengl/opengl_linux.c
+        src/detection/os/os_nbsd.c
+        src/detection/packages/packages_obsd.c
+        src/detection/poweradapter/poweradapter_nosupport.c
+        src/detection/processes/processes_nbsd.c
+        src/detection/gtk_qt/qt.c
+        src/detection/sound/sound_linux.c
+        src/detection/swap/swap_obsd.c
+        src/detection/terminalfont/terminalfont_linux.c
+        src/detection/terminalshell/terminalshell_linux.c
+        src/detection/terminalsize/terminalsize_linux.c
+        src/detection/theme/theme_linux.c
+        src/detection/tpm/tpm_nosupport.c
+        src/detection/uptime/uptime_bsd.c
+        src/detection/users/users_linux.c
+        src/detection/wallpaper/wallpaper_linux.c
+        src/detection/wifi/wifi_nosupport.c
+        src/detection/wm/wm_nosupport.c
+        src/detection/de/de_linux.c
+        src/detection/wmtheme/wmtheme_linux.c
+        src/detection/camera/camera_linux.c
+        src/detection/zpool/zpool_linux.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_linux.c
+        src/common/processing_linux.c
+        src/common/sysctl.c
+        src/detection/battery/battery_nosupport.c
+        src/detection/bios/bios_nosupport.c
+        src/detection/bluetooth/bluetooth_linux.c
+        src/detection/bluetoothradio/bluetoothradio_linux.c
+        src/detection/board/board_nosupport.c
+        src/detection/bootmgr/bootmgr_nosupport.c
+        src/detection/brightness/brightness_nosupport.c
+        src/detection/btrfs/btrfs_nosupport.c
+        src/detection/chassis/chassis_nosupport.c
+        src/detection/cpu/cpu_obsd.c
+        src/detection/cpucache/cpucache_nosupport.c
+        src/detection/cpuusage/cpuusage_bsd.c
+        src/detection/cursor/cursor_linux.c
+        src/detection/disk/disk_bsd.c
+        src/detection/dns/dns_linux.c
+        src/detection/physicaldisk/physicaldisk_nosupport.c
+        src/detection/physicalmemory/physicalmemory_nosupport.c
+        src/detection/diskio/diskio_obsd.c
+        src/detection/displayserver/linux/displayserver_linux.c
+        src/detection/displayserver/linux/drm.c
+        src/detection/displayserver/linux/wayland/wayland.c
+        src/detection/displayserver/linux/wayland/global-output.c
+        src/detection/displayserver/linux/wayland/zwlr-output.c
+        src/detection/displayserver/linux/wayland/kde-output.c
+        src/detection/displayserver/linux/wayland/wlr-output-management-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
+        src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
+        src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
+        src/detection/displayserver/linux/wmde.c
+        src/detection/displayserver/linux/xcb.c
+        src/detection/displayserver/linux/xlib.c
+        src/detection/font/font_linux.c
+        src/detection/gpu/gpu_pci.c
+        src/detection/gpu/gpu_general.c
+        src/detection/gtk_qt/gtk.c
+        src/detection/host/host_obsd.c
+        src/detection/lm/lm_nosupport.c
+        src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_nosupport.c
+        src/detection/libc/libc_nosupport.c
+        src/detection/loadavg/loadavg_bsd.c
+        src/detection/locale/locale_linux.c
+        src/detection/localip/localip_linux.c
+        src/detection/gamepad/gamepad_nosupport.c
+        src/detection/media/media_linux.c
+        src/detection/memory/memory_obsd.c
+        src/detection/mouse/mouse_nosupport.c
+        src/detection/netio/netio_bsd.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_obsd.c
         src/detection/packages/packages_obsd.c
@@ -723,13 +840,13 @@ elseif(OpenBSD)
         src/detection/theme/theme_linux.c
         src/detection/tpm/tpm_nosupport.c
         src/detection/uptime/uptime_bsd.c
-        src/detection/users/users_nosupport.c
+        src/detection/users/users_obsd.c
         src/detection/wallpaper/wallpaper_linux.c
         src/detection/wifi/wifi_nosupport.c
         src/detection/wm/wm_nosupport.c
         src/detection/de/de_linux.c
         src/detection/wmtheme/wmtheme_linux.c
-        src/detection/camera/camera_nosupport.c
+        src/detection/camera/camera_linux.c
         src/detection/zpool/zpool_nosupport.c
         src/util/platform/FFPlatform_unix.c
         src/util/binary_linux.c
@@ -766,6 +883,7 @@ elseif(APPLE)
         src/detection/host/host_apple.c
         src/detection/icons/icons_nosupport.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_apple.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/libc/libc_apple.c
@@ -774,7 +892,8 @@ elseif(APPLE)
         src/detection/gamepad/gamepad_apple.c
         src/detection/media/media_apple.m
         src/detection/memory/memory_apple.c
-        src/detection/netio/netio_bsd.c
+        src/detection/mouse/mouse_apple.c
+        src/detection/netio/netio_apple.c
         src/detection/opengl/opengl_apple.c
         src/detection/os/os_apple.m
         src/detection/packages/packages_apple.c
@@ -811,6 +930,7 @@ elseif(WIN32)
         src/detection/battery/battery_windows.c
         src/detection/bios/bios_windows.c
         src/detection/bluetooth/bluetooth_windows.c
+        src/detection/bluetooth/bluetooth_windows.cpp
         src/detection/bluetoothradio/bluetoothradio_windows.c
         src/detection/board/board_windows.c
         src/detection/bootmgr/bootmgr_windows.c
@@ -832,6 +952,7 @@ elseif(WIN32)
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
         src/detection/initsystem/initsystem_nosupport.c
+        src/detection/keyboard/keyboard_windows.c
         src/detection/libc/libc_windows.cpp
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_nosupport.c
@@ -840,10 +961,11 @@ elseif(WIN32)
         src/detection/gamepad/gamepad_windows.c
         src/detection/media/media_windows.c
         src/detection/memory/memory_windows.c
+        src/detection/mouse/mouse_windows.c
         src/detection/physicalmemory/physicalmemory_linux.c
         src/detection/netio/netio_windows.c
         src/detection/opengl/opengl_windows.c
-        src/detection/os/os_windows.cpp
+        src/detection/os/os_windows.c
         src/detection/packages/packages_windows.c
         src/detection/poweradapter/poweradapter_nosupport.c
         src/detection/processes/processes_windows.c
@@ -916,6 +1038,7 @@ elseif(SunOS)
         src/detection/host/host_windows.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
+        src/detection/keyboard/keyboard_nosupport.c
         src/detection/libc/libc_nosupport.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_sunos.c
@@ -924,6 +1047,7 @@ elseif(SunOS)
         src/detection/gamepad/gamepad_nosupport.c
         src/detection/media/media_linux.c
         src/detection/memory/memory_sunos.c
+        src/detection/mouse/mouse_nosupport.c
         src/detection/netio/netio_sunos.c
         src/detection/opengl/opengl_linux.c
         src/detection/os/os_sunos.c
@@ -1018,24 +1142,58 @@ if(APPLE AND EXISTS "/usr/bin/otool")
         target_compile_definitions(libfastfetch PUBLIC FF_LIBSYSTEM_VERSION="${CMAKE_MATCH_1}")
     endif()
 endif()
-if(FreeBSD AND EXISTS "/usr/local/bin/objdump")
-    execute_process(COMMAND /bin/sh -c "/usr/local/bin/objdump -T /lib/libc.so.* | grep 'FBSD_[^ )]*' -o | sort -Vru | head -1"
+if(MidnightBSD AND EXISTS "/usr/bin/objdump")
+    execute_process(COMMAND /bin/sh -c "/usr/bin/objdump -T /lib/libc.so.* | grep 'FBSD_[0-9][0-9]*\\.[0-9][0-9]*' -o | sort -Vru | head -1"
                     OUTPUT_VARIABLE OBJDUMP_T_RESULT)
     if("${OBJDUMP_T_RESULT}" MATCHES "FBSD_([0-9]+\\.[0-9]+)")
+        message(STATUS "Found FBSD ${CMAKE_MATCH_1}")
         target_compile_definitions(libfastfetch PUBLIC FF_FBSD_VERSION="${CMAKE_MATCH_1}")
     endif()
+elseif(FreeBSD AND EXISTS "/usr/local/bin/objdump")
+    execute_process(COMMAND /bin/sh -c "/usr/local/bin/objdump -T /lib/libc.so.* | grep 'FBSD_[0-9][0-9]*\\.[0-9][0-9]*' -o | sort -Vru | head -1"
+                    OUTPUT_VARIABLE OBJDUMP_T_RESULT)
+    if("${OBJDUMP_T_RESULT}" MATCHES "FBSD_([0-9]+\\.[0-9]+)")
+        message(STATUS "Found FBSD ${CMAKE_MATCH_1}")
+        target_compile_definitions(libfastfetch PUBLIC FF_FBSD_VERSION="${CMAKE_MATCH_1}")
+    endif()
+elseif(DragonFly AND EXISTS "/usr/local/bin/objdump")
+    execute_process(COMMAND /bin/sh -c "/usr/local/bin/objdump -T /lib/libc.so.* | grep 'DF[0-9][0-9]*\\.[0-9][0-9]*' -o | sort -Vru | head -1"
+                    OUTPUT_VARIABLE OBJDUMP_T_RESULT)
+    if("${OBJDUMP_T_RESULT}" MATCHES "DF([0-9]+\\.[0-9]+)")
+        message(STATUS "Found DF ${CMAKE_MATCH_1}")
+        target_compile_definitions(libfastfetch PUBLIC FF_DF_VERSION="${CMAKE_MATCH_1}")
+    endif()
 endif()
 
-if(LINUX OR ANDROID)
-    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__=1 _FILE_OFFSET_BITS=64)
+if(LINUX)
+    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE _ATFILE_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 _TIME_BITS=64) # "$<$<CONFIG:Release>:_FORTIFY_SOURCE=3>"
+elseif(ANDROID)
+    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE _FILE_OFFSET_BITS=64 "$<$<CONFIG:DEBUG>:__BIONIC_FORTIFY>" "$<$<CONFIG:DEBUG>:__BIONIC_FORTIFY_RUNTIME_CHECKS_ENABLED>")
 elseif(WIN32)
-    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE WIN32_LEAN_AND_MEAN=1 _WIN32_WINNT=0x0A00)
+    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE WIN32_LEAN_AND_MEAN _WIN32_WINNT=0x0A00 NOMINMAX UNICODE) # "$<$<CONFIG:Release>:_FORTIFY_SOURCE=3>"
 elseif(APPLE)
     target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 _DARWIN_C_SOURCE)
 elseif(OpenBSD)
     target_compile_definitions(libfastfetch PUBLIC _XOPEN_SOURCE=700 _FILE_OFFSET_BITS=64 _BSD_SOURCE)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/usr/X11R6/lib") # detect x11 lib path automatically
+elseif(DragonFly)
+    target_compile_definitions(libfastfetch PUBLIC __FreeBSD__)
 elseif(SunOS)
     target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE _XOPEN_SOURCE __STDC_WANT_LIB_EXT1__ _FILE_OFFSET_BITS=64 __EXTENSIONS__ _POSIX_C_SOURCE)
+elseif(NetBSD)
+    target_compile_definitions(libfastfetch PUBLIC _GNU_SOURCE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-char-subscripts")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,/usr/X11R7/lib -Wl,-rpath,/usr/pkg/lib") # ditto
+endif()
+
+if(FreeBSD OR OpenBSD OR NetBSD)
+    include(CheckStructHasMember)
+    set(CMAKE_REQUIRED_DEFINITIONS "-D_IFI_OQDROPS=1")
+    CHECK_STRUCT_HAS_MEMBER("struct if_data" ifi_oqdrops net/if.h HAVE_IFI_OQDROPS LANGUAGE C)
+    if(HAVE_IFI_OQDROPS)
+    target_compile_definitions(libfastfetch PUBLIC _IFI_OQDROPS FF_HAVE_IFI_OQDROPS)
+    endif()
+    unset(CMAKE_REQUIRED_DEFINITIONS)
 endif()
 
 if(HAVE_STATX)
@@ -1062,6 +1220,9 @@ endif()
 if(NOT BINARY_LINK_TYPE STREQUAL "dlopen")
     message(STATUS "Enabling custom link type: ${BINARY_LINK_TYPE}")
     target_compile_definitions(libfastfetch PRIVATE FF_DISABLE_DLOPEN=1)
+    if(NOT WIN32)
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--copy-dt-needed-entries")
+    endif()
 endif()
 
 function(ff_lib_enable VARNAME PKGCONFIG_NAMES CMAKE_NAME)
@@ -1117,18 +1278,10 @@ ff_lib_enable(XCB_RANDR
     "xcb-randr"
     "XcbRandr"
 )
-ff_lib_enable(XCB
-    "xcb"
-    "Xcb"
-)
 ff_lib_enable(XRANDR
     "xrandr"
     "XRandr"
 )
-ff_lib_enable(X11
-    "x11"
-    "X11"
-)
 ff_lib_enable(DRM
     "libdrm"
     "Libdrm"
@@ -1181,7 +1334,7 @@ ff_lib_enable(EGL
     "egl"
     "EGL"
 )
-if(NOT OpenBSD)
+if(NOT OpenBSD AND NOT NetBSD)
     ff_lib_enable(GLX
         "glx"
         "GLX"
@@ -1220,6 +1373,10 @@ ff_lib_enable(DIRECTX_HEADERS
     "DirectX-Headers"
     "DirectX-Headers"
 )
+ff_lib_enable(PCIACCESS
+    "pciaccess"
+    "pciaccess"
+)
 # The system <libzfs.h> is only usable on SunOS. We provide our local copy of it so it's always available.
 if(ENABLE_LIBZFS)
     if(BINARY_LINK_TYPE STREQUAL "dlopen")
@@ -1298,18 +1455,33 @@ elseif(WIN32)
         PRIVATE "hid"
         PRIVATE "wtsapi32"
         PRIVATE "imagehlp"
+        PRIVATE "cfgmgr32"
+        PRIVATE "winbrand"
+        PRIVATE "propsys"
     )
 elseif(FreeBSD)
     target_link_libraries(libfastfetch
         PRIVATE "m"
         PRIVATE "usbhid"
-        PRIVATE "geom"
     )
+    if(NOT DragonFly)
+        target_link_libraries(libfastfetch
+            PRIVATE "geom"
+        )
+    else()
+        target_link_libraries(libfastfetch
+            PRIVATE "devstat"
+        )
+    endif()
 elseif(OpenBSD)
     target_link_libraries(libfastfetch
         PRIVATE "m"
         PRIVATE "kvm"
     )
+elseif(NetBSD)
+    target_link_libraries(libfastfetch
+        PRIVATE "m"
+    )
 elseif(SunOS)
     target_link_libraries(libfastfetch
         PRIVATE "m"
@@ -1362,9 +1534,9 @@ if(WIN32)
     set(CMAKE_CXX_STANDARD 17)
 endif()
 if(FreeBSD)
-  set(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
+    set(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
 endif()
-if(LINUX OR FreeBSD)
+if(LINUX OR FreeBSD OR OpenBSD OR NetBSD)
     CHECK_INCLUDE_FILE("linux/videodev2.h" HAVE_LINUX_VIDEODEV2)
     if(HAVE_LINUX_VIDEODEV2)
         target_compile_definitions(libfastfetch PRIVATE FF_HAVE_LINUX_VIDEODEV2=1)

README.md

@@ -40,7 +40,6 @@ Some distros package an outdated fastfetch version. Older versions receive no su
 * openSUSE: `zypper install fastfetch`
 * ALT Linux: `apt-get install fastfetch`
 * Exherbo: `cave resolve --execute app-misc/fastfetch`
-* GNU Guix: `guix install fastfetch`
 * Solus: `eopkg install fastfetch`
 * Slackware: `sbopkg -i fastfetch`
 * Void Linux: `xbps-install fastfetch`
@@ -194,7 +193,7 @@ See [#1096](https://github.com/fastfetch-cli/fastfetch/issues/1096).
 
 Neofetch incorrectly counts `rc` packages ( the package has been removed, but that the configuration files remain ). Bug https://github.com/dylanaraps/neofetch/issues/2278
 
-### Q: I use Debian / Ubuntu / Debian deserved distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it a bug?
+### Q: I use Debian / Ubuntu / Debian derived distro. My GPU is detected as `XXXX Device XXXX (VGA compatible)`. Is it a bug?
 
 Try upgrading `pci.ids`: Download <https://pci-ids.ucw.cz/v2.2/pci.ids> and overwrite file `/usr/share/hwdata/pci.ids`. For AMD GPUs, you should also upgrade `amdgpu.ids`: Download <https://gitlab.freedesktop.org/mesa/drm/-/raw/main/data/amdgpu.ids> and overwrite file `/usr/share/libdrm/amdgpu.ids`
 

completions/fastfetch.zsh

@@ -26,7 +26,7 @@ def main():
         for flag in data[key]:
             if flag["long"] == "logo-color-[1-9]":
                 for i in range(1, 10):
-                    command_prefix = f"--logo-color-{i}[{flag["desc"]} ({i})]"
+                    command_prefix = f"--logo-color-{i}[{flag['desc']} ({i})]"
                     print_command(command_prefix, flag)
                 continue
 
@@ -34,11 +34,11 @@ def main():
                 continue
 
             if "short" in flag:
-                command_prefix = f"-{flag["short"]}[{flag["desc"]}]"
+                command_prefix = f"-{flag['short']}[{flag['desc']}]"
                 print_command(command_prefix, flag)
 
             if "long" in flag:
-                command_prefix = f"--{flag["long"]}[{flag["desc"]}]"
+                command_prefix = f"--{flag['long']}[{flag['desc']}]"
                 print_command(command_prefix, flag)
 
 

debian/changelog

@@ -1,3 +1,33 @@
+fastfetch (2.30.1) jammy; urgency=medium
+
+  * Update to 2.30.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 18 Nov 2024 15:40:48 +0800
+
+fastfetch (2.30.0) jammy; urgency=medium
+
+  * Update to 2.30.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 18 Nov 2024 09:30:58 +0800
+
+fastfetch (2.29.0) jammy; urgency=medium
+
+  * Update to 2.29.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Mon, 04 Nov 2024 15:05:02 +0800
+
+fastfetch (2.28.0) jammy; urgency=medium
+
+  * Update to 2.28.0
+
+ -- Carter Li <zhangsongcui@live.cn>  Wed, 23 Oct 2024 10:18:59 +0800
+
+fastfetch (2.27.1) jammy; urgency=medium
+
+  * Update to 2.27.1
+
+ -- Carter Li <zhangsongcui@live.cn>  Sun, 06 Oct 2024 12:55:18 +0800
+
 fastfetch (2.26.1ubuntu1) jammy; urgency=medium
 
   * Update correct code

debian/files

@@ -1 +1 @@
-fastfetch_2.26.1ubuntu1_source.buildinfo universe/utils optional
+fastfetch_2.30.1_source.buildinfo universe/utils optional

doc/json_schema.json

@@ -34,6 +34,35 @@
             "description": "Output color of the module. Left empty to use `display.color.output`",
             "$ref": "#/$defs/colors"
         },
+        "percentType": {
+            "description": "Set the percentage output type",
+            "oneOf": [
+                {
+                    "type": "number",
+                    "description": "1 for percentage number, 2 for multi-color bar, 3 for both, 6 for bar only, 9 for colored number, 10 for monochrome bar",
+                    "minimum": 0,
+                    "maximum": 255,
+                    "default": 9
+                },
+                {
+                    "type": "array",
+                    "description": "array of string flags",
+                    "items": {
+                        "enum": [
+                            "num",
+                            "bar",
+                            "hide-others",
+                            "num-color",
+                            "bar-monochrome"
+                        ]
+                    },
+                    "default": [
+                        "num",
+                        "num-color"
+                    ]
+                }
+            ]
+        },
         "percent": {
             "description": "Threshold of percentage colors",
             "type": "object",
@@ -50,6 +79,9 @@
                     "minimum": 0,
                     "maximum": 100,
                     "description": "Value greater than green and less then yellow will be shown in yellow.\nValue greater than yellow will be shown in red"
+                },
+                "type": {
+                    "$ref": "#/$defs/percentType"
                 }
             }
         },
@@ -576,11 +608,7 @@
                     "description": "Set how a percentage value should be displayed",
                     "properties": {
                         "type": {
-                            "type": "number",
-                            "description": "Set the percentage output type. 1 for percentage number, 2 for multi-color bar, 3 for both, 6 for bar only, 9 for colored number, 10 for monochrome bar",
-                            "minimum": 0,
-                            "maximum": 255,
-                            "default": 9
+                            "$ref": "#/$defs/percentType"
                         },
                         "ndigits": {
                             "type": "number",
@@ -1181,6 +1209,12 @@
                                         "description": "Display CPU usage per CPU logical core, instead of an average result",
                                         "default": false
                                     },
+                                    "waitTime": {
+                                        "type": "integer",
+                                        "description": "Wait time (in ms). CPU usage = (inUseEnd - inUseStart) / waitTime",
+                                        "default": 200,
+                                        "minimum": 1
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1472,6 +1506,12 @@
                                         "type": "boolean",
                                         "default": false
                                     },
+                                    "waitTime": {
+                                        "type": "integer",
+                                        "description": "Wait time (in ms). Disk I/O = (totalBytesEnd - totalBytesStart) / waitTime",
+                                        "default": 200,
+                                        "minimum": 1
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1841,6 +1881,12 @@
                                         "type": "boolean",
                                         "default": false
                                     },
+                                    "waitTime": {
+                                        "type": "integer",
+                                        "description": "Wait time (in ms). Disk I/O = (totalBytesEnd - totalBytesStart) / waitTime",
+                                        "default": 200,
+                                        "minimum": 1
+                                    },
                                     "key": {
                                         "$ref": "#/$defs/key"
                                     },
@@ -1924,15 +1970,19 @@
                                                 "eopkg",
                                                 "flatpak",
                                                 "guix",
+                                                "linglong",
                                                 "lpkg",
                                                 "lpkgbuild",
                                                 "macports",
+                                                "mport",
                                                 "nix",
                                                 "opkg",
                                                 "pacman",
+                                                "pacstall",
                                                 "paludis",
                                                 "pkg",
                                                 "pkgtool",
+                                                "qi",
                                                 "rpm",
                                                 "scoop",
                                                 "snap",

presets/all.jsonc

@@ -74,7 +74,8 @@
             "showSpeed": true,
             "showMtu": true,
             "showLoop": true,
-            "showFlags": true
+            "showFlags": true,
+            "showAllIps": true
         },
         "dns",
         "wifi",

presets/ci.jsonc

@@ -76,7 +76,8 @@
             "showSpeed": true,
             "showMtu": true,
             "showLoop": true,
-            "showFlags": true
+            "showFlags": true,
+            "showAllIps": true
         },
         "dns",
         "wifi",
@@ -86,8 +87,8 @@
         "opengl",
         "opencl",
         "users",
-        "bluetooth",
-        "bluetoothradio",
+        // "bluetooth", // doesn't work on macOS because it requires bluetooth permissions
+        // "bluetoothradio",
         "sound",
         "camera",
         "gamepad",

run.sh

@@ -5,18 +5,22 @@ set -e
 mkdir -p build/
 cd build/
 
-if [ -z "${CMAKE_BUILD_TYPE}" ]; then
-    CMAKE_BUILD_TYPE=Release
-fi
-cmake "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" ..
+cmake ..
 
-if [ -z "$OSTYPE" ] || [ "$OSTYPE" = "linux-gnu" ]; then
-    cmake_build_args="-j$(nproc)"
-elif [ "$OSTYPE" = "darwin" ]; then
-    cmake_build_args="-j$(sysctl -n hw.ncpu)"
-else
-    cmake_build_args=""
-fi
-cmake --build . --target fastfetch ${cmake_build_args}
+kernel_name="$(uname -s)"
+
+case "${kernel_name}" in
+    "Linux" | "MINGW"*)
+        cmake_build_args="-j$(nproc)"
+        ;;
+    "Darwin" | *"BSD" | "DragonFly")
+        cmake_build_args="-j$(sysctl -n hw.ncpu)"
+        ;;
+    *)
+        cmake_build_args=""
+        ;;
+esac
+
+cmake --build . --target fastfetch "${cmake_build_args}"
 
 ./fastfetch "$@"

scripts/gen-man.py

@@ -0,0 +1,258 @@
+#!/usr/bin/env python3
+
+"""
+Python script to generate a man page for the command `fastfetch`.
+The man content will be printed to stdout so you will need to
+pipe it to a file if you want to save it.
+The command options will be generated using a JSON file.
+For the format of the JSON file, see https://github.com/fastfetch-cli/fastfetch/blob/dev/src/data/help.json
+"""
+
+from json import load
+from datetime import datetime, timezone
+from time import time
+from re import search
+from os import environ, path
+
+
+###### Text Decorations Tags ######
+
+startUnderline = r"\fI" # start underline text tag
+endUnderline = r"\fR" # end underline text tag
+
+startBold = r"\fB" # start bold text tag
+endBold = r"\fR" # end bold text tag
+
+
+###### Parameters ######
+
+# path to the current directory
+pathToCurrentDir = path.dirname(__file__)
+# path to the JSON option file
+pathToHelpFile = path.join(pathToCurrentDir, "../src/data/help.json")
+# man page section
+manSection = 1
+# title (center header)
+titlePage = "Fastfetch man page"
+# date (center footer)
+# format : "Month (abbreviation) Day Year"
+todayDate = datetime.fromtimestamp(
+    int(environ.get("SOURCE_DATE_EPOCH", time())),
+    tz=timezone.utc,
+).strftime("%b %d %Y")
+# file to fastfetch version (left footer)
+pathToVersionFile = path.join(pathToCurrentDir, "../CMakeLists.txt")
+
+
+###### Sections Text ######
+
+# text displayed in the "NAME" section
+nameSection = r"fastfetch \- A maintained, feature\-rich and performance oriented, neofetch like system information tool"
+
+# text displayed at the beginning of the "OPTIONS" section
+optionSection = r"""
+Parsing is not case sensitive. E.g. \fB--logo-type\fR is
+equal to \fB--LOGO-TYPE\fR.
+
+If a value is between square brakets, it is optional.
+An optional boolean value defaults to true if not specified.
+
+More detailed help messages for each options can be printed
+with \fB-h <option_without_dash_prefix>\fR.
+
+All options can be made permanent with command
+\fBfastfetch <options> --gen-config\fR.
+"""
+
+# text displayed in the "CONFIGURATION"
+configurationSection = f"""
+.SS Fetch Structure
+
+The structure of a fetch describes the modules that should
+be included in the output. It consists of a string of modules,
+separated by a colon (:). To list all available modules,
+use --list-modules.
+
+
+.SS Config Files
+
+Fastfetch uses JSONC based format for configuration.
+Fastfetch doesn't generate config file automatically;
+it should be generated manually by {startBold}--gen-config{endBold}.
+The config file will be saved in
+{startBold}~/.config/fastfetch/config.jsonc{endBold} by default.
+
+A JSONC config file is a JSON file that also supports comments
+with (// and /* */). Those files must have the extension '.jsonc'.
+
+The specified configuration/preset files are searched in the following order:
+
+{startBold}1.{endBold} relative to the current working directory
+
+{startBold}2.{endBold} relative to ~/.local/share/fastfetch/presets/
+
+{startBold}3.{endBold} relative to /usr/share/fastfetch/presets/
+
+Fastfetch provides some default presets. List them with --list-presets.
+"""
+
+# text displayed in the "EXAMPLE" section
+exampleSection = """
+.SS Config files:
+.nf
+// ~/.config/fastfetch/config.jsonc
+{
+    "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
+    "modules": [
+        "title",
+        "separator",
+        "module1",
+        {
+            "type": "module2",
+            "module2-option": "value"
+        }
+    ]
+}
+.fi
+"""
+
+# text displayed in the "BUGS" section
+bugSection = "Please report bugs to : \
+https://github.com/fastfetch-cli/fastfetch/issues"
+
+# text displayed in the "WIKI" section
+wikiSection = "Fastfetch github wiki : https://github.com/fastfetch-cli/fastfetch/wiki/Configuration"
+
+
+###### Argument decoration ######
+
+### optional arguments tags ###
+
+# if an optional argument is displayed as [?optArg] (with "optArg" underlined)
+# this value should be f"[?{startUnderline}"
+startOptionalArgument = f"[{startUnderline}?"
+# if an optional argument is displayed as [?optArg] (with "optArg underlined")
+# this value should be f"{endUnderline}]"
+endOptionalArgument = f"{endUnderline}]"
+
+### mandatory arguments tags ###
+startMandatoryArgument = f"{startUnderline}"
+endMandatoryArgument = f"{endUnderline}"
+
+def main():
+
+    # importing the JSON file
+    with open(pathToHelpFile, 'r') as jsonFile:
+        helpFileData = load(jsonFile) # json.load
+
+
+    ######## Start printing the generated .1 file ########
+
+
+    ###### header, footer & config #####
+
+    print(f".TH FASTFETCH {manSection} ", end=" ")
+    print(f"\"{todayDate}\"", end=" ")
+
+    # version number
+    with open(pathToVersionFile, 'r') as versionFile:
+
+        # research version number in file with regex
+        for line in versionFile:
+            researchVersion = search(r"^\s*VERSION (\d+\.\d+\.\d+)$", line)
+            if (researchVersion):
+                print(f"\"{researchVersion.group(1)}\"", end=" ")
+                break
+
+    print(f"\"{titlePage}\"")
+
+
+    ###### Name ######
+
+    print(".SH NAME")
+    print(nameSection)
+
+
+    ##### Synopsis ######
+
+    print(".SH SYNOPSIS")
+    print(".B fastfetch")
+    print(f"[{startUnderline}OPTIONS{endUnderline}]")\
+
+
+    ###### Wiki ######
+
+    print(".SH WIKI")
+    print(wikiSection)
+
+
+    ###### Configuration ######
+
+    print(".SH CONFIGURATION")
+    print(configurationSection)
+
+
+    ###### Options ######
+
+    print(".SH OPTIONS")
+    print(optionSection)
+    print()
+
+    # loop through every options sections
+    for key, value in helpFileData.items():
+
+        # print new subsection
+        print(f".SS {key}:")
+
+        # loop through every option in a section
+        for option in value:
+            # list of existing keys for this option
+            keyList = option.keys()
+
+            # start a new "option" entry
+            print(".TP")
+            print(startBold, end="")
+
+            # short option (-opt)
+            if "short" in keyList:
+                print(fr"\-{ option['short'] }", end="")
+                # if also have a long option, print a comma
+                if "long" in keyList:
+                    print(", ", end="")
+
+            # long option (--option)
+            if "long" in keyList:
+                print(fr"\-\-{ option['long'] }", end="")
+
+            print(endBold, end=" ")
+
+            # arguments
+            if "arg" in keyList:
+                # if argument is optional, print "[arg]"
+                if "optional" in option["arg"].keys() and option["arg"]["optional"]:
+                    print(startOptionalArgument + option['arg']['type'] + endOptionalArgument, end="")
+
+                # if argument is mandatory, print "arg"
+                else:
+                    print(startMandatoryArgument + option['arg']['type'] + endMandatoryArgument, end="")
+
+            # description
+            print(f"\n {option['desc']} \n")
+
+
+    ###### Examples ######
+
+    print(".SH EXAMPLES")
+    print(exampleSection)
+
+
+    ###### Bugs ######
+
+    print(".SH BUGS")
+    print(bugSection)
+
+
+
+
+if __name__ == "__main__":
+    main()

scripts/gen-pciids.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 from requests import get as http_get
 
 class PciDeviceModel:

src/common/dbus.c

@@ -171,7 +171,7 @@ DBusMessage* ffDBusGetMethodReply(FFDBusData* dbus, const char* busName, const c
     if (arg)
         dbus->lib->ffdbus_message_append_args(message, DBUS_TYPE_STRING, &arg, DBUS_TYPE_INVALID);
 
-    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
 
@@ -189,7 +189,7 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
         DBUS_TYPE_STRING, &property,
         DBUS_TYPE_INVALID);
 
-    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, FF_DBUS_TIMEOUT_MILLISECONDS, NULL);
+    DBusMessage* reply = dbus->lib->ffdbus_connection_send_with_reply_and_block(dbus->connection, message, instance.config.general.processingTimeout, NULL);
 
     dbus->lib->ffdbus_message_unref(message);
 

src/common/dbus.h

@@ -6,8 +6,6 @@
 #include "util/FFstrbuf.h"
 #include "common/library.h"
 
-#define FF_DBUS_TIMEOUT_MILLISECONDS 100
-
 typedef struct FFDBusLibrary
 {
     FF_LIBRARY_SYMBOL(dbus_bus_get)
@@ -38,4 +36,9 @@ DBusMessage* ffDBusGetProperty(FFDBusData* dbus, const char* busName, const char
 bool ffDBusGetPropertyString(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, FFstrbuf* result);
 bool ffDBusGetPropertyUint(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface, const char* property, uint32_t* result);
 
+static inline DBusMessage* ffDBusGetAllProperties(FFDBusData* dbus, const char* busName, const char* objectPath, const char* interface)
+{
+    return ffDBusGetMethodReply(dbus, busName, objectPath, "org.freedesktop.DBus.Properties", "GetAll", interface);
+}
+
 #endif // FF_HAVE_DBUS

src/common/font.c

@@ -51,7 +51,7 @@ static void fontInitPretty(FFfont* font)
 
     for(uint32_t i = 0; i < font->styles.length; i++)
     {
-        ffStrbufAppend(&font->pretty, ffListGet(&font->styles, i));
+        ffStrbufAppend(&font->pretty, FF_LIST_GET(FFstrbuf, font->styles, i));
 
         if(i < font->styles.length - 1)
             ffStrbufAppendS(&font->pretty, ", ");
@@ -86,7 +86,7 @@ void ffFontInitQt(FFfont* font, const char* data)
     {
         do
         {
-            FFstrbuf* style = ffListAdd(&font->styles);
+            FFstrbuf* style = (FFstrbuf*) ffListAdd(&font->styles);
             ffStrbufInit(style);
             data = ffStrbufAppendSUntilC(style, data, ' ');
             if (data) data++;
@@ -142,7 +142,7 @@ static void fontPangoParseWord(const char** data, FFfont* font, FFstrbuf* altern
     ) {
         if(alternativeBuffer == NULL)
         {
-            alternativeBuffer = ffListAdd(&font->styles);
+            alternativeBuffer = (FFstrbuf*) ffListAdd(&font->styles);
             ffStrbufInit(alternativeBuffer);
         }
 
@@ -215,7 +215,7 @@ void ffFontDestroy(FFfont* font)
     ffStrbufDestroy(&font->name);
     ffStrbufDestroy(&font->size);
 
-    for(uint32_t i = 0; i < font->styles.length; i++)
-        ffStrbufDestroy(ffListGet(&font->styles, i));
+    FF_LIST_FOR_EACH(FFstrbuf, str, font->styles)
+        ffStrbufDestroy(str);
     ffListDestroy(&font->styles);
 }

src/common/format.c

@@ -42,10 +42,10 @@ void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg)
             break;
         case FF_FORMAT_ARG_TYPE_LIST:
         {
-            const FFlist* list = formatarg->value;
+            const FFlist* list = (const FFlist*) formatarg->value;
             for(uint32_t i = 0; i < list->length; i++)
             {
-                ffStrbufAppend(buffer, ffListGet(list, i));
+                ffStrbufAppend(buffer, FF_LIST_GET(FFstrbuf, *list, i));
                 if(i < list->length - 1)
                     ffStrbufAppendS(buffer, ", ");
             }
@@ -110,7 +110,7 @@ static inline bool formatArgSet(const FFformatarg* arg)
         (arg->type == FF_FORMAT_ARG_TYPE_DOUBLE && *(double*)arg->value > 0.0) || //Also is false for NaN
         (arg->type == FF_FORMAT_ARG_TYPE_INT && *(int*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_STRBUF && ((FFstrbuf*)arg->value)->length > 0) ||
-        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet(arg->value)) ||
+        (arg->type == FF_FORMAT_ARG_TYPE_STRING && ffStrSet((char*)arg->value)) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT8 && *(uint8_t*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT16 && *(uint16_t*)arg->value > 0) ||
         (arg->type == FF_FORMAT_ARG_TYPE_UINT && *(uint32_t*)arg->value > 0) ||

src/common/format.h

@@ -2,7 +2,7 @@
 
 #include "util/FFstrbuf.h"
 
-typedef enum FFformatArgType
+typedef enum __attribute__((__packed__)) FFformatArgType
 {
     FF_FORMAT_ARG_TYPE_NULL = 0,
     FF_FORMAT_ARG_TYPE_UINT,
@@ -43,6 +43,6 @@ typedef struct FFformatarg
 void ffFormatAppendFormatArg(FFstrbuf* buffer, const FFformatarg* formatarg);
 void ffParseFormatString(FFstrbuf* buffer, const FFstrbuf* formatstr, uint32_t numArgs, const FFformatarg* arguments);
 #define FF_PARSE_FORMAT_STRING_CHECKED(buffer, formatstr, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
     ffParseFormatString((buffer), (formatstr), (numArgs), (arguments));\
 } while (0)

src/common/init.c

@@ -76,19 +76,21 @@ static void resetConsole(void)
 }
 
 #ifdef _WIN32
-BOOL WINAPI consoleHandler(DWORD signal)
+BOOL WINAPI consoleHandler(FF_MAYBE_UNUSED DWORD signal)
 {
-    FF_UNUSED(signal);
     resetConsole();
     exit(0);
 }
 #else
-static void exitSignalHandler(int signal)
+static void exitSignalHandler(FF_MAYBE_UNUSED int signal)
 {
-    FF_UNUSED(signal);
     resetConsole();
     exit(0);
 }
+static void chldSignalHandler(FF_MAYBE_UNUSED int signal)
+{
+    // empty; used to interrupt the poll and read syscalls
+}
 #endif
 
 void ffStart(void)
@@ -118,6 +120,7 @@ void ffStart(void)
     sigaction(SIGINT, &action, NULL);
     sigaction(SIGTERM, &action, NULL);
     sigaction(SIGQUIT, &action, NULL);
+    sigaction(SIGCHLD, &(struct sigaction) { .sa_handler = chldSignalHandler }, NULL);
     #endif
 
     //reset everything to default before we start printing
@@ -179,15 +182,9 @@ void ffListFeatures(void)
         #if FF_HAVE_XCB_RANDR
             "xcb-randr\n"
         #endif
-        #if FF_HAVE_XCB
-            "xcb\n"
-        #endif
         #if FF_HAVE_XRANDR
             "xrandr\n"
         #endif
-        #if FF_HAVE_X11
-            "x11\n"
-        #endif
         #if FF_HAVE_DRM
             "drm\n"
         #endif
@@ -245,7 +242,7 @@ void ffListFeatures(void)
         #if FF_HAVE_DDCUTIL
             "libddcutil\n"
         #endif
-        #if FF_HAVE_ELF || __sun || __FreeBSD__ || __OpenBSD__
+        #if FF_HAVE_ELF || __sun || (__FreeBSD__ && !__DragonFly__) || __OpenBSD__ || __NetBSD__
             "libelf\n"
         #endif
         #if FF_HAVE_LIBZFS

src/common/io/io.h

@@ -13,6 +13,8 @@
     #include <unistd.h>
     #include <dirent.h>
     #include <sys/stat.h>
+    #include <errno.h>
+    #include <limits.h>
     typedef int FFNativeFD;
     #define FF_INVALID_FD (-1)
     // procfs's file can be changed between read calls such as /proc/meminfo and /proc/uptime.
@@ -66,9 +68,11 @@ static inline ssize_t ffReadFDData(FFNativeFD fd, size_t dataSize, void* data)
 }
 
 ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data);
+ssize_t ffReadFileDataRelative(FFNativeFD dfd, const char* fileName, size_t dataSize, void* data);
 
 bool ffAppendFDBuffer(FFNativeFD fd, FFstrbuf* buffer);
 bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer);
+bool ffAppendFileBufferRelative(FFNativeFD dfd, const char* fileName, FFstrbuf* buffer);
 
 static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
 {
@@ -76,12 +80,19 @@ static inline bool ffReadFileBuffer(const char* fileName, FFstrbuf* buffer)
     return ffAppendFileBuffer(fileName, buffer);
 }
 
+static inline bool ffReadFileBufferRelative(FFNativeFD dfd, const char* fileName, FFstrbuf* buffer)
+{
+    ffStrbufClear(buffer);
+    return ffAppendFileBufferRelative(dfd, fileName, buffer);
+}
+
 //Bit flags, combine with |
-typedef enum FFPathType
+typedef enum __attribute__((__packed__)) FFPathType
 {
     FF_PATHTYPE_FILE = 1 << 0,
     FF_PATHTYPE_DIRECTORY = 1 << 1,
     FF_PATHTYPE_ANY = FF_PATHTYPE_FILE | FF_PATHTYPE_DIRECTORY,
+    FF_PATHTYPE_FORCE_UNSIGNED = UINT8_MAX,
 } FFPathType;
 
 static inline bool ffPathExists(const char* path, FFPathType pathType)
@@ -108,6 +119,7 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)
     }
     else
     {
+        #if __APPLE__ // #1395
         struct stat fileStat;
         if(stat(path, &fileStat) != 0)
             return false;
@@ -119,6 +131,24 @@ static inline bool ffPathExists(const char* path, FFPathType pathType)
 
         if(pathType & FF_PATHTYPE_DIRECTORY && mode == S_IFDIR)
             return true;
+        #else
+        size_t len = strlen(path);
+        assert(len < PATH_MAX);
+        if (len == 0) return false;
+
+        int ret;
+        if (path[len - 1] != '/')
+        {
+            char buf[PATH_MAX + 1];
+            memcpy(buf, path, len);
+            buf[len] = '/';
+            buf[len + 1] = 0;
+            ret = access(buf, F_OK);
+        }
+        else
+            ret = access(path, F_OK);
+        return pathType == FF_PATHTYPE_DIRECTORY ? ret == 0 : ret == -1 && errno == ENOTDIR;
+        #endif
     }
 
     #endif
@@ -211,3 +241,8 @@ static inline bool ffSearchUserConfigFile(const FFlist* configDirs, const char*
 
     return false;
 }
+
+#ifdef _WIN32
+// Only O_RDONLY is supported
+HANDLE openat(HANDLE dfd, const char* fileName, bool directory);
+#endif

src/common/io/io_unix.c

@@ -37,7 +37,7 @@ static void createSubfolders(const char* fileName)
 bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
 {
     int openFlagsModes = O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC;
-    int openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
+    mode_t openFlagsRights = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH;
 
     int FF_AUTO_CLOSE_FD fd = open(fileName, openFlagsModes, openFlagsRights);
     if(fd == -1)
@@ -108,6 +108,15 @@ ssize_t ffReadFileData(const char* fileName, size_t dataSize, void* data)
     return ffReadFDData(fd, dataSize, data);
 }
 
+ssize_t ffReadFileDataRelative(int dfd, const char* fileName, size_t dataSize, void* data)
+{
+    int FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, O_RDONLY | O_CLOEXEC);
+    if(fd == -1)
+        return -1;
+
+    return ffReadFDData(fd, dataSize, data);
+}
+
 bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
 {
     int FF_AUTO_CLOSE_FD fd = open(fileName, O_RDONLY | O_CLOEXEC);
@@ -117,6 +126,15 @@ bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
     return ffAppendFDBuffer(fd, buffer);
 }
 
+bool ffAppendFileBufferRelative(int dfd, const char* fileName, FFstrbuf* buffer)
+{
+    int FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, O_RDONLY | O_CLOEXEC);
+    if(fd == -1)
+        return false;
+
+    return ffAppendFDBuffer(fd, buffer);
+}
+
 bool ffPathExpandEnv(FF_MAYBE_UNUSED const char* in, FF_MAYBE_UNUSED FFstrbuf* out)
 {
     bool result = false;

src/common/io/io_windows.c

@@ -3,6 +3,8 @@
 #include "util/stringUtils.h"
 
 #include <windows.h>
+#include <ntstatus.h>
+#include <winternl.h>
 
 static void createSubfolders(const char* fileName)
 {
@@ -38,7 +40,7 @@ bool ffWriteFileData(const char* fileName, size_t dataSize, const void* data)
 
 static inline void readWithLength(HANDLE handle, FFstrbuf* buffer, uint32_t length)
 {
-    ffStrbufEnsureFixedLengthFree(buffer, length);
+    ffStrbufEnsureFree(buffer, length);
     DWORD bytesRead = 0;
     while(
         length > 0 &&
@@ -100,6 +102,49 @@ bool ffAppendFileBuffer(const char* fileName, FFstrbuf* buffer)
     return ffAppendFDBuffer(handle, buffer);
 }
 
+HANDLE openat(HANDLE dfd, const char* fileName, bool directory)
+{
+    NTSTATUS ret;
+    UNICODE_STRING fileNameW;
+    ret = RtlAnsiStringToUnicodeString(&fileNameW, &(ANSI_STRING) {
+        .Length = (USHORT) strlen(fileName),
+        .Buffer = (PCHAR) fileName
+    }, TRUE);
+    if (!NT_SUCCESS(ret)) return INVALID_HANDLE_VALUE;
+
+    FF_AUTO_CLOSE_FD HANDLE hFile;
+    IO_STATUS_BLOCK iosb = {};
+    ret = NtOpenFile(&hFile, FILE_READ_DATA | SYNCHRONIZE, &(OBJECT_ATTRIBUTES) {
+        .Length = sizeof(OBJECT_ATTRIBUTES),
+        .RootDirectory = dfd,
+        .ObjectName = &fileNameW,
+    }, &iosb, FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT | (directory ? FILE_DIRECTORY_FILE : FILE_NON_DIRECTORY_FILE));
+    RtlFreeUnicodeString(&fileNameW);
+
+    if(!NT_SUCCESS(ret) || iosb.Information != FILE_OPENED)
+        return INVALID_HANDLE_VALUE;
+
+    return hFile;
+}
+
+bool ffAppendFileBufferRelative(HANDLE dfd, const char* fileName, FFstrbuf* buffer)
+{
+    HANDLE FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, false);
+    if(fd == INVALID_HANDLE_VALUE)
+        return false;
+
+    return ffAppendFDBuffer(fd, buffer);
+}
+
+ssize_t ffReadFileDataRelative(HANDLE dfd, const char* fileName, size_t dataSize, void* data)
+{
+    HANDLE FF_AUTO_CLOSE_FD fd = openat(dfd, fileName, false);
+    if(fd == INVALID_HANDLE_VALUE)
+        return -1;
+
+    return ffReadFDData(fd, dataSize, data);
+}
+
 bool ffPathExpandEnv(const char* in, FFstrbuf* out)
 {
     DWORD length = ExpandEnvironmentStringsA(in, NULL, 0);

src/common/library.c

@@ -29,6 +29,17 @@ static void* libraryLoad(const char* path, int maxVersion)
     // libX.dll.1 never exists on Windows, while libX-1.dll may exist
     FF_UNUSED(maxVersion)
 
+    if(result != NULL)
+        return result;
+
+    uint32_t pathLen = ffStrbufLastIndexC(&instance.state.platform.exePath, '/');
+    if (pathLen == instance.state.platform.exePath.length)
+        return result;
+
+    char absPath[MAX_PATH + 1];
+    strcpy(mempcpy(absPath, instance.state.platform.exePath.chars, pathLen + 1), path);
+    return dlopen(absPath, FF_DLOPEN_FLAGS);
+
     #else
 
     if(result != NULL || maxVersion < 0)

src/common/library.h

@@ -43,11 +43,6 @@ static inline void ffLibraryUnload(void** handle)
     if(symbolMapping == NULL) \
         return returnValue;
 
-#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
-    symbolMapping = dlsym(library, #symbolName); \
-    if(symbolMapping == NULL && !(symbolMapping = (__typeof__(&symbolName)) dlsym(library, #alternateName))) \
-        return returnValue;
-
 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
     __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
 
@@ -57,18 +52,12 @@ static inline void ffLibraryUnload(void** handle)
 #define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
     __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
 
-#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
-    __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);
 
 #define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
 
-#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
-    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 
@@ -87,9 +76,6 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...);
 #define FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, symbolMapping, symbolName, returnValue) \
     symbolMapping = (__typeof__(&symbolName)) &symbolName
 
-#define FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, symbolMapping, symbolName, alternateName, returnValue) \
-    symbolMapping = (__typeof__(&symbolName)) &symbolName
-
 #define FF_LIBRARY_LOAD_SYMBOL(library, symbolName, returnValue) \
     FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, returnValue);
 
@@ -99,18 +85,12 @@ void* ffLibraryLoad(const char* path, int maxVersion, ...);
 #define FF_LIBRARY_LOAD_SYMBOL_MESSAGE(library, symbolName) \
     FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
 
-#define FF_LIBRARY_LOAD_SYMBOL_MESSAGE2(library, symbolName, alternateName) \
-    FF_MAYBE_UNUSED __typeof__(&symbolName) FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_VAR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, returnValue);
 
 #define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(library, varName, symbolName) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName).ff ## symbolName, symbolName, "dlsym " #symbolName " failed");
 
-#define FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE2(library, varName, symbolName, alternateName) \
-    FF_LIBRARY_LOAD_SYMBOL_ADDRESS2(library, (varName).ff ## symbolName, symbolName, alternateName, "dlsym " #symbolName " failed");
-
 #define FF_LIBRARY_LOAD_SYMBOL_PTR(library, varName, symbolName, returnValue) \
     FF_LIBRARY_LOAD_SYMBOL_ADDRESS(library, (varName)->ff ## symbolName, symbolName, returnValue);
 

src/common/modules.c

@@ -5,65 +5,65 @@ static FFModuleBaseInfo* A[] = {
 };
 
 static FFModuleBaseInfo* B[] = {
-    (void*) &instance.config.modules.battery,
-    (void*) &instance.config.modules.bios,
-    (void*) &instance.config.modules.bluetooth,
-    (void*) &instance.config.modules.bluetoothRadio,
-    (void*) &instance.config.modules.board,
-    (void*) &instance.config.modules.bootmgr,
-    (void*) &instance.config.modules.break_,
-    (void*) &instance.config.modules.brightness,
-    (void*) &instance.config.modules.btrfs,
+    (FFModuleBaseInfo*) &instance.config.modules.battery,
+    (FFModuleBaseInfo*) &instance.config.modules.bios,
+    (FFModuleBaseInfo*) &instance.config.modules.bluetooth,
+    (FFModuleBaseInfo*) &instance.config.modules.bluetoothRadio,
+    (FFModuleBaseInfo*) &instance.config.modules.board,
+    (FFModuleBaseInfo*) &instance.config.modules.bootmgr,
+    (FFModuleBaseInfo*) &instance.config.modules.break_,
+    (FFModuleBaseInfo*) &instance.config.modules.brightness,
+    (FFModuleBaseInfo*) &instance.config.modules.btrfs,
     NULL,
 };
 
 static FFModuleBaseInfo* C[] = {
-    (void*) &instance.config.modules.camera,
-    (void*) &instance.config.modules.chassis,
-    (void*) &instance.config.modules.command,
-    (void*) &instance.config.modules.colors,
-    (void*) &instance.config.modules.cpu,
-    (void*) &instance.config.modules.cpuCache,
-    (void*) &instance.config.modules.cpuUsage,
-    (void*) &instance.config.modules.cursor,
-    (void*) &instance.config.modules.custom,
+    (FFModuleBaseInfo*) &instance.config.modules.camera,
+    (FFModuleBaseInfo*) &instance.config.modules.chassis,
+    (FFModuleBaseInfo*) &instance.config.modules.command,
+    (FFModuleBaseInfo*) &instance.config.modules.colors,
+    (FFModuleBaseInfo*) &instance.config.modules.cpu,
+    (FFModuleBaseInfo*) &instance.config.modules.cpuCache,
+    (FFModuleBaseInfo*) &instance.config.modules.cpuUsage,
+    (FFModuleBaseInfo*) &instance.config.modules.cursor,
+    (FFModuleBaseInfo*) &instance.config.modules.custom,
     NULL,
 };
 
 static FFModuleBaseInfo* D[] = {
-    (void*) &instance.config.modules.dateTime,
-    (void*) &instance.config.modules.de,
-    (void*) &instance.config.modules.display,
-    (void*) &instance.config.modules.disk,
-    (void*) &instance.config.modules.diskIo,
-    (void*) &instance.config.modules.dns,
+    (FFModuleBaseInfo*) &instance.config.modules.dateTime,
+    (FFModuleBaseInfo*) &instance.config.modules.de,
+    (FFModuleBaseInfo*) &instance.config.modules.display,
+    (FFModuleBaseInfo*) &instance.config.modules.disk,
+    (FFModuleBaseInfo*) &instance.config.modules.diskIo,
+    (FFModuleBaseInfo*) &instance.config.modules.dns,
     NULL,
 };
 
 static FFModuleBaseInfo* E[] = {
-    (void*) &instance.config.modules.editor,
+    (FFModuleBaseInfo*) &instance.config.modules.editor,
     NULL,
 };
 
 static FFModuleBaseInfo* F[] = {
-    (void*) &instance.config.modules.font,
+    (FFModuleBaseInfo*) &instance.config.modules.font,
     NULL,
 };
 
 static FFModuleBaseInfo* G[] = {
-    (void*) &instance.config.modules.gamepad,
-    (void*) &instance.config.modules.gpu,
+    (FFModuleBaseInfo*) &instance.config.modules.gamepad,
+    (FFModuleBaseInfo*) &instance.config.modules.gpu,
     NULL,
 };
 
 static FFModuleBaseInfo* H[] = {
-    (void*) &instance.config.modules.host,
+    (FFModuleBaseInfo*) &instance.config.modules.host,
     NULL,
 };
 
 static FFModuleBaseInfo* I[] = {
-    (void*) &instance.config.modules.icons,
-    (void*) &instance.config.modules.initSystem,
+    (FFModuleBaseInfo*) &instance.config.modules.icons,
+    (FFModuleBaseInfo*) &instance.config.modules.initSystem,
     NULL,
 };
 
@@ -72,45 +72,47 @@ static FFModuleBaseInfo* J[] = {
 };
 
 static FFModuleBaseInfo* K[] = {
-    (void*) &instance.config.modules.kernel,
+    (FFModuleBaseInfo*) &instance.config.modules.kernel,
+    (FFModuleBaseInfo*) &instance.config.modules.keyboard,
     NULL,
 };
 
 static FFModuleBaseInfo* L[] = {
-    (void*) &instance.config.modules.lm,
-    (void*) &instance.config.modules.loadavg,
-    (void*) &instance.config.modules.locale,
-    (void*) &instance.config.modules.localIP,
+    (FFModuleBaseInfo*) &instance.config.modules.lm,
+    (FFModuleBaseInfo*) &instance.config.modules.loadavg,
+    (FFModuleBaseInfo*) &instance.config.modules.locale,
+    (FFModuleBaseInfo*) &instance.config.modules.localIP,
     NULL,
 };
 
 static FFModuleBaseInfo* M[] = {
-    (void*) &instance.config.modules.media,
-    (void*) &instance.config.modules.memory,
-    (void*) &instance.config.modules.monitor,
+    (FFModuleBaseInfo*) &instance.config.modules.media,
+    (FFModuleBaseInfo*) &instance.config.modules.memory,
+    (FFModuleBaseInfo*) &instance.config.modules.monitor,
+    (FFModuleBaseInfo*) &instance.config.modules.mouse,
     NULL,
 };
 
 static FFModuleBaseInfo* N[] = {
-    (void*) &instance.config.modules.netIo,
+    (FFModuleBaseInfo*) &instance.config.modules.netIo,
     NULL,
 };
 
 static FFModuleBaseInfo* O[] = {
-    (void*) &instance.config.modules.openCL,
-    (void*) &instance.config.modules.openGL,
-    (void*) &instance.config.modules.os,
+    (FFModuleBaseInfo*) &instance.config.modules.openCL,
+    (FFModuleBaseInfo*) &instance.config.modules.openGL,
+    (FFModuleBaseInfo*) &instance.config.modules.os,
     NULL,
 };
 
 static FFModuleBaseInfo* P[] = {
-    (void*) &instance.config.modules.packages,
-    (void*) &instance.config.modules.physicalDisk,
-    (void*) &instance.config.modules.physicalMemory,
-    (void*) &instance.config.modules.player,
-    (void*) &instance.config.modules.powerAdapter,
-    (void*) &instance.config.modules.processes,
-    (void*) &instance.config.modules.publicIP,
+    (FFModuleBaseInfo*) &instance.config.modules.packages,
+    (FFModuleBaseInfo*) &instance.config.modules.physicalDisk,
+    (FFModuleBaseInfo*) &instance.config.modules.physicalMemory,
+    (FFModuleBaseInfo*) &instance.config.modules.player,
+    (FFModuleBaseInfo*) &instance.config.modules.powerAdapter,
+    (FFModuleBaseInfo*) &instance.config.modules.processes,
+    (FFModuleBaseInfo*) &instance.config.modules.publicIP,
     NULL,
 };
 
@@ -123,42 +125,42 @@ static FFModuleBaseInfo* R[] = {
 };
 
 static FFModuleBaseInfo* S[] = {
-    (void*) &instance.config.modules.separator,
-    (void*) &instance.config.modules.shell,
-    (void*) &instance.config.modules.sound,
-    (void*) &instance.config.modules.swap,
+    (FFModuleBaseInfo*) &instance.config.modules.separator,
+    (FFModuleBaseInfo*) &instance.config.modules.shell,
+    (FFModuleBaseInfo*) &instance.config.modules.sound,
+    (FFModuleBaseInfo*) &instance.config.modules.swap,
     NULL,
 };
 
 static FFModuleBaseInfo* T[] = {
-    (void*) &instance.config.modules.terminal,
-    (void*) &instance.config.modules.terminalFont,
-    (void*) &instance.config.modules.terminalSize,
-    (void*) &instance.config.modules.terminalTheme,
-    (void*) &instance.config.modules.title,
-    (void*) &instance.config.modules.theme,
-    (void*) &instance.config.modules.tpm,
+    (FFModuleBaseInfo*) &instance.config.modules.terminal,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalFont,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalSize,
+    (FFModuleBaseInfo*) &instance.config.modules.terminalTheme,
+    (FFModuleBaseInfo*) &instance.config.modules.title,
+    (FFModuleBaseInfo*) &instance.config.modules.theme,
+    (FFModuleBaseInfo*) &instance.config.modules.tpm,
     NULL,
 };
 
 static FFModuleBaseInfo* U[] = {
-    (void*) &instance.config.modules.uptime,
-    (void*) &instance.config.modules.users,
+    (FFModuleBaseInfo*) &instance.config.modules.uptime,
+    (FFModuleBaseInfo*) &instance.config.modules.users,
     NULL,
 };
 
 static FFModuleBaseInfo* V[] = {
-    (void*) &instance.config.modules.version,
-    (void*) &instance.config.modules.vulkan,
+    (FFModuleBaseInfo*) &instance.config.modules.version,
+    (FFModuleBaseInfo*) &instance.config.modules.vulkan,
     NULL,
 };
 
 static FFModuleBaseInfo* W[] = {
-    (void*) &instance.config.modules.wallpaper,
-    (void*) &instance.config.modules.weather,
-    (void*) &instance.config.modules.wm,
-    (void*) &instance.config.modules.wifi,
-    (void*) &instance.config.modules.wmTheme,
+    (FFModuleBaseInfo*) &instance.config.modules.wallpaper,
+    (FFModuleBaseInfo*) &instance.config.modules.weather,
+    (FFModuleBaseInfo*) &instance.config.modules.wm,
+    (FFModuleBaseInfo*) &instance.config.modules.wifi,
+    (FFModuleBaseInfo*) &instance.config.modules.wmTheme,
     NULL,
 };
 
@@ -171,7 +173,7 @@ static FFModuleBaseInfo* Y[] = {
 };
 
 static FFModuleBaseInfo* Z[] = {
-    (void*) &instance.config.modules.zpool,
+    (FFModuleBaseInfo*) &instance.config.modules.zpool,
     NULL,
 };
 

src/common/netif/netif_bsd.c

@@ -91,7 +91,11 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
         if (rtmsg.hdr.rtm_seq == 1 && rtmsg.hdr.rtm_pid == pid)
         {
             struct sockaddr_dl* sdl = (struct sockaddr_dl *)get_rt_address(&rtmsg.hdr, RTA_IFP);
-            if (sdl)
+            if (sdl
+                #ifndef __sun
+                && sdl->sdl_len
+                #endif
+            )
             {
                 assert(sdl->sdl_nlen <= IF_NAMESIZE);
                 memcpy(iface, sdl->sdl_data, sdl->sdl_nlen);

src/common/netif/netif_linux.c

@@ -13,11 +13,9 @@ bool ffNetifGetDefaultRouteImpl(char iface[IF_NAMESIZE + 1], uint32_t* ifIndex)
     if (!netRoute) return false;
 
     // skip first line
-    flockfile(netRoute);
-    while (getc_unlocked(netRoute) != '\n');
-    funlockfile(netRoute);
-    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
+    FF_UNUSED(fscanf(netRoute, "%*[^\n]\n"));
 
+    unsigned long long destination; //, gateway, flags, refCount, use, metric, mask, mtu,
     while (fscanf(netRoute, "%" FF_STR(IF_NAMESIZE) "s%llx%*[^\n]", iface, &destination) == 2)
     {
         if (destination != 0) continue;

src/common/option.h

@@ -45,12 +45,13 @@ static inline void ffOptionInitModuleBaseInfo(
     baseInfo->generateJsonConfig = (__typeof__(baseInfo->generateJsonConfig)) generateJsonConfig;
 }
 
-typedef enum FFModuleKeyType
+typedef enum __attribute__((__packed__)) FFModuleKeyType
 {
     FF_MODULE_KEY_TYPE_NONE = 0,
     FF_MODULE_KEY_TYPE_STRING = 1 << 0,
     FF_MODULE_KEY_TYPE_ICON = 1 << 1,
     FF_MODULE_KEY_TYPE_BOTH = FF_MODULE_KEY_TYPE_STRING | FF_MODULE_KEY_TYPE_ICON,
+    FF_MODULE_KEY_TYPE_FORCE_UNSIGNED = UINT8_MAX,
 } FFModuleKeyType;
 
 typedef struct FFModuleArgs

src/common/parsing.c

@@ -72,7 +72,7 @@ static void parseSize(FFstrbuf* result, uint64_t bytes, uint32_t base, const cha
     }
 
     if(counter == 0)
-        ffStrbufAppendF(result, "%"PRIu64" %s", bytes, prefixes[0]);
+        ffStrbufAppendF(result, "%" PRIu64 " %s", bytes, prefixes[0]);
     else
         ffStrbufAppendF(result, "%.*f %s", instance.config.display.sizeNdigits, size, prefixes[counter]);
 }
@@ -190,6 +190,48 @@ void ffParseGTK(FFstrbuf* buffer, const FFstrbuf* gtk2, const FFstrbuf* gtk3, co
     }
 }
 
+void ffParseDuration(uint32_t days, uint32_t hours, uint32_t minutes, uint32_t seconds, FFstrbuf* result)
+{
+    if(days == 0 && hours == 0 && minutes == 0)
+    {
+        ffStrbufAppendF(result, "%u seconds", seconds);
+        return;
+    }
+
+    if(days > 0)
+    {
+        ffStrbufAppendF(result, "%u day", days);
+
+        if(days > 1)
+            ffStrbufAppendC(result, 's');
+
+        if(days >= 100)
+            ffStrbufAppendS(result, "(!)");
+
+        if(hours > 0 || minutes > 0)
+            ffStrbufAppendS(result, ", ");
+    }
+
+    if(hours > 0)
+    {
+        ffStrbufAppendF(result, "%u hour", hours);
+
+        if(hours > 1)
+            ffStrbufAppendC(result, 's');
+
+        if(minutes > 0)
+            ffStrbufAppendS(result, ", ");
+    }
+
+    if(minutes > 0)
+    {
+        ffStrbufAppendF(result, "%u min", minutes);
+
+        if(minutes > 1)
+            ffStrbufAppendC(result, 's');
+    }
+}
+
 #ifdef _WIN32
     #pragma GCC diagnostic pop
 #endif

src/common/parsing.h

@@ -27,3 +27,4 @@ int8_t ffVersionCompare(const FFVersion* version1, const FFVersion* version2);
 
 void ffParseSize(uint64_t bytes, FFstrbuf* result);
 bool ffParseFrequency(uint32_t mhz, FFstrbuf* result);
+void ffParseDuration(uint32_t days, uint32_t hours, uint32_t minutes, uint32_t seconds, FFstrbuf* result);

src/common/percent.c

@@ -14,7 +14,46 @@ static void appendOutputColor(FFstrbuf* buffer, const FFModuleArgs* module)
         ffStrbufAppendF(buffer, "\e[%sm", instance.config.display.colorOutput.chars);
 }
 
-void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig config, const FFModuleArgs* module)
+const char* ffPercentParseTypeJsonConfig(yyjson_val* jsonVal, FFPercentageTypeFlags* result)
+{
+    if (yyjson_is_uint(jsonVal))
+    {
+        *result = (FFPercentageTypeFlags) yyjson_get_uint(jsonVal);
+        return NULL;
+    }
+    if (yyjson_is_arr(jsonVal))
+    {
+        FFPercentageTypeFlags flags = 0;
+
+        yyjson_val* item;
+        size_t idx, max;
+        yyjson_arr_foreach(jsonVal, idx, max, item)
+        {
+            const char* flag = yyjson_get_str(item);
+            if (!flag)
+                return "Error: percent.type: invalid flag string";
+            if (ffStrEqualsIgnCase(flag, "num"))
+                flags |= FF_PERCENTAGE_TYPE_NUM_BIT;
+            else if (ffStrEqualsIgnCase(flag, "bar"))
+                flags |= FF_PERCENTAGE_TYPE_BAR_BIT;
+            else if (ffStrEqualsIgnCase(flag, "hide-others"))
+                flags |= FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT;
+            else if (ffStrEqualsIgnCase(flag, "num-color"))
+                flags |= FF_PERCENTAGE_TYPE_NUM_COLOR_BIT;
+            else if (ffStrEqualsIgnCase(flag, "bar-monochrome"))
+                flags |= FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT;
+            else
+                return "Error: percent.type: unknown flag string";
+        }
+
+        *result = flags;
+        return NULL;
+    }
+
+    return "Error: usage: percent.type must be a number or an array of strings";
+}
+
+void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFPercentageModuleConfig config, const FFModuleArgs* module)
 {
     uint8_t green = config.green, yellow = config.yellow;
     assert(green <= 100 && yellow <= 100);
@@ -41,15 +80,18 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
     }
     else
     {
-        const char* colorGreen = instance.config.display.percentColorGreen.chars;
-        const char* colorYellow = instance.config.display.percentColorYellow.chars;
-        const char* colorRed = instance.config.display.percentColorRed.chars;
+        const char* colorGreen = options->percentColorGreen.chars;
+        const char* colorYellow = options->percentColorYellow.chars;
+        const char* colorRed = options->percentColorRed.chars;
+
+        FFPercentageTypeFlags percentType = config.type == 0 ? options->percentType : config.type;
+        bool monochrome = !!(percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT);
 
         for (uint32_t i = 0; i < blocksPercent; ++i)
         {
             if(!options->pipe)
             {
-                if (options->percentType & FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT)
+                if (monochrome)
                 {
                     const char* color = NULL;
                     if (green <= yellow)
@@ -104,14 +146,15 @@ void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig con
     }
 }
 
-void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFColorRangeConfig config, bool parentheses, const FFModuleArgs* module)
+void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFPercentageModuleConfig config, bool parentheses, const FFModuleArgs* module)
 {
     uint8_t green = config.green, yellow = config.yellow;
     assert(green <= 100 && yellow <= 100);
 
     const FFOptionsDisplay* options = &instance.config.display;
+    FFPercentageTypeFlags percentType = config.type == 0 ? options->percentType : config.type;
 
-    bool colored = !!(options->percentType & FF_PERCENTAGE_TYPE_NUM_COLOR_BIT);
+    bool colored = !!(percentType & FF_PERCENTAGE_TYPE_NUM_COLOR_BIT);
 
     if (parentheses)
         ffStrbufAppendC(buffer, '(');
@@ -156,7 +199,7 @@ void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFColorRangeConfig con
         ffStrbufAppendC(buffer, ')');
 }
 
-bool ffPercentParseCommandOptions(const char* key, const char* subkey, const char* value, FFColorRangeConfig* config)
+bool ffPercentParseCommandOptions(const char* key, const char* subkey, const char* value, FFPercentageModuleConfig* config)
 {
     if (!ffStrStartsWithIgnCase(subkey, "percent-"))
         return false;
@@ -187,10 +230,16 @@ bool ffPercentParseCommandOptions(const char* key, const char* subkey, const cha
         return true;
     }
 
+    if (ffStrEqualsIgnCase(subkey, "type"))
+    {
+        config->type = (FFPercentageTypeFlags) ffOptionParseUInt32(key, value);
+        return true;
+    }
+
     return false;
 }
 
-bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFColorRangeConfig* config)
+bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFPercentageModuleConfig* config)
 {
     if (!ffStrEqualsIgnCase(key, "percent"))
         return false;
@@ -225,10 +274,21 @@ bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFColorRangeCo
         config->yellow = (uint8_t) num;
     }
 
+    yyjson_val* typeVal = yyjson_obj_get(value, "type");
+    if (typeVal)
+    {
+        const char* error = ffPercentParseTypeJsonConfig(typeVal, &config->type);
+        if (error)
+        {
+            fputs(error, stderr);
+            exit(480);
+        }
+    }
+
     return true;
 }
 
-void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFColorRangeConfig defaultConfig, FFColorRangeConfig config)
+void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFPercentageModuleConfig defaultConfig, FFPercentageModuleConfig config)
 {
     if (config.green == defaultConfig.green && config.yellow == defaultConfig.yellow)
         return;
@@ -238,4 +298,6 @@ void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FF
         yyjson_mut_obj_add_uint(doc, percent, "green", config.green);
     if (config.yellow != defaultConfig.yellow)
         yyjson_mut_obj_add_uint(doc, percent, "yellow", config.yellow);
+    if (config.type != defaultConfig.type)
+        yyjson_mut_obj_add_uint(doc, percent, "type", config.type);
 }

src/common/percent.h

@@ -4,14 +4,24 @@
 #include "common/parsing.h"
 #include "common/option.h"
 
-enum FFPercentageTypeFlags
+typedef enum __attribute__((__packed__)) FFPercentageTypeFlags
 {
+    FF_PERCENTAGE_TYPE_NONE = 0,
     FF_PERCENTAGE_TYPE_NUM_BIT = 1 << 0,
     FF_PERCENTAGE_TYPE_BAR_BIT = 1 << 1,
     FF_PERCENTAGE_TYPE_HIDE_OTHERS_BIT = 1 << 2,
     FF_PERCENTAGE_TYPE_NUM_COLOR_BIT = 1 << 3,
     FF_PERCENTAGE_TYPE_BAR_MONOCHROME_BIT = FF_PERCENTAGE_TYPE_NUM_COLOR_BIT,
-};
+    FF_PERCENTAGE_TYPE_FORCE_UNSIGNED_ = UINT8_MAX,
+} FFPercentageTypeFlags;
+static_assert(sizeof(FFPercentageTypeFlags) == 1, "");
+
+typedef struct FFPercentageModuleConfig
+{
+    uint8_t green;
+    uint8_t yellow;
+    FFPercentageTypeFlags type;
+} FFPercentageModuleConfig;
 
 // if (green <= yellow)
 // [0, green]: print green
@@ -23,12 +33,13 @@ enum FFPercentageTypeFlags
 // [yellow, green): print yellow
 // [0, yellow): print red
 
-void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFColorRangeConfig config, const FFModuleArgs* module);
-void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFColorRangeConfig config, bool parentheses, const FFModuleArgs* module);
+void ffPercentAppendBar(FFstrbuf* buffer, double percent, FFPercentageModuleConfig config, const FFModuleArgs* module);
+void ffPercentAppendNum(FFstrbuf* buffer, double percent, FFPercentageModuleConfig config, bool parentheses, const FFModuleArgs* module);
 
 typedef struct yyjson_val yyjson_val;
 typedef struct yyjson_mut_doc yyjson_mut_doc;
 typedef struct yyjson_mut_val yyjson_mut_val;
-bool ffPercentParseCommandOptions(const char* key, const char* subkey, const char* value, FFColorRangeConfig* config);
-bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFColorRangeConfig* config);
-void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFColorRangeConfig defaultConfig, FFColorRangeConfig config);
+bool ffPercentParseCommandOptions(const char* key, const char* subkey, const char* value, FFPercentageModuleConfig* config);
+bool ffPercentParseJsonObject(const char* key, yyjson_val* value, FFPercentageModuleConfig* config);
+void ffPercentGenerateJsonConfig(yyjson_mut_doc* doc, yyjson_mut_val* module, FFPercentageModuleConfig defaultConfig, FFPercentageModuleConfig config);
+const char* ffPercentParseTypeJsonConfig(yyjson_val* value, FFPercentageTypeFlags* result);

src/common/printing.h

@@ -3,18 +3,19 @@
 #include "fastfetch.h"
 #include "common/format.h"
 
-typedef enum FFPrintType {
+typedef enum __attribute__((__packed__)) FFPrintType {
     FF_PRINT_TYPE_DEFAULT = 0,
     FF_PRINT_TYPE_NO_CUSTOM_KEY = 1 << 0, // key has been formatted outside
     FF_PRINT_TYPE_NO_CUSTOM_KEY_COLOR = 1 << 1,
     FF_PRINT_TYPE_NO_CUSTOM_KEY_WIDTH = 1 << 2,
     FF_PRINT_TYPE_NO_CUSTOM_OUTPUT_FORMAT = 1 << 3, // reserved
+    FF_PRINT_TYPE_FORCE_UNSIGNED = UINT8_MAX,
 } FFPrintType;
 
 void ffPrintLogoAndKey(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType);
 void ffPrintFormat(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, uint32_t numArgs, const FFformatarg* arguments);
 #define FF_PRINT_FORMAT_CHECKED(moduleName, moduleIndex, moduleArgs, printType, numArgs, arguments) do {\
-    static_assert(sizeof(arguments) / sizeof(*(arguments)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(arguments) / sizeof(*arguments) == (numArgs), "Invalid number of format arguments");\
     ffPrintFormat((moduleName), (moduleIndex), (moduleArgs), (printType), (numArgs), (arguments));\
 } while (0)
 FF_C_PRINTF(5, 6) void ffPrintError(const char* moduleName, uint8_t moduleIndex, const FFModuleArgs* moduleArgs, FFPrintType printType, const char* message, ...);
@@ -23,6 +24,6 @@ void ffPrintCharTimes(char c, uint32_t times);
 
 void ffPrintModuleFormatHelp(const char* name, const char* def, uint32_t numArgs, const char* args[]);
 #define FF_PRINT_MODULE_FORMAT_HELP_CHECKED(moduleName, def, numArgs, args) do {\
-    static_assert(sizeof(args) / sizeof(*(args)) == (numArgs), "Invalid number of format arguments");\
+    static_assert(sizeof(args) / sizeof(*args) == (numArgs), "Invalid number of format arguments");\
     ffPrintModuleFormatHelp((moduleName), (def), (numArgs), (args));\
 } while (0)

src/common/processing_linux.c

@@ -1,7 +1,6 @@
 #include "fastfetch.h"
 #include "common/processing.h"
 #include "common/io/io.h"
-#include "common/time.h"
 #include "util/stringUtils.h"
 #include "util/mallocHelper.h"
 
@@ -23,9 +22,12 @@
 #elif defined(__sun)
     #include <procfs.h>
 #elif defined(__OpenBSD__)
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <kvm.h>
+    #include <sys/param.h>
+    #include <sys/sysctl.h>
+    #include <kvm.h>
+#elif defined(__NetBSD__)
+    #include <sys/types.h>
+    #include <sys/sysctl.h>
 #endif
 
 enum { FF_PIPE_BUFSIZ = 8192 };
@@ -87,6 +89,16 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
                 waitpid(childPid, NULL, 0);
                 return "poll(&pollfd, 1, timeout) timeout (try increasing --processing-timeout)";
             }
+            else if (errno == EINTR)
+            {
+                // The child process has been terminated. See `chldSignalHandler` in `common/init.c`
+                if (waitpid(childPid, NULL, WNOHANG) == childPid)
+                {
+                    // Read remaining data from the pipe
+                    fcntl(childPipeFd, F_SETFL, O_CLOEXEC | O_NONBLOCK);
+                    childPid = -1;
+                }
+            }
             else if (pollfd.revents & POLLERR)
             {
                 kill(childPid, SIGTERM);
@@ -101,7 +113,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         else if (nRead == 0)
         {
             int stat_loc = 0;
-            if (waitpid(childPid, &stat_loc, 0) == childPid)
+            if (childPid > 0 && waitpid(childPid, &stat_loc, 0) == childPid)
             {
                 if (!WIFEXITED(stat_loc))
                     return "child process exited abnormally";
@@ -110,10 +122,15 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
                 // We only handle 127 as an error. See `getTerminalVersionUrxvt` in `terminalshell.c`
                 return NULL;
             }
-            return "waitpid() failed";
+            return NULL;
         }
         else if (nRead < 0)
-            break;
+        {
+            if (errno == EAGAIN)
+                return NULL;
+            else
+                break;
+        }
     };
 
     return "read(childPipeFd, str, FF_PIPE_BUFSIZ) failed";
@@ -139,12 +156,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
     if (exePath)
     {
         snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (int)pid);
-        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        char buf[PATH_MAX];
+        ssize_t length = readlink(filePath, buf, PATH_MAX - 1);
         if (length > 0) // doesn't contain trailing NUL
         {
-            exePath->chars[length] = '\0';
-            exePath->length = (uint32_t) length;
+            buf[length] = '\0';
+            ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length);
+            ffStrbufAppendNS(exePath, (uint32_t)length, buf);
         }
     }
 
@@ -152,14 +170,12 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
 
     size_t len = 0;
     int mibs[] = { CTL_KERN, KERN_PROCARGS2, pid };
-    if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), NULL, &len, NULL, 0) == 0)
+    if (sysctl(mibs, ARRAY_SIZE(mibs), NULL, &len, NULL, 0) == 0)
     {// try get arg0
-        #ifndef MAC_OS_X_VERSION_10_15
         //don't know why if don't let len longer, proArgs2 and len will change during the following sysctl() in old MacOS version.
         len++;
-        #endif
         FF_AUTO_FREE char* const procArgs2 = malloc(len);
-        if (sysctl(mibs, sizeof(mibs) / sizeof(*mibs), procArgs2, &len, NULL, 0) == 0)
+        if (sysctl(mibs, ARRAY_SIZE(mibs), procArgs2, &len, NULL, 0) == 0)
         {
             // https://gist.github.com/nonowarn/770696#file-getargv-c-L46
             uint32_t argc = *(uint32_t*) procArgs2;
@@ -191,17 +207,18 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
     }
     else
     {
-        ffStrbufEnsureFixedLengthFree(exe, PATH_MAX);
-        int length = proc_pidpath(pid, exe->chars, exe->allocated);
+        char buf[PROC_PIDPATHINFO_MAXSIZE];
+        int length = proc_pidpath(pid, buf, ARRAY_SIZE(buf));
         if (length > 0)
         {
-            exe->length = (uint32_t) length;
+            ffStrbufEnsureFixedLengthFree(exe, (uint32_t) length);
+            ffStrbufAppendNS(exe, (uint32_t) length, buf);
             if (exePath)
                 ffStrbufSet(exePath, exe);
         }
     }
 
-    #elif defined(__FreeBSD__)
+    #elif defined(__FreeBSD__) || defined(__NetBSD__)
 
     size_t size = ARG_MAX;
     FF_AUTO_FREE char* args = malloc(size);
@@ -209,7 +226,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
     static_assert(ARG_MAX > PATH_MAX, "");
 
     if(exePath && sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}, 4,
+        (int[]){CTL_KERN,
+        #if __FreeBSD__
+            KERN_PROC, KERN_PROC_PATHNAME, pid
+        #else
+            KERN_PROC_ARGS, pid, KERN_PROC_PATHNAME
+        #endif
+        }, 4,
         args, &size,
         NULL, 0
     ) == 0)
@@ -217,7 +240,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
 
     size = ARG_MAX;
     if(sysctl(
-        (int[]){CTL_KERN, KERN_PROC, KERN_PROC_ARGS, pid}, 4,
+        (int[]){CTL_KERN,
+            #if __FreeBSD__
+                KERN_PROC, KERN_PROC_ARGS, pid
+            #else
+                KERN_PROC_ARGS, pid, KERN_PROC_ARGV,
+            #endif
+        }, 4,
         args, &size,
         NULL, 0
     ) == 0)
@@ -242,7 +271,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
 
     #elif defined(__sun)
 
-    char filePath[PATH_MAX];
+    char filePath[128];
     snprintf(filePath, sizeof(filePath), "/proc/%d/psinfo", (int) pid);
     psinfo_t proc;
     if (ffReadFileData(filePath, sizeof(proc), &proc) == sizeof(proc))
@@ -254,12 +283,13 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
     if (exePath)
     {
         snprintf(filePath, sizeof(filePath), "/proc/%d/path/a.out", (int) pid);
-        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        char buf[PATH_MAX];
+        ssize_t length = readlink(filePath, buf, PATH_MAX - 1);
         if (length > 0) // doesn't contain trailing NUL
         {
-            exePath->chars[length] = '\0';
-            exePath->length = (uint32_t) length;
+            buf[length] = '\0';
+            ffStrbufEnsureFixedLengthFree(exePath, (uint32_t)length);
+            ffStrbufAppendNS(exePath, (uint32_t)length, buf);
         }
     }
 
@@ -350,6 +380,13 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i
 
     #elif defined(__FreeBSD__)
 
+    #ifdef __DragonFly__
+        #define ki_comm kp_comm
+        #define ki_ppid kp_ppid
+        #define ki_tdev kp_tdev
+        #define ki_flag kp_flags
+    #endif
+
     struct kinfo_proc proc;
     size_t size = sizeof(proc);
     if(sysctl(
@@ -376,6 +413,34 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, i
             *tty = -1;
     }
 
+    #elif defined(__NetBSD__)
+
+    struct kinfo_proc2 proc;
+    size_t size = sizeof(proc);
+    if(sysctl(
+        (int[]){CTL_KERN, KERN_PROC2, KERN_PROC_PID, pid, sizeof(proc), 1}, 6,
+        &proc, &size,
+        NULL, 0
+    ) != 0)
+        return "sysctl(KERN_PROC_PID) failed";
+
+    ffStrbufSetS(name, proc.p_comm);
+    if (ppid)
+        *ppid = (pid_t)proc.p_ppid;
+    if (tty)
+    {
+        if (proc.p_flag & P_CONTROLT)
+        {
+            const char* ttyName = devname(proc.p_tdev, S_IFCHR);
+            if (ffStrStartsWith(ttyName, "pts/"))
+                *tty = (int32_t) strtol(ttyName + strlen("pts/"), NULL, 10);
+            else
+                *tty = -1;
+        }
+        else
+            *tty = -1;
+    }
+
     #elif defined(__sun)
     char path[128];
     snprintf(path, sizeof(path), "/proc/%d/psinfo", (int) pid);

src/common/processing_windows.c

@@ -49,8 +49,11 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
 {
     int timeout = instance.config.general.processingTimeout;
 
+    wchar_t pipeName[32];
+    swprintf(pipeName, ARRAY_SIZE(pipeName), L"\\\\.\\pipe\\FASTFETCH-%u", GetCurrentProcessId());
+
     FF_AUTO_CLOSE_FD HANDLE hChildPipeRead = CreateNamedPipeW(
-        L"\\\\.\\pipe\\LOCAL\\",
+        pipeName,
         PIPE_ACCESS_INBOUND | FILE_FLAG_FIRST_PIPE_INSTANCE | (timeout < 0 ? 0 : FILE_FLAG_OVERLAPPED),
         0,
         1,
@@ -60,10 +63,10 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         NULL
     );
     if (hChildPipeRead == INVALID_HANDLE_VALUE)
-        return "CreateNamedPipeW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+        return "CreateNamedPipeW(L\"\\\\.\\pipe\\FASTFETCH-$(PID)\") failed";
 
     HANDLE hChildPipeWrite = CreateFileW(
-        L"\\\\.\\pipe\\LOCAL\\",
+        pipeName,
         GENERIC_WRITE,
         0,
         &(SECURITY_ATTRIBUTES){
@@ -76,7 +79,7 @@ const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool use
         NULL
     );
     if (hChildPipeWrite == INVALID_HANDLE_VALUE)
-        return "CreateFileW(L\"\\\\.\\pipe\\LOCAL\\\") failed";
+        return "CreateFileW(L\"\\\\.\\pipe\\FASTFETCH-$(PID)\") failed";
 
     PROCESS_INFORMATION piProcInfo = {0};
 

src/common/properties.c

@@ -100,7 +100,7 @@ bool ffParsePropFileValues(const char* filename, uint32_t numQueries, FFpropquer
     bool valueStorage[32];
     bool* unsetValues = valueStorage;
 
-    if (numQueries > sizeof(valueStorage) / sizeof(valueStorage[0]))
+    if (numQueries > ARRAY_SIZE(valueStorage))
         unsetValues = malloc(sizeof(bool) * numQueries);
 
     bool allSet = true;

src/common/settings.h

@@ -2,7 +2,7 @@
 
 #include "fastfetch.h"
 
-typedef enum FFvarianttype
+typedef enum __attribute__((__packed__)) FFvarianttype
 {
     FF_VARIANT_TYPE_STRING,
     FF_VARIANT_TYPE_BOOL,

src/data/help.json

@@ -916,6 +916,14 @@
                 "type": "str"
             }
         },
+        {
+            "long": "diskio-wait-time",
+            "desc": "Set the wait time (in ms) when detecting disk usage",
+            "arg": {
+                "type": "num",
+                "default": 1000
+            }
+        },
         {
             "long": "physicaldisk-name-prefix",
             "desc": "Show disks with given name prefix only",
@@ -1070,6 +1078,14 @@
                 "default": false
             }
         },
+        {
+            "long": "cpuusage-wait-time",
+            "desc": "Set the wait time (in ms) when detecting CPU usage",
+            "arg": {
+                "type": "num",
+                "default": 200
+            }
+        },
         {
             "long": "de-slow-version-detection",
             "desc": "Set if DE version should be detected with slow operations",
@@ -1305,6 +1321,14 @@
                 "default": false
             }
         },
+        {
+            "long": "netio-wait-time",
+            "desc": "Set the wait time (in ms) when detecting network usage",
+            "arg": {
+                "type": "num",
+                "default": 1000
+            }
+        },
         {
             "long": "publicip-timeout",
             "desc": "Time in milliseconds to wait for the public ip server to respond",
@@ -1578,6 +1602,24 @@
             },
             "pseudo": true
         },
+        {
+            "long": "<module>-percent-type",
+            "desc": "Set the percentage output type",
+            "remark": [
+                "0 for use global `--percent-type` value",
+                "1 for percentage number",
+                "2 for multi-color bar",
+                "3 for both",
+                "6 for bar only",
+                "9 for colored number",
+                "10 for monochrome bar"
+            ],
+            "arg": {
+                "type": "num",
+                "default": 0
+            },
+            "pseudo": true
+        },
         {
             "long": "<module>-temp-green",
             "desc": [

src/detection/battery/battery.h

@@ -15,6 +15,7 @@ typedef struct FFBatteryResult
     double capacity;
     double temperature;
     uint32_t cycleCount;
+    int32_t timeRemaining;
 } FFBatteryResult;
 
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results);

src/detection/battery/battery_android.c

@@ -1,6 +1,6 @@
 #include "fastfetch.h"
 #include "battery.h"
-
+#include "util/stringUtils.h"
 #include "common/processing.h"
 #include "common/properties.h"
 
@@ -36,6 +36,7 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
     FFBatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
     battery->cycleCount = 0;
+    battery->timeRemaining = -1;
     ffStrbufInit(&battery->manufacturer);
     ffStrbufInit(&battery->modelName);
     ffStrbufInit(&battery->status);
@@ -44,7 +45,27 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
     ffStrbufInit(&battery->manufactureDate);
 
     battery->capacity = yyjson_get_num(yyjson_obj_get(root, "percentage"));
-    ffStrbufAppendS(&battery->status, yyjson_get_str(yyjson_obj_get(root, "status")));
+    const char* acStatus = yyjson_get_str(yyjson_obj_get(root, "plugged"));
+    if (acStatus)
+    {
+        if (ffStrEquals(acStatus, "PLUGGED_AC"))
+            ffStrbufAppendS(&battery->status, "AC Connected, ");
+        else if (ffStrEquals(acStatus, "PLUGGED_USB"))
+            ffStrbufAppendS(&battery->status, "USB Connected, ");
+        else if (ffStrEquals(acStatus, "PLUGGED_WIRELESS"))
+            ffStrbufAppendS(&battery->status, "Wireless Connected, ");
+    }
+    const char* status = yyjson_get_str(yyjson_obj_get(root, "status"));
+    if (status)
+    {
+        if (ffStrEquals(status, "CHARGING"))
+            ffStrbufAppendS(&battery->status, "Charging");
+        else if (ffStrEquals(status, "DISCHARGING"))
+            ffStrbufAppendS(&battery->status, "Discharging");
+    }
+    ffStrbufTrimRight(&battery->status, ' ');
+    ffStrbufTrimRight(&battery->status, ',');
+
     if(options->temp)
         battery->temperature = yyjson_get_num(yyjson_obj_get(root, "temperature"));
 
@@ -74,6 +95,7 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
     FFBatteryResult* battery = ffListAdd(results);
     battery->temperature = FF_BATTERY_TEMP_UNSET;
     battery->cycleCount = 0;
+    battery->timeRemaining = -1;
     ffStrbufInit(&battery->manufacturer);
     ffStrbufInit(&battery->modelName);
     ffStrbufInit(&battery->status);

src/detection/battery/battery_apple.c

@@ -57,13 +57,24 @@ const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
         ffCfDictGetInt(properties, CFSTR(kIOPMPSCycleCountKey), &cycleCount);
         battery->cycleCount = cycleCount < 0 ? 0 : (uint32_t) cycleCount;
 
-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSExternalConnectedKey), &boolValue) && boolValue)
-            ffStrbufAppendS(&battery->status, "AC connected, ");
-        else
-            ffStrbufAppendS(&battery->status, "Discharging, ");
-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSIsChargingKey), &boolValue) && boolValue)
+        battery->timeRemaining = -1;
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSExternalConnectedKey), &boolValue) == NULL)
+        {
+            if (boolValue)
+                ffStrbufAppendS(&battery->status, "AC connected, ");
+            else
+            {
+                ffStrbufAppendS(&battery->status, "Discharging, ");
+                ffCfDictGetInt(properties, CFSTR("AvgTimeToEmpty"), &battery->timeRemaining); // in minutes
+                if (battery->timeRemaining < 0 || battery->timeRemaining >= 0xFFFF)
+                    battery->timeRemaining = -1;
+                else
+                    battery->timeRemaining *= 60;
+            }
+        }
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSIsChargingKey), &boolValue) == NULL && boolValue)
             ffStrbufAppendS(&battery->status, "Charging, ");
-        if (!ffCfDictGetBool(properties, CFSTR(kIOPMPSAtCriticalLevelKey), &boolValue) && boolValue)
+        if (ffCfDictGetBool(properties, CFSTR(kIOPMPSAtCriticalLevelKey), &boolValue) == NULL && boolValue)
             ffStrbufAppendS(&battery->status, "Critical, ");
         ffStrbufTrimRight(&battery->status, ' ');
         ffStrbufTrimRight(&battery->status, ',');

src/detection/battery/battery_bsd.c

@@ -41,7 +41,9 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
         ffStrbufInit(&battery->technology);
         ffStrbufInit(&battery->serial);
         ffStrbufInit(&battery->manufactureDate);
-
+        battery->timeRemaining = -1;
+        if (battio.battinfo.min > 0)
+            battery->timeRemaining = battio.battinfo.min * 60;
         battery->capacity = battio.battinfo.cap;
         if(battio.battinfo.state == ACPI_BATT_STAT_INVALID)
         {
@@ -68,13 +70,26 @@ const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* r
             ffStrbufTrimRight(&battery->status, ',');
         }
 
+        #ifdef ACPIIO_BATT_GET_BIX
         battio.unit = i;
         if (ioctl(acpifd, ACPIIO_BATT_GET_BIX, &battio) >= 0)
         {
             ffStrbufAppendS(&battery->manufacturer, battio.bix.oeminfo);
             ffStrbufAppendS(&battery->modelName, battio.bix.model);
             ffStrbufAppendS(&battery->technology, battio.bix.type);
+            ffStrbufAppendS(&battery->serial, battio.bix.serial);
+            battery->cycleCount = battio.bix.cycles;
         }
+        #elif defined(ACPIIO_BATT_GET_BIF)
+        battio.unit = i;
+        if (ioctl(acpifd, ACPIIO_BATT_GET_BIF, &battio) >= 0)
+        {
+            ffStrbufAppendS(&battery->manufacturer, battio.bif.oeminfo);
+            ffStrbufAppendS(&battery->modelName, battio.bif.model);
+            ffStrbufAppendS(&battery->technology, battio.bif.type);
+            ffStrbufAppendS(&battery->serial, battio.bif.serial);
+        }
+        #endif
     }
     return NULL;
 }

src/detection/battery/battery_linux.c

@@ -3,39 +3,45 @@
 #include "util/stringUtils.h"
 
 #include <dirent.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 // https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-class-power
 
-static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* options, FFlist* results)
+static bool checkAc(const char* id, FFstrbuf* tmpBuffer)
 {
-    uint32_t dirLength = dir->length;
+    if (ffStrStartsWith(id, "BAT"))
+        ffStrbufSetS(tmpBuffer, "/sys/class/power_supply/ADP1/online");
+    else if (ffStrStartsWith(id, "macsmc-battery"))
+        ffStrbufSetS(tmpBuffer, "/sys/class/power_supply/macsmc-ac/online");
+    else
+        ffStrbufClear(tmpBuffer);
 
+    char online = '\0';
+    return ffReadFileData(tmpBuffer->chars, 1, &online) == 1 && online == '1';
+}
+
+static void parseBattery(int dfd, const char* id, FFBatteryOptions* options, FFlist* results)
+{
     FF_STRBUF_AUTO_DESTROY tmpBuffer = ffStrbufCreate();
 
-    //type must exist and be "Battery"
-    ffStrbufAppendS(dir, "/type");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
-        ffStrbufTrimRightSpace(&tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-
+    // type must exist and be "Battery"
+    if (!ffReadFileBufferRelative(dfd, "type", &tmpBuffer))
+        return;
+    ffStrbufTrimRightSpace(&tmpBuffer);
     if(!ffStrbufIgnCaseEqualS(&tmpBuffer, "Battery"))
         return;
 
-    //scope may not exist or must not be "Device"
-    ffStrbufAppendS(dir, "/scope");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+    // scope may not exist or must not be "Device"
+    if (ffReadFileBufferRelative(dfd, "scope", &tmpBuffer))
         ffStrbufTrimRightSpace(&tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
 
     if(ffStrbufIgnCaseEqualS(&tmpBuffer, "Device"))
         return;
 
-    //capacity must exist and be not empty
-    ffStrbufAppendS(dir, "/capacity");
-    bool available = ffReadFileBuffer(dir->chars, &tmpBuffer); // This is expensive in my laptop
-    ffStrbufSubstrBefore(dir, dirLength);
-
-    if (!available)
+    // capacity must exist and be not empty
+    // This is expensive in my laptop
+    if (!ffReadFileBufferRelative(dfd, "capacity", &tmpBuffer))
         return;
 
     FFBatteryResult* result = ffListAdd(results);
@@ -44,39 +50,63 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
     //At this point, we have a battery. Try to get as much values as possible.
 
     ffStrbufInit(&result->manufacturer);
-    ffStrbufAppendS(dir, "/manufacturer");
-    if (ffReadFileBuffer(dir->chars, &result->manufacturer))
+    if (ffReadFileBufferRelative(dfd, "manufacturer", &result->manufacturer))
         ffStrbufTrimRightSpace(&result->manufacturer);
     else if (ffStrEquals(id, "macsmc-battery")) // asahi
         ffStrbufSetStatic(&result->manufacturer, "Apple Inc.");
-    ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->modelName);
-    ffStrbufAppendS(dir, "/model_name");
-    if (ffReadFileBuffer(dir->chars, &result->modelName))
+    if (ffReadFileBufferRelative(dfd, "model_name", &result->modelName))
         ffStrbufTrimRightSpace(&result->modelName);
-    ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->technology);
-    ffStrbufAppendS(dir, "/technology");
-    if (ffReadFileBuffer(dir->chars, &result->technology))
+    if (ffReadFileBufferRelative(dfd, "technology", &result->technology))
         ffStrbufTrimRightSpace(&result->technology);
-    ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->status);
-    ffStrbufAppendS(dir, "/status");
-    if (ffReadFileBuffer(dir->chars, &result->status))
+    if (ffReadFileBufferRelative(dfd, "status", &result->status))
         ffStrbufTrimRightSpace(&result->status);
-    ffStrbufSubstrBefore(dir, dirLength);
 
     // Unknown, Charging, Discharging, Not charging, Full
-    if (ffStrbufEqualS(&result->status, "Not charging") || ffStrbufEqualS(&result->status, "Full"))
-        ffStrbufSetStatic(&result->status, "AC Connected");
-    else if (ffStrbufEqualS(&result->status, "Unknown"))
-        ffStrbufClear(&result->status);
 
-    ffStrbufAppendS(dir, "/capacity_level");
-    if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+    result->timeRemaining = -1;
+    if (ffStrbufEqualS(&result->status, "Discharging"))
+    {
+        if (ffReadFileBufferRelative(dfd, "time_to_empty_now", &tmpBuffer))
+            result->timeRemaining = (int32_t) ffStrbufToSInt(&tmpBuffer, 0);
+        else
+        {
+            if (ffReadFileBufferRelative(dfd, "charge_now", &tmpBuffer))
+            {
+                int64_t chargeNow = ffStrbufToSInt(&tmpBuffer, 0);
+                if (chargeNow > 0)
+                {
+                    if (ffReadFileBufferRelative(dfd, "current_now", &tmpBuffer))
+                    {
+                        int64_t currentNow = ffStrbufToSInt(&tmpBuffer, INT64_MIN);
+                        if (currentNow < 0) currentNow = -currentNow;
+                        if (currentNow > 0)
+                            result->timeRemaining = (int32_t) ((chargeNow * 3600) / currentNow);
+                    }
+                }
+            }
+        }
+
+        if (checkAc(id, &tmpBuffer))
+            ffStrbufAppendS(&result->status, ", AC Connected");
+    }
+    else if (ffStrbufEqualS(&result->status, "Not charging") || ffStrbufEqualS(&result->status, "Full"))
+        ffStrbufSetStatic(&result->status, "AC Connected");
+    else if (ffStrbufEqualS(&result->status, "Charging"))
+        ffStrbufAppendS(&result->status, ", AC Connected");
+    else if (ffStrbufEqualS(&result->status, "Unknown"))
+    {
+        ffStrbufClear(&result->status);
+        if (checkAc(id, &tmpBuffer))
+            ffStrbufAppendS(&result->status, "AC Connected");
+    }
+
+    if (ffReadFileBufferRelative(dfd, "capacity_level", &tmpBuffer))
     {
         ffStrbufTrimRightSpace(&result->manufacturer);
         if (ffStrbufEqualS(&tmpBuffer, "Critical"))
@@ -87,50 +117,33 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
                 ffStrbufSetStatic(&result->status, "Critical");
         }
     }
-    ffStrbufSubstrBefore(dir, dirLength);
 
     ffStrbufInit(&result->serial);
-    ffStrbufAppendS(dir, "/serial_number");
-    if (ffReadFileBuffer(dir->chars, &result->serial))
+    if (ffReadFileBufferRelative(dfd, "serial_number", &result->serial))
         ffStrbufTrimRightSpace(&result->serial);
-    ffStrbufSubstrBefore(dir, dirLength);
 
-    ffStrbufAppendS(dir, "/cycle_count");
-    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-    if (available)
+    if (ffReadFileBufferRelative(dfd, "cycle_count", &tmpBuffer))
     {
         int64_t cycleCount = ffStrbufToSInt(&tmpBuffer, 0);
         result->cycleCount = cycleCount < 0 || cycleCount > UINT32_MAX ? 0 : (uint32_t) cycleCount;
     }
 
     ffStrbufInit(&result->manufactureDate);
-    ffStrbufAppendS(dir, "/manufacture_year");
-    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-    ffStrbufSubstrBefore(dir, dirLength);
-    if (available)
+    if (ffReadFileBufferRelative(dfd, "manufacture_year", &tmpBuffer))
     {
         int year = (int) ffStrbufToSInt(&tmpBuffer, 0);
         if (year > 0)
         {
-            ffStrbufAppendS(dir, "/manufacture_month");
-            available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-            ffStrbufSubstrBefore(dir, dirLength);
-            if (available)
+            if (ffReadFileBufferRelative(dfd, "manufacture_month", &tmpBuffer))
             {
                 int month = (int) ffStrbufToSInt(&tmpBuffer, 0);
                 if (month > 0)
                 {
-                    ffStrbufAppendS(dir, "/manufacture_day");
-                    available = ffReadFileBuffer(dir->chars, &tmpBuffer);
-                    ffStrbufSubstrBefore(dir, dirLength);
-                    if (available)
+                    if (ffReadFileBufferRelative(dfd, "manufacture_day", &tmpBuffer))
                     {
                         int day = (int) ffStrbufToSInt(&tmpBuffer, 0);
                         if (day > 0)
-                        {
                             ffStrbufSetF(&result->manufactureDate, "%.4d-%.2d-%.2d", year, month, day);
-                        }
                     }
                 }
             }
@@ -140,33 +153,25 @@ static void parseBattery(FFstrbuf* dir, const char* id, FFBatteryOptions* option
     result->temperature = FF_BATTERY_TEMP_UNSET;
     if (options->temp)
     {
-        ffStrbufAppendS(dir, "/temp");
-        if (ffReadFileBuffer(dir->chars, &tmpBuffer))
+        if (ffReadFileBufferRelative(dfd, "temp", &tmpBuffer))
             result->temperature = ffStrbufToDouble(&tmpBuffer) / 10;
-        ffStrbufSubstrBefore(dir, dirLength);
     }
 }
 
 const char* ffDetectBattery(FFBatteryOptions* options, FFlist* results)
 {
-    FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateA(64);
-    ffStrbufAppendS(&baseDir, "/sys/class/power_supply/");
-
-    uint32_t baseDirLength = baseDir.length;
-
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(baseDir.chars);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/class/power_supply/");
     if(dirp == NULL)
         return "opendir(\"/sys/class/power_supply/\") == NULL";
 
     struct dirent* entry;
     while((entry = readdir(dirp)) != NULL)
     {
-        if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
+        if(entry->d_name[0] == '.')
             continue;
 
-        ffStrbufAppendS(&baseDir, entry->d_name);
-        parseBattery(&baseDir, entry->d_name, options, results);
-        ffStrbufSubstrBefore(&baseDir, baseDirLength);
+        FF_AUTO_CLOSE_FD int dfd = openat(dirfd(dirp), entry->d_name, O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+        if (dfd > 0) parseBattery(dfd, entry->d_name, options, results);
     }
 
     return NULL;

src/detection/battery/battery_windows.c

@@ -121,6 +121,13 @@ static const char* detectWithSetupApi(FFBatteryOptions* options, FFlist* results
                 battery->temperature = temp / 10.0 - 273.15;
         }
 
+        {
+            bqi.InformationLevel = BatteryEstimatedTime;
+            ULONG time;
+            if(DeviceIoControl(hBattery, IOCTL_BATTERY_QUERY_INFORMATION, &bqi, sizeof(bqi), &time, sizeof(time), &dwOut, NULL))
+                battery->timeRemaining = time == BATTERY_UNKNOWN_TIME ? -1 : (int32_t) time;
+        }
+
         {
             BATTERY_STATUS bs;
             BATTERY_WAIT_STATUS bws = { .BatteryTag = bqi.BatteryTag };
@@ -241,6 +248,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF
         ffStrbufInit(&battery->serial);
         battery->temperature = FF_BATTERY_TEMP_UNSET;
         battery->cycleCount = 0;
+        battery->timeRemaining = info.EstimatedTime == BATTERY_UNKNOWN_TIME ? -1 : (int32_t) info.EstimatedTime;
 
         battery->capacity = info.RemainingCapacity * 100.0 / info.MaxCapacity;
         if(info.AcOnLine)
@@ -252,6 +260,7 @@ static const char* detectWithNtApi(FF_MAYBE_UNUSED FFBatteryOptions* options, FF
         else if(info.Discharging)
             ffStrbufAppendS(&battery->status, "Discharging");
 
+
         detectBySmbios(battery);
 
         return NULL;

src/detection/bios/bios_bsd.c

@@ -25,7 +25,7 @@ const char* ffDetectBios(FFBiosResult* result)
         {
             ffStrbufSetStatic(&result->type,
                 ffPathExists("/dev/efi" /*efidev*/, FF_PATHTYPE_FILE) ||
-                ffPathExists("/boot/efi/efi" /*efi partition*/, FF_PATHTYPE_DIRECTORY)
+                ffPathExists("/boot/efi/efi/" /*efi partition*/, FF_PATHTYPE_DIRECTORY)
                     ? "UEFI" : "BIOS");
         }
     }

src/detection/bios/bios_linux.c

@@ -10,7 +10,7 @@ const char *ffDetectBios(FFBiosResult *bios)
     ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_release", "/sys/class/dmi/id/bios_release", &bios->release);
     ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_vendor", "/sys/class/dmi/id/bios_vendor", &bios->vendor);
     ffGetSmbiosValue("/sys/devices/virtual/dmi/id/bios_version", "/sys/class/dmi/id/bios_version", &bios->version);
-    if (ffPathExists("/sys/firmware/efi", FF_PATHTYPE_DIRECTORY) || ffPathExists("/sys/firmware/acpi/tables/UEFI", FF_PATHTYPE_FILE))
+    if (ffPathExists("/sys/firmware/efi/", FF_PATHTYPE_DIRECTORY) || ffPathExists("/sys/firmware/acpi/tables/UEFI", FF_PATHTYPE_FILE))
         ffStrbufSetStatic(&bios->type, "UEFI");
     else
         ffStrbufSetStatic(&bios->type, "BIOS");

src/detection/bios/bios_nbsd.c

@@ -0,0 +1,15 @@
+#include "bios.h"
+#include "common/sysctl.h"
+#include "util/smbiosHelper.h"
+
+const char* ffDetectBios(FFBiosResult* bios)
+{
+    if (ffSysctlGetString("machdep.dmi.bios-date", &bios->date) == NULL)
+        ffCleanUpSmbiosValue(&bios->date);
+    if (ffSysctlGetString("machdep.dmi.bios-version", &bios->version) == NULL)
+        ffCleanUpSmbiosValue(&bios->version);
+    if (ffSysctlGetString("machdep.dmi.bios-vendor", &bios->vendor) == NULL)
+        ffCleanUpSmbiosValue(&bios->vendor);
+    ffSysctlGetString("machdep.bootmethod", &bios->type);
+    return NULL;
+}

src/detection/bios/bios_nosupport.c

@@ -1,6 +1,6 @@
 #include "bios.h"
 
-const char* ffDetectBios(FFBiosResult* bios)
+const char* ffDetectBios(FF_MAYBE_UNUSED FFBiosResult* bios)
 {
     return "Not supported on this platform";
 }

src/detection/bluetooth/bluetooth_apple.m

@@ -2,6 +2,14 @@
 
 #import <IOBluetooth/IOBluetooth.h>
 
+@interface IOBluetoothDevice()
+    @property (nonatomic) uint8_t batteryPercentCase;
+    @property (nonatomic) uint8_t batteryPercentCombined;
+    @property (nonatomic) uint8_t batteryPercentLeft;
+    @property (nonatomic) uint8_t batteryPercentRight;
+    @property (nonatomic) uint8_t batteryPercentSingle;
+@end
+
 const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 {
     NSArray<IOBluetoothDevice*>* ioDevices = IOBluetoothDevice.pairedDevices;
@@ -13,8 +21,17 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
         FFBluetoothResult* device = ffListAdd(devices);
         ffStrbufInitS(&device->name, ioDevice.name.UTF8String);
         ffStrbufInitS(&device->address, ioDevice.addressString.UTF8String);
+        ffStrbufReplaceAllC(&device->address, '-', ':');
+        ffStrbufUpperCase(&device->address);
         ffStrbufInit(&device->type);
-        device->battery = 0;
+
+        if (ioDevice.batteryPercentSingle)
+            device->battery = ioDevice.batteryPercentSingle;
+        else if (ioDevice.batteryPercentCombined)
+            device->battery = ioDevice.batteryPercentCombined;
+        else if (ioDevice.batteryPercentCase)
+            device->battery = ioDevice.batteryPercentCase;
+
         device->connected = !!ioDevice.isConnected;
         if(ioDevice.serviceClassMajor & kBluetoothServiceClassMajorLimitedDiscoverableMode)
             ffStrbufAppendS(&device->type, "Limited Discoverable Mode, ");

src/detection/bluetooth/bluetooth_windows.c

@@ -33,13 +33,13 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
     do {
         FFBluetoothResult* device = ffListAdd(devices);
         ffStrbufInitWS(&device->name, btdi.szName);
-        ffStrbufInitF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
-            btdi.Address.rgBytes[0],
-            btdi.Address.rgBytes[1],
-            btdi.Address.rgBytes[2],
-            btdi.Address.rgBytes[3],
+        ffStrbufInitF(&device->address, "%02X:%02X:%02X:%02X:%02X:%02X",
+            btdi.Address.rgBytes[5],
             btdi.Address.rgBytes[4],
-            btdi.Address.rgBytes[5]);
+            btdi.Address.rgBytes[3],
+            btdi.Address.rgBytes[2],
+            btdi.Address.rgBytes[1],
+            btdi.Address.rgBytes[0]);
         ffStrbufInit(&device->type);
         device->battery = 0;
         device->connected = !!btdi.fConnected;
@@ -121,5 +121,8 @@ const char* ffDetectBluetooth(FFlist* devices /* FFBluetoothResult */)
 
     ffBluetoothFindDeviceClose(hFind);
 
+    const char* ffBluetoothDetectBattery(FFlist* result);
+    ffBluetoothDetectBattery(devices);
+
     return NULL;
 }

src/detection/bluetooth/bluetooth_windows.cpp

@@ -0,0 +1,122 @@
+extern "C"
+{
+#include "bluetooth.h"
+}
+#include "util/windows/wmi.hpp"
+#include "util/windows/unicode.hpp"
+
+STDAPI InitVariantFromStringArray(_In_reads_(cElems) PCWSTR *prgsz, _In_ ULONG cElems, _Out_ VARIANT *pvar);
+
+template <typename Fn>
+struct on_scope_exit {
+    on_scope_exit(Fn &&fn): _fn(std::move(fn)) {}
+    ~on_scope_exit() { this->_fn(); }
+
+private:
+    Fn _fn;
+};
+
+extern "C"
+const char* ffBluetoothDetectBattery(FFlist* devices)
+{
+    FFWmiQuery query(L"SELECT __PATH FROM Win32_PnPEntity WHERE Service = 'BthHFEnum'", nullptr, FFWmiNamespace::CIMV2);
+    if(!query)
+        return "Query WMI service failed";
+
+    IWbemClassObject* pInParams = nullptr;
+    on_scope_exit releaseInParams([&] { pInParams && pInParams->Release(); });
+    {
+        IWbemClassObject* pnpEntityClass = nullptr;
+
+        if (FAILED(query.pService->GetObjectW(bstr_t(L"Win32_PnPEntity"), 0, nullptr, &pnpEntityClass, nullptr)))
+            return "Failed to get PnP entity class";
+        on_scope_exit releasePnpEntityClass([&] { pnpEntityClass && pnpEntityClass->Release(); });
+
+        if (FAILED(pnpEntityClass->GetMethod(bstr_t(L"GetDeviceProperties"), 0, &pInParams, NULL)))
+            return "Failed to get GetDeviceProperties method";
+
+        VARIANT devicePropertyKeys;
+        PCWSTR props[] = { L"{104EA319-6EE2-4701-BD47-8DDBF425BBE5} 2", L"DEVPKEY_Bluetooth_DeviceAddress" };
+
+        if (FAILED(InitVariantFromStringArray(props, ARRAY_SIZE(props), &devicePropertyKeys)))
+            return "Failed to init variant from string array";
+        on_scope_exit releaseDevicePropertyKeys([&] { VariantClear(&devicePropertyKeys); });
+
+        if (FAILED(pInParams->Put(L"devicePropertyKeys", 0, &devicePropertyKeys, CIM_FLAG_ARRAY | CIM_STRING)))
+            return "Failed to put devicePropertyKeys";
+    }
+
+    while (FFWmiRecord record = query.next())
+    {
+        IWbemCallResult* pCallResult = nullptr;
+
+        if (FAILED(query.pService->ExecMethod(record.get(L"__PATH").bstrVal, bstr_t(L"GetDeviceProperties"), 0, nullptr, pInParams, nullptr, &pCallResult)))
+            continue;
+        on_scope_exit releaseCallResult([&] { pCallResult && pCallResult->Release(); });
+
+        IWbemClassObject* pResultObject = nullptr;
+        if (FAILED(pCallResult->GetResultObject(WBEM_INFINITE, &pResultObject)))
+            continue;
+        on_scope_exit releaseResultObject([&] { pResultObject && pResultObject->Release(); });
+
+        VARIANT propArray;
+        if (FAILED(pResultObject->Get(L"deviceProperties", 0, &propArray, nullptr, nullptr)))
+            continue;
+        on_scope_exit releasePropArray([&] { VariantClear(&propArray); });
+
+        if (propArray.vt != (VT_ARRAY | VT_UNKNOWN) ||
+            (propArray.parray->fFeatures & FADF_UNKNOWN) == 0 ||
+            propArray.parray->cDims != 1 ||
+            propArray.parray->rgsabound[0].cElements != 2
+        )
+            continue;
+
+        uint8_t batt = 0;
+        for (LONG i = 0; i < 2; i++)
+        {
+            IWbemClassObject* object = nullptr;
+            if (FAILED(SafeArrayGetElement(propArray.parray, &i, &object)))
+                continue;
+
+            FFWmiRecord rec(object);
+            auto data = rec.get(L"Data");
+            if (data.vt == VT_EMPTY)
+                break;
+
+            if (i == 0)
+                batt = data.get<uint8_t>();
+            else
+            {
+                FF_STRBUF_AUTO_DESTROY addr; // MAC address without colon
+                ffStrbufInitWSV(&addr, data.get<std::wstring_view>());
+                if (__builtin_expect(addr.length != 12, 0))
+                    continue;
+
+                FF_LIST_FOR_EACH(FFBluetoothResult, bt, *devices)
+                {
+                    if (bt->address.length != 12 + 5)
+                        continue;
+
+                    if (addr.chars[0] == bt->address.chars[0] &&
+                        addr.chars[1] == bt->address.chars[1] &&
+                        addr.chars[2] == bt->address.chars[3] &&
+                        addr.chars[3] == bt->address.chars[4] &&
+                        addr.chars[4] == bt->address.chars[6] &&
+                        addr.chars[5] == bt->address.chars[7] &&
+                        addr.chars[6] == bt->address.chars[9] &&
+                        addr.chars[7] == bt->address.chars[10] &&
+                        addr.chars[8] == bt->address.chars[12] &&
+                        addr.chars[9] == bt->address.chars[13] &&
+                        addr.chars[10] == bt->address.chars[15] &&
+                        addr.chars[11] == bt->address.chars[16])
+                    {
+                        bt->battery = batt;
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    return NULL;
+}

src/detection/bluetoothradio/bluetoothradio_linux.c

@@ -202,6 +202,7 @@ const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */)
     #ifdef FF_HAVE_DBUS
         return detectBluetooth(devices);
     #else
+        FF_UNUSED(devices) 
         return "Fastfetch was compiled without DBus support";
     #endif
 }

src/detection/bluetoothradio/bluetoothradio_windows.c

@@ -84,12 +84,12 @@ const char* ffDetectBluetoothRadio(FFlist* devices /* FFBluetoothRadioResult */)
 
         BLUETOOTH_ADDRESS_STRUCT addr = { .ullLong = blri.localInfo.address };
         ffStrbufInitF(&device->address, "%02x:%02x:%02x:%02x:%02x:%02x",
-            addr.rgBytes[0],
-            addr.rgBytes[1],
-            addr.rgBytes[2],
-            addr.rgBytes[3],
+            addr.rgBytes[5],
             addr.rgBytes[4],
-            addr.rgBytes[5]);
+            addr.rgBytes[3],
+            addr.rgBytes[2],
+            addr.rgBytes[1],
+            addr.rgBytes[0]);
 
         device->lmpVersion = blri.radioInfo.lmpVersion;
         device->lmpSubversion = blri.radioInfo.lmpSubversion;

src/detection/board/board_nbsd.c

@@ -0,0 +1,15 @@
+#include "board.h"
+#include "common/sysctl.h"
+#include "util/smbiosHelper.h"
+
+const char* ffDetectBoard(FFBoardResult* board)
+{
+    if (ffSysctlGetString("machdep.dmi.board-product", &board->name) == NULL)
+        ffCleanUpSmbiosValue(&board->name);
+    if (ffSysctlGetString("machdep.dmi.board-version", &board->version) == NULL)
+        ffCleanUpSmbiosValue(&board->version);
+    if (ffSysctlGetString("machdep.dmi.board-vendor", &board->vendor) == NULL)
+        ffCleanUpSmbiosValue(&board->vendor);
+
+    return NULL;
+}

src/detection/bootmgr/bootmgr.c

@@ -34,9 +34,9 @@ bool ffEfiFillLoadOption(const FFEfiLoadOption* efiOption, FFBootmgrResult* resu
         ffEfiUcs2ToUtf8(efiOption->Description, &result->name);
 
     for (
-        ffEfiDevicePathProtocol* filePathList = (void*) &efiOption->Description[descLen + 1];
+        ffEfiDevicePathProtocol* filePathList = (ffEfiDevicePathProtocol*) &efiOption->Description[descLen + 1];
         filePathList->Type != 0x7F; // End of Hardware Device Path
-        filePathList = (void*) ((uint8_t*) filePathList + filePathList->Length))
+        filePathList = (ffEfiDevicePathProtocol*) ((uint8_t*) filePathList + filePathList->Length))
     {
         if (filePathList->Type == 4 && filePathList->SubType == 4)
         {

src/detection/bootmgr/bootmgr_windows.c

@@ -38,9 +38,9 @@ const char* ffDetectBootmgr(FFBootmgrResult* result)
 
     uint8_t buffer[2048];
     wchar_t key[16];
-    swprintf(key, sizeof(key) / sizeof(*key), L"Boot%04X", value);
+    swprintf(key, ARRAY_SIZE(key), L"Boot%04X", value);
     uint32_t size = GetFirmwareEnvironmentVariableW(key, L"{" FF_EFI_GLOBAL_GUID L"}", buffer, sizeof(buffer));
-    if (size < sizeof(FFEfiLoadOption) || size == sizeof(buffer))
+    if (size < sizeof(FFEfiLoadOption) || size == ARRAY_SIZE(buffer))
         return "GetFirmwareEnvironmentVariableW(Boot####) failed";
 
     ffEfiFillLoadOption((FFEfiLoadOption *)buffer, result);

src/detection/brightness/brightness_apple.c

@@ -92,13 +92,13 @@ static const char* detectWithDdcci(FF_MAYBE_UNUSED const FFDisplayServerResult*
 
             for (uint32_t i = 0; i < 2; ++i)
             {
-                IOAVServiceWriteI2C(service, 0x37, 0x51, i2cIn, sizeof(i2cIn));
+                IOAVServiceWriteI2C(service, 0x37, 0x51, i2cIn, ARRAY_SIZE(i2cIn));
                 usleep(options->ddcciSleep * 1000);
             }
         }
 
         uint8_t i2cOut[12] = {};
-        if (IOAVServiceReadI2C(service, 0x37, 0x51, i2cOut, sizeof(i2cOut)) == KERN_SUCCESS)
+        if (IOAVServiceReadI2C(service, 0x37, 0x51, i2cOut, ARRAY_SIZE(i2cOut)) == KERN_SUCCESS)
         {
             if (i2cOut[2] != 0x02 || i2cOut[3] != 0x00)
                 continue;
@@ -113,7 +113,7 @@ static const char* detectWithDdcci(FF_MAYBE_UNUSED const FFDisplayServerResult*
             ffStrbufInit(&brightness->name);
 
             uint8_t edid[128] = {};
-            if (IOAVServiceReadI2C(service, 0x50, 0x00, edid, sizeof(edid)) == KERN_SUCCESS)
+            if (IOAVServiceReadI2C(service, 0x50, 0x00, edid, ARRAY_SIZE(edid)) == KERN_SUCCESS)
                 ffEdidGetName(edid, &brightness->name);
         }
     }
@@ -155,12 +155,12 @@ static const char* detectWithDdcci(const FFDisplayServerResult* displayServer, F
                 .sendAddress = 0x6e,
                 .sendTransactionType = kIOI2CSimpleTransactionType,
                 .sendBuffer = (vm_address_t) i2cIn,
-                .sendBytes = sizeof(i2cIn) / sizeof(i2cIn[0]),
+                .sendBytes = ARRAY_SIZE(i2cIn),
                 .minReplyDelay = options->ddcciSleep,
                 .replyAddress = 0x6F,
                 .replySubAddress = 0x51,
                 .replyTransactionType = kIOI2CDDCciReplyTransactionType,
-                .replyBytes = sizeof(i2cOut) / sizeof(i2cOut[0]),
+                .replyBytes = ARRAY_SIZE(i2cOut),
                 .replyBuffer = (vm_address_t) i2cOut,
             };
             IOReturn ret = IOI2CSendRequest(connect, kNilOptions, &request);

src/detection/brightness/brightness_bsd.c

@@ -16,7 +16,7 @@ const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFl
 
     for (char i = '0'; i <= '9'; ++i)
     {
-        path[sizeof(path) - 2] = i;
+        path[ARRAY_SIZE(path) - 2] = i;
 
         FF_AUTO_CLOSE_FD int blfd = open(path, O_RDONLY | O_CLOEXEC);
         if (blfd < 0)

src/detection/brightness/brightness_linux.c

@@ -25,7 +25,7 @@ static const char* detectWithBacklight(FFlist* result)
     struct dirent* entry;
     while((entry = readdir(dirp)) != NULL)
     {
-        if(ffStrEquals(entry->d_name, ".") || ffStrEquals(entry->d_name, ".."))
+        if(entry->d_name[0] == '.')
             continue;
 
         ffStrbufAppendS(&backlightDir, entry->d_name);
@@ -48,7 +48,7 @@ static const char* detectWithBacklight(FFlist* result)
                     // if we managed to get edid, use it
                     ffStrbufAppendS(&brightness->name, "/edid");
                     uint8_t edidData[128];
-                    if(ffReadFileData(brightness->name.chars, sizeof(edidData), edidData) == sizeof(edidData))
+                    if(ffReadFileData(brightness->name.chars, ARRAY_SIZE(edidData), edidData) == ARRAY_SIZE(edidData))
                     {
                         ffStrbufClear(&brightness->name);
                         ffEdidGetName(edidData, &brightness->name);
@@ -99,7 +99,7 @@ double ddca_set_default_sleep_multiplier(double multiplier); // ddcutil 1.4
 DDCA_Status ddca_init(const char *libopts, int syslog_level, int opts);
 #endif
 
-static const char* detectWithDdcci(FFBrightnessOptions* options, FFlist* result)
+static const char* detectWithDdcci(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFlist* result)
 {
     FF_LIBRARY_LOAD(libddcutil, "dlopen ddcutil failed", "libddcutil" FF_LIBRARY_EXTENSION, 5);
     FF_LIBRARY_LOAD_SYMBOL_MESSAGE(libddcutil, ddca_get_display_info_list2)

src/detection/btrfs/btrfs_linux.c

@@ -1,16 +1,18 @@
 #include "btrfs.h"
 
 #include "common/io/io.h"
+#include <fcntl.h>
 
 enum { uuidLen = (uint32_t) __builtin_strlen("00000000-0000-0000-0000-000000000000") };
 
-static const char* enumerateDevices(FFBtrfsResult* item, FFstrbuf* path, FFstrbuf* buffer)
+static const char* enumerateDevices(FFBtrfsResult* item, int dfd, FFstrbuf* buffer)
 {
-    ffStrbufAppendS(path, "devices/");
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path->chars);
+    int subfd = openat(dfd, "devices", O_RDONLY | O_CLOEXEC | O_DIRECTORY);
+    if (subfd < 0) return "openat(\"/sys/fs/btrfs/UUID/devices\") == -1";
+
+    FF_AUTO_CLOSE_DIR DIR* dirp = fdopendir(subfd);
     if(dirp == NULL)
-        return "opendir(\"/sys/fs/btrfs/UUID/devices\") == NULL";
-    const uint32_t devicesPathLen = path->length;
+        return "fdopendir(\"/sys/fs/btrfs/UUID/devices\") == NULL";
 
     struct dirent* entry;
     while ((entry = readdir(dirp)) != NULL)
@@ -21,25 +23,25 @@ static const char* enumerateDevices(FFBtrfsResult* item, FFstrbuf* path, FFstrbu
         if (item->devices.length)
             ffStrbufAppendC(&item->devices, ',');
         ffStrbufAppendS(&item->devices, entry->d_name);
-        ffStrbufAppendS(path, entry->d_name);
-        ffStrbufAppendS(path, "/size");
 
-        if (ffReadFileBuffer(path->chars, buffer))
+        char path[ARRAY_SIZE(entry->d_name) + ARRAY_SIZE("/size") + 1];
+        snprintf(path, ARRAY_SIZE(path), "%s/size", entry->d_name);
+
+        if (ffReadFileBufferRelative(subfd, path, buffer))
             item->totalSize += ffStrbufToUInt(buffer, 0) * 512;
-
-        ffStrbufSubstrBefore(path, devicesPathLen);
     }
 
     return NULL;
 }
 
-static const char* enumerateFeatures(FFBtrfsResult* item, FFstrbuf* path)
+static const char* enumerateFeatures(FFBtrfsResult* item, int dfd)
 {
-    ffStrbufAppendS(path, "features/");
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path->chars);
+    int subfd = openat(dfd, "features", O_RDONLY | O_CLOEXEC | O_DIRECTORY);
+    if (subfd < 0) return "openat(\"/sys/fs/btrfs/UUID/features\") == -1";
+
+    FF_AUTO_CLOSE_DIR DIR* dirp = fdopendir(subfd);
     if(dirp == NULL)
-        return "opendir(\"/sys/fs/btrfs/UUID/features\") == NULL";
-    const uint32_t featuresPathLen = path->length;
+        return "fdopendir(\"/sys/fs/btrfs/UUID/features\") == NULL";
 
     struct dirent* entry;
     while ((entry = readdir(dirp)) != NULL)
@@ -49,45 +51,33 @@ static const char* enumerateFeatures(FFBtrfsResult* item, FFstrbuf* path)
         if (item->features.length)
             ffStrbufAppendC(&item->features, ',');
         ffStrbufAppendS(&item->features, entry->d_name);
-
-        ffStrbufSubstrBefore(path, featuresPathLen);
     }
 
     return NULL;
 }
 
-static const char* detectAllocation(FFBtrfsResult* item, FFstrbuf* path, FFstrbuf* buffer)
+static const char* detectAllocation(FFBtrfsResult* item, int dfd, FFstrbuf* buffer)
 {
-    ffStrbufAppendS(path, "allocation/");
-    const uint32_t AllocationPathLen = path->length;
+    FF_AUTO_CLOSE_FD int subfd = openat(dfd, "allocation", O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+    if (subfd < 0) return "openat(\"/sys/fs/btrfs/UUID/allocation\") == -1";
 
-    ffStrbufAppendS(path, "global_rsv_size");
-    if (ffReadFileBuffer(path->chars, buffer))
+    if (ffReadFileBufferRelative(subfd, "global_rsv_size", buffer))
         item->globalReservationTotal = ffStrbufToUInt(buffer, 0);
     else
         return "ffReadFileBuffer(\"/sys/fs/btrfs/UUID/allocation/global_rsv_size\") == NULL";
-    ffStrbufSubstrBefore(path, AllocationPathLen);
 
-    ffStrbufAppendS(path, "global_rsv_reserved");
-    if (ffReadFileBuffer(path->chars, buffer))
+    if (ffReadFileBufferRelative(subfd, "global_rsv_reserved", buffer))
         item->globalReservationUsed = ffStrbufToUInt(buffer, 0);
-    ffStrbufSubstrBefore(path, AllocationPathLen);
     item->globalReservationUsed = item->globalReservationTotal - item->globalReservationUsed;
 
     #define FF_BTRFS_DETECT_TYPE(index, _type) \
-    ffStrbufAppendS(path, #_type "/total_bytes"); \
-    if (ffReadFileBuffer(path->chars, buffer)) \
+    if (ffReadFileBufferRelative(subfd, #_type "/total_bytes", buffer)) \
         item->allocation[index].total = ffStrbufToUInt(buffer, 0); \
-    ffStrbufSubstrBefore(path, AllocationPathLen); \
     \
-    ffStrbufAppendS(path, #_type "/bytes_used"); \
-    if (ffReadFileBuffer(path->chars, buffer)) \
+    if (ffReadFileBufferRelative(subfd, #_type "/bytes_used", buffer)) \
         item->allocation[index].used = ffStrbufToUInt(buffer, 0); \
-    ffStrbufSubstrBefore(path, AllocationPathLen); \
     \
-    ffStrbufAppendS(path, #_type "/dup"); \
-    item->allocation[index].dup = ffPathExists(path->chars, FF_PATHTYPE_DIRECTORY); \
-    ffStrbufSubstrBefore(path, AllocationPathLen); \
+    item->allocation[index].dup = faccessat(subfd, #_type "/dup/", F_OK, 0) == 0; \
     \
     item->allocation[index].type = #_type;
 
@@ -102,10 +92,7 @@ static const char* detectAllocation(FFBtrfsResult* item, FFstrbuf* path, FFstrbu
 
 const char* ffDetectBtrfs(FFlist* result)
 {
-    FF_STRBUF_AUTO_DESTROY path = ffStrbufCreateS("/sys/fs/btrfs/");
-    const uint32_t basePathLen = path.length;
-
-    FF_AUTO_CLOSE_DIR DIR* dirp = opendir(path.chars);
+    FF_AUTO_CLOSE_DIR DIR* dirp = opendir("/sys/fs/btrfs/");
     if(dirp == NULL)
         return "opendir(\"/sys/fs/btrfs\") == NULL";
 
@@ -120,46 +107,33 @@ const char* ffDetectBtrfs(FFlist* result)
             continue;
 
         FFBtrfsResult* item = ffListAdd(result);
-        (*item) = (FFBtrfsResult){};
-        ffStrbufInitNS(&item->uuid, uuidLen, entry->d_name);
-        ffStrbufInit(&item->name);
-        ffStrbufInit(&item->devices);
-        ffStrbufInit(&item->features);
+        (*item) = (FFBtrfsResult){
+            .uuid = ffStrbufCreateNS(uuidLen, entry->d_name),
+            .name = ffStrbufCreate(),
+            .devices = ffStrbufCreate(),
+            .features = ffStrbufCreate(),
+        };
 
-        ffStrbufAppendNS(&path, uuidLen, entry->d_name);
-        ffStrbufAppendC(&path, '/');
-        const uint32_t itemPathLen = path.length;
+        FF_AUTO_CLOSE_FD int dfd = openat(dirfd(dirp), entry->d_name, O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+        if (dfd < 0) continue;
 
-        ffStrbufAppendS(&path, "label");
-        if (ffAppendFileBuffer(path.chars, &item->name))
+        if (ffAppendFileBufferRelative(dfd, "label", &item->name))
             ffStrbufTrimRightSpace(&item->name);
-        ffStrbufSubstrBefore(&path, itemPathLen);
 
-        enumerateDevices(item, &path, &buffer);
-        ffStrbufSubstrBefore(&path, itemPathLen);
+        enumerateDevices(item, dfd, &buffer);
 
-        enumerateFeatures(item, &path);
-        ffStrbufSubstrBefore(&path, itemPathLen);
+        enumerateFeatures(item, dfd);
 
-        ffStrbufAppendS(&path, "generation");
-        if (ffReadFileBuffer(path.chars, &buffer))
+        if (ffReadFileBufferRelative(dfd, "generation", &buffer))
             item->generation = (uint32_t) ffStrbufToUInt(&buffer, 0);
-        ffStrbufSubstrBefore(&path, itemPathLen);
 
-        ffStrbufAppendS(&path, "nodesize");
-        if (ffReadFileBuffer(path.chars, &buffer))
+        if (ffReadFileBufferRelative(dfd, "nodesize", &buffer))
             item->nodeSize = (uint32_t) ffStrbufToUInt(&buffer, 0);
-        ffStrbufSubstrBefore(&path, itemPathLen);
 
-        ffStrbufAppendS(&path, "sectorsize");
-        if (ffReadFileBuffer(path.chars, &buffer))
+        if (ffReadFileBufferRelative(dfd, "sectorsize", &buffer))
             item->sectorSize = (uint32_t) ffStrbufToUInt(&buffer, 0);
-        ffStrbufSubstrBefore(&path, itemPathLen);
 
-        detectAllocation(item, &path, &buffer);
-
-        // finally
-        ffStrbufSubstrBefore(&path, basePathLen);
+        detectAllocation(item, dfd, &buffer);
     }
 
     return NULL;

src/detection/camera/camera_linux.c

@@ -16,7 +16,7 @@ const char* ffDetectCamera(FFlist* result)
 
     for (uint32_t i = 0; i <= 9; ++i)
     {
-        path[sizeof(path) - 2] = (char) (i + '0');
+        path[ARRAY_SIZE(path) - 2] = (char) (i + '0');
         FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY);
         if (fd < 0)
             break;

src/detection/camera/camera_windows.cpp

@@ -52,7 +52,7 @@ const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)
 
         wchar_t buffer[256];
         uint32_t length = 0;
-        if (FAILED(device->GetString(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, buffer, sizeof(buffer), &length)) || length == 0)
+        if (FAILED(device->GetString(MF_DEVSOURCE_ATTRIBUTE_FRIENDLY_NAME, buffer, ARRAY_SIZE(buffer), &length)) || length == 0)
             continue;
 
         FFCameraResult* camera = (FFCameraResult*) ffListAdd(result);
@@ -63,7 +63,7 @@ const char* ffDetectCamera(FF_MAYBE_UNUSED FFlist* result)
         camera->width = 0;
         camera->height = 0;
 
-        if (SUCCEEDED(device->GetString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, buffer, sizeof(buffer), &length)) && length > 0)
+        if (SUCCEEDED(device->GetString(MF_DEVSOURCE_ATTRIBUTE_SOURCE_TYPE_VIDCAP_SYMBOLIC_LINK, buffer, ARRAY_SIZE(buffer), &length)) && length > 0)
             ffStrbufSetNWS(&camera->id, length, buffer);
 
         IMFMediaSource* FF_AUTO_RELEASE_COM_OBJECT source = nullptr;

src/detection/chassis/chassis_nbsd.c

@@ -0,0 +1,15 @@
+#include "chassis.h"
+#include "common/sysctl.h"
+#include "util/smbiosHelper.h"
+
+const char* ffDetectChassis(FFChassisResult* chassis)
+{
+    if (ffSysctlGetString("machdep.dmi.chassis-type", &chassis->type) == NULL)
+        ffCleanUpSmbiosValue(&chassis->type);
+    if (ffSysctlGetString("machdep.dmi.chassis-version", &chassis->version) == NULL)
+        ffCleanUpSmbiosValue(&chassis->version);
+    if (ffSysctlGetString("machdep.dmi.chassis-vendor", &chassis->vendor) == NULL)
+        ffCleanUpSmbiosValue(&chassis->vendor);
+
+    return NULL;
+}

src/detection/cpu/cpu.c

@@ -13,9 +13,10 @@ const char* ffDetectCPU(const FFCPUOptions* options, FFCPUResult* cpu)
         " 2-Core", " 4-Core", " 6-Core", " 8-Core", " 10-Core", " 12-Core", " 14-Core", " 16-Core",
         " with Radeon Graphics"
     };
-    ffStrbufRemoveStrings(&cpu->name, sizeof(removeStrings) / sizeof(removeStrings[0]), removeStrings);
+    ffStrbufRemoveStrings(&cpu->name, ARRAY_SIZE(removeStrings), removeStrings);
     ffStrbufSubstrBeforeFirstC(&cpu->name, '@'); //Cut the speed output in the name as we append our own
     ffStrbufTrimRight(&cpu->name, ' '); //If we removed the @ in previous step there was most likely a space before it
+    ffStrbufRemoveDupWhitespaces(&cpu->name);
     return NULL;
 }
 
@@ -37,6 +38,8 @@ const char* ffCPUAppleCodeToName(uint32_t code)
         case 6031:
         case 6034: return "Apple M3 Max";
         case 8132: return "Apple M4";
+        case 6040: return "Apple M4 Pro";
+        case 6041: return "Apple M4 Max";
         default: return NULL;
     }
 }

src/detection/cpu/cpu.h

@@ -15,6 +15,7 @@ typedef struct FFCPUResult
     FFstrbuf name;
     FFstrbuf vendor;
 
+    uint16_t packages;
     uint16_t coresPhysical;
     uint16_t coresLogical;
     uint16_t coresOnline;

src/detection/cpu/cpu_apple.c

@@ -59,7 +59,12 @@ static const char* detectFrequency(FFCPUResult* cpu)
         pMax = pMax > pStart[i] ? pMax : pStart[i];
 
     if (pMax > 0)
-        cpu->frequencyMax = pMax / 1000 / 1000;
+    {
+        if (pMax > 100000000) // Assume that pMax is in Hz, M1~M3
+            cpu->frequencyMax = pMax / 1000 / 1000;
+        else // Assume that pMax is in kHz, M4 and later (#1394)
+            cpu->frequencyMax = pMax / 1000;
+    }
 
     return NULL;
 }
@@ -85,8 +90,8 @@ static const char* detectCoreCount(FFCPUResult* cpu)
     if (nPerfLevels <= 0) return "sysctl(hw.nperflevels) failed";
 
     char sysctlKey[] = "hw.perflevelN.logicalcpu";
-    if (nPerfLevels > sizeof(cpu->coreTypes) / sizeof(cpu->coreTypes[0]))
-        nPerfLevels = sizeof(cpu->coreTypes) / sizeof(cpu->coreTypes[0]);
+    if (nPerfLevels > ARRAY_SIZE(cpu->coreTypes))
+        nPerfLevels = ARRAY_SIZE(cpu->coreTypes);
     for (uint32_t i = 0; i < nPerfLevels; ++i)
     {
         sysctlKey[strlen("hw.perflevel")] = (char) ('0' + i);
@@ -104,6 +109,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
         return "sysctlbyname(machdep.cpu.brand_string) failed";
 
     ffSysctlGetString("machdep.cpu.vendor", &cpu->vendor);
+    cpu->packages = (uint16_t) ffSysctlGetInt("hw.packages", 1);
     if (cpu->vendor.length == 0 && ffStrbufStartsWithS(&cpu->name, "Apple "))
         ffStrbufAppendS(&cpu->vendor, "Apple");
 

src/detection/cpu/cpu_bsd.c

@@ -25,7 +25,7 @@ static const char* detectThermalTemp(double* current)
 
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
-    if (ffSysctlGetString("hw.model", &cpu->name))
+    if (ffSysctlGetString("hw.model", &cpu->name) != NULL)
         return "sysctlbyname(hw.model) failed";
 
     cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);

src/detection/cpu/cpu_linux.c

@@ -89,7 +89,9 @@ static void detectQualcomm(FFCPUResult* cpu)
 {
     // https://en.wikipedia.org/wiki/List_of_Qualcomm_Snapdragon_systems_on_chips
 
-    if (ffStrbufEqualS(&cpu->name, "SM8635"))
+    if (ffStrbufEqualS(&cpu->name, "SM8750"))
+        ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Elite [SM8750]");
+    else if (ffStrbufEqualS(&cpu->name, "SM8635"))
         ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8s Gen 3 [SM8635]");
     else if (ffStrbufEqualS(&cpu->name, "SM8650-AC"))
         ffStrbufSetStatic(&cpu->name, "Qualcomm Snapdragon 8 Gen 3 for Galaxy [SM8650-AC]");
@@ -157,14 +159,13 @@ static void detectAndroid(FFCPUResult* cpu)
 #if __arm__ || __aarch64__
 #include "cpu_arm.h"
 
-static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
+static void detectArmName(FFstrbuf* cpuinfo, FFCPUResult* cpu, uint32_t implId)
 {
-    FF_AUTO_FREE char* line = NULL;
-    rewind(cpuinfo);
+    char* line = NULL;
     size_t len = 0;
     uint32_t lastPartId = UINT32_MAX;
     uint32_t num = 0;
-    while(getline(&line, &len, cpuinfo) != -1)
+    while(ffStrbufGetline(&line, &len, cpuinfo))
     {
         if (!ffStrStartsWith(line, "CPU part\t: ")) continue;
         uint32_t partId = (uint32_t) strtoul(line + strlen("CPU part\t: "), NULL, 16);
@@ -218,18 +219,18 @@ static void detectArmName(FILE* cpuinfo, FFCPUResult* cpu, uint32_t implId)
 #endif
 
 static const char* parseCpuInfo(
-    FF_MAYBE_UNUSED FILE* cpuinfo,
-    FF_MAYBE_UNUSED FFCPUResult* cpu,
+    FFstrbuf* cpuinfo,
+    FFCPUResult* cpu,
     FF_MAYBE_UNUSED FFstrbuf* physicalCoresBuffer,
     FF_MAYBE_UNUSED FFstrbuf* cpuMHz,
     FF_MAYBE_UNUSED FFstrbuf* cpuIsa,
     FF_MAYBE_UNUSED FFstrbuf* cpuUarch,
     FF_MAYBE_UNUSED FFstrbuf* cpuImplementer)
 {
-    FF_AUTO_FREE char* line = NULL;
+    char* line = NULL;
     size_t len = 0;
 
-    while(getline(&line, &len, cpuinfo) != -1)
+    while(ffStrbufGetline(&line, &len, cpuinfo))
     {
         //Stop after reasonable information is acquired
         if((*line == '\0' || *line == '\n')
@@ -389,7 +390,7 @@ FF_MAYBE_UNUSED static void detectArmSoc(FFCPUResult* cpu)
 
     // device-vendor,device-model\0soc-vendor,soc-model\0
     char content[256];
-    ssize_t length = ffReadFileData("/proc/device-tree/compatible", sizeof(content), content);
+    ssize_t length = ffReadFileData("/proc/device-tree/compatible", ARRAY_SIZE(content), content);
     if (length <= 2) return;
 
     // get the second NUL terminated string if it exists
@@ -463,11 +464,32 @@ FF_MAYBE_UNUSED static void detectArmSoc(FFCPUResult* cpu)
     }
 }
 
+FF_MAYBE_UNUSED static uint16_t getPackageCount(FFstrbuf* cpuinfo)
+{
+    const char* p = cpuinfo->chars;
+    uint64_t low = 0, high = 0;
+
+    while ((p = memmem(p, cpuinfo->length - (uint32_t) (p - cpuinfo->chars), "\nphysical id\t:", strlen("\nphysical id\t:"))))
+    {
+        if (!p) break;
+        p += strlen("\nphysical id\t:");
+        char* pend;
+        unsigned long id = strtoul(p, &pend, 10);
+        if (__builtin_expect(id > 64, false)) // Do 129-socket boards exist?
+            high |= 1 << (id - 64);
+        else
+            low |= 1 << id;
+        p = pend;
+    }
+
+    return (uint16_t) (__builtin_popcountll(low) + __builtin_popcountll(high));
+}
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
-    FF_AUTO_CLOSE_FILE FILE* cpuinfo = fopen("/proc/cpuinfo", "r");
-    if(cpuinfo == NULL)
-        return "fopen(\"/proc/cpuinfo\", \"r\") failed";
+    FF_STRBUF_AUTO_DESTROY cpuinfo = ffStrbufCreateA(PROC_FILE_BUFFSIZ);
+    if (!ffReadFileBuffer("/proc/cpuinfo", &cpuinfo) || cpuinfo.length == 0)
+        return "ffReadFileBuffer(\"/proc/cpuinfo\") failed";
 
     cpu->temperature = options->temp ? detectCPUTemp() : FF_CPU_TEMP_UNSET;
 
@@ -477,12 +499,15 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     FF_STRBUF_AUTO_DESTROY cpuUarch = ffStrbufCreate();
     FF_STRBUF_AUTO_DESTROY cpuImplementerStr = ffStrbufCreate();
 
-    const char* error = parseCpuInfo(cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
+    const char* error = parseCpuInfo(&cpuinfo, cpu, &physicalCoresBuffer, &cpuMHz, &cpuIsa, &cpuUarch, &cpuImplementerStr);
     if (error) return error;
 
     cpu->coresLogical = (uint16_t) get_nprocs_conf();
     cpu->coresOnline = (uint16_t) get_nprocs();
     cpu->coresPhysical = (uint16_t) ffStrbufToUInt(&physicalCoresBuffer, cpu->coresLogical);
+    #if __x86_64__ || __i386__
+    cpu->packages = getPackageCount(&cpuinfo);
+    #endif
 
     // Ref https://github.com/fastfetch-cli/fastfetch/issues/1194#issuecomment-2295058252
     ffCPUDetectSpeedByCpuid(cpu);
@@ -517,7 +542,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     #endif
 
     if (cpu->name.length == 0)
-        detectArmName(cpuinfo, cpu, cpuImplementer);
+        detectArmName(&cpuinfo, cpu, cpuImplementer);
     #endif
 
     return NULL;

src/detection/cpu/cpu_nbsd.c

@@ -0,0 +1,57 @@
+#include "cpu.h"
+#include "common/sysctl.h"
+#include <sys/sysctl.h>
+
+static const char* detectCpuTemp(double* current)
+{
+    int temp = ffSysctlGetInt("dev.cpu.0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"dev.cpu.0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
+
+static const char* detectThermalTemp(double* current)
+{
+    int temp = ffSysctlGetInt("hw.acpi.thermal.tz0.temperature", -999999);
+    if (temp == -999999)
+        return "ffSysctlGetInt(\"hw.acpi.thermal.tz0.temperature\") failed";
+
+    // In tenth of degrees Kelvin
+    *current = (double) temp / 10 - 273.15;
+    return NULL;
+}
+
+const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
+{
+    if (ffSysctlGetString("machdep.cpu_brand", &cpu->name) != NULL)
+    {
+        if (ffSysctlGetString("machdep.dmi.processor-version", &cpu->name) != NULL)
+            return "sysctlbyname(machdep.cpu_brand) failed";
+    }
+
+    cpu->coresPhysical = (uint16_t) ffSysctlGetInt("hw.ncpu", 1);
+    cpu->coresLogical = cpu->coresPhysical;
+    cpu->coresOnline = (uint16_t) ffSysctlGetInt("hw.ncpuonline", cpu->coresLogical);
+
+    ffCPUDetectSpeedByCpuid(cpu);
+
+    {
+        struct clockinfo info;
+        size_t length = sizeof(info);
+        if (sysctl((int[]) {CTL_KERN, KERN_CLOCKRATE}, 2, &info, &length, NULL, 0) == 0)
+            cpu->frequencyBase = (uint32_t) info.hz / 1000;
+    }
+
+    cpu->temperature = FF_CPU_TEMP_UNSET;
+
+    if (options->temp)
+    {
+        if (detectCpuTemp(&cpu->temperature) != NULL)
+            detectThermalTemp(&cpu->temperature);
+    }
+
+    return NULL;
+}

src/detection/cpu/cpu_nosupport.c

@@ -1,6 +1,6 @@
 #include "cpu.h"
 
-const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
+const char* ffDetectCPUImpl(FF_MAYBE_UNUSED const FFCPUOptions* options, FF_MAYBE_UNUSED FFCPUResult* cpu)
 {
     return "Not supported on this platform";
 }

src/detection/cpu/cpu_obsd.c

@@ -1,6 +1,9 @@
 #include "cpu.h"
 #include "common/sysctl.h"
 
+#include <sys/time.h>
+#include <sys/sensors.h>
+
 const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
 {
     if (ffSysctlGetString(CTL_HW, HW_MODEL, &cpu->name))
@@ -13,7 +16,14 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
     ffCPUDetectSpeedByCpuid(cpu);
 
     cpu->frequencyBase = (uint32_t) ffSysctlGetInt(CTL_HW, HW_CPUSPEED, 0);
-    cpu->temperature = FF_CPU_TEMP_UNSET; // HW_SENSORS?
+    cpu->temperature = FF_CPU_TEMP_UNSET;
+    if (options->temp)
+    {
+        struct sensor sensors;
+        size_t size = sizeof(sensors);
+        if (sysctl((int[]) {CTL_HW, HW_SENSORS, 0, SENSOR_TEMP, 0}, 5, &sensors, &size, NULL, 0) == 0)
+            cpu->temperature = (double) (sensors.value - 273150000) / 1E6;
+    }
 
     return NULL;
 }

src/detection/cpu/cpu_windows.c

@@ -100,9 +100,7 @@ static const char* detectNCores(FFCPUResult* cpu)
         ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
     )
     {
-        if (ptr->Relationship == RelationProcessorCore)
-            ++cpu->coresPhysical;
-        else if (ptr->Relationship == RelationGroup)
+        if (ptr->Relationship == RelationGroup)
         {
             for (uint32_t index = 0; index < ptr->Group.ActiveGroupCount; ++index)
             {
@@ -110,6 +108,10 @@ static const char* detectNCores(FFCPUResult* cpu)
                 cpu->coresLogical += ptr->Group.GroupInfo[index].MaximumProcessorCount;
             }
         }
+        else if (ptr->Relationship == RelationProcessorCore)
+            ++cpu->coresPhysical;
+        else if (ptr->Relationship == RelationProcessorPackage)
+            cpu->packages++;
     }
 
     return NULL;

src/detection/cpucache/cpucache.h

@@ -2,7 +2,7 @@
 
 #include "fastfetch.h"
 
-typedef enum FFCPUCacheType
+typedef enum __attribute__((__packed__)) FFCPUCacheType
 {
     FF_CPU_CACHE_TYPE_UNIFIED = 0,
     FF_CPU_CACHE_TYPE_INSTRUCTION = 1,

src/detection/cpucache/cpucache_apple.c

@@ -1,5 +1,6 @@
 #include "cpucache.h"
 #include "common/sysctl.h"
+#include "util/stringUtils.h"
 
 const char* ffDetectCPUCache(FFCPUCacheResult* result)
 {
@@ -10,44 +11,44 @@ const char* ffDetectCPUCache(FFCPUCacheResult* result)
     // macOS provides the global system cache line size
     uint32_t lineSize = (uint32_t) ffSysctlGetInt("hw.cachelinesize", 0);
 
-    char sysctlKey[256] = "hw.perflevelN.";
+    char sysctlKey[128] = "hw.perflevelN.";
     char* pNum = sysctlKey + strlen("hw.perflevel");
     char* pSubkey = sysctlKey + strlen("hw.perflevelN.");
-    const size_t lenLeft = sizeof(sysctlKey) - strlen("hw.perflevelN.");
+    const size_t lenLeft = ARRAY_SIZE(sysctlKey) - strlen("hw.perflevelN.");
 
     for (uint32_t i = 0; i < nPerfLevels; ++i)
     {
         *pNum = (char) ('0' + i);
 
-        strncpy(pSubkey, "physicalcpu", lenLeft);
+        ffStrCopy(pSubkey, "physicalcpu", lenLeft);
         uint32_t ncpu = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (ncpu <= 0) continue;
 
-        strncpy(pSubkey, "l1icachesize", lenLeft);
+        ffStrCopy(pSubkey, "l1icachesize", lenLeft);
         uint32_t size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
             ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_INSTRUCTION)->num = ncpu;
 
-        strncpy(pSubkey, "l1dcachesize", lenLeft);
+        ffStrCopy(pSubkey, "l1dcachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
             ffCPUCacheAddItem(result, 1, size, lineSize, FF_CPU_CACHE_TYPE_DATA)->num = ncpu;
 
-        strncpy(pSubkey, "l2cachesize", lenLeft);
+        ffStrCopy(pSubkey, "l2cachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
         {
-            strncpy(pSubkey, "cpusperl2", lenLeft);
+            ffStrCopy(pSubkey, "cpusperl2", lenLeft);
             uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
             if (cpuSper)
                 ffCPUCacheAddItem(result, 2, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;
         }
 
-        strncpy(pSubkey, "l3cachesize", lenLeft);
+        ffStrCopy(pSubkey, "l3cachesize", lenLeft);
         size = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
         if (size)
         {
-            strncpy(pSubkey, "cpusperl3", lenLeft);
+            ffStrCopy(pSubkey, "cpusperl3", lenLeft);
             uint32_t cpuSper = (uint32_t) ffSysctlGetInt(sysctlKey, 0);
             if (cpuSper)
                 ffCPUCacheAddItem(result, 3, size, lineSize, FF_CPU_CACHE_TYPE_UNIFIED)->num = ncpu / cpuSper;

src/detection/cpuusage/cpuusage.c

@@ -13,7 +13,7 @@ void ffPrepareCPUUsage(void)
     ffGetCpuUsageInfo(&cpuTimes1);
 }
 
-const char* ffGetCpuUsageResult(FFlist* result)
+const char* ffGetCpuUsageResult(FFCPUUsageOptions* options, FFlist* result)
 {
     const char* error = NULL;
     if(cpuTimes1.elementSize == 0)
@@ -21,7 +21,7 @@ const char* ffGetCpuUsageResult(FFlist* result)
         ffListInit(&cpuTimes1, sizeof(FFCpuUsageInfo));
         error = ffGetCpuUsageInfo(&cpuTimes1);
         if(error) return error;
-        ffTimeSleep(200);
+        ffTimeSleep(options->waitTime);
     }
 
     if(cpuTimes1.length == 0) return "No CPU cores found";
@@ -36,14 +36,14 @@ retry:
 
     for (uint32_t i = 0; i < cpuTimes1.length; ++i)
     {
-        FFCpuUsageInfo* cpuTime1 = ffListGet(&cpuTimes1, i);
-        FFCpuUsageInfo* cpuTime2 = ffListGet(&cpuTimes2, i);
+        FFCpuUsageInfo* cpuTime1 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes1, i);
+        FFCpuUsageInfo* cpuTime2 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes2, i);
         if (cpuTime2->totalAll <= cpuTime1->totalAll)
         {
             if (++retryCount <= 3)
             {
                 ffListClear(&cpuTimes2);
-                ffTimeSleep(200);
+                ffTimeSleep(options->waitTime);
                 goto retry;
             }
         }
@@ -51,8 +51,8 @@ retry:
 
     for (uint32_t i = 0; i < cpuTimes1.length; ++i)
     {
-        FFCpuUsageInfo* cpuTime1 = ffListGet(&cpuTimes1, i);
-        FFCpuUsageInfo* cpuTime2 = ffListGet(&cpuTimes2, i);
+        FFCpuUsageInfo* cpuTime1 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes1, i);
+        FFCpuUsageInfo* cpuTime2 = FF_LIST_GET(FFCpuUsageInfo, cpuTimes2, i);
         *(double*) ffListAdd(result) = (double)(cpuTime2->inUseAll - cpuTime1->inUseAll) / (double)(cpuTime2->totalAll - cpuTime1->totalAll) * 100;
         cpuTime1->inUseAll = cpuTime2->inUseAll;
         cpuTime1->totalAll = cpuTime2->totalAll;

src/detection/cpuusage/cpuusage.h

@@ -8,4 +8,4 @@ typedef struct FFCpuUsageInfo {
 } FFCpuUsageInfo;
 const char* ffGetCpuUsageInfo(FFlist* cpuTimes);
 
-const char* ffGetCpuUsageResult(FFlist* result); // list of double
+const char* ffGetCpuUsageResult(FFCPUUsageOptions* options, FFlist* result); // list of double

src/detection/cpuusage/cpuusage_bsd.c

@@ -6,15 +6,19 @@
 #include <sys/resource.h>
 #include <stdlib.h>
 
-#ifdef __OpenBSD__
+#if __OpenBSD__ || __NetBSD__
     #include <sys/sched.h>
 #endif
 
 const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 {
     size_t neededLength = 0;
-#ifdef __OpenBSD__
-    int ctls[] = {CTL_KERN, KERN_CPTIME};
+#if __OpenBSD__|| __NetBSD__
+    #ifdef KERN_CPTIME
+        int ctls[] = {CTL_KERN, KERN_CPTIME};
+    #else
+        int ctls[] = {CTL_KERN, KERN_CP_TIME};
+    #endif
     if (sysctl(ctls, 2, NULL, &neededLength, NULL, 0) != 0)
         return "sysctl({CTL_KERN, KERN_CPTIME}, 2, NULL) failed";
 #else
@@ -27,7 +31,7 @@ const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 
     FF_AUTO_FREE uint64_t (*cpTimes)[CPUSTATES] = malloc(neededLength);
 
-#ifdef __OpenBSD__
+#if __OpenBSD__ || __NetBSD__
     if (sysctl(ctls, 2, cpTimes, &neededLength, NULL, 0) != 0)
         return "sysctl({CTL_KERN, KERN_CPTIME}, 2, NULL) failed";
 #else

src/detection/cpuusage/cpuusage_linux.c

@@ -8,13 +8,13 @@
 const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
 {
     char buf[PROC_FILE_BUFFSIZ];
-    ssize_t nRead = ffReadFileData("/proc/stat", sizeof(buf) - 1, buf);
+    ssize_t nRead = ffReadFileData("/proc/stat", ARRAY_SIZE(buf) - 1, buf);
     if(nRead < 0)
     {
         #ifdef __ANDROID__
         return "Accessing \"/proc/stat\" is restricted on Android O+";
         #else
-        return "ffReadFileData(\"/proc/stat\", sizeof(buf) - 1, buf) failed";
+        return "ffReadFileData(\"/proc/stat\", ARRAY_SIZE(buf) - 1, buf) failed";
         #endif
     }
     buf[nRead] = '\0';

src/detection/cpuusage/cpuusage_nosupport.c

@@ -1,7 +1,7 @@
 #include "fastfetch.h"
 #include "detection/cpuusage/cpuusage.h"
 
-const char* ffGetCpuUsageInfo(FFlist* cpuTimes)
+const char* ffGetCpuUsageInfo(FF_MAYBE_UNUSED FFlist* cpuTimes)
 {
     return "Not support on this platform";
 }

src/detection/disk/disk_bsd.c

@@ -5,7 +5,17 @@
 #include <sys/mount.h>
 #include <sys/stat.h>
 
+#ifdef __NetBSD__
+#include <sys/types.h>
+#include <sys/statvfs.h>
+#define getfsstat(...) getvfsstat(__VA_ARGS__)
+#define statfs statvfs
+#define f_flags f_flag
+#define f_bsize f_frsize
+#endif
+
 #ifdef __FreeBSD__
+#if __has_include(<libgeom.h>)
 #include <libgeom.h>
 
 static const char* detectFsLabel(struct statfs* fs, FFDisk* disk)
@@ -42,6 +52,12 @@ static const char* detectFsLabel(struct statfs* fs, FFDisk* disk)
 
     return NULL;
 }
+#else
+static const char* detectFsLabel(struct statfs* fs, FFDisk* disk)
+{
+    return "Fastfetch was compiled without libgeom support";
+}
+#endif
 
 static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 {
@@ -51,7 +67,7 @@ static void detectFsInfo(struct statfs* fs, FFDisk* disk)
             ? FF_DISK_VOLUME_TYPE_REGULAR_BIT
             : FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
     }
-    else if(ffStrbufStartsWithS(&disk->mountpoint, "/boot") || ffStrbufStartsWithS(&disk->mountpoint, "/efi"))
+    else if(fs->f_flags & MNT_IGNORE)
         disk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
     else if(!(fs->f_flags & MNT_LOCAL))
         disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
@@ -95,7 +111,15 @@ void detectFsInfo(struct statfs* fs, FFDisk* disk)
 #else
 static void detectFsInfo(struct statfs* fs, FFDisk* disk)
 {
-    FF_UNUSED(fs, disk);
+    #ifdef MNT_IGNORE
+    if(fs->f_flags & MNT_IGNORE)
+        disk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
+    else
+    #endif
+    if(!(fs->f_flags & MNT_LOCAL))
+        disk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
+    else
+        disk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
 }
 #endif
 
@@ -117,7 +141,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
             if(!ffDiskMatchMountpoint(options, fs->f_mntonname))
                 continue;
         }
-        else if(!ffStrStartsWith(fs->f_mntfromname, "/dev/") && !ffStrEquals(fs->f_fstypename, "zfs"))
+        else if(!ffStrEquals(fs->f_mntonname, "/") && !ffStrStartsWith(fs->f_mntfromname, "/dev/") && !ffStrEquals(fs->f_fstypename, "zfs"))
             continue;
 
         #ifdef __FreeBSD__
@@ -151,10 +175,11 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
         #ifdef __OpenBSD__
         #define st_birthtimespec __st_birthtim
         #endif
-
+        #ifndef __DragonFly__
         struct stat st;
         if(stat(fs->f_mntonname, &st) == 0 && st.st_birthtimespec.tv_sec > 0)
             disk->createTime = (uint64_t)((st.st_birthtimespec.tv_sec * 1000) + (st.st_birthtimespec.tv_nsec / 1000000));
+        #endif
     }
 
     return NULL;

src/detection/disk/disk_linux.c

@@ -149,7 +149,7 @@ static void detectName(FFDisk* disk)
 
 #ifdef __ANDROID__
 
-static void detectType(FF_MAYBE_UNUSED const FFlist* disks, FFDisk* currentDisk)
+static void detectType(FF_MAYBE_UNUSED const FFlist* disks, FFDisk* currentDisk, FF_MAYBE_UNUSED struct mntent* device)
 {
     if(ffStrbufEqualS(&currentDisk->mountpoint, "/") || ffStrbufEqualS(&currentDisk->mountpoint, "/storage/emulated"))
         currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
@@ -176,7 +176,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
         FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
         for(uint32_t i = 0; i < disks->length - 1; i++)
         {
-            const FFDisk* otherDevice = ffListGet(disks, i);
+            const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
             if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
                 return true;
         }
@@ -188,7 +188,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
         //Filter all disks which device was already found. This catches BTRFS subvolumes.
         for(uint32_t i = 0; i < disks->length - 1; i++)
         {
-            const FFDisk* otherDevice = ffListGet(disks, i);
+            const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
 
             if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
                 return true;
@@ -204,7 +204,7 @@ static bool isRemovable(FFDisk* currentDisk)
         return false;
 
     char sysBlockPartition[64];
-    snprintf(sysBlockPartition, sizeof(sysBlockPartition), "/sys/class/block/%s", currentDisk->mountFrom.chars + strlen("/dev/"));
+    snprintf(sysBlockPartition, ARRAY_SIZE(sysBlockPartition), "/sys/class/block/%s", currentDisk->mountFrom.chars + strlen("/dev/"));
 
     char sysBlockVolume[PATH_MAX]; // /sys/devices/pci0000:00/0000:00:14.0/usb4/4-3/4-3:1.0/host0/target0:0:0/0:0:0:0/block/sda/sda1
     if (realpath(sysBlockPartition, sysBlockVolume) == NULL)
@@ -215,7 +215,7 @@ static bool isRemovable(FFDisk* currentDisk)
     return ffReadFileData(sysBlockVolume, 1, &removableChar) > 0 && removableChar == '1';
 }
 
-static void detectType(const FFlist* disks, FFDisk* currentDisk)
+static void detectType(const FFlist* disks, FFDisk* currentDisk, struct mntent* device)
 {
     if(ffStrbufStartsWithS(&currentDisk->mountpoint, "/boot") || ffStrbufStartsWithS(&currentDisk->mountpoint, "/efi"))
         currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
@@ -225,6 +225,8 @@ static void detectType(const FFlist* disks, FFDisk* currentDisk)
         currentDisk->type = FF_DISK_VOLUME_TYPE_EXTERNAL_BIT;
     else
         currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
+    if (hasmntopt(device, MNTOPT_RO))
+        currentDisk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
 }
 
 #endif
@@ -233,7 +235,7 @@ static void detectStats(FFDisk* disk)
 {
     struct statvfs fs;
     if(statvfs(disk->mountpoint.chars, &fs) != 0)
-        memset(&fs, 0, sizeof(struct statvfs)); //Set all values to 0, so our values get initialized to 0 too
+        memset(&fs, 0, sizeof(fs)); //Set all values to 0, so our values get initialized to 0 too
 
     disk->bytesTotal = fs.f_blocks * fs.f_frsize;
     disk->bytesFree = fs.f_bfree * fs.f_frsize;
@@ -251,15 +253,17 @@ static void detectStats(FFDisk* disk)
         disk->filesTotal = disk->filesUsed = 0;
     }
 
-    if(fs.f_flag & ST_RDONLY)
-        disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
-
     disk->createTime = 0;
     #ifdef FF_HAVE_STATX
     struct statx stx;
     if (statx(0, disk->mountpoint.chars, 0, STATX_BTIME, &stx) == 0 && (stx.stx_mask & STATX_BTIME))
         disk->createTime = (uint64_t)((stx.stx_btime.tv_sec * 1000) + (stx.stx_btime.tv_nsec / 1000000));
     #endif
+
+    #ifdef __ANDROID__ // hasmntopt requires a higher Android API level
+    if(fs.f_flag & ST_RDONLY)
+        disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
+    #endif
 }
 
 const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
@@ -298,7 +302,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
         detectName(disk); // Also detects external devices
 
         //detect type
-        detectType(disks, disk);
+        detectType(disks, disk, device);
 
         //Detects stats
         detectStats(disk);

src/detection/disk/disk_nosupport.c

@@ -1,6 +1,6 @@
 #include "disk.h"
 
-const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
+const char* ffDetectDisksImpl(FF_MAYBE_UNUSED FFDiskOptions* options, FF_MAYBE_UNUSED FFlist* disks)
 {
     return "Not supported on this platform";
 }

src/detection/disk/disk_sunos.c

@@ -48,7 +48,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
         FF_STRBUF_AUTO_DESTROY zpoolName = ffStrbufCreateNS(index, currentDisk->mountFrom.chars);
         for(uint32_t i = 0; i < disks->length - 1; i++)
         {
-            const FFDisk* otherDevice = ffListGet(disks, i);
+            const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
             if(ffStrbufEqualS(&otherDevice->filesystem, "zfs") && ffStrbufStartsWith(&otherDevice->mountFrom, &zpoolName))
                 return true;
         }
@@ -60,7 +60,7 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
         //Filter all disks which device was already found. This catches BTRFS subvolumes.
         for(uint32_t i = 0; i < disks->length - 1; i++)
         {
-            const FFDisk* otherDevice = ffListGet(disks, i);
+            const FFDisk* otherDevice = FF_LIST_GET(FFDisk, *disks, i);
 
             if(ffStrbufEqual(&currentDisk->mountFrom, &otherDevice->mountFrom))
                 return true;
@@ -72,19 +72,21 @@ static bool isSubvolume(const FFlist* disks, FFDisk* currentDisk)
 
 static void detectType(const FFlist* disks, FFDisk* currentDisk, struct mnttab* device)
 {
-    if(ffStrContains(device->mnt_mntopts, MNTOPT_NOBROWSE))
+    if(hasmntopt(device, MNTOPT_NOBROWSE))
         currentDisk->type = FF_DISK_VOLUME_TYPE_HIDDEN_BIT;
     else if(isSubvolume(disks, currentDisk))
         currentDisk->type = FF_DISK_VOLUME_TYPE_SUBVOLUME_BIT;
     else
         currentDisk->type = FF_DISK_VOLUME_TYPE_REGULAR_BIT;
+    if (hasmntopt(device, MNTOPT_RO))
+        currentDisk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
 }
 
 static void detectStats(FFDisk* disk)
 {
     struct statvfs fs;
     if(statvfs(disk->mountpoint.chars, &fs) != 0)
-        memset(&fs, 0, sizeof(struct statvfs));
+        memset(&fs, 0, sizeof(fs));
 
     disk->bytesTotal = fs.f_blocks * fs.f_frsize;
     disk->bytesFree = fs.f_bfree * fs.f_frsize;
@@ -94,9 +96,6 @@ static void detectStats(FFDisk* disk)
     disk->filesTotal = (uint32_t) fs.f_files;
     disk->filesUsed = (uint32_t) (disk->filesTotal - fs.f_ffree);
 
-    if(fs.f_flag & ST_RDONLY)
-        disk->type |= FF_DISK_VOLUME_TYPE_READONLY_BIT;
-
     ffStrbufSetS(&disk->name, fs.f_fstr);
 
     disk->createTime = 0;

src/detection/disk/disk_windows.c

@@ -22,9 +22,9 @@ static unsigned __stdcall testRemoteVolumeAccessible(void* mountpoint)
 const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
 {
     wchar_t buf[MAX_PATH + 1];
-    uint32_t length = GetLogicalDriveStringsW(sizeof(buf) / sizeof(*buf), buf);
-    if (length == 0 || length >= sizeof(buf) / sizeof(*buf))
-        return "GetLogicalDriveStringsW(sizeof(buf) / sizeof(*buf), buf) failed";
+    uint32_t length = GetLogicalDriveStringsW(ARRAY_SIZE(buf), buf);
+    if (length == 0 || length >= ARRAY_SIZE(buf))
+        return "GetLogicalDriveStringsW(ARRAY_SIZE(buf), buf) failed";
 
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
 
@@ -32,7 +32,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
     if (__builtin_expect(options->folders.length == 1 && options->folders.chars[0] == '/', 0))
     {
         wchar_t path[MAX_PATH + 1];
-        GetSystemWindowsDirectoryW(path, sizeof(path) / sizeof(*path));
+        GetSystemWindowsDirectoryW(path, ARRAY_SIZE(path));
         ffStrbufSetF(&options->folders, "%c:\\", (char) path[0]);
     }
 
@@ -76,7 +76,7 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
         {
             wchar_t volumeName[MAX_PATH + 1];
             mountpoint[2] = L'\0';
-            if(QueryDosDeviceW(mountpoint, volumeName, sizeof(volumeName) / sizeof(*volumeName)))
+            if(QueryDosDeviceW(mountpoint, volumeName, ARRAY_SIZE(volumeName)))
                 ffStrbufSetWS(&disk->mountFrom, volumeName);
             mountpoint[2] = L'\\';
         }
@@ -104,11 +104,11 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
 
         DWORD diskFlags;
         BOOL result = GetVolumeInformationW(mountpoint,
-            diskName, sizeof(diskName) / sizeof(*diskName), //Volume name
+            diskName, ARRAY_SIZE(diskName), //Volume name
             NULL, //Serial number
             NULL, //Max component length
             &diskFlags, //File system flags
-            diskFileSystem, sizeof(diskFileSystem) / sizeof(*diskFileSystem)
+            diskFileSystem, ARRAY_SIZE(diskFileSystem)
         );
         SetErrorMode(errorMode);
 

src/detection/diskio/diskio.c

@@ -41,9 +41,9 @@ const char* ffDetectDiskIO(FFlist* result, FFDiskIOOptions* options)
         return "No physical disk found";
 
     uint64_t time2 = ffTimeGetNow();
-    while (time2 - time1 < 1000)
+    while (time2 - time1 < options->waitTime)
     {
-        ffTimeSleep((uint32_t) (1000 - (time2 - time1)));
+        ffTimeSleep((uint32_t) (options->waitTime - (time2 - time1)));
         time2 = ffTimeGetNow();
     }
 
@@ -56,8 +56,8 @@ const char* ffDetectDiskIO(FFlist* result, FFDiskIOOptions* options)
 
     for (uint32_t i = 0; i < result->length; ++i)
     {
-        FFDiskIOResult* icPrev = (FFDiskIOResult*)ffListGet(&ioCounters1, i);
-        FFDiskIOResult* icCurr = (FFDiskIOResult*)ffListGet(result, i);
+        FFDiskIOResult* icPrev = FF_LIST_GET(FFDiskIOResult, ioCounters1, i);
+        FFDiskIOResult* icCurr = FF_LIST_GET(FFDiskIOResult, *result, i);
         if (!ffStrbufEqual(&icPrev->devPath, &icCurr->devPath))
             return "Physical disk device path changed";
 

src/detection/diskio/diskio_bsd.c

@@ -1,4 +1,7 @@
 #include "diskio.h"
+
+#if __has_include(<libgeom.h>)
+
 #include "util/stringUtils.h"
 
 #include <devstat.h>
@@ -58,3 +61,49 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
 
     return NULL;
 }
+
+#else
+
+#include <devstat.h>
+#include <memory.h>
+
+const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+{
+    if (checkversion() < 0)
+        return "checkversion() failed";
+
+    struct statinfo stats = {
+        .dinfo = (struct devinfo *)calloc(1, sizeof(struct devinfo)),
+    };
+    if (getdevs(&stats) < 0)
+        return "getdevs() failed";
+
+    for (int i = 0; i < stats.dinfo->numdevs; i++)
+    {
+        struct devstat* current = &stats.dinfo->devices[i];
+        if (current->device_type & DEVSTAT_TYPE_PASS)
+            continue;
+
+        char deviceName[128];
+        snprintf(deviceName, sizeof(deviceName), "%s%d", current->device_name, current->unit_number);
+
+        if (options->namePrefix.length && strncmp(deviceName, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
+        ffStrbufInitS(&device->name, deviceName);
+        ffStrbufInitF(&device->devPath, "/dev/%s", deviceName);
+        device->bytesRead = current->bytes_read;
+        device->readCount = current->num_reads;
+        device->bytesWritten = current->bytes_written;
+        device->writeCount = current->num_writes;
+    }
+
+    if (stats.dinfo->mem_ptr)
+        free(stats.dinfo->mem_ptr);
+    free(stats.dinfo);
+
+    return NULL;
+}
+
+#endif

src/detection/diskio/diskio_linux.c

@@ -6,6 +6,71 @@
 #include <ctype.h>
 #include <limits.h>
 #include <inttypes.h>
+#include <fcntl.h>
+
+static void parseDiskIOCounters(int dfd, const char* devName, FFlist* result, FFDiskIOOptions* options)
+{
+    FF_AUTO_CLOSE_FD int devfd = openat(dfd, "device", O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+    if (devfd < 0) return; // virtual device
+
+    FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
+
+    {
+        if (ffAppendFileBufferRelative(devfd, "vendor", &name))
+        {
+            ffStrbufTrimRightSpace(&name);
+            if (name.length > 0)
+                ffStrbufAppendC(&name, ' ');
+        }
+
+        if (ffAppendFileBufferRelative(devfd, "model", &name))
+            ffStrbufTrimRightSpace(&name);
+
+        if (name.length == 0)
+            ffStrbufSetS(&name, devName);
+        else if (ffStrStartsWith(devName, "nvme"))
+        {
+            int devid, nsid;
+            if (sscanf(devName, "nvme%dn%d", &devid, &nsid) == 2)
+            {
+                bool multiNs = nsid > 1;
+                if (!multiNs)
+                {
+                    char pathSysBlock[16];
+                    snprintf(pathSysBlock, ARRAY_SIZE(pathSysBlock), "nvme%dn2", devid);
+                    multiNs = faccessat(devfd, pathSysBlock, F_OK, 0) == 0;
+                }
+                if (multiNs)
+                {
+                    // In Asahi Linux, there are multiple namespaces for the same NVMe drive.
+                    ffStrbufAppendF(&name, " - %d", nsid);
+                }
+            }
+        }
+
+        if (options->namePrefix.length && !ffStrbufStartsWith(&name, &options->namePrefix))
+            return;
+    }
+
+    // I/Os merges sectors ticks ...
+    uint64_t nRead, sectorRead, nWritten, sectorWritten;
+    {
+        char sysBlockStat[PROC_FILE_BUFFSIZ];
+        ssize_t fileSize = ffReadFileDataRelative(dfd, "stat", ARRAY_SIZE(sysBlockStat) - 1, sysBlockStat);
+        if (fileSize <= 0) return;
+        sysBlockStat[fileSize] = '\0';
+        if (sscanf(sysBlockStat, "%" PRIu64 "%*u%" PRIu64 "%*u%" PRIu64 "%*u%" PRIu64 "%*u", &nRead, &sectorRead, &nWritten, &sectorWritten) <= 0)
+            return;
+    }
+
+    FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
+    ffStrbufInitMove(&device->name, &name);
+    ffStrbufInitF(&device->devPath, "/dev/%s", devName);
+    device->bytesRead = sectorRead * 512;
+    device->bytesWritten = sectorWritten * 512;
+    device->readCount = nRead;
+    device->writeCount = nWritten;
+}
 
 const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
 {
@@ -18,84 +83,10 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
     {
         const char* const devName = sysBlockEntry->d_name;
 
-        if (devName[0] == '.')
-            continue;
+        if (devName[0] == '.') continue;;
 
-        char pathSysBlock[PATH_MAX];
-        snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s", devName);
-
-        char pathSysDeviceReal[PATH_MAX];
-        ssize_t pathLength = readlink(pathSysBlock, pathSysDeviceReal, sizeof(pathSysDeviceReal) - 1);
-        if (pathLength < 0)
-            continue;
-        pathSysDeviceReal[pathLength] = '\0';
-
-        if (strstr(pathSysDeviceReal, "/virtual/")) // virtual device
-            continue;
-
-        snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device", devName);
-        if (!ffPathExists(pathSysBlock, FF_PATHTYPE_DIRECTORY))
-            continue;
-
-        FF_STRBUF_AUTO_DESTROY name = ffStrbufCreate();
-
-        {
-            snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/vendor", devName);
-            if (ffAppendFileBuffer(pathSysBlock, &name))
-            {
-                ffStrbufTrimRightSpace(&name);
-                if (name.length > 0)
-                    ffStrbufAppendC(&name, ' ');
-            }
-
-            snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/model", devName);
-            ffAppendFileBuffer(pathSysBlock, &name);
-            ffStrbufTrimRightSpace(&name);
-
-            if (name.length == 0)
-                ffStrbufSetS(&name, devName);
-            else if (ffStrStartsWith(devName, "nvme"))
-            {
-                int devid, nsid;
-                if (sscanf(devName, "nvme%dn%d", &devid, &nsid) == 2)
-                {
-                    bool multiNs = nsid > 1;
-                    if (!multiNs)
-                    {
-                        snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/device/nvme%dn2", devName, devid);
-                        multiNs = ffPathExists(pathSysBlock, FF_PATHTYPE_DIRECTORY);
-                    }
-                    if (multiNs)
-                    {
-                        // In Asahi Linux, there are multiple namespaces for the same NVMe drive.
-                        ffStrbufAppendF(&name, " - %d", nsid);
-                    }
-                }
-            }
-
-            if (options->namePrefix.length && !ffStrbufStartsWith(&name, &options->namePrefix))
-                continue;
-        }
-
-        // I/Os merges sectors ticks ...
-        uint64_t nRead, sectorRead, nWritten, sectorWritten;
-        {
-            char sysBlockStat[PROC_FILE_BUFFSIZ];
-            snprintf(pathSysBlock, PATH_MAX, "/sys/block/%s/stat", devName);
-            ssize_t fileSize = ffReadFileData(pathSysBlock, sizeof(sysBlockStat) - 1, sysBlockStat);
-            if (fileSize <= 0) continue;
-            sysBlockStat[fileSize] = '\0';
-            if (sscanf(sysBlockStat, "%" PRIu64 "%*u%" PRIu64 "%*u%" PRIu64 "%*u%" PRIu64 "%*u", &nRead, &sectorRead, &nWritten, &sectorWritten) <= 0)
-                continue;
-        }
-
-        FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
-        ffStrbufInitMove(&device->name, &name);
-        ffStrbufInitF(&device->devPath, "/dev/%s", devName);
-        device->bytesRead = sectorRead * 512;
-        device->bytesWritten = sectorWritten * 512;
-        device->readCount = nRead;
-        device->writeCount = nWritten;
+        FF_AUTO_CLOSE_FD int dfd = openat(dirfd(sysBlockDirp), devName, O_RDONLY | O_CLOEXEC | O_PATH | O_DIRECTORY);
+        if (dfd > 0) parseDiskIOCounters(dfd, devName, result, options);
     }
 
     return NULL;

src/detection/diskio/diskio_nbsd.c

@@ -0,0 +1,38 @@
+#include "diskio.h"
+#include "util/stringUtils.h"
+#include "util/mallocHelper.h"
+
+#include <sys/iostat.h>
+#include <sys/sysctl.h>
+
+const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+{
+    int mib[] = {CTL_HW, HW_IOSTATS, sizeof(struct io_sysctl)};
+    size_t len;
+    if (sysctl(mib, ARRAY_SIZE(mib), NULL, &len, NULL, 0) < 0)
+        return "sysctl({HW_IOSTATS}, NULL) failed";
+    uint32_t nDrive = (uint32_t) (len / sizeof(struct io_sysctl));
+    
+    struct io_sysctl* stats = malloc(len);
+
+    if (sysctl(mib, ARRAY_SIZE(mib), stats, &len, NULL, 0) < 0)
+        return "sysctl({HW_IOSTATS}, stats) failed";
+    
+    for (uint32_t i = 0; i < nDrive; ++i)
+    {
+        struct io_sysctl* st = &stats[i];
+
+        if (options->namePrefix.length && strncmp(st->name, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
+        ffStrbufInitF(&device->devPath, "/dev/%s", st->name);
+        ffStrbufInitS(&device->name, st->name);
+        device->bytesRead = st->rbytes;
+        device->readCount = st->rxfer;
+        device->bytesWritten = st->wbytes;
+        device->writeCount = st->wxfer;
+    }
+
+    return NULL;
+}

src/detection/diskio/diskio_nosupport.c

@@ -1,6 +1,6 @@
 #include "diskio.h"
 
-const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+const char* ffDiskIOGetIoCounters(FF_MAYBE_UNUSED FFlist* result, FF_MAYBE_UNUSED FFDiskIOOptions* options)
 {
     return "Not supported on this platform";
 }

src/detection/diskio/diskio_obsd.c

@@ -0,0 +1,40 @@
+#include "diskio.h"
+#include "util/stringUtils.h"
+#include "util/mallocHelper.h"
+
+#include <sys/disk.h>
+#include <sys/sysctl.h>
+
+const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
+{
+    int mib[] = {CTL_HW, HW_DISKSTATS};
+    size_t len;
+    if (sysctl(mib, ARRAY_SIZE(mib), NULL, &len, NULL, 0) < 0)
+        return "sysctl({HW_DISKSTATS}, NULL) failed";
+    uint32_t nDrive = (uint32_t) (len / sizeof(struct diskstats));
+
+    printf("C: %d\n", nDrive);
+
+    struct diskstats* stats = malloc(len);
+
+    if (sysctl(mib, ARRAY_SIZE(mib), stats, &len, NULL, 0) < 0)
+        return "sysctl({HW_DISKSTATS}, stats) failed";
+
+    for (uint32_t i = 0; i < nDrive; ++i)
+    {
+        struct diskstats* st = &stats[i];
+
+        if (options->namePrefix.length && strncmp(st->ds_name, options->namePrefix.chars, options->namePrefix.length) != 0)
+            continue;
+
+        FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
+        ffStrbufInitF(&device->devPath, "/dev/%s", st->ds_name);
+        ffStrbufInitS(&device->name, st->ds_name);
+        device->bytesRead = st->ds_rbytes;
+        device->readCount = st->ds_rxfer;
+        device->bytesWritten = st->ds_wbytes;
+        device->writeCount = st->ds_wxfer;
+    }
+
+    return NULL;
+}

src/detection/diskio/diskio_sunos.c

@@ -27,12 +27,12 @@ const char* ffDiskIOGetIoCounters(FFlist* result, FFDiskIOOptions* options)
             continue;
 
         FFDiskIOResult* device = (FFDiskIOResult*) ffListAdd(result);
-        ffStrbufInitS(&device->devPath, ks->ks_name);
+        ffStrbufInit(&device->devPath);
+        ffStrbufInitS(&device->name, ks->ks_name);
         device->bytesRead = kio.nread;
         device->readCount = kio.reads;
         device->bytesWritten = kio.nwritten;
         device->writeCount = kio.writes;
-        ffStrbufInitS(&device->name, ks->ks_name);
     }
 
     return NULL;

src/detection/diskio/diskio_windows.c

@@ -22,7 +22,7 @@ static bool detectPhysicalDisk(const wchar_t* szDevice, FFlist* result, FFDiskIO
         },
         sizeof(STORAGE_PROPERTY_QUERY),
         &sddBuffer,
-        sizeof(sddBuffer),
+        ARRAY_SIZE(sddBuffer),
         &retSize,
         NULL
     ) || retSize == 0)

src/detection/displayserver/displayserver.c

@@ -7,23 +7,30 @@ FFDisplayResult* ffdsAppendDisplay(
     double refreshRate,
     uint32_t scaledWidth,
     uint32_t scaledHeight,
+    uint32_t preferredWidth,
+    uint32_t preferredHeight,
+    double preferredRefreshRate,
     uint32_t rotation,
     FFstrbuf* name,
     FFDisplayType type,
     bool primary,
     uint64_t id,
     uint32_t physicalWidth,
-    uint32_t physicalHeight)
+    uint32_t physicalHeight,
+    const char* platformApi)
 {
     if(width == 0 || height == 0)
         return NULL;
 
-    FFDisplayResult* display = ffListAdd(&result->displays);
+    FFDisplayResult* display = (FFDisplayResult*) ffListAdd(&result->displays);
     display->width = width;
     display->height = height;
     display->refreshRate = refreshRate;
     display->scaledWidth = scaledWidth;
     display->scaledHeight = scaledHeight;
+    display->preferredWidth = preferredWidth;
+    display->preferredHeight = preferredHeight;
+    display->preferredRefreshRate = preferredRefreshRate;
     display->rotation = rotation;
     ffStrbufInitMove(&display->name, name);
     display->type = type;
@@ -31,6 +38,7 @@ FFDisplayResult* ffdsAppendDisplay(
     display->physicalWidth = physicalWidth;
     display->physicalHeight = physicalHeight;
     display->primary = primary;
+    display->platformApi = platformApi;
 
     display->bitDepth = 0;
     display->hdrStatus = FF_DISPLAY_HDR_STATUS_UNKNOWN;

src/detection/displayserver/displayserver.h

@@ -42,13 +42,13 @@
 #define FF_WM_PROTOCOL_X11 "X11"
 #define FF_WM_PROTOCOL_WAYLAND "Wayland"
 
-typedef enum FFDisplayType {
+typedef enum __attribute__((__packed__)) FFDisplayType {
     FF_DISPLAY_TYPE_UNKNOWN,
     FF_DISPLAY_TYPE_BUILTIN,
     FF_DISPLAY_TYPE_EXTERNAL,
 } FFDisplayType;
 
-typedef enum FFDisplayHdrStatus
+typedef enum __attribute__((__packed__)) FFDisplayHdrStatus
 {
     FF_DISPLAY_HDR_STATUS_UNKNOWN,
     FF_DISPLAY_HDR_STATUS_UNSUPPORTED,
@@ -58,18 +58,22 @@ typedef enum FFDisplayHdrStatus
 
 typedef struct FFDisplayResult
 {
-    uint32_t width;
-    uint32_t height;
-    double refreshRate;
-    uint32_t scaledWidth;
-    uint32_t scaledHeight;
+    uint32_t width; // in px
+    uint32_t height; // in px
+    double refreshRate; // in Hz
+    uint32_t scaledWidth; // in px
+    uint32_t scaledHeight; // in px
+    uint32_t preferredWidth; // in px
+    uint32_t preferredHeight; // in px
+    double preferredRefreshRate; // in Hz
     FFstrbuf name;
     FFDisplayType type;
     uint32_t rotation;
     uint64_t id; // platform dependent
-    uint32_t physicalWidth;
-    uint32_t physicalHeight;
+    uint32_t physicalWidth; // in mm
+    uint32_t physicalHeight; // in mm
     bool primary;
+    const char* platformApi;
     uint8_t bitDepth;
     FFDisplayHdrStatus hdrStatus;
     uint16_t manufactureYear;
@@ -96,10 +100,14 @@ FFDisplayResult* ffdsAppendDisplay(
     double refreshRate,
     uint32_t scaledWidth,
     uint32_t scaledHeight,
+    uint32_t preferredWidth,
+    uint32_t preferredHeight,
+    double preferredRefreshRate,
     uint32_t rotation,
     FFstrbuf* name,
     FFDisplayType type,
     bool primary,
     uint64_t id,
     uint32_t physicalWidth,
-    uint32_t physicalHeight);
+    uint32_t physicalHeight,
+    const char* platformApi);

src/detection/displayserver/displayserver_android.c

@@ -61,12 +61,16 @@ static void detectWithDumpsys(FFDisplayServerResult* ds)
                 0,
                 0,
                 0,
+                0,
+                0,
+                0,
                 &name,
                 FF_DISPLAY_TYPE_UNKNOWN,
                 false,
                 0,
                 0,
-                0
+                0,
+                "dumpsys"
             );
         }
 
@@ -96,11 +100,15 @@ static bool detectWithGetprop(FFDisplayServerResult* ds)
             (uint32_t) (height / scaleFactor + .5),
             0,
             0,
+            0,
+            0,
+            NULL,
             FF_DISPLAY_TYPE_BUILTIN,
             false,
             0,
             0,
-            0
+            0,
+            "getprop"
         );
     }
 

src/detection/displayserver/displayserver_apple.c

@@ -9,9 +9,9 @@
 #include <CoreGraphics/CGDirectDisplay.h>
 #include <CoreVideo/CVDisplayLink.h>
 
+#ifdef MAC_OS_X_VERSION_10_15
 extern Boolean CoreDisplay_Display_SupportsHDRMode(CGDirectDisplayID display) __attribute__((weak_import));
 extern Boolean CoreDisplay_Display_IsHDRModeEnabled(CGDirectDisplayID display) __attribute__((weak_import));
-#ifdef MAC_OS_X_VERSION_10_15
 extern CFDictionaryRef CoreDisplay_DisplayCreateInfoDictionary(CGDirectDisplayID display) __attribute__((weak_import));
 #else
 #include <IOKit/graphics/IOGraphicsLib.h>
@@ -21,7 +21,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
 {
     CGDirectDisplayID screens[128];
     uint32_t screenCount;
-    if(CGGetOnlineDisplayList(sizeof(screens) / sizeof(screens[0]), screens, &screenCount) != kCGErrorSuccess)
+    if(CGGetOnlineDisplayList(ARRAY_SIZE(screens), screens, &screenCount) != kCGErrorSuccess)
         return;
 
     FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
@@ -36,6 +36,8 @@ static void detectDisplays(FFDisplayServerResult* ds)
 
             if (refreshRate == 0)
             {
+                #pragma clang diagnostic push
+                #pragma clang diagnostic ignored "-Wdeprecated-declarations"
                 CVDisplayLinkRef link;
                 if(CVDisplayLinkCreateWithCGDisplay(screen, &link) == kCVReturnSuccess)
                 {
@@ -44,6 +46,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
                         refreshRate = time.timeScale / (double) time.timeValue; //59.97...
                     CVDisplayLinkRelease(link);
                 }
+                #pragma clang diagnostic pop
             }
 
             ffStrbufClear(&buffer);
@@ -57,7 +60,11 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 displayInfo = IODisplayCreateInfoDictionary(servicePort, kIODisplayOnlyPreferredName);
             }
             #endif
+
             uint32_t physicalWidth = 0, physicalHeight = 0;
+            uint32_t preferredWidth = 0, preferredHeight = 0;
+            double preferredRefreshRate = 0;
+
             if(displayInfo)
             {
                 CFDictionaryRef productNames;
@@ -73,9 +80,35 @@ static void detectDisplays(FFDisplayServerResult* ds)
                     if (edidLength >= 128)
                         ffEdidGetPhysicalSize(edidData, &physicalWidth, &physicalHeight);
                 }
+
+                if (!physicalWidth || !physicalHeight)
+                {
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayHorizontalImageSize), (int*) &physicalWidth) == NULL)
+                        ffCfDictGetInt(displayInfo, CFSTR(kDisplayVerticalImageSize), (int*) &physicalHeight);
+                }
+
+                ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelWidth"), (int*) &preferredWidth);
+                ffCfDictGetInt(displayInfo, CFSTR("kCGDisplayPixelHeight"), (int*) &preferredHeight);
+                if (preferredWidth && preferredHeight)
+                {
+                    FF_CFTYPE_AUTO_RELEASE CFArrayRef allModes = CGDisplayCopyAllDisplayModes(screen, NULL);
+                    if (allModes)
+                    {
+                        for (CFIndex i = 0, count = CFArrayGetCount(allModes); i < count; i++)
+                        {
+                            CGDisplayModeRef modeInfo = (CGDisplayModeRef) CFArrayGetValueAtIndex(allModes, i);
+                            if (CGDisplayModeGetPixelWidth(modeInfo) == preferredWidth && CGDisplayModeGetPixelHeight(modeInfo) == preferredHeight)
+                            {
+                                double rr = CGDisplayModeGetRefreshRate(modeInfo);
+                                if (rr > preferredRefreshRate) preferredRefreshRate = rr;
+                                break;
+                            }
+                        }
+                    }
+                }
             }
 
-            if (!physicalWidth || !physicalHeight)
+            if ((!physicalWidth || !physicalHeight) && CGDisplayPrimaryDisplay(screen) == screen) // #1406
             {
                 CGSize size = CGDisplayScreenSize(screen);
                 physicalWidth = (uint32_t) (size.width + 0.5);
@@ -88,16 +121,24 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 refreshRate,
                 (uint32_t)CGDisplayModeGetWidth(mode),
                 (uint32_t)CGDisplayModeGetHeight(mode),
+                preferredWidth,
+                preferredHeight,
+                preferredRefreshRate,
                 (uint32_t)CGDisplayRotation(screen),
                 &buffer,
                 CGDisplayIsBuiltin(screen) ? FF_DISPLAY_TYPE_BUILTIN : FF_DISPLAY_TYPE_EXTERNAL,
                 CGDisplayIsMain(screen),
                 (uint64_t)screen,
                 physicalWidth,
-                physicalHeight
+                physicalHeight,
+                "CoreGraphics"
             );
             if (display)
             {
+                #ifndef MAC_OS_X_VERSION_10_11
+                FF_CFTYPE_AUTO_RELEASE CFStringRef pe = CGDisplayModeCopyPixelEncoding(mode);
+                if (pe) display->bitDepth = (uint8_t) (CFStringGetLength(pe) - CFStringFind(pe, CFSTR("B"), 0).location);
+                #else
                 // https://stackoverflow.com/a/33519316/9976392
                 // Also shitty, but better than parsing `CFCopyDescription(mode)`
                 CFDictionaryRef dict = (CFDictionaryRef) *((int64_t *)mode + 2);
@@ -107,10 +148,12 @@ static void detectDisplays(FFDisplayServerResult* ds)
                     ffCfDictGetInt(dict, kCGDisplayBitsPerSample, &bitDepth);
                     display->bitDepth = (uint8_t) bitDepth;
                 }
+                #endif
 
-                if (display->type == FF_DISPLAY_TYPE_BUILTIN)
+                if (display->type == FF_DISPLAY_TYPE_BUILTIN && displayInfo)
                     display->hdrStatus = CFDictionaryContainsKey(displayInfo, CFSTR("ReferencePeakHDRLuminance"))
                         ? FF_DISPLAY_HDR_STATUS_SUPPORTED : FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
+                #ifdef MAC_OS_X_VERSION_10_15
                 else if (CoreDisplay_Display_SupportsHDRMode)
                 {
                     if (CoreDisplay_Display_SupportsHDRMode(screen))
@@ -122,13 +165,18 @@ static void detectDisplays(FFDisplayServerResult* ds)
                     else
                         display->hdrStatus = FF_DISPLAY_HDR_STATUS_UNSUPPORTED;
                 }
+                #endif
 
                 display->serial = CGDisplaySerialNumber(screen);
-                int value;
-                if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayYearOfManufacture), &value) == NULL)
-                    display->manufactureYear = (uint16_t) value;
-                if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayWeekOfManufacture), &value) == NULL)
-                    display->manufactureWeek = (uint16_t) value;
+
+                if (displayInfo)
+                {
+                    int value;
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayYearOfManufacture), &value) == NULL)
+                        display->manufactureYear = (uint16_t) value;
+                    if (ffCfDictGetInt(displayInfo, CFSTR(kDisplayWeekOfManufacture), &value) == NULL)
+                        display->manufactureWeek = (uint16_t) value;
+                }
             }
             CGDisplayModeRelease(mode);
         }

src/detection/displayserver/displayserver_windows.c

@@ -36,9 +36,9 @@ static void detectDisplays(FFDisplayServerResult* ds)
     EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (LPARAM) &monitors);
 
     DISPLAYCONFIG_PATH_INFO paths[128];
-    uint32_t pathCount = sizeof(paths) / sizeof(paths[0]);
+    uint32_t pathCount = ARRAY_SIZE(paths);
     DISPLAYCONFIG_MODE_INFO modes[256];
-    uint32_t modeCount = sizeof(modes) / sizeof(modes[0]);
+    uint32_t modeCount = ARRAY_SIZE(modes);
 
     if (QueryDisplayConfig(
         QDC_ONLY_ACTIVE_PATHS,
@@ -66,7 +66,7 @@ static void detectDisplays(FFDisplayServerResult* ds)
             {
                 FF_LIST_FOR_EACH(FFMonitorInfo, item, monitors)
                 {
-                    if (wcsncmp(item->info.szDevice, sourceName.viewGdiDeviceName, sizeof(sourceName.viewGdiDeviceName) / sizeof(wchar_t)) == 0)
+                    if (wcsncmp(item->info.szDevice, sourceName.viewGdiDeviceName, ARRAY_SIZE(sourceName.viewGdiDeviceName)) == 0)
                     {
                         monitorInfo = item;
                         break;
@@ -102,11 +102,11 @@ static void detectDisplays(FFDisplayServerResult* ds)
                         *pRegPath = *pDevPath;
                     ++pRegPath;
                     ++pDevPath;
-                    assert(pRegPath < regPath + sizeof(regPath) / sizeof(wchar_t) + strlen("Device Parameters"));
+                    assert(pRegPath < regPath + ARRAY_SIZE(regPath) + strlen("Device Parameters"));
                 }
                 wcscpy(pRegPath, L"Device Parameters");
 
-                edidLength = sizeof(edidData);
+                edidLength = ARRAY_SIZE(edidData);
                 if (RegGetValueW(HKEY_LOCAL_MACHINE, regPath, L"EDID", RRF_RT_REG_BINARY, NULL, edidData, &edidLength) == ERROR_SUCCESS &&
                     edidLength > 0 && edidLength % 128 == 0)
                 {
@@ -149,12 +149,30 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 default: rotation = 0; break;
             }
 
+            DISPLAYCONFIG_TARGET_PREFERRED_MODE preferredMode = {
+                .header = {
+                    .type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_PREFERRED_MODE,
+                    .size = sizeof(preferredMode),
+                    .adapterId = path->targetInfo.adapterId,
+                    .id = path->targetInfo.id,
+                }
+            };
+            double preferredRefreshRate = 0;
+            if (DisplayConfigGetDeviceInfo(&preferredMode.header) == ERROR_SUCCESS)
+            {
+                DISPLAYCONFIG_RATIONAL freq = preferredMode.targetMode.targetVideoSignalInfo.vSyncFreq;
+                preferredRefreshRate = freq.Numerator / (double) freq.Denominator;
+            }
+
             FFDisplayResult* display = ffdsAppendDisplay(ds,
                 width,
                 height,
                 path->targetInfo.refreshRate.Numerator / (double) path->targetInfo.refreshRate.Denominator,
                 (uint32_t) (monitorInfo->info.rcMonitor.right - monitorInfo->info.rcMonitor.left),
                 (uint32_t) (monitorInfo->info.rcMonitor.bottom - monitorInfo->info.rcMonitor.top),
+                preferredMode.width,
+                preferredMode.height,
+                preferredRefreshRate,
                 rotation,
                 &name,
                 path->targetInfo.outputTechnology == DISPLAYCONFIG_OUTPUT_TECHNOLOGY_OTHER ? FF_DISPLAY_TYPE_UNKNOWN :
@@ -165,7 +183,8 @@ static void detectDisplays(FFDisplayServerResult* ds)
                 !!(monitorInfo->info.dwFlags & MONITORINFOF_PRIMARY),
                 (uint64_t)(uintptr_t) monitorInfo->handle,
                 physicalWidth,
-                physicalHeight
+                physicalHeight,
+                "GDI"
             );
 
             if (display)
@@ -217,19 +236,24 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
 
     //https://github.com/hykilpikonna/hyfetch/blob/master/neofetch#L2067
     const FFOSResult* os = ffDetectOS();
-    if(
-        ffStrbufEqualS(&os->version, "11") ||
-        ffStrbufEqualS(&os->version, "10") ||
-        ffStrbufEqualS(&os->version, "2022") ||
-        ffStrbufEqualS(&os->version, "2019") ||
-        ffStrbufEqualS(&os->version, "2016")
-    ) ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
-    else if(
-        ffStrbufEqualS(&os->version, "8") ||
-        ffStrbufEqualS(&os->version, "8.1") ||
-        ffStrbufEqualS(&os->version, "2012 R2") ||
-        ffStrbufEqualS(&os->version, "2012")
-    ) ffStrbufSetStatic(&ds->dePrettyName, "Metro");
+    uint32_t ver = (uint32_t) ffStrbufToUInt(&os->version, 0);
+    if (ver > 1000)
+    {
+        // Windows Server
+        if (ver >= 2016)
+            ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
+        else if (ver >= 2012)
+            ffStrbufSetStatic(&ds->dePrettyName, "Metro");
+        else
+            ffStrbufSetStatic(&ds->dePrettyName, "Aero");
+    }
     else
-        ffStrbufSetStatic(&ds->dePrettyName, "Aero");
+    {
+        if (ver >= 10)
+            ffStrbufSetStatic(&ds->dePrettyName, "Fluent");
+        else if (ver >= 8)
+            ffStrbufSetStatic(&ds->dePrettyName, "Metro");
+        else
+            ffStrbufSetStatic(&ds->dePrettyName, "Aero");
+    }
 }

src/detection/displayserver/linux/displayserver_linux.c

@@ -54,18 +54,11 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
         //Try the x11 libs, from most feature rich to least.
         //We use the display list to detect if a connection is needed.
         //They respect wmProtocolName, and only detect display if it is set.
-
         if(ds->displays.length == 0)
             ffdsConnectXcbRandr(ds);
 
         if(ds->displays.length == 0)
             ffdsConnectXrandr(ds);
-
-        if(ds->displays.length == 0)
-            ffdsConnectXcb(ds);
-
-        if(ds->displays.length == 0)
-            ffdsConnectXlib(ds);
     }
 
     //This display detection method is display server independent.
@@ -86,7 +79,7 @@ void ffConnectDisplayServerImpl(FFDisplayServerResult* ds)
                 if (ffSettingsGetFreeBSDKenv("screen.height", &buf))
                 {
                     uint32_t height = (uint32_t) ffStrbufToUInt(&buf, 0);
-                    ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0);
+                    ffdsAppendDisplay(ds, width, height, 0, 0, 0, 0, 0, 0, 0, NULL, FF_DISPLAY_TYPE_UNKNOWN, false, 0, 0, 0, "kenv");
                 }
             }
         }