README: refer to cr.i3wm.org for patches

[i3/i3status] / src / print_cpu_temperature.c

diff --git a/src/print_cpu_temperature.c b/src/print_cpu_temperature.c
index e3340f6e66c1c8f775c11b8ab435ca87855a83ab..0e02070085c37a76495e2b6b0245f5aa4f2586ec 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>
@@ -38,7 +38,7 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
 #ifdef THERMAL_ZONE
         const char *walk;
         char *outwalk = buffer;
-       bool colorful_output;
+        bool colorful_output = false;
 
         if (path == NULL)
                 asprintf(&thermal_zone, THERMAL_ZONE, zone);
@@ -56,7 +56,7 @@ 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];
+                        static char buf[16];
                         long int temp;
                         if (!slurp(path, buf, sizeof(buf)))
                                 goto error;
@@ -69,10 +69,12 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
                                         colorful_output = true;
                                 }
                                 outwalk += sprintf(outwalk, "%ld", (temp/1000));
-                                if (colorful_output)
+                                if (colorful_output) {
                                         END_COLOR;
+                                        colorful_output = false;
+                                }
                         }
-#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+#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))
@@ -80,47 +82,49 @@ void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const
 
                         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 };
+        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);
+        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;
-                               }
+        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));
+                                outwalk += sprintf(outwalk, "%.2f", MUKTOC(sensor.value));
 
-                               if (colorful_output)
-                                       END_COLOR;
-                       }
-               }
-       }
+                                if (colorful_output) {
+                                        END_COLOR;
+                                        colorful_output = false;
+                                }
+                        }
+                }
+        }
 #endif
                         walk += strlen("degrees");
                 }