Skip to content
Merged
Show file tree
Hide file tree
Changes from 42 commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
20a3737
Packaging: update debian stuff [ci skip]
CarterLi Jun 5, 2025
e5f57a3
Logo (Builtin): Add Fedora2_small (#1785)
noahzm Jun 6, 2025
4a1ada6
Host (Linux): more detailed info of WSL
CarterLi Jun 6, 2025
3bd750b
Host (Linux): detect Linux Binary Compatibility on FreeBSD
CarterLi Jun 6, 2025
a66c26f
Logo (Builtin): improve colors of bedrock_small
CarterLi Jun 7, 2025
9c37f1b
CPU (Windows): use `perflib.h` instead of `pdh.h` for querying CPU temp
CarterLi Jun 7, 2025
781a692
JsonSchema: document `swap.separate`
CarterLi Jun 7, 2025
ddf5099
TerminalFont: support rio terminal emulator (#1789)
dpassen Jun 7, 2025
541acca
Logo (Builtin): add xenia_old; update colors of xenia
CarterLi Jun 10, 2025
c8d1d29
Disk (Linux): hide `/boot/firmware` by default
CarterLi Jun 9, 2025
c9adab3
OS (Linux): detect Raspberry Pi OS
CarterLi Jun 10, 2025
f3e8e8a
Logo (Builtin): detect and add TrueNAS Scale
CarterLi Jun 10, 2025
ba69e31
OS (MacOS): add macOS 26 Tahoe
CarterLi Jun 10, 2025
e68406e
DE (macOS): report Liquid Glass on macOS 26+
CarterLi Jun 10, 2025
9e959bc
WM (MacOS): Added Aerospace WM detection
CopticFelo Jun 9, 2025
1e32a95
CPU (NetBSD): properly support PowerPC (#1802)
techflashYT Jun 11, 2025
f1cc2d1
Packages (OpenBSD): fix counting by ignoring hidden folders
CarterLi Jun 13, 2025
2e1ddcf
Logo (Builtin): Add HarmonyOS support (#1804)
OverflowCat Jun 14, 2025
c2ed71c
Global: set `SetErrorMode(SEM_FAILCRITICALERRORS)` globally
CarterLi Jun 14, 2025
da958e1
Logo (Builtin): added AnushOS (#1806)
AVSISP Jun 15, 2025
38887e7
Logo (Builtin): add GhostFreak
CarterLi Jun 15, 2025
3fcbd80
Board (macOS): detect board-id if available
CarterLi Jun 16, 2025
636bcaa
Kmod: remove Chinese comments [ci skip]
CarterLi Jun 13, 2025
a1873f3
CI: split amd64 and arm64 builds
CarterLi Jun 17, 2025
39e009b
CI: upgrade OpenBSD version
CarterLi Jun 17, 2025
d182f3f
OS (macOS): seems macOS 26 Beta 1 still reports itself as macOS 16. H…
CarterLi Jun 17, 2025
71faf1c
GPU (macOS): detect Metal 4 support
CarterLi Jun 17, 2025
d203710
WM (FreeBSD): fix Hyprland version detection
CarterLi Jun 17, 2025
40e33c6
GPU (FreeBSD): support detection by DRM [wip]
CarterLi Jun 17, 2025
8559cc4
GPU (Linux / FreeBSD): unifies DRM related code and code clean up
CarterLi Jun 18, 2025
6917f94
GPU (Linux / FreeBSD): add DRM detection support for old radeon driver
CarterLi Jun 18, 2025
960a817
GPU (Linux): fix building without features
CarterLi Jun 18, 2025
7b22434
GPU (Windows): fix build
CarterLi Jun 18, 2025
4f42d38
GPU (FreeBSD): fix mem leaks
CarterLi Jun 18, 2025
c377872
GPU (Linux): correctly call radeon driver
CarterLi Jun 19, 2025
0e1ef96
GPU (Linux): detect shared vram usage of AMD GPU
CarterLi Jun 19, 2025
68fd21d
GPU (Linux): fix an issue which vram_usage is bigger t han vram_visible
CarterLi Jun 19, 2025
3291a99
Global: add missing O_CLOEXEC to open()
apocelipes Jun 19, 2025
b079a86
Chore: code cleanups
CarterLi Jun 19, 2025
e0e966d
Logo (Builtin): rename hydra framework to hydrapwk
CarterLi Jun 20, 2025
a3e2592
Doc: update `help.json`
CarterLi Jun 20, 2025
e4e11ee
Release: v2.46.0
CarterLi Jun 20, 2025
c67c52d
Logo (Builtin): add Kalpa Desktop
CarterLi Jun 20, 2025
488454c
Logo (Builtin): simplify kali linux
CarterLi Jun 20, 2025
925e09c
Doc: update changelog [ci skip]
CarterLi Jun 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 54 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -408,8 +408,55 @@ jobs:
name: fastfetch-musl-amd64
path: ./fastfetch-*.*

macos-universal:
name: macOS-universal
macos-amd64:
name: macOS-amd64
runs-on: macos-13
permissions:
security-events: write
contents: read
steps:
- name: checkout repository
uses: actions/checkout@v4

- name: uname -a
run: uname -a

- name: install required packages
run: |
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa

- name: configure project
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .

- name: build project
run: cmake --build . --target package --verbose -j4

- name: list features
run: ./fastfetch --list-features

- 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: otool -L fastfetch

- name: run tests
run: ctest --output-on-failure

- name: upload artifacts
uses: actions/upload-artifact@v4
with:
name: fastfetch-macos-amd64
path: ./fastfetch-*.*

macos-aarch64:
name: macOS-aarch64
runs-on: macos-latest
permissions:
security-events: write
Expand All @@ -426,7 +473,7 @@ jobs:
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install --overwrite vulkan-loader vulkan-headers molten-vk imagemagick chafa

- name: configure project
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_OSX_ARCHITECTURES='arm64;x86_64' .
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On .

- name: build project
run: cmake --build . --target package --verbose -j4
Expand All @@ -452,7 +499,7 @@ jobs:
- name: upload artifacts
uses: actions/upload-artifact@v4
with:
name: fastfetch-macos-universal
name: fastfetch-macos-aarch64
path: ./fastfetch-*.*

sunos-amd64:
Expand Down Expand Up @@ -542,7 +589,7 @@ jobs:
architecture: x86-64
cpu_count: 4
shell: bash
version: '7.6'
version: '7.7'
run: |
uname -a
sudo pkg_add -r cmake git pkgconf wayland vulkan-headers vulkan-loader glib2 dconf dbus sqlite3 xfconf imagemagick chafa
Expand Down Expand Up @@ -808,7 +855,8 @@ jobs:
- linux-ppc64le
- linux-s390x
- musl-amd64
- macos-universal
- macos-amd64
- macos-aarch64
- freebsd-amd64
- openbsd-amd64
- netbsd-amd64
Expand Down
37 changes: 37 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
# 2.46.0

Features:
* Support Rio terminal font detection (#1789, TerminalFont, Linux)
* Support GPU detection by DRM on FreeBSD (GPU, FreeBSD)
* Enable by `--gpu-detection-method auto`
* Require proper DRM drivers installed and loaded
* Support PowerPC CPU detection on NetBSD (#1802, CPU, NetBSD)
* Support Aerospace WM detection (#1796, WM, macOS)
* Improve Raspberry Pi OS for RPI5 detection (#1773, OS, Linux)
* Support Linux Binary Compatibility detection on FreeBSD (#1786, Host, Linux)
* Use `board-id` as board name if available (Board, macOS)
* Intel only
* Support shared VRAM usage detection for AMD GPUs (GPU, Linux)
* Use `perflib.h` instead of `pdh.h` for CPU temperature querying to get rid of pdh.dll (#1787, CPU, Windows)
* Support GPU info detection for old ATI radeon driver (#1810, GPU, Linux)
* Add macOS 26 Tahoe support (macOS)
* Report macOS 26 code name (OS)
* Report Liquid Glass DE on macOS 26+ (DE)
* Detect Metal 4 support (GPU)

Bugfixes:
* Fix packages counting by ignoring hidden folders (Packages, OpenBSD)
* Fix Hyprland version detection (WM, FreeBSD)
* Don't show `Please insert a disk into drive D:` error dialogs (#1805, Disk, Windows)
* Hide `/boot/firmware` by default (Disk, Linux)

Logos:
* Rename Hydra Framework to HydraPwk (#1812)
* Add AnushOS (#1806)
* Add HarmonyOS (#1804)
* Add GhostFreak (#1801)
* Add TrueNAS Scale (#1795)
* Add Fedora2_small (#1785)
* Add xenia_old; update colors of xenia (#1797)
* Improve colors of bedrock_small (#1790)

# 2.45.0

Features:
Expand Down
27 changes: 14 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url

project(fastfetch
VERSION 2.45.0
VERSION 2.46.0
LANGUAGES C
DESCRIPTION "Fast neofetch-like system information tool"
HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"
Expand Down Expand Up @@ -61,7 +61,7 @@ cmake_dependent_option(ENABLE_WAYLAND "Enable wayland-client" ON "LINUX OR FreeB
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_DRM_AMDGPU "Enable libdrm_amdgpu" ON "LINUX OR FreeBSD" 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 OR Haiku" OFF)
Expand Down Expand Up @@ -529,6 +529,7 @@ if(LINUX)
src/detection/displayserver/linux/xlib.c
src/detection/font/font_linux.c
src/detection/gpu/gpu_linux.c
src/detection/gpu/gpu_drm.c
src/detection/gpu/gpu_pci.c
src/detection/gtk_qt/gtk.c
src/detection/host/host_linux.c
Expand Down Expand Up @@ -676,6 +677,7 @@ elseif(FreeBSD)
src/detection/displayserver/linux/xlib.c
src/detection/font/font_linux.c
src/detection/gpu/gpu_bsd.c
src/detection/gpu/gpu_drm.c
src/detection/gpu/gpu_pci.c
src/detection/gtk_qt/gtk.c
src/detection/host/host_bsd.c
Expand Down Expand Up @@ -1593,7 +1595,6 @@ elseif(WIN32)
PRIVATE "winbrand"
PRIVATE "propsys"
PRIVATE "secur32"
PRIVATE "pdh"
)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "ARM64")
# WoA only works on Windows 10 or higher
Expand Down Expand Up @@ -1925,17 +1926,17 @@ install(
##################

set(CPACK_GENERATOR "TGZ;ZIP")
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(CMAKE_SYSTEM_PROCESSOR "amd64")
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(CMAKE_SYSTEM_PROCESSOR "aarch64")
endif()
if(APPLE)
string(TOLOWER "${CMAKE_PROJECT_NAME}-macos-universal" CPACK_PACKAGE_FILE_NAME)
else() # We don't use this in Windows
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
set(CMAKE_SYSTEM_PROCESSOR "amd64")
endif()
if(IS_MUSL)
string(TOLOWER "${CMAKE_PROJECT_NAME}-musl-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
else()
string(TOLOWER "${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
endif()
string(TOLOWER "${CMAKE_PROJECT_NAME}-macos-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME) # use macos instead of darwin
elseif(IS_MUSL)
string(TOLOWER "${CMAKE_PROJECT_NAME}-musl-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
else()
string(TOLOWER "${CMAKE_PROJECT_NAME}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" CPACK_PACKAGE_FILE_NAME)
endif()

if(LINUX)
Expand Down
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
fastfetch (2.45.0) jammy; urgency=medium

* Update to 2.45.0

-- Carter Li <[email protected]> Thu, 05 Jun 2025 10:56:38 +0800

fastfetch (2.44.0) jammy; urgency=medium

* Update to 2.44.0
Expand Down
2 changes: 1 addition & 1 deletion debian/files
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fastfetch_2.44.0_source.buildinfo universe/utils optional
fastfetch_2.45.0_source.buildinfo universe/utils optional
5 changes: 5 additions & 0 deletions doc/json_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3002,6 +3002,11 @@
"const": "swap",
"description": "Print swap (paging file) space usage"
},
"separate": {
"type": "boolean",
"description": "Set if detailed swap devices should be reported on separate lines instead of a summary",
"default": false
},
"percent": {
"$ref": "#/$defs/percent"
},
Expand Down
5 changes: 4 additions & 1 deletion presets/all.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@
},
"memory",
"physicalmemory",
"swap",
{
"type": "swap",
"separate": true
},
"disk",
"btrfs",
"zpool",
Expand Down
5 changes: 4 additions & 1 deletion presets/ci.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@
},
"memory",
"physicalmemory",
"swap",
{
"type": "swap",
"separate": true
},
"disk",
"btrfs",
"zpool",
Expand Down
1 change: 1 addition & 0 deletions src/common/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ void ffStart(void)
ffHideCursor = instance.config.display.hideCursor && !instance.config.display.pipe && !instance.state.resultDoc;

#ifdef _WIN32
SetErrorMode(SEM_FAILCRITICALERRORS);
if (instance.config.display.noBuffer)
setvbuf(stdout, NULL, _IONBF, 0);
else
Expand Down
2 changes: 1 addition & 1 deletion src/common/io/io_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ bool ffSuppressIO(bool suppress)

void listFilesRecursively(uint32_t baseLength, FFstrbuf* folder, uint8_t indentation, const char* folderName, bool pretty)
{
FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY);
FF_AUTO_CLOSE_FD int dfd = open(folder->chars, O_RDONLY | O_CLOEXEC);
if (dfd < 0)
return;

Expand Down
4 changes: 2 additions & 2 deletions src/data/help.json
Original file line number Diff line number Diff line change
Expand Up @@ -1144,11 +1144,11 @@
"arg": {
"type": "enum",
"enum": {
"auto": "Query platform-specific graphics APIs. Requires proper GPU drivers to be installed. Not supported on BSDs",
"auto": "Query platform-specific graphics APIs. Requires proper GPU drivers to be installed. Supported on Linux, FreeBSD, Windows and macOS",
"pci": "Search PCI devices, which does not require GPU drivers to be installed. Not supported on Windows and macOS",
"vulkan": "Use Vulkan API. Slow and requires proper Vulkan drivers to be installed. Used for Android",
"opencl": "Use OpenCL API. Slow and requires proper OpenCL drivers to be installed",
"opengl": "Use OpenGL API. Slow and only detects one GPU"
"opengl": "Use OpenGL API. Slow and only detects one GPU. Used for OpenBSD"
},
"default": "auto"
}
Expand Down
4 changes: 2 additions & 2 deletions src/detection/battery/battery_nbsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* results)
{
FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC);
if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC) failed";

prop_dictionary_t root = NULL;
if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
Expand Down
4 changes: 2 additions & 2 deletions src/detection/battery/battery_obsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

const char* ffDetectBattery(FF_MAYBE_UNUSED FFBatteryOptions* options, FFlist* result)
{
FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY);
FF_AUTO_CLOSE_FD int devfd = open("/dev/apm", O_RDONLY | O_CLOEXEC);

if (devfd < 0) return "open(dev/apm, O_RDONLY) failed";
if (devfd < 0) return "open(dev/apm, O_RDONLY | O_CLOEXEC) failed";

struct apm_power_info info = {};

Expand Down
16 changes: 13 additions & 3 deletions src/detection/board/board_apple.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,19 @@ const char* ffDetectBoard(FFBoardResult* result)
if (!service)
return "No IOPlatformExpertDevice found";

io_name_t name;
if (IORegistryEntryGetName(service, name) == kIOReturnSuccess)
ffStrbufSetS(&result->name, name);
FF_CFTYPE_AUTO_RELEASE CFTypeRef boardId = IORegistryEntryCreateCFProperty(service, CFSTR("board-id"), kCFAllocatorDefault, kNilOptions);
if (boardId)
ffCfStrGetString(boardId, &result->name);
else
{
io_name_t name;
if (IORegistryEntryGetName(service, name) == kIOReturnSuccess)
ffStrbufSetS(&result->name, name);
}

FF_CFTYPE_AUTO_RELEASE CFStringRef version = IORegistryEntryCreateCFProperty(service, CFSTR("version"), kCFAllocatorDefault, kNilOptions);
if (version)
ffCfStrGetString(version, &result->version);

FF_CFTYPE_AUTO_RELEASE CFTypeRef manufacturer = IORegistryEntryCreateCFProperty(service, CFSTR("manufacturer"), kCFAllocatorDefault, kNilOptions);
if (manufacturer)
Expand Down
2 changes: 1 addition & 1 deletion src/detection/bootmgr/bootmgr_bsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

const char* ffDetectBootmgr(FFBootmgrResult* result)
{
FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR);
FF_AUTO_CLOSE_FD int efifd = open("/dev/efi", O_RDWR | O_CLOEXEC);
if (efifd < 0) return "open(/dev/efi) failed";

uint8_t buffer[2048];
Expand Down
2 changes: 1 addition & 1 deletion src/detection/brightness/brightness_obsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const char* ffDetectBrightness(FF_MAYBE_UNUSED FFBrightnessOptions* options, FFl
for (char i = '0'; i <= '9'; ++i) {
path[strlen("/dev/ttyC")] = i;

FF_AUTO_CLOSE_FD int devfd = open(path, O_RDONLY);
FF_AUTO_CLOSE_FD int devfd = open(path, O_RDONLY | O_CLOEXEC);

if (devfd < 0) {
if (errno == EACCES && i == '0')
Expand Down
2 changes: 1 addition & 1 deletion src/detection/camera/camera_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const char* ffDetectCamera(FFlist* result)
for (uint32_t i = 0; i <= 9; ++i)
{
path[ARRAY_SIZE(path) - 2] = (char) (i + '0');
FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY);
FF_AUTO_CLOSE_FD int fd = open(path, O_RDONLY | O_CLOEXEC);
if (fd < 0)
{
if (errno == ENOENT)
Expand Down
2 changes: 1 addition & 1 deletion src/detection/cpu/cpu_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ FF_MAYBE_UNUSED static const char* detectCPUX86(const FFCPUOptions* options, FFC

static const char* detectPhysicalCores(FFCPUResult* cpu)
{
int dfd = open("/sys/devices/system/cpu/", O_RDONLY | O_DIRECTORY);
int dfd = open("/sys/devices/system/cpu/", O_RDONLY | O_DIRECTORY | O_CLOEXEC);
if (dfd < 0) return "open(\"/sys/devices/system/cpu/\") failed";

FF_AUTO_CLOSE_DIR DIR* dir = fdopendir(dfd);
Expand Down
7 changes: 4 additions & 3 deletions src/detection/cpu/cpu_nbsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ static void freePropDict(prop_dictionary_t* pdict)

static const char* detectCpuTemp(double* current)
{
FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY);
if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY) failed";
FF_AUTO_CLOSE_FD int fd = open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC);
if (fd < 0) return "open(_PATH_SYSMON, O_RDONLY | O_CLOEXEC) failed";

__attribute__((__cleanup__(freePropDict))) prop_dictionary_t root = NULL;
if (prop_dictionary_recv_ioctl(fd, ENVSYS_GETDICTIONARY, &root) < 0)
Expand Down Expand Up @@ -51,7 +51,8 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
{
if (ffSysctlGetString("machdep.cpu_brand", &cpu->name) != NULL &&
ffSysctlGetString("machdep.dmi.processor-version", &cpu->name) != NULL &&
ffSysctlGetString("hw.cpu0.name", &cpu->name) != NULL)
ffSysctlGetString("hw.cpu0.name", &cpu->name) != NULL &&
ffSysctlGetString("hw.model", &cpu->name) != NULL)
{
ffStrbufSetS(&cpu->name, "Unknown CPU");
}
Expand Down
Loading
Loading