fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-01 18:42:56 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

WM (macOS): improves reliability of WM plugin detection

Browse Source
This commit is contained in:
Carter Li
2026-08-30 19:03:54 +08:00
parent 753ddec3c5
commit 4dba32aabb
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/wm/wm_apple.m
+14 -7
View File
@@ -11,16 +11,23 @@
const char* ffDetectWMPlugin(FFstrbuf* pluginName) {
int request[] = { CTL_KERN, KERN_PROC, KERN_PROC_ALL };
u_int requestLength = ARRAY_SIZE(request);
size_t length;
size_t length = 0;
FF_AUTO_FREE struct kinfo_proc* processes = ffSysctlGetData(request, requestLength, &length);
if (processes == nullptr) {
return "sysctl(CTL_KERN, KERN_PROC, KERN_PROC_ALL) failed";
if (sysctl(request, ARRAY_SIZE(request), nullptr, &length, nullptr, 0) != 0) {
return "sysctl({CTL_KERN, KERN_PROC, KERN_PROC_ALL, nullptr}) failed";
}
assert(length % sizeof(struct kinfo_proc) == 0);
for (size_t i = 0; i < length / sizeof(struct kinfo_proc); i++) {
// The process table may change between the two sysctl calls; retry with a larger buffer.
length += length / 8 + sizeof(struct kinfo_proc);
FF_AUTO_FREE struct kinfo_proc* processes = malloc(length);
if (sysctl(request, ARRAY_SIZE(request), processes, &length, nullptr, 0) != 0) {
return "sysctl({CTL_KERN, KERN_PROC, KERN_PROC_ALL, processes}) failed";
}
uint32_t count = (uint32_t) (length / sizeof(struct kinfo_proc));
for (size_t i = 0; i < count; i++) {
const struct kinfo_proc* proc = &processes[i];
if (proc->kp_eproc.e_ppid != 1) {
continue;