Merge pull request #362 from LinusDierheimer/dev

Merge macOS Bios module support for 1.8.0

CHANGELOG.md

@@ -25,6 +25,7 @@ Features:
 * Supports GPU detection on Android
 * Supports Kitty Terminal terminal font
 * Supports bar output for percentage values
+* Supports Bios module on macOS
 * Supports eopkg package manager detection
 * Supports iTerm image logo protocol
 * Supports image logo printing on macOS

CMakeLists.txt

@@ -420,7 +420,7 @@ elseif(APPLE)
         src/common/processing_linux.c
         src/common/sysctl.c
         src/detection/battery/battery_apple.c
-        src/detection/bios/bios_nosupport.c
+        src/detection/bios/bios_apple.c
         src/detection/board/board_nosupport.c
         src/detection/chassis/chassis_nosupport.c
         src/detection/cpu/cpu_apple.c

README.md

@@ -61,10 +61,10 @@ For the image logo, iTerm with iterm image protocol should work. Apple Terminal
 
 ### Windows
 
-* [`libcJSON`](https://github.com/DaveGamble/cJSON): Used for Windows Terminal font detection.
 * [`wlanapi`](https://learn.microsoft.com/en-us/windows/win32/api/wlanapi/): A system dll which isn't supported by Windows Server by default. Used for Wifi info detection.
-* [`libvulkan`](https://www.vulkan.org/): Vulkan module. Usually has been provided by GPU drivers.
-* [`libOpenCL`](https://www.khronos.org/opencl/): OpenCL module
+* [`libcJSON`](https://github.com/DaveGamble/cJSON): Used for Windows Terminal font detection. [`cjson`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-cjson)
+* [`libvulkan`](https://www.vulkan.org/): Vulkan module. Usually has been provided by GPU drivers. [`vulkan-loader`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-loader) [`vulkan-headers`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-vulkan-headers)
+* [`libOpenCL`](https://www.khronos.org/opencl/): OpenCL module. [`opencl-icd`](https://github.com/msys2/MINGW-packages/tree/master/mingw-w64-opencl-icd)
 
 Note: In Windows 7, 8 and 8.1, [ConEmu](https://conemu.github.io/en/AnsiEscapeCodes.html) is required to run fastfetch due to [the lack of ASCII escape code native support](https://en.wikipedia.org/wiki/ANSI_escape_code#DOS,_OS/2,_and_Windows). In addition, special build `fastfetch-windows-old` in [Github Actions](https://github.com/LinusDierheimer/fastfetch/actions) is provided to support these old systems, which
 
@@ -75,8 +75,8 @@ For the image logo, only chafa is supported due to [the design flaw of ConPTY](h
 
 ### Android
 
-* [`freetype`](https://www.freetype.org/): Used for Termux font detection.
-* [`libvulkan`](https://www.vulkan.org/): Vulkan module, also used for GPU detection. Usually has been provided by Android system.
+* [`freetype`](https://www.freetype.org/): Used for Termux font detection. [`freetype`](https://github.com/termux/termux-packages/tree/master/packages/freetype)
+* [`libvulkan`](https://www.vulkan.org/): Vulkan module, also used for GPU detection. Usually has been provided by Android system. [`vulkan-loader-android`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-loader-android) [`vulkan-headers`](https://github.com/termux/termux-packages/tree/master/packages/vulkan-headers)
 
 ## Support status
 All categories not listed here should work without needing a specific implementation.
@@ -130,7 +130,15 @@ If the build process fails to find the headers for a library listed in [dependen
 
 ### Building on Windows
 
-Currently GCC or clang is required (MSVC is not supported). MSYS2 with CLANG64 sub system is suggested (and tested) to build fastfetch.
+Currently GCC or clang is required (MSVC is not supported). MSYS2 with CLANG64 subsystem (or CLANGARM64 if needed) is suggested (and tested) to build fastfetch. If you need Windows 7 / 8.x support, using MINGW64 is suggested.
+
+1. Install [MSYS2](https://www.msys2.org/#installation)
+1. Open `MSYS2 CLANG64` (not `MSYS2 / MSYS`, which targets cygwin C runtime)
+1. Install dependencies  
+```bash
+pacman -Syu mingw-w64-clang-x86_64-cmake mingw-w64-clang-x86_64-pkgconf mingw-w64-clang-x86_64-clang mingw-w64-clang-x86_64-cjson mingw-w64-clang-x86_64-vulkan-loader mingw-w64-clang-x86_64-opencl-icd
+```
+1. Follow building instructions of Linux
 
 ## Packaging
 

src/detection/bios/bios_apple.c

@@ -0,0 +1,70 @@
+#include "bios.h"
+#include "util/apple/cf_helpers.h"
+
+#include <IOKit/IOKitLib.h>
+
+void ffDetectBios(FFBiosResult* bios)
+{
+    ffStrbufInit(&bios->error);
+    ffStrbufInit(&bios->biosDate);
+    ffStrbufInit(&bios->biosRelease);
+    ffStrbufInit(&bios->biosVendor);
+    ffStrbufInit(&bios->biosVersion);
+
+    io_registry_entry_t registryEntry;
+
+    #ifndef __aarch64__
+
+    //https://github.com/osquery/osquery/blob/master/osquery/tables/system/darwin/smbios_tables.cpp
+    //For Intel
+    if((registryEntry = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/rom")))
+    {
+        CFMutableDictionaryRef properties;
+        if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess)
+        {
+            IOObjectRelease(registryEntry);
+            ffStrbufAppendS(&bios->error, "IORegistryEntryCreateCFProperties(registryEntry) failed");
+            return;
+        }
+
+        ffCfDictGetString(properties, CFSTR("vendor"), &bios->biosVendor);
+        ffCfDictGetString(properties, CFSTR("version"), &bios->biosVersion);
+        ffCfDictGetString(properties, CFSTR("release-date"), &bios->biosDate);
+        if(!ffStrbufContainC(&bios->biosDate, '-'))
+            ffStrbufAppendS(&bios->biosRelease, "Efi-");
+        ffStrbufAppend(&bios->biosRelease, &bios->biosVersion);
+
+        CFRelease(properties);
+        IOObjectRelease(registryEntry);
+        return;
+    }
+
+    #else
+
+    //For arm64
+    if((registryEntry = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/")))
+    {
+        CFMutableDictionaryRef properties;
+        if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) == kIOReturnSuccess)
+        {
+            ffCfDictGetString(properties, CFSTR("manufacturer"), &bios->biosVendor);
+            CFRelease(properties);
+        }
+        IOObjectRelease(registryEntry);
+    }
+
+    if((registryEntry = IORegistryEntryFromPath(MACH_PORT_NULL, "IODeviceTree:/chosen")))
+    {
+        CFMutableDictionaryRef properties;
+        if(IORegistryEntryCreateCFProperties(registryEntry, &properties, kCFAllocatorDefault, kNilOptions) == kIOReturnSuccess)
+        {
+            ffCfDictGetString(properties, CFSTR("system-firmware-version"), &bios->biosRelease);
+            ffStrbufAppend(&bios->biosVersion, &bios->biosRelease);
+            ffStrbufSubstrAfterFirstC(&bios->biosVersion, '-');
+            CFRelease(properties);
+        }
+        IOObjectRelease(registryEntry);
+    }
+
+    #endif
+}

src/util/FFstrbuf.h

@@ -189,6 +189,11 @@ static inline FF_C_NODISCARD bool ffStrbufIgnCaseEqual(const FFstrbuf* strbuf, c
     return ffStrbufIgnCaseComp(strbuf, comp) == 0;
 }
 
+static inline FF_C_NODISCARD bool ffStrbufContainC(const FFstrbuf* strbuf, char c)
+{
+    return memchr(strbuf->chars, c, strbuf->length) != NULL;
+}
+
 static inline FF_C_NODISCARD bool ffStrbufContainS(const FFstrbuf* strbuf, const char* str)
 {
     return strstr(strbuf->chars, str) != NULL;

tests/strbuf.c

@@ -204,6 +204,10 @@ int main(void)
     VERIFY(strbuf.allocated == 32);
     VERIFY(ffStrbufEqualS(&strbuf, "1234567890123456789012345678901"));
 
+    //containC
+    VERIFY(ffStrbufContainC(&strbuf, '1'));
+    VERIFY(!ffStrbufContainC(&strbuf, '-'));
+
     ffStrbufDestroy(&strbuf);
 
     //Success