Make sure colorful_output variable is initialized.

[i3/i3status] / src / print_cpu_temperature.c

diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c
index 25b45f68489bcdef2088309dac50fd443aff67a7..e25cea5b6b1772e5ba0bd7741fc3fdb30691c37f 100644 (file)
--- a/src/print_cpu_temperature.c
+++ b/src/print_cpu_temperature.c
@@ -8,7 +8,7 @@
 
 #include "i3status.h"
 
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
 #include <err.h>
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -16,6 +16,17 @@
 #define TZ_KELVTOC(x) (((x) - TZ_ZEROC) / 10), abs(((x) - TZ_ZEROC) % 10)
 #endif
 
+#if defined(__OpenBSD__)
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <sys/sensors.h>
+#include <errno.h>
+#include <err.h>
+
+#define MUKTOC(v) ((v - 273150000) / 1000000.0)
+#endif
+
 static char *thermal_zone;
 
 /*
@@ -23,16 +34,17 @@ static char *thermal_zone;
  * returns the temperature in degree celcius.
  *
  */
-void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format) {
+void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int max_threshold) {
 #ifdef THERMAL_ZONE
         const char *walk;
         char *outwalk = buffer;
-        static char buf[16];
+        bool colorful_output = false;
 
-        if (path == NULL) {
+        if (path == NULL)
                 asprintf(&thermal_zone, THERMAL_ZONE, zone);
-                path = thermal_zone;
-        }
+        else
+                asprintf(&thermal_zone, path, zone);
+        path = thermal_zone;
 
         INSTANCE(path);
 
@@ -44,29 +56,83 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
 
                 if (BEGINS_WITH(walk+1, "degrees")) {
 #if defined(LINUX)
+                       static char buf[16];
                         long int temp;
                         if (!slurp(path, buf, sizeof(buf)))
                                 goto error;
                         temp = strtol(buf, NULL, 10);
                         if (temp == LONG_MIN || temp == LONG_MAX || temp <= 0)
                                 *(outwalk++) = '?';
-                        else
+                        else {
+                                if ((temp/1000) >= max_threshold) {
+                                        START_COLOR("color_bad");
+                                        colorful_output = true;
+                                }
                                 outwalk += sprintf(outwalk, "%ld", (temp/1000));
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+                                if (colorful_output) {
+                                        END_COLOR;
+                                        colorful_output = false;
+                                }
+                        }
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
                         int sysctl_rslt;
                         size_t sysctl_size = sizeof(sysctl_rslt);
                         if (sysctlbyname(path, &sysctl_rslt, &sysctl_size, NULL, 0))
                                 goto error;
 
                         outwalk += sprintf(outwalk, "%d.%d", TZ_KELVTOC(sysctl_rslt));
+#elif defined(__OpenBSD__)
+       struct sensordev sensordev;
+       struct sensor sensor;
+       size_t sdlen, slen;
+       int dev, numt, mib[5] = { CTL_HW, HW_SENSORS, 0, 0, 0 };
+
+       sdlen = sizeof(sensordev);
+       slen = sizeof(sensor);
+
+       for (dev = 0; ; dev++) {
+               mib[2] = dev;
+               if (sysctl(mib, 3, &sensordev, &sdlen, NULL, 0) == -1) {
+                       if (errno == ENXIO)
+                               continue;
+                       if (errno == ENOENT)
+                               break;
+                       goto error;
+               }
+               /* 'path' is the node within the full path (defaults to acpitz0). */
+               if (strncmp(sensordev.xname, path, strlen(path)) == 0) {
+                       mib[3] = SENSOR_TEMP;
+                       /* Limit to temo0, but should retrieve from a full path... */
+                       for (numt = 0; numt < 1 /*sensordev.maxnumt[SENSOR_TEMP]*/; numt++) {
+                               mib[4] = numt;
+                               if (sysctl(mib, 5, &sensor, &slen, NULL, 0) == -1) {
+                                       if (errno != ENOENT) {
+                                               warn("sysctl");
+                                               continue;
+                                       }
+                               }
+                               if ((int)MUKTOC(sensor.value) >= max_threshold) {
+                                       START_COLOR("color_bad");
+                                       colorful_output = true;
+                               }
+
+                               outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value));
+
+                               if (colorful_output) {
+                                       END_COLOR;
+                                        colorful_output = false;
+                                }
+                       }
+               }
+       }
 #endif
                         walk += strlen("degrees");
                 }
         }
-
         OUTPUT_FULL_TEXT(buffer);
         return;
 error:
 #endif
-        (void)fputs("Cannot read temperature\n", stderr);
+        OUTPUT_FULL_TEXT("cant read temp");
+        (void)fputs("i3status: Cannot read temperature. Verify that you have a thermal zone in /sys/class/thermal or disable the cpu_temperature module in your i3status config.\n", stderr);
 }