username(): get rid of unneeded uid variable

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index d580ac0..5500a62 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -25,13 +25,7 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 
 #include <unistd.h>
 #include <X11/Xlib.h>
 

-#undef strlcat
-#undef strlcpy
-
-#include "extern/arg.h"
-#include "extern/strlcat.h"
-#include "extern/strlcpy.h"
-#include "extern/concat.h"
+#include "arg.h"

 
 struct arg {
        char *(*func)();
 
 struct arg {
        char *(*func)();


@@ -52,6 +46,8 @@ static char *entropy(void);
 static char *gid(void);
 static char *hostname(void);
 static char *ip(const char *iface);
 static char *gid(void);
 static char *hostname(void);
 static char *ip(const char *iface);

+static char *kernel_release(void);
+static char *keyboard_indicators(void);

 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);
 static char *load_avg(void);
 static char *ram_free(void);
 static char *ram_perc(void);


@@ -69,14 +65,11 @@ 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 *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 sighandler(const int signo);

-static void usage(void);
+static void usage(const int eval);

 
 char *argv0;
 
 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;
 static unsigned short int done;
 static unsigned short int dflag, oflag;
 static Display *dpy;


@@ -110,13 +103,14 @@ static char *
 battery_perc(const char *bat)
 {
        int perc;
 battery_perc(const char *bat)
 {
        int perc;

+       char path[PATH_MAX];

        FILE *fp;
 
        FILE *fp;
 

-       ccat(3, "/sys/class/power_supply/", bat, "/capacity");
-       fp = fopen(concat, "r");
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
+       fp = fopen(path, "r");

        if (fp == NULL) {
        if (fp == NULL) {

-               warn("Failed to open file %s", concat);
-               return smprintf(UNKNOWN_STR);
+               warn("Failed to open file %s", path);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%i", &perc);
        fclose(fp);
        }
        fscanf(fp, "%i", &perc);
        fclose(fp);


@@ -127,14 +121,15 @@ battery_perc(const char *bat)
 static char *
 battery_state(const char *bat)
 {
 static char *
 battery_state(const char *bat)
 {

+       char path[PATH_MAX];

        char state[12];
        FILE *fp;
 
        char state[12];
        FILE *fp;
 

-       ccat(3, "/sys/class/power_supply/", bat, "/status");
-       fp = fopen(concat, "r");
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
+       fp = fopen(path, "r");

        if (fp == NULL) {
        if (fp == NULL) {

-               warn("Failed to open file %s", concat);
-               return smprintf(UNKNOWN_STR);
+               warn("Failed to open file %s", path);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%12s", state);
        fclose(fp);
        }
        fscanf(fp, "%12s", state);
        fclose(fp);


@@ -145,6 +140,8 @@ battery_state(const char *bat)
                return smprintf("-");
        } else if (strcmp(state, "Full") == 0) {
                return smprintf("=");
                return smprintf("-");
        } else if (strcmp(state, "Full") == 0) {
                return smprintf("=");

+       } else if (strcmp(state, "Unknown") == 0) {
+               return smprintf("/");

        } else {
                return smprintf("?");
        }
        } else {
                return smprintf("?");
        }


@@ -160,18 +157,18 @@ cpu_perc(void)
        fp = fopen("/proc/stat", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/stat");
        fp = fopen("/proc/stat", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/stat");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
        fclose(fp);
 
        }
        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");
        if (fp == NULL) {
                warn("Failed to open file /proc/stat");
        sleep(delay);
 
        fp = fopen("/proc/stat", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/stat");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
        fclose(fp);
        }
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
        fclose(fp);


@@ -188,7 +185,7 @@ datetime(const char *fmt)
 
        t = time(NULL);
        if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {
 
        t = time(NULL);
        if (strftime(str, sizeof(str), fmt, localtime(&t)) == 0) {

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%s", str);
        }
 
        return smprintf("%s", str);


@@ -201,7 +198,7 @@ disk_free(const char *mnt)
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
        }
 
        return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);


@@ -215,7 +212,7 @@ disk_perc(const char *mnt)
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
        }
 
        perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));


@@ -230,7 +227,7 @@ disk_total(const char *mnt)
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
        }
 
        return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);


@@ -243,7 +240,7 @@ disk_used(const char *mnt)
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");
 
        if (statvfs(mnt, &fs) < 0) {
                warn("Failed to get filesystem info");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
        }
 
        return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);


