InitSystem: add new module

Fix #974

Author: CarterLi

CMakeLists.txt

@@ -343,6 +343,7 @@ set(LIBFASTFETCH_SRC
     src/modules/gpu/gpu.c
     src/modules/host/host.c
     src/modules/icons/icons.c
+    src/modules/initsystem/initsystem.c
     src/modules/gamepad/gamepad.c
     src/modules/kernel/kernel.c
     src/modules/lm/lm.c
@@ -431,6 +432,7 @@ if(LINUX)
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_linux.c
         src/detection/lm/lm_linux.c
         src/detection/loadavg/loadavg_linux.c
@@ -489,6 +491,7 @@ elseif(ANDROID)
         src/detection/gpu/gpu_nosupport.c
         src/detection/host/host_android.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_android.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_linux.c
@@ -559,6 +562,7 @@ elseif(BSD)
         src/detection/host/host_bsd.c
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/libc/libc_bsd.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/locale/locale_linux.c
@@ -618,6 +622,7 @@ elseif(APPLE)
         src/detection/gpu/gpu_apple.m
         src/detection/host/host_apple.c
         src/detection/icons/icons_nosupport.c
+        src/detection/initsystem/initsystem_linux.c
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_bsd.c
         src/detection/libc/libc_apple.c
@@ -676,6 +681,7 @@ elseif(WIN32)
         src/detection/gpu/gpu_windows.c
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
+        src/detection/initsystem/initsystem_nosupport.c
         src/detection/libc/libc_windows.cpp
         src/detection/lm/lm_nosupport.c
         src/detection/loadavg/loadavg_nosupport.c

src/common/modules.c

@@ -59,6 +59,7 @@ static FFModuleBaseInfo* H[] = {
 
 static FFModuleBaseInfo* I[] = {
     (void*) &instance.config.modules.icons,
+    (void*) &instance.config.modules.initSystem,
     NULL,
 };
 

src/common/processing.h

@@ -2,6 +2,8 @@
 
 #include "util/FFstrbuf.h"
 
+#include <sys/types.h>
+
 const char* ffProcessAppendOutput(FFstrbuf* buffer, char* const argv[], bool useStdErr);
 
 static inline const char* ffProcessAppendStdOut(FFstrbuf* buffer, char* const argv[])
@@ -24,5 +26,5 @@ static inline const char* ffProcessAppendStdErr(FFstrbuf* buffer, char* const ar
 bool ffProcessGetInfoWindows(uint32_t pid, uint32_t* ppid, FFstrbuf* pname, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath, bool* gui);
 #else
 void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, const char** exeName, FFstrbuf* exePath);
-const char* ffProcessGetBasicInfoLinux(pid_t pid, char* name, pid_t* ppid, int32_t* tty);
+const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, int32_t* tty);
 #endif

src/common/processing_linux.c

@@ -3,6 +3,7 @@
 #include "common/io/io.h"
 #include "common/time.h"
 #include "util/stringUtils.h"
+#include "util/mallocHelper.h"
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -17,6 +18,9 @@
     #include <sys/user.h>
     #include <sys/sysctl.h>
 #endif
+#ifdef __APPLE__
+    #include <libproc.h>
+#endif
 
 enum { FF_PIPE_BUFSIZ = 8192 };
 
@@ -119,28 +123,31 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
     char filePath[64];
     snprintf(filePath, sizeof(filePath), "/proc/%d/cmdline", (int)pid);
 
-    if(ffAppendFileBuffer(filePath, exe))
+    if(ffReadFileBuffer(filePath, exe))
     {
-        ffStrbufTrimRightSpace(exe);
         ffStrbufRecalculateLength(exe); //Trim the arguments
+        ffStrbufTrimRightSpace(exe);
         ffStrbufTrimLeft(exe, '-'); //Login shells start with a dash
     }
 
-    snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (int)pid);
-    ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
-    ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
-    if (length > 0) // doesn't contain trailing NUL
+    if (exePath)
     {
-        exePath->chars[length] = '\0';
-        exePath->length = (uint32_t) length;
+        snprintf(filePath, sizeof(filePath), "/proc/%d/exe", (int)pid);
+        ffStrbufEnsureFixedLengthFree(exePath, PATH_MAX);
+        ssize_t length = readlink(filePath, exePath->chars, exePath->allocated - 1);
+        if (length > 0) // doesn't contain trailing NUL
+        {
+            exePath->chars[length] = '\0';
+            exePath->length = (uint32_t) length;
+        }
     }
 
     #elif defined(__APPLE__)
 
     size_t len = 0;
     int mibs[] = { CTL_KERN, KERN_PROCARGS2, pid };
     if (sysctl(mibs, sizeof(mibs) / sizeof(*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++;
@@ -153,7 +160,8 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
             const char* realExePath = procArgs2 + sizeof(argc);
 
             const char* arg0 = memchr(realExePath, '\0', len - (size_t) (realExePath - procArgs2));
-            ffStrbufSetNS(exePath, (uint32_t) (arg0 - realExePath), realExePath);
+            if (exePath)
+                ffStrbufSetNS(exePath, (uint32_t) (arg0 - realExePath), realExePath);
 
             do arg0++; while (*arg0 == '\0');
             assert(arg0 < procArgs2 + len);
@@ -162,6 +170,17 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
             ffStrbufSetS(exe, arg0);
         }
     }
+    else
+    {
+        ffStrbufEnsureFixedLengthFree(exe, PATH_MAX);
+        int length = proc_pidpath(pid, exe->chars, exe->allocated);
+        if (length > 0)
+        {
+            exe->length = (uint32_t) length;
+            if (exePath)
+                ffStrbufSet(exePath, exe);
+        }
+    }
 
     #elif defined(__FreeBSD__)
 
@@ -170,7 +189,7 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
 
     static_assert(ARG_MAX > PATH_MAX, "");
 
-    if(sysctl(
+    if(exePath && sysctl(
         (int[]){CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, pid}, 4,
         args, &size,
         NULL, 0
@@ -213,34 +232,46 @@ void ffProcessGetInfoLinux(pid_t pid, FFstrbuf* processName, FFstrbuf* exe, cons
         *exeName = exe->chars + lastSlashIndex + 1;
 }
 
-const char* ffProcessGetBasicInfoLinux(pid_t pid, char* name, pid_t* ppid, int32_t* tty)
+const char* ffProcessGetBasicInfoLinux(pid_t pid, FFstrbuf* name, pid_t* ppid, int32_t* tty)
 {
     if (pid <= 0)
         return "Invalid pid";
 
     #ifdef __linux__
 
-    char statFilePath[64];
-    snprintf(statFilePath, sizeof(statFilePath), "/proc/%d/stat", (int)pid);
-    char buf[PROC_FILE_BUFFSIZ];
-    ssize_t nRead = ffReadFileData(statFilePath, sizeof(buf) - 1, buf);
-    if(nRead < 0)
-        return "ffReadFileData(statFilePath, sizeof(buf)-1, buf) failed";
-    buf[nRead] = '\0';
-
-    *ppid = 0;
-    static_assert(sizeof(*ppid) == sizeof(int), "");
-
-    int tty_;
-    if(
-        sscanf(buf, "%*s (%255[^)]) %*c %d %*d %*d %d", name, ppid, &tty_) < 2 || //stat (comm) state ppid pgrp session tty
-        !ffStrSet(name) ||
-        *ppid == 0
-    )
-        return "sscanf(stat) failed";
-
-    if (tty)
-        *tty = tty_ & 0xFF;
+    char procFilePath[64];
+    if (ppid)
+    {
+        snprintf(procFilePath, sizeof(procFilePath), "/proc/%d/stat", (int)pid);
+        char buf[PROC_FILE_BUFFSIZ];
+        ssize_t nRead = ffReadFileData(procFilePath, sizeof(buf) - 1, buf);
+        if(nRead < 0)
+            return "ffReadFileData(/proc/pid/stat, PROC_FILE_BUFFSIZ-1, buf) failed";
+        buf[nRead] = '\0';
+
+        *ppid = 0;
+        static_assert(sizeof(*ppid) == sizeof(int), "");
+
+        ffStrbufEnsureFixedLengthFree(name, 255);
+        int tty_;
+        if(
+            sscanf(buf, "%*s (%255[^)]) %*c %d %*d %*d %d", name->chars, ppid, &tty_) < 2 || //stat (comm) state ppid pgrp session tty
+            name->chars[0] == '\0'
+        )
+            return "sscanf(stat) failed";
+
+        ffStrbufRecalculateLength(name);
+        if (tty)
+            *tty = tty_ & 0xFF;
+    }
+    else
+    {
+        snprintf(procFilePath, sizeof(procFilePath), "/proc/%d/comm", (int)pid);
+        ssize_t nRead = ffReadFileBuffer(procFilePath, name);
+        if(nRead < 0)
+            return "ffReadFileBuffer(/proc/pid/comm, name) failed";
+        ffStrbufTrimRightSpace(name);
+    }
 
     #elif defined(__APPLE__)
 
@@ -253,8 +284,9 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, char* name, pid_t* ppid, int32
     ))
         return "sysctl(KERN_PROC_PID) failed";
 
-    *ppid = (pid_t)proc.kp_eproc.e_ppid;
-    strcpy(name, proc.kp_proc.p_comm); //trancated to 16 chars
+    ffStrbufSetS(name, proc.kp_proc.p_comm); //trancated to 16 chars
+    if (ppid)
+        *ppid = (pid_t)proc.kp_eproc.e_ppid;
     if (tty)
     {
         *tty = ((proc.kp_eproc.e_tdev >> 24) & 0xFF) == 0x10
@@ -273,8 +305,9 @@ const char* ffProcessGetBasicInfoLinux(pid_t pid, char* name, pid_t* ppid, int32
     ))
         return "sysctl(KERN_PROC_PID) failed";
 
-    *ppid = (pid_t)proc.ki_ppid;
-    strcpy(name, proc.ki_comm);
+    ffStrbufSetS(name, proc.ki_comm);
+    if (ppid)
+        *ppid = (pid_t)proc.ki_ppid;
     if (tty)
     {
         if (proc.ki_tdev != NODEV && proc.ki_flag & P_CONTROLT)

src/detection/initsystem/initsystem.h

@@ -0,0 +1,12 @@
+#pragma once
+
+#include "fastfetch.h"
+
+typedef struct FFInitSystemResult
+{
+    uint32_t pid;
+    FFstrbuf name;
+    FFstrbuf exe;
+} FFInitSystemResult;
+
+const char* ffDetectInitSystem(FFInitSystemResult* result);

src/detection/initsystem/initsystem_linux.c

@@ -0,0 +1,14 @@
+#include "initsystem.h"
+#include "common/processing.h"
+
+const char* ffDetectInitSystem(FFInitSystemResult* result)
+{
+    const char* error = ffProcessGetBasicInfoLinux((int) result->pid, &result->name, NULL, NULL);
+    if (error) return error;
+
+    const char* exeName;
+
+    ffProcessGetInfoLinux((int) result->pid, &result->name, &result->exe, &exeName, NULL);
+
+    return NULL;
+}

src/detection/initsystem/initsystem_nosupport.c

@@ -0,0 +1,6 @@
+#include "initsystem.h"
+
+const char* ffDetectInitSystem(FF_MAYBE_UNUSED FFInitSystemResult* result)
+{
+    return "Not supported on this platform";
+}