whhops

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index f39a2dc..21cda51 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -20,6 +20,7 @@
 #include <sys/socket.h>
 #include <sys/sysinfo.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
@@ -29,7 +30,6 @@
 
 #include "extern/arg.h"
 #include "extern/strlcat.h"
-#include "extern/strlcpy.h"
 #include "extern/concat.h"
 
 struct arg {
@@ -68,6 +68,7 @@ static char *username(void);
 static char *vol_perc(const char *card);
 static char *wifi_perc(const char *iface);
 static char *wifi_essid(const char *iface);
+static char *kernel_release(void);
 static void set_status(const char *str);
 static void sighandler(const int signo);
 static void usage(void);
@@ -424,7 +425,7 @@ run_command(const char *cmd)
 static char *
 swap_free(void)
 {
-       long free;
+       long total, free;
        FILE *fp;
        char buf[2048];
        size_t bytes_read;
@@ -443,6 +444,12 @@ swap_free(void)
                return smprintf(UNKNOWN_STR);
        }
 
+       match = strstr(buf, "SwapTotal");
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
+       if (total == 0) {
+               return smprintf(UNKNOWN_STR);
+       }
+
        match = strstr(buf, "SwapFree");
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
@@ -471,11 +478,14 @@ swap_perc(void)
                return smprintf(UNKNOWN_STR);
        }
 
-       match = strstr(buf, "SwapCached");
-       sscanf(match, "SwapCached: %ld kB\n", &cached);
-
        match = strstr(buf, "SwapTotal");
        sscanf(match, "SwapTotal: %ld kB\n", &total);
+       if (total == 0) {
+               return smprintf(UNKNOWN_STR);
+       }
+
+       match = strstr(buf, "SwapCached");
+       sscanf(match, "SwapCached: %ld kB\n", &cached);
 
        match = strstr(buf, "SwapFree");
        sscanf(match, "SwapFree: %ld kB\n", &free);
@@ -507,6 +517,9 @@ swap_total(void)
 
        match = strstr(buf, "SwapTotal");
        sscanf(match, "SwapTotal: %ld kB\n", &total);
+       if (total == 0) {
+               return smprintf(UNKNOWN_STR);
+       }
 
        return smprintf("%f", (float)total / 1024 / 1024);
 }
@@ -533,11 +546,14 @@ swap_used(void)
                return smprintf(UNKNOWN_STR);
        }
 
-       match = strstr(buf, "SwapCached");
-       sscanf(match, "SwapCached: %ld kB\n", &cached);
-
        match = strstr(buf, "SwapTotal");
        sscanf(match, "SwapTotal: %ld kB\n", &total);
+       if (total == 0) {
+               return smprintf(UNKNOWN_STR);
+       }
+
+       match = strstr(buf, "SwapCached");
+       sscanf(match, "SwapCached: %ld kB\n", &cached);
 
        match = strstr(buf, "SwapFree");
        sscanf(match, "SwapFree: %ld kB\n", &free);
@@ -706,6 +722,16 @@ wifi_essid(const char *iface)
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
+static char *
+kernel_release(void)
+{
+       struct utsname udata;
+       if (uname(&udata) < 0)
+               return smprintf(UNKNOWN_STR);
+
+       return smprintf("%s", udata.release);
+}
+
 static void
 set_status(const char *str)
 {
@@ -732,7 +758,7 @@ int
 main(int argc, char *argv[])
 {
        unsigned short int i;
-       char status_string[4096];
+       char status_string[2048];
        char *res, *element;
        struct arg argument;
        struct sigaction act;
@@ -784,7 +810,8 @@ main(int argc, char *argv[])
                                element = smprintf(UNKNOWN_STR);
                                warnx("Failed to format output");
                        }
-                       strlcat(status_string, element, sizeof(status_string));
+                       if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string))
+                               warnx("Output too long");
                        free(res);
                        free(element);
                }