@@ -258,7 +255,7 @@ entropy(void)
        fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
        fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/sys/kernel/random/entropy_avail");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%d", &num);
        fclose(fp);
        }
        fscanf(fp, "%d", &num);
        fclose(fp);


@@ -279,7 +276,7 @@ hostname(void)
 
        if (gethostname(buf, sizeof(buf)) == -1) {
                warn("hostname");
 
        if (gethostname(buf, sizeof(buf)) == -1) {
                warn("hostname");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%s", buf);
        }
 
        return smprintf("%s", buf);


@@ -294,7 +291,7 @@ ip(const char *iface)
 
        if (getifaddrs(&ifaddr) == -1) {
                warn("Failed to get IP address for interface %s", iface);
 
        if (getifaddrs(&ifaddr) == -1) {
                warn("Failed to get IP address for interface %s", iface);

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
        }
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {


@@ -305,7 +302,7 @@ ip(const char *iface)
                if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {
                                warnx("Failed to get IP address for interface %s", iface);
                if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {
                                warnx("Failed to get IP address for interface %s", iface);

-                               return smprintf(UNKNOWN_STR);
+                               return smprintf("%s", UNKNOWN_STR);

                        }
                        return smprintf("%s", host);
                }
                        }
                        return smprintf("%s", host);
                }


@@ -313,7 +310,42 @@ ip(const char *iface)
 
        freeifaddrs(ifaddr);
 
 
        freeifaddrs(ifaddr);
 

-       return smprintf(UNKNOWN_STR);
+       return smprintf("%s", UNKNOWN_STR);
+}
+
+static char *
+kernel_release(void)
+{
+       struct utsname udata;
+
+       if (uname(&udata) < 0) {
+               return smprintf(UNKNOWN_STR);
+       }
+
+       return smprintf("%s", udata.release);
+}
+
+static char *
+keyboard_indicators(void)
+{
+       Display *dpy = XOpenDisplay(NULL);
+       XKeyboardState state;
+       XGetKeyboardControl(dpy, &state);
+       XCloseDisplay(dpy);
+
+       switch (state.led_mask) {
+               case 1:
+                       return smprintf("c");
+                       break;
+               case 2:
+                       return smprintf("n");
+                       break;
+               case 3:
+                       return smprintf("cn");
+                       break;
+               default:
+                       return smprintf("");
+       }

 }
 
 static char *
 }
 
 static char *


@@ -323,7 +355,7 @@ load_avg(void)
 
        if (getloadavg(avgs, 3) < 0) {
                warnx("Failed to get the load avg");
 
        if (getloadavg(avgs, 3) < 0) {
                warnx("Failed to get the load avg");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
        }
 
        return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);


@@ -338,7 +370,7 @@ ram_free(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "MemFree: %ld kB\n", &free);
        fclose(fp);
        }
        fscanf(fp, "MemFree: %ld kB\n", &free);
        fclose(fp);


