From 1cf03e463a0d75a8ba7cb610fd735e83dbff9d09 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@hyperic.com>
Date: Fri, 2 Dec 2005 01:12:51 +0000
Subject: [PATCH] unhardcode powerpc as the cpu model

---
 src/os/darwin/darwin_sigar.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/os/darwin/darwin_sigar.c b/src/os/darwin/darwin_sigar.c
index 703a4194..5664afb8 100644
--- a/src/os/darwin/darwin_sigar.c
+++ b/src/os/darwin/darwin_sigar.c
@@ -1362,10 +1362,19 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
     }
 
     size = sizeof(model);
-    if (sysctlbyname("hw.model", &model, &size, NULL, 0) == -1) {
-        strcpy(model, "Unknown");
+    if (sysctlbyname("hw.model", &model, &size, NULL, 0) < 0) {
+        int mib[] = { CTL_HW, HW_MODEL };
+        size = sizeof(model);
+        if (sysctl(mib, NMIB(mib), &model[0], &size, NULL, 0) < 0) {
+#ifdef DARWIN
+            strcpy(model, "powerpc");
+#else
+            strcpy(model, "Unknown");
+#endif
+        }
     }
-    else if ((ptr = strchr(model, ' '))) {
+
+    if ((ptr = strchr(model, ' '))) {
         *ptr = '\0';
         if (strstr(model, "Intel")) {
             SIGAR_SSTRCPY(vendor, "Intel");
@@ -1389,12 +1398,12 @@ int sigar_cpu_info_list_get(sigar_t *sigar,
         info = &cpu_infos->data[cpu_infos->number++];
 #ifdef DARWIN
         SIGAR_SSTRCPY(info->vendor, "Apple");
-        SIGAR_SSTRCPY(info->model, "powerpc");
 #else
         SIGAR_SSTRCPY(info->vendor, vendor);
+#endif
         SIGAR_SSTRCPY(info->model, model);
         sigar_cpu_model_adjust(sigar, info);
-#endif
+
         info->mhz = mhz;
         info->cache_size = SIGAR_FIELD_NOTIMPL;
     }