Experimental RSS code.

[monky] / src / freebsd.c

diff --git a/src/freebsd.c b/src/freebsd.c
index d40f233..e27f480 100644 (file)
--- a/src/freebsd.c
+++ b/src/freebsd.c
@@ -424,6 +424,20 @@ get_battery_stuff(char *buf, unsigned int n, const char *bat, int item)
 }
 
 int
+get_battery_perct(const char *bat)
+{
+       /* not implemented */
+       return (0);
+}
+
+int
+get_battery_perct_bar(const char *bar)
+{
+       /* not implemented */
+       return (0);
+}
+
+int
 open_i2c_sensor(const char *dev, const char *type, int n, int *div,
                char *devtype)
 {
@@ -530,7 +544,7 @@ get_freq_dynamic(char *p_client_buffer, size_t client_buffer_size,
        snprintf(p_client_buffer, client_buffer_size, p_format,
                (float)((cycles[1] - cycles[0]) / microseconds) / divisor);
 #else
-       get_freq(p_client_buffer, client_buffer_size, p_format, divisor);
+       get_freq(p_client_buffer, client_buffer_size, p_format, divisor, 1);
 #endif
 }
 
@@ -805,28 +819,38 @@ char
        int fd;
        struct apm_info info;
 
+       out = (char *)calloc(16, sizeof (char));
+
        fd = open(APMDEV, O_RDONLY);
-       if (fd < 0)
-               return ("ERR");
+       if (fd < 0) {
+               strncpy(out, "ERR", 16);
+               return (out);
+       }
 
        if (apm_getinfo(fd, &info) != 0) {
                close(fd);
-               return ("ERR");
+               strncpy(out, "ERR", 16);
+               return (out);
        }
        close(fd);
 
        switch (info.ai_acline) {
                case 0:
-                       return ("off-line");
+                       strncpy(out, "off-line", 16);
+                       return (out);
                        break;
                case 1:
-                       if (info.ai_batt_stat == 3)
-                               return ("charging");
-                       else
-                               return ("on-line");
+                       if (info.ai_batt_stat == 3) {
+                               strncpy(out, "charging", 16);
+                               return (out);
+                       } else {
+                               strncpy(out, "on-line", 16);
+                               return (out);
+                       }
                        break;
                default:
-                       return ("unknown");
+                       strncpy(out, "unknown", 16);
+                       return (out);
                        break;
        }
 }