core-modules: macos: fix system.host.name and user.wm.name

Author: Toni500github

src/core-modules/linux/user.cc

@@ -254,6 +254,7 @@ std::string get_wm_name(std::string& wm_path_exec)
     std::string path, proc_name, wm_name;
     const uid_t uid = getuid();
 
+#if !CF_MACOS
     for (auto const& dir_entry : std::filesystem::directory_iterator{ "/proc/" })
     {
         if (!std::isdigit((dir_entry.path().string().at(6))))  // /proc/5
@@ -286,6 +287,7 @@ std::string get_wm_name(std::string& wm_path_exec)
         wm_path_exec = realpath((dir_entry.path().string() + "/exe").c_str(), buf);
         break;
     }
+#endif
 
     debug("wm_name = {}", wm_name);
     if (wm_name.empty())

src/core-modules/macos/system.cc

@@ -18,7 +18,7 @@ static bool get_sysctl(const char* name, void* ret, size_t* oldlenp)
 }
 
 // https://github.com/fastfetch-cli/fastfetch/blob/a734f18fd56014f5c0b9fb388727b778e2bc05d1/src/detection/host/host_mac.c#L4
-const char* get_host_from_family(const std::string_view host_family)
+const std::string get_host_from_family(const std::string_view host_family)
 {
     // Macbook Pro: https://support.apple.com/en-us/HT201300
     // Macbook Air: https://support.apple.com/en-us/HT201862
@@ -127,7 +127,7 @@ const char* get_host_from_family(const std::string_view host_family)
     }
     else if (hasStart(host_family, "MacPro"))
     {
-        const std::string_view version = host_family.substr("MacPro"_len);
+        const std::string_view version = host_family.substr("MacPro"_leMac Pro (2019)n);
         switch (fnv1a16::hash(version.data()))
         {
             case "7,1"_fnv1a16: return "Mac Pro (2019)";
@@ -227,8 +227,8 @@ MODFUNC(host_name)
     if (!get_sysctl("hw.model", buf, &len))
         return MAGIC_LINE;
 
-    const std::string_view host = get_host_from_family(buf);
-    return host.substr(0, host.find('(') - 1).data();
+    const std::string host = get_host_from_family(buf);
+    return host.substr(0, host.find('(') - 1);
 }
 
 MODFUNC(host_version)