bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use Gestalt for versions in sys_info

This commit is contained in:
Doug MacEachern 2006-09-26 13:32:45 +00:00
parent d93c43fa9b
commit 852c61e493
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/os/darwin/darwin_sigar.c
View File

@ -31,6 +31,7 @@
#include <mach/task.h> #include <mach/task.h>
#include <mach/vm_map.h> #include <mach/vm_map.h>
#include <mach/shared_memory_server.h> #include <mach/shared_memory_server.h>
#include <Gestalt.h>
#else #else
#include <sys/dkstat.h> #include <sys/dkstat.h>
#include <sys/types.h> #include <sys/types.h>
@ -2187,19 +2188,49 @@ int sigar_os_sys_info_get(sigar_t *sigar,
{ {
#ifdef DARWIN #ifdef DARWIN
char *codename = NULL; char *codename = NULL;
long version_major, version_minor, version_fix;
SIGAR_SSTRCPY(sysinfo->name, "MacOSX"); SIGAR_SSTRCPY(sysinfo->name, "MacOSX");
SIGAR_SSTRCPY(sysinfo->vendor_name, "Mac OS X");
SIGAR_SSTRCPY(sysinfo->vendor, "Apple"); SIGAR_SSTRCPY(sysinfo->vendor, "Apple");
if (strnEQ(sysinfo->version, "10.4", 4)) { Gestalt(gestaltSystemVersionMajor, &version_major);
codename = "Tiger"; Gestalt(gestaltSystemVersionMinor, &version_minor);
Gestalt(gestaltSystemVersionBugFix, &version_fix);
sprintf(sysinfo->vendor_version, "%ld.%ld",
version_major, version_minor);
sprintf(sysinfo->version, "%s.%ld",
sysinfo->vendor_version, version_fix);
if (version_major == 10) {
switch (version_minor) {
case 2:
codename = "Jaguar";
break;
case 3:
codename = "Panther";
break;
case 4:
codename = "Tiger";
break;
case 5:
codename = "Leopard";
break;
default:
codename = "Unknown";
break;
}
} }
else if (strnEQ(sysinfo->version, "10.3", 4)) { else {
codename = "Panther"; return SIGAR_ENOTIMPL;
} }
if (codename) { SIGAR_SSTRCPY(sysinfo->vendor_code_name, codename);
SIGAR_SSTRCPY(sysinfo->vendor_code_name, codename);
} sprintf(sysinfo->description, "%s %s",
sysinfo->vendor_name, sysinfo->vendor_code_name);
#else #else
#endif #endif