@@ -355,7 +387,7 @@ ram_perc(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fscanf(fp, "MemFree: %ld kB\n", &free);
        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fscanf(fp, "MemFree: %ld kB\n", &free);


@@ -375,7 +407,7 @@ ram_total(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fclose(fp);
        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fclose(fp);


@@ -392,7 +424,7 @@ ram_used(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fscanf(fp, "MemFree: %ld kB\n", &free);
        }
        fscanf(fp, "MemTotal: %ld kB\n", &total);
        fscanf(fp, "MemFree: %ld kB\n", &free);


@@ -406,19 +438,22 @@ ram_used(void)
 static char *
 run_command(const char *cmd)
 {
 static char *
 run_command(const char *cmd)
 {

+       char *nlptr;

        FILE *fp;
        FILE *fp;

-       char buf[1024] = "n/a";
+       char buf[1024] = UNKNOWN_STR;

 
        fp = popen(cmd, "r");
        if (fp == NULL) {
                warn("Failed to get command output for %s", cmd);
 
        fp = popen(cmd, "r");
        if (fp == NULL) {
                warn("Failed to get command output for %s", cmd);

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       fgets(buf, sizeof(buf)-1, fp);
+       fgets(buf, sizeof(buf), fp);

        pclose(fp);
        pclose(fp);

+       buf[sizeof(buf) - 1] = '\0';

 
 

-       buf[strlen(buf)] = '\0';
-       strtok(buf, "\n");
+       if ((nlptr = strstr(buf, "\n")) != NULL) {
+               nlptr[0] = '\0';
+       }

 
        return smprintf("%s", buf);
 }
 
        return smprintf("%s", buf);
 }


@@ -435,23 +470,26 @@ swap_free(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_free: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+

        buf[bytes_read] = '\0';
        fclose(fp);
        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);
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%f", (float)free / 1024 / 1024);


@@ -469,26 +507,31 @@ swap_perc(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_perc: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+

        buf[bytes_read] = '\0';
        fclose(fp);
        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);
 
        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);
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%d%%", 100 * (total - free - cached) / total);


@@ -506,21 +549,21 @@ swap_total(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_total: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+

        buf[bytes_read] = '\0';
        fclose(fp);
        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);
 }
 
        return smprintf("%f", (float)total / 1024 / 1024);
 }


@@ -537,26 +580,30 @@ swap_used(void)
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");
        fp = fopen("/proc/meminfo", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/meminfo");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);
+       }
+       if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
+               warn("swap_used: read error");
+               fclose(fp);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       bytes_read = fread(buf, sizeof(char), sizeof(buf), fp);
+

        buf[bytes_read] = '\0';
        fclose(fp);
        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);
 
        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);
        sscanf(match, "SwapFree: %ld kB\n", &free);
 
        return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);


@@ -571,7 +618,7 @@ temp(const char *file)
        fp = fopen(file, "r");
        if (fp == NULL) {
                warn("Failed to open file %s", file);
        fp = fopen(file, "r");
        if (fp == NULL) {
                warn("Failed to open file %s", file);

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fscanf(fp, "%d", &temp);
        fclose(fp);
        }
        fscanf(fp, "%d", &temp);
        fclose(fp);


@@ -596,12 +643,11 @@ uptime(void)
 static char *
 username(void)
 {
 static char *
 username(void)
 {

-       uid_t uid = geteuid();
-       struct passwd *pw = getpwuid(uid);
+       struct passwd *pw = getpwuid(geteuid());

 
        if (pw == NULL) {
                warn("Failed to get username");
 
        if (pw == NULL) {
                warn("Failed to get username");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        return smprintf("%s", pw->pw_name);
        }
 
        return smprintf("%s", pw->pw_name);


@@ -628,14 +674,16 @@ vol_perc(const char *card)
        }
 
        ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask);
        }
 
        ioctl(afd, MIXER_READ(SOUND_MIXER_DEVMASK), &devmask);

-       for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++)
-               if (devmask & (1 << i))
-                       if (!strcmp("vol", vnames[i]))
+       for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {
+               if (devmask & (1 << i)) {
+                       if (!strcmp("vol", vnames[i])) {

                                ioctl(afd, MIXER_READ(i), &v);
                                ioctl(afd, MIXER_READ(i), &v);

+                       }
+               }
+       }

 
        close(afd);
 
        close(afd);

-       if (v == 0)
-               return smprintf("mute");
+

        return smprintf("%d%%", v & 0xff);
 }
 
        return smprintf("%d%%", v & 0xff);
 }
 


@@ -645,37 +693,38 @@ wifi_perc(const char *iface)
        int perc;
        char buf[255];
        char *datastart;
        int perc;
        char buf[255];
        char *datastart;

+       char path[PATH_MAX];

        char status[5];
        FILE *fp;
 
        char status[5];
        FILE *fp;
 

