Host: detect mac model in FreeBSD & Windows

Author: CarterLi

CMakeLists.txt

@@ -650,6 +650,7 @@ elseif(FreeBSD)
         src/detection/gpu/gpu_pci.c
         src/detection/gtk_qt/gtk.c
         src/detection/host/host_bsd.c
+        src/detection/host/host_mac.c
         src/detection/lm/lm_linux.c
         src/detection/icons/icons_linux.c
         src/detection/initsystem/initsystem_linux.c
@@ -951,6 +952,7 @@ elseif(WIN32)
         src/detection/dns/dns_windows.c
         src/detection/font/font_windows.c
         src/detection/gpu/gpu_windows.c
+        src/detection/host/host_mac.c
         src/detection/host/host_windows.c
         src/detection/icons/icons_windows.c
         src/detection/initsystem/initsystem_nosupport.c

src/detection/host/host.h

@@ -13,4 +13,6 @@ typedef struct FFHostResult
     FFstrbuf vendor;
 } FFHostResult;
 
+const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel);
+bool ffHostDetectMac(FFHostResult* host);
 const char* ffDetectHost(FFHostResult* host);

src/detection/host/host_apple.c

@@ -39,8 +39,6 @@ const char* getOthersByIokit(FFHostResult* host)
     return NULL;
 }
 
-const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel);
-
 const char* ffDetectHost(FFHostResult* host)
 {
     const char* error = ffSysctlGetString("hw.model", &host->family);

src/detection/host/host_bsd.c

@@ -19,5 +19,9 @@ const char* ffDetectHost(FFHostResult* host)
     ffSettingsGetFreeBSDKenv("smbios.system.maker", &host->vendor);
     ffCleanUpSmbiosValue(&host->vendor);
 
+    #ifdef __x86_64__
+    ffHostDetectMac(host);
+    #endif
+
     return NULL;
 }

src/detection/host/host_linux.c

@@ -5,8 +5,6 @@
 
 #include <stdlib.h>
 
-const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel);
-
 static void getHostProductName(FFstrbuf* name)
 {
     if (ffReadFileBuffer("/sys/firmware/devicetree/base/model", name))
@@ -64,17 +62,9 @@ const char* ffDetectHost(FFHostResult* host)
         if (ffStrbufStartsWithS(&host->name, "Apple "))
             ffStrbufSetStatic(&host->vendor, "Apple Inc.");
     }
+
     #ifdef __x86_64__
-    else if (ffStrbufEqualS(&host->family, "Mac") && ffStrbufEqualS(&host->vendor, "Apple Inc."))
-    {
-        const char* productName = ffHostGetMacProductNameWithHwModel(&host->name);
-        if (productName)
-        {
-            ffStrbufDestroy(&host->family);
-            ffStrbufInitMove(&host->family, &host->name);
-            ffStrbufSetStatic(&host->name, productName);
-        }
-    }
+    ffHostDetectMac(host);
     #endif
 
     //KVM/Qemu virtual machine

src/detection/host/host_mac.c

@@ -1,4 +1,4 @@
-#include "util/FFstrbuf.h"
+#include "host.h"
 #include "util/stringUtils.h"
 
 const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel)
@@ -173,3 +173,21 @@ const char* ffHostGetMacProductNameWithHwModel(const FFstrbuf* hwModel)
     }
     return NULL;
 }
+
+bool ffHostDetectMac(FFHostResult* host)
+{
+    #ifdef __x86_64__
+    if (ffStrbufEqualS(&host->family, "Mac") && ffStrbufEqualS(&host->vendor, "Apple Inc."))
+    {
+        const char* productName = ffHostGetMacProductNameWithHwModel(&host->name);
+        if (productName)
+        {
+            ffStrbufDestroy(&host->family);
+            ffStrbufInitMove(&host->family, &host->name);
+            ffStrbufSetStatic(&host->name, productName);
+            return true;
+        }
+    }
+    #endif
+    return false;
+}

src/detection/host/host_windows.c

@@ -72,5 +72,9 @@ const char* ffDetectHost(FFHostResult* host)
         ffCleanUpSmbiosValue(&host->family);
     }
 
+    #ifdef __x86_64__
+    ffHostDetectMac(host);
+    #endif
+
     return NULL;
 }