diff options
Diffstat (limited to 'plugin_cpuinfo.c')
| -rw-r--r-- | plugin_cpuinfo.c | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/plugin_cpuinfo.c b/plugin_cpuinfo.c index b3c7cda..76e7233 100644 --- a/plugin_cpuinfo.c +++ b/plugin_cpuinfo.c @@ -1,9 +1,9 @@ -/* $Id: plugin_cpuinfo.c 728 2007-01-14 11:14:38Z michael $ - * $URL: https://ssl.bulix.org/svn/lcd4linux/branches/0.10.1/plugin_cpuinfo.c $ +/* $Id: plugin_cpuinfo.c 1079 2010-01-15 21:44:04Z volker $ + * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/plugin_cpuinfo.c $ * * plugin for /proc/cpuinfo parsing * - * Copyright (C) 2003 Michael Reinelt <reinelt@eunet.at> + * Copyright (C) 2003 Michael Reinelt <michael@reinelt.co.at> * Copyright (C) 2004 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net> * * This file is part of LCD4Linux. @@ -45,11 +45,15 @@ #include "plugin.h" #include "hash.h" +#ifdef __MAC_OS_X_VERSION_10_3 +#include <sys/types.h> +#include <sys/sysctl.h> +#endif static HASH CPUinfo; static FILE *stream = NULL; -static int parse_cpuinfo(void) +static int parse_cpuinfo(char *oid) { int age; @@ -58,6 +62,10 @@ static int parse_cpuinfo(void) if (age > 0 && age <= 1000) return 0; +#ifndef __MAC_OS_X_VERSION_10_3 + + /* Linux Kernel, /proc-filesystem */ + if (stream == NULL) stream = fopen("/proc/cpuinfo", "r"); if (stream == NULL) { @@ -93,6 +101,34 @@ static int parse_cpuinfo(void) hash_put(&CPUinfo, key, val); } + /* to avoid compiler unused warning */ + oid = 0; + +#else + + /* MACH Kernel, MacOS X */ + + char val_ret[256]; + int *val; + size_t val_len; + + if (sysctlbyname(oid, NULL, &val_len, NULL, 0) != 0) { + error("Error %d by sysctl(%s): %s", errno, oid, strerror(errno)); + return -1; + } + if (val_len > sizeof(val_ret)) { + error("Error: Result of sysctl(%s) too big (%zd > %zd)!", oid, val_len, sizeof(val_ret)); + return -1; + } + sysctlbyname(oid, &val_ret, &val_len, NULL, 0); + if (val_len == sizeof(int)) { + /* we got an integer instead of a string */ + val = (int *) val_ret; + snprintf(val_ret, sizeof(val_ret), "%d", *val); + } + hash_put(&CPUinfo, oid, val_ret); +#endif + return 0; } @@ -101,12 +137,12 @@ static void my_cpuinfo(RESULT * result, RESULT * arg1) { char *key, *val; - if (parse_cpuinfo() < 0) { + key = R2S(arg1); + if (parse_cpuinfo(key) < 0) { SetResult(&result, R_STRING, ""); return; } - key = R2S(arg1); val = hash_get(&CPUinfo, key, NULL); if (val == NULL) val = ""; |