Add native OpenBSD support for mute/volume

[slstatus.git] / components / temperature.c

diff --git a/components/temperature.c b/components/temperature.c
index 720f1b7..8462d0f 100644 (file)
--- a/components/temperature.c
+++ b/components/temperature.c
@@ -3,25 +3,29 @@
 
 #include "../util.h"
 
+
 #if defined(__linux__)
+       #include <stdint.h>
+
        const char *
        temp(const char *file)
        {
-               int temp;
+               uintmax_t temp;
 
-               return (pscanf(file, "%d", &temp) == 1) ?
-                      bprintf("%d", temp / 1000) : NULL;
+               if (pscanf(file, "%ju", &temp) != 1) {
+                       return NULL;
+               }
+
+               return bprintf("%ju", temp / 1000);
        }
 #elif defined(__OpenBSD__)
-       #include <errno.h>
        #include <stdio.h>
-       #include <string.h>
-       #include <sys/sysctl.h>
-       #include <sys/time.h>
+       #include <sys/time.h> /* before <sys/sensors.h> for struct timeval */
        #include <sys/sensors.h>
+       #include <sys/sysctl.h>
 
        const char *
-       temp(const char *null)
+       temp(const char *unused)
        {
                int mib[5];
                size_t size;
@@ -36,12 +40,32 @@
                size = sizeof(temp);
 
                if (sysctl(mib, 5, &temp, &size, NULL, 0) < 0) {
-                       fprintf(stderr, "sysctl 'SENSOR_TEMP': %s\n",
-                               strerror(errno));
+                       warn("sysctl 'SENSOR_TEMP':");
                        return NULL;
                }
 
                /* kelvin to celsius */
-               return bprintf("%d", (temp.value - 273150000) / 1000000);
+               return bprintf("%d", (temp.value - 273150000) / 1E6);
+       }
+#elif defined(__FreeBSD__)
+       #include <stdio.h>
+       #include <stdlib.h>
+       #include <sys/sysctl.h>
+
+       const char *
+       temp(const char *zone)
+       {
+               char buf[256];
+               int temp;
+               size_t len;
+
+               len = sizeof(temp);
+               snprintf(buf, sizeof(buf), "hw.acpi.thermal.%s.temperature", zone);
+               if (sysctlbyname(buf, &temp, &len, NULL, 0) == -1
+                               || !len)
+                       return NULL;
+
+               /* kelvin to decimal celcius */
+               return bprintf("%d.%d", (temp - 2731) / 10, abs((temp - 2731) % 10));
        }
 #endif