add extra error tests to swap_*() && fix bytes_read bug

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 329093f..ac09c9f 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -75,7 +75,7 @@ static void usage(void);
 
 char *argv0;
 char concat[];
-static unsigned short int delay;
+static unsigned short int delay = 0;
 static unsigned short int done;
 static unsigned short int dflag, oflag;
 static Display *dpy;
@@ -164,7 +164,7 @@ cpu_perc(void)
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
-       delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
+       delay++;
        sleep(delay);
 
        fp = fopen("/proc/stat", "r");
@@ -407,7 +407,7 @@ run_command(const char *cmd)
 {
        char *nlptr;
        FILE *fp;
-       char buf[1024] = "n/a";
+       char buf[1024] = UNKNOWN_STR;
 
        fp = popen(cmd, "r");
        if (fp == NULL) {
@@ -439,21 +439,24 @@ swap_free(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf(UNKNOWN_STR);
        }
-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+               warn("swap_free: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
        buf[bytes_read] = '\0';
        fclose(fp);
-       if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-               warn("Failed to read /proc/meminfo\n");
-               return smprintf(UNKNOWN_STR);
-       }
 
-       match = strstr(buf, "SwapTotal");
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-       if (total == 0) {
-               return smprintf(UNKNOWN_STR);
+       if ((match = strstr(buf, "SwapTotal")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
        }
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-       match = strstr(buf, "SwapFree");
+       if ((match = strstr(buf, "SwapFree")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
+       }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%f", (float)free / 1024 / 1024);
@@ -473,24 +476,29 @@ swap_perc(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf(UNKNOWN_STR);
        }
-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+               warn("swap_perc: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
        buf[bytes_read] = '\0';
        fclose(fp);
-       if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-               warn("Failed to read /proc/meminfo\n");
-               return smprintf(UNKNOWN_STR);
-       }
 
-       match = strstr(buf, "SwapTotal");
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-       if (total == 0) {
-               return smprintf(UNKNOWN_STR);
+       if ((match = strstr(buf, "SwapTotal")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
        }
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-       match = strstr(buf, "SwapCached");
+       if ((match = strstr(buf, "SwapCached")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
+       }
        sscanf(match, "SwapCached: %ld kB\n", &cached);
 
-       match = strstr(buf, "SwapFree");
+       if ((match = strstr(buf, "SwapFree")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
+       }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%d%%", 100 * (total - free - cached) / total);
@@ -510,19 +518,19 @@ swap_total(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf(UNKNOWN_STR);
        }
-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+               warn("swap_total: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
        buf[bytes_read] = '\0';
        fclose(fp);
-       if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-               warn("Failed to read /proc/meminfo\n");
-               return smprintf(UNKNOWN_STR);
-       }
 
-       match = strstr(buf, "SwapTotal");
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-       if (total == 0) {
-               return smprintf(UNKNOWN_STR);
+       if ((match = strstr(buf, "SwapTotal")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
        }
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
 
        return smprintf("%f", (float)total / 1024 / 1024);
 }
@@ -541,24 +549,28 @@ swap_used(void)
                warn("Failed to open file /proc/meminfo");
                return smprintf(UNKNOWN_STR);
        }
-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+               warn("swap_used: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
        buf[bytes_read] = '\0';
        fclose(fp);
-       if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-               warn("Failed to read /proc/meminfo\n");
-               return smprintf(UNKNOWN_STR);
-       }
 
-       match = strstr(buf, "SwapTotal");
-       sscanf(match, "SwapTotal: %ld kB\n", &total);
-       if (total == 0) {
-               return smprintf(UNKNOWN_STR);
+       if ((match = strstr(buf, "SwapTotal")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
        }
+       sscanf(match, "SwapTotal: %ld kB\n", &total);
 
-       match = strstr(buf, "SwapCached");
+       if ((match = strstr(buf, "SwapCached")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
+       }
        sscanf(match, "SwapCached: %ld kB\n", &cached);
 
-       match = strstr(buf, "SwapFree");
+       if ((match = strstr(buf, "SwapFree")) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);
+       }
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
@@ -829,8 +841,13 @@ main(int argc, char *argv[])
                 * subtract delay time spend in function
                 * calls from the actual global delay time
                 */
-               sleep(UPDATE_INTERVAL - delay);
-               delay = 0;
+               if ((UPDATE_INTERVAL - delay) <= 0) {
+                       delay = 0;
+                       continue;
+               } else {
+                       sleep(UPDATE_INTERVAL - delay);
+                       delay = 0;
+               }
        }
 
        if (!oflag) {