-       ccat(3, "/sys/class/net/", iface, "/operstate");
-       fp = fopen(concat, "r");
+       snprintf(path, sizeof(path), "%s%s%s", "/sys/class/net/", iface, "/operstate");
+       fp = fopen(path, "r");

        if (fp == NULL) {
        if (fp == NULL) {

-               warn("Failed to open file %s", concat);
-               return smprintf(UNKNOWN_STR);
+               warn("Failed to open file %s", path);
+               return smprintf("%s", UNKNOWN_STR);

        }
        fgets(status, 5, fp);
        fclose(fp);
        if(strcmp(status, "up\n") != 0) {
        }
        fgets(status, 5, fp);
        fclose(fp);
        if(strcmp(status, "up\n") != 0) {

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        fp = fopen("/proc/net/wireless", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/net/wireless");
        }
 
        fp = fopen("/proc/net/wireless", "r");
        if (fp == NULL) {
                warn("Failed to open file /proc/net/wireless");

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

-       ccat(2, iface, ":");
+

        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
        fclose(fp);
 
        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
        fgets(buf, sizeof(buf), fp);
        fclose(fp);
 

-       datastart = strstr(buf, concat);
-       if (datastart != NULL) {
-               datastart = strstr(buf, ":");
-               sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);
+       if ((datastart = strstr(buf, iface)) == NULL) {
+               return smprintf("%s", UNKNOWN_STR);

        }
        }

+       datastart = (datastart+(strlen(iface)+1));
+       sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &perc);

 
        return smprintf("%d%%", perc);
 }
 
        return smprintf("%d%%", perc);
 }


@@ -689,42 +738,26 @@ wifi_essid(const char *iface)
 
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
 
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;

-       sprintf(wreq.ifr_name, iface);
+       snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
+

        if (sockfd == -1) {
                warn("Failed to get ESSID for interface %s", iface);
        if (sockfd == -1) {
                warn("Failed to get ESSID for interface %s", iface);

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
                warn("Failed to get ESSID for interface %s", iface);
        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
                warn("Failed to get ESSID for interface %s", iface);

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        }
 
        close(sockfd);
 
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
        }
 
        close(sockfd);
 
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)

-               return smprintf(UNKNOWN_STR);
+               return smprintf("%s", UNKNOWN_STR);

        else
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
        else
                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)
-{
-       XStoreName(dpy, DefaultRootWindow(dpy), str);
-       XSync(dpy, False);
-}
-

 static void
 sighandler(const int signo)
 {
 static void
 sighandler(const int signo)
 {


@@ -734,17 +767,17 @@ sighandler(const int signo)
 }
 
 static void
 }
 
 static void

-usage(void)
+usage(const int eval)

 {
 {

-       fprintf(stderr, "usage: %s [-dhov]\n", argv0);
-       exit(1);
+       fprintf(stderr, "usage: %s [-d] [-o] [-v] [-h]\n", argv0);
+       exit(eval);

 }
 
 int
 main(int argc, char *argv[])
 {
        unsigned short int i;
 }
 
 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;
        char *res, *element;
        struct arg argument;
        struct sigaction act;


@@ -757,14 +790,16 @@ main(int argc, char *argv[])
                        oflag = 1;
                        break;
                case 'v':
                        oflag = 1;
                        break;
                case 'v':

-                       printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
+                       printf("slstatus (C) 2016-2017 slstatus engineers\n");

                        return 0;
                        return 0;

+               case 'h':
+                       usage(0);

                default:
                default:

-                       usage();
+                       usage(1);

        } ARGEND
 
        if (dflag && oflag) {
        } ARGEND
 
        if (dflag && oflag) {

-               usage();
+               usage(1);

        }
        if (dflag && daemon(1, 1) < 0) {
                err(1, "daemon");
        }
        if (dflag && daemon(1, 1) < 0) {
                err(1, "daemon");


@@ -793,30 +828,32 @@ main(int argc, char *argv[])
                        }
                        element = smprintf(argument.fmt, res);
                        if (element == NULL) {
                        }
                        element = smprintf(argument.fmt, res);
                        if (element == NULL) {

-                               element = smprintf(UNKNOWN_STR);
+                               element = smprintf("%s", UNKNOWN_STR);

                                warnx("Failed to format output");
                        }
                                warnx("Failed to format output");
                        }

-                       strlcat(status_string, element, sizeof(status_string));
+                       strncat(status_string, element, sizeof(status_string) - strlen(status_string) - 1);

                        free(res);
                        free(element);
                }
 
                if (!oflag) {
                        free(res);
                        free(element);
                }
 
                if (!oflag) {

-                       set_status(status_string);
+                       XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+                       XSync(dpy, False);

                } else {
                        printf("%s\n", status_string);
                }
 
                } else {
                        printf("%s\n", status_string);
                }
 

-               /*
-                * 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) {
        }
 
        if (!oflag) {

-               set_status(NULL);
+               XStoreName(dpy, DefaultRootWindow(dpy), NULL);

                XCloseDisplay(dpy);
        }
 
                XCloseDisplay(dpy);
        }