signal handling to exit gracefully + small coding style fixes

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 5c7659c..cb5f1f2 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,14 +1,14 @@
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>
 /* See LICENSE file for copyright and license details. */
 
 #include <alsa/asoundlib.h>

-#include <arpa/inet.h>
+#include <err.h>

 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
 #include <linux/wireless.h>

-#include <locale.h>

 #include <netdb.h>
 #include <pwd.h>
 #include <netdb.h>
 #include <pwd.h>

+#include <signal.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -28,15 +28,16 @@
 
 #include "strlcat.h"
 #include "strlcpy.h"
 
 #include "strlcat.h"
 #include "strlcpy.h"

+#include "concat.h"
+
+char concat[];

 
 

-typedef char *(*op_fun)();

 struct arg {
 struct arg {

-       op_fun func;
+       char *(*func)();

        const char *format;
        const char *args;
 };
 
        const char *format;
        const char *args;
 };
 

-static void setstatus(const char *);

 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static char *cpu_perc(void);


@@ -62,29 +63,34 @@ static char *username(void);
 static char *vol_perc(const char *);
 static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 static char *vol_perc(const char *);
 static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);

+static void sighandler(const int);

 
 

+static unsigned short int delay;

 static Display *dpy;
 static Display *dpy;

+static int done = 0;

 
 #include "config.h"
 
 
 #include "config.h"
 

-static void
-setstatus(const char *str)
-{
-       /* set WM_NAME via X11 */
-       XStoreName(dpy, DefaultRootWindow(dpy), str);
-       XSync(dpy, False);
-}
-

 static char *
 smprintf(const char *fmt, ...)
 {
 static char *
 smprintf(const char *fmt, ...)
 {

-       va_list fmtargs;
-       char *ret = NULL;
+       va_list ap;
+       char *ret;
+       int len;
+
+       va_start(ap, fmt);
+       len = vsnprintf(NULL, 0, fmt, ap);
+       va_end(ap);

 
 

-       va_start(fmtargs, fmt);
-       if (vasprintf(&ret, fmt, fmtargs) < 0)
-               return NULL;
-       va_end(fmtargs);
+       ret = malloc(++len);
+       if (ret == NULL) {
+               perror("malloc");
+               exit(1);
+       }
+
+       va_start(ap, fmt);
+       vsnprintf(ret, len, fmt, ap);
+       va_end(ap);

 
        return ret;
 }
 
        return ret;
 }


@@ -93,31 +99,25 @@ static char *
 battery_perc(const char *battery)
 {
        int now, full, perc;
 battery_perc(const char *battery)
 {
        int now, full, perc;

-       char batterynowfile[64] = "";
-       char batteryfullfile[64] = "";

        FILE *fp;
 
        FILE *fp;
 

-       strlcat(batterynowfile, batterypath, sizeof(batterynowfile));
-       strlcat(batterynowfile, battery, sizeof(batterynowfile));
-       strlcat(batterynowfile, "/", sizeof(batterynowfile));
-       strlcat(batterynowfile, batterynow, sizeof(batterynowfile));
-
-       strlcat(batteryfullfile, batterypath, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-       strlcat(batteryfullfile, batteryfull, sizeof(batteryfullfile));
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);

 
 

-       if (!(fp = fopen(batterynowfile, "r"))) {
-               fprintf(stderr, "Error opening battery file: %s.\n", batterynowfile);
-               return smprintf(unknowntext);
+       fp = fopen(concat, "r");
+       if (fp == NULL) {
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);

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

-       if (!(fp = fopen(batteryfullfile, "r"))) {
-               fprintf(stderr, "Error opening battery file.\n");
-               return smprintf(unknowntext);
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
+
+       fp = fopen(concat, "r");
+       if (fp == NULL) {
+               warn("Error opening battery file: %s", concat);
+               return smprintf(UNKNOWN_STR);

        }
 
        fscanf(fp, "%i", &full);
        }
 
        fscanf(fp, "%i", &full);


@@ -133,54 +133,43 @@ cpu_perc(void)
 {
        int perc;
        long double a[4], b[4];
 {
        int perc;
        long double a[4], b[4];

-       FILE *fp;
+       FILE *fp = fopen("/proc/stat","r");

 
 

-       if (!(fp = fopen("/proc/stat","r"))) {
-               fprintf(stderr, "Error opening stat file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Error opening stat file");
+               return smprintf(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);
 

-       /* wait a second (for avg values) */
-       sleep(1);
+       delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1));
+       sleep(delay);

 
 

-       if (!(fp = fopen("/proc/stat","r"))) {
-               fprintf(stderr, "Error opening stat file.\n");
-               return smprintf(unknowntext);
+       fp = fopen("/proc/stat","r");
+       if (fp == NULL) {
+               warn("Error opening stat file");
+               return smprintf(UNKNOWN_STR);

        }
 
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
        fclose(fp);
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
        }
 
        fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
        fclose(fp);
        perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));

+

        return smprintf("%d%%", perc);
 }
 
 static char *
 datetime(const char *timeformat)
 {
        return smprintf("%d%%", perc);
 }
 
 static char *
 datetime(const char *timeformat)
 {

-       time_t tm;
-       size_t bufsize = 64;
-       char *buf = malloc(bufsize);
-       if (buf == NULL) {
-               fprintf(stderr, "Failed to get date/time.\n");
-               return smprintf(unknowntext);
-       }
+       time_t t;
+       char timestr[80];

 
 

-       time(&tm);
-       setlocale(LC_TIME, "");
-       if (!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-               setlocale(LC_TIME, "C");
-               free(buf);
-               fprintf(stderr, "Strftime failed.\n");
-               return smprintf(unknowntext);
-       }
+       t = time(NULL);
+       if (strftime(timestr, sizeof(timestr), timeformat, localtime(&t)) == 0)
+               return smprintf(UNKNOWN_STR);

 
 

-       setlocale(LC_TIME, "C");
-       char *ret = smprintf("%s", buf);
-       free(buf);
-       return ret;
+       return smprintf("%s", timestr);

 }
 
 static char *
 }
 
 static char *


@@ -189,9 +178,10 @@ disk_free(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {

-               fprintf(stderr, "Could not get filesystem info.\n");
-               return smprintf(unknowntext);
+               warn("Could not get filesystem info");
+               return smprintf(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);
 }
 


@@ -202,11 +192,12 @@ disk_perc(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {

-               fprintf(stderr, "Could not get filesystem info.\n");
-               return smprintf(unknowntext);
+               warn("Could not get filesystem info");
+               return smprintf(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));

+

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


@@ -216,8 +207,8 @@ disk_total(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {

-               fprintf(stderr, "Could not get filesystem info.\n");
-               return smprintf(unknowntext);
+               warn("Could not get filesystem info");
+               return smprintf(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);


@@ -229,8 +220,8 @@ disk_used(const char *mountpoint)
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {
        struct statvfs fs;
 
        if (statvfs(mountpoint, &fs) < 0) {

-               fprintf(stderr, "Could not get filesystem info.\n");
-               return smprintf(unknowntext);
+               warn("Could not get filesystem info");
+               return smprintf(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);


@@ -240,38 +231,42 @@ static char *
 entropy(void)
 {
        int entropy = 0;
 entropy(void)
 {
        int entropy = 0;

-       FILE *fp;
+       FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");

 
 

-       if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
-               fprintf(stderr, "Could not open entropy file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Could not open entropy file");
+               return smprintf(UNKNOWN_STR);

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

+

        return smprintf("%d", entropy);
 }
 
 static char *
 gid(void)
 {
        return smprintf("%d", entropy);
 }
 
 static char *
 gid(void)
 {

-       gid_t gid = getgid();
-       return smprintf("%d", gid);
+       return smprintf("%d", getgid());

 }
 
 static char *
 hostname(void)
 {
        char hostname[HOST_NAME_MAX];
 }
 
 static char *
 hostname(void)
 {
        char hostname[HOST_NAME_MAX];

-       FILE *fp;
+       FILE *fp = fopen("/proc/sys/kernel/hostname", "r");

 
 

-       if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
-               fprintf(stderr, "Could not open hostname file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Could not open hostname file");
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

-       fscanf(fp, "%s\n", hostname);
+       fgets(hostname, sizeof(hostname), fp);
+       /* FIXME: needs improvement */
+       memset(&hostname[strlen(hostname)-1], '\0',
+               sizeof(hostname) - strlen(hostname));

        fclose(fp);
        fclose(fp);

+

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


@@ -283,30 +278,29 @@ ip(const char *interface)
        char host[NI_MAXHOST];
 
        if (getifaddrs(&ifaddr) == -1) {
        char host[NI_MAXHOST];
 
        if (getifaddrs(&ifaddr) == -1) {

-               fprintf(stderr, "Error getting IP address.\n");
-               return smprintf(unknowntext);
+               warn("Error getting IP address");
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

-       /* get the ip address */

        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                if (ifa->ifa_addr == NULL)
                        continue;
 
        for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
                if (ifa->ifa_addr == NULL)
                        continue;
 

-               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST);
+               s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST,
+                                                               NULL, 0, NI_NUMERICHOST);

 
                if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {
 
                if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {

-                               fprintf(stderr, "Error getting IP address.\n");
-                               return smprintf(unknowntext);
+                               warnx("Error getting IP address.");
+                               return smprintf(UNKNOWN_STR);

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

-       /* free the address */

        freeifaddrs(ifaddr);
 
        freeifaddrs(ifaddr);
 

-       return smprintf(unknowntext);
+       return smprintf(UNKNOWN_STR);

 }
 
 static char *
 }
 
 static char *


@@ -315,8 +309,8 @@ load_avg(void)
        double avgs[3];
 
        if (getloadavg(avgs, 3) < 0) {
        double avgs[3];
 
        if (getloadavg(avgs, 3) < 0) {

-               fprintf(stderr, "Error getting load avg.\n");
-               return smprintf(unknowntext);
+               warnx("Error getting load avg.");
+               return smprintf(UNKNOWN_STR);

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


@@ -326,15 +320,16 @@ static char *
 ram_free(void)
 {
        long free;
 ram_free(void)
 {
        long free;

-       FILE *fp;
+       FILE *fp = fopen("/proc/meminfo", "r");

 
 

-       if (!(fp = fopen("/proc/meminfo", "r"))) {
-               fprintf(stderr, "Error opening meminfo file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Error opening meminfo file");
+               return smprintf(UNKNOWN_STR);

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

+

        return smprintf("%f", (float)free / 1024 / 1024);
 }
 
        return smprintf("%f", (float)free / 1024 / 1024);
 }
 


@@ -343,11 +338,11 @@ ram_perc(void)
 {
        int perc;
        long total, free, buffers, cached;
 {
        int perc;
        long total, free, buffers, cached;

-       FILE *fp;
+       FILE *fp = fopen("/proc/meminfo", "r");

 
 

-       if (!(fp = fopen("/proc/meminfo", "r"))) {
-               fprintf(stderr, "Error opening meminfo file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Error opening meminfo file");
+               return smprintf(UNKNOWN_STR);

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


@@ -357,6 +352,7 @@ ram_perc(void)
 
        fclose(fp);
        perc = 100 * ((total - free) - (buffers + cached)) / total;
 
        fclose(fp);
        perc = 100 * ((total - free) - (buffers + cached)) / total;

+

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


@@ -364,15 +360,16 @@ static char *
 ram_total(void)
 {
        long total;
 ram_total(void)
 {
        long total;

-       FILE *fp;
+       FILE *fp = fopen("/proc/meminfo", "r");

 
 

-       if (!(fp = fopen("/proc/meminfo", "r"))) {
-               fprintf(stderr, "Error opening meminfo file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Error opening meminfo file");
+               return smprintf(UNKNOWN_STR);

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

+

        return smprintf("%f", (float)total / 1024 / 1024);
 }
 
        return smprintf("%f", (float)total / 1024 / 1024);
 }
 


@@ -380,11 +377,11 @@ static char *
 ram_used(void)
 {
        long free, total, buffers, cached, used;
 ram_used(void)
 {
        long free, total, buffers, cached, used;

-       FILE *fp;
+       FILE *fp = fopen("/proc/meminfo", "r");

 
 

-       if (!(fp = fopen("/proc/meminfo", "r"))) {
-               fprintf(stderr, "Error opening meminfo file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Error opening meminfo file");
+               return smprintf(UNKNOWN_STR);

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


@@ -394,6 +391,7 @@ ram_used(void)
 
        fclose(fp);
        used = total - free - buffers - cached;
 
        fclose(fp);
        used = total - free - buffers - cached;

+

        return smprintf("%f", (float)used / 1024 / 1024);
 }
 
        return smprintf("%f", (float)used / 1024 / 1024);
 }
 


@@ -401,15 +399,15 @@ static char *
 run_command(const char* command)
 {
        int good;
 run_command(const char* command)
 {
        int good;

-       FILE *fp;
-       char buffer[64];
+       FILE *fp = popen(command, "r");
+       char buffer[64] = "";

 
 

-       if (!(fp = popen(command, "r"))) {
-               fprintf(stderr, "Could not get command output for: %s.\n", command);
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Could not get command output for: %s", command);
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

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

        pclose(fp);
        for (int i = 0 ; i != sizeof(buffer); i++) {
                if (buffer[i] == '\0') {
        pclose(fp);
        for (int i = 0 ; i != sizeof(buffer); i++) {
                if (buffer[i] == '\0') {


@@ -418,7 +416,8 @@ run_command(const char* command)
                }
        }
        if (good)
                }
        }
        if (good)

-               buffer[strlen(buffer) - 1] = '\0';
+               buffer[strlen(buffer)-1] = '\0';
+

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


@@ -426,15 +425,16 @@ static char *
 temp(const char *file)
 {
        int temperature;
 temp(const char *file)
 {
        int temperature;

-       FILE *fp;
+       FILE *fp = fopen(file, "r");

 
 

-       if (!(fp = fopen(file, "r"))) {
-               fprintf(stderr, "Could not open temperature file.\n");
-               return smprintf(unknowntext);
+       if (fp == NULL) {
+               warn("Could not open temperature file");
+               return smprintf(UNKNOWN_STR);

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

+

        return smprintf("%d°C", temperature / 1000);
 }
 
        return smprintf("%d°C", temperature / 1000);
 }
 


@@ -455,125 +455,99 @@ uptime(void)
 static char *
 username(void)
 {
 static char *
 username(void)
 {

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

 
 

-       uid = geteuid();
-       pw = getpwuid(uid);
-
-       if (pw)
-               return smprintf("%s", pw->pw_name);
-       else {
-               fprintf(stderr, "Could not get username.\n");
-               return smprintf(unknowntext);
+       if (pw == NULL) {
+               warn("Could not get username");
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

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

 }
 
 static char *
 uid(void)
 {
 }
 
 static char *
 uid(void)
 {

-       register uid_t uid;
-
-       uid = geteuid();
-
-       if (uid)
-               return smprintf("%d", uid);
-       else {
-               fprintf(stderr, "Could not get uid.\n");
-               return smprintf(unknowntext);
-       }
-
-       return smprintf(unknowntext);
+       return smprintf("%d", geteuid());

 }
 
 
 static char *
 }
 
 
 static char *

-vol_perc(const char *soundcard)
-{
-       int mute = 0;
-       long vol = 0, max = 0, min = 0;
+vol_perc(const char *snd_card)
+{ /* FIX THIS SHIT! */
+       long int vol, max, min;

        snd_mixer_t *handle;
        snd_mixer_t *handle;

-       snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-       snd_mixer_selem_id_t *vol_info, *mute_info;
+       snd_mixer_elem_t *elem;
+       snd_mixer_selem_id_t *s_elem;

 
        snd_mixer_open(&handle, 0);
 
        snd_mixer_open(&handle, 0);

-       snd_mixer_attach(handle, soundcard);
+       snd_mixer_attach(handle, snd_card);

        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);
        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);

+       snd_mixer_selem_id_malloc(&s_elem);
+       snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL);
+       elem = snd_mixer_find_selem(handle, s_elem);

 
 

-       snd_mixer_selem_id_malloc(&vol_info);
-       snd_mixer_selem_id_malloc(&mute_info);
-       if (vol_info == NULL || mute_info == NULL) {
-               fprintf(stderr, "Could not get alsa volume.\n");
-               return smprintf(unknowntext);
-       }
-       snd_mixer_selem_id_set_name(vol_info, channel);
-       snd_mixer_selem_id_set_name(mute_info, channel);
-       pcm_mixer = snd_mixer_find_selem(handle, vol_info);
-       mas_mixer = snd_mixer_find_selem(handle, mute_info);
-
-       snd_mixer_selem_get_playback_volume_range(pcm_mixer, &min, &max);
-       snd_mixer_selem_get_playback_volume(pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
-       snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);
-
-       if (vol_info)
-               snd_mixer_selem_id_free(vol_info);
-       if (mute_info)
-               snd_mixer_selem_id_free(mute_info);
-       if (handle)
+       if (elem == NULL) {
+               snd_mixer_selem_id_free(s_elem);

                snd_mixer_close(handle);
                snd_mixer_close(handle);

+               warn("error: ALSA");
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-       if (!mute)
-               return smprintf("mute");
-       else
-               return smprintf("%d%%", (vol * 100) / max);
+       snd_mixer_handle_events(handle);
+       snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
+       snd_mixer_selem_get_playback_volume(elem, 0, &vol);
+
+       snd_mixer_selem_id_free(s_elem);
+       snd_mixer_close(handle);
+
+       return smprintf("%d", ((uint_fast16_t)(vol * 100) / max));

 }
 
 static char *
 wifi_perc(const char *wificard)
 {
 }
 
 static char *
 wifi_perc(const char *wificard)
 {

-       int bufsize = 255;

        int strength;
        int strength;

-       char buf[bufsize];
+       char buf[255];

        char *datastart;
        char *datastart;

-       char path[64];

        char status[5];
        char status[5];

-       char needle[sizeof wificard + 1];

        FILE *fp;
 
        FILE *fp;
 

-       memset(path, 0, sizeof path);
-       strlcat(path, "/sys/class/net/", sizeof(path));
-       strlcat(path, wificard, sizeof(path));
-       strlcat(path, "/operstate", sizeof(path));
+       ccat(3, "/sys/class/net/", wificard, "/operstate");

 
 

-       if(!(fp = fopen(path, "r"))) {
-               fprintf(stderr, "Error opening wifi operstate file.\n");
-               return smprintf(unknowntext);
+       fp = fopen(concat, "r");
+
+       if (fp == NULL) {
+               warn("Error opening wifi operstate file");
+               return smprintf(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(unknowntext);
+               return smprintf(UNKNOWN_STR);

 
 

-       if (!(fp = fopen("/proc/net/wireless", "r"))) {
-               fprintf(stderr, "Error opening wireless file.\n");
-               return smprintf(unknowntext);
+       fp = fopen("/proc/net/wireless", "r");
+       if (fp == NULL) {
+               warn("Error opening wireless file");
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

-       strlcpy(needle, wificard, sizeof(needle));
-       strlcat(needle, ":", sizeof(needle));
-       fgets(buf, bufsize, fp);
-       fgets(buf, bufsize, fp);
-       fgets(buf, bufsize, fp);
-       if ((datastart = strstr(buf, needle)) != NULL) {
+       ccat(2, wificard, ":");
+       fgets(buf, sizeof(buf), fp);
+       fgets(buf, sizeof(buf), fp);
+       fgets(buf, sizeof(buf), fp);
+
+       datastart = strstr(buf, concat);
+       if (datastart != NULL) {

                datastart = strstr(buf, ":");
                sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &strength);
        }
 
        fclose(fp);
                datastart = strstr(buf, ":");
                sscanf(datastart + 1, " %*d   %d  %*d  %*d                %*d      %*d          %*d              %*d      %*d            %*d", &strength);
        }
 
        fclose(fp);

+

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


@@ -581,28 +555,38 @@ static char *
 wifi_essid(const char *wificard)
 {
        char id[IW_ESSID_MAX_SIZE+1];
 wifi_essid(const char *wificard)
 {
        char id[IW_ESSID_MAX_SIZE+1];

-       int sockfd;
+       int sockfd = socket(AF_INET, SOCK_DGRAM, 0);

        struct iwreq wreq;
 
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
        sprintf(wreq.ifr_name, wificard);
        struct iwreq wreq;
 
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
        sprintf(wreq.ifr_name, wificard);

-       if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
-               fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
-               return smprintf(unknowntext);
+       if (sockfd == -1) {
+               warn("Cannot open socket for interface: %s", wificard);
+               return smprintf(UNKNOWN_STR);

        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {

-               fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard);
-               return smprintf(unknowntext);
+               warn("Get ESSID ioctl failed for interface %s", wificard);
+               return smprintf(UNKNOWN_STR);

        }
 
        }
 

+       close(sockfd);
+

        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)

-               return smprintf(unknowntext);
+               return smprintf(UNKNOWN_STR);

        else
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
        else
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 

+static void
+sighandler(int signo)
+{
+       if (signo == SIGTERM || signo == SIGINT) {
+               done = 1;
+       }
+}
+

 int
 main(void)
 {
 int
 main(void)
 {


@@ -610,14 +594,17 @@ main(void)
        char status_string[4096];
        char *res, *element;
        struct arg argument;
        char status_string[4096];
        char *res, *element;
        struct arg argument;

+       struct sigaction act;

 
 

-       if (!(dpy = XOpenDisplay(0x0))) {
-               fprintf(stderr, "Cannot open display!\n");
-               exit(1);
-       }
+       memset(&act, 0, sizeof(act));
+       act.sa_handler = sighandler;
+       sigaction(SIGINT,  &act, 0);
+       sigaction(SIGTERM, &act, 0);

 
 

-       for (;;) {
-               memset(status_string, 0, sizeof(status_string));
+       dpy = XOpenDisplay(NULL);
+
+       while (!done) {
+               status_string[0] = '\0';

                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
                        argument = args[i];
                        if (argument.args == NULL)
                for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
                        argument = args[i];
                        if (argument.args == NULL)


@@ -626,18 +613,24 @@ main(void)
                                res = argument.func(argument.args);
                        element = smprintf(argument.format, res);
                        if (element == NULL) {
                                res = argument.func(argument.args);
                        element = smprintf(argument.format, res);
                        if (element == NULL) {

-                               element = smprintf(unknowntext);
-                               fprintf(stderr, "Failed to format output.\n");
+                               element = smprintf(UNKNOWN_STR);
+                               warnx("Failed to format output.");

                        }
                        strlcat(status_string, element, sizeof(status_string));
                        free(res);
                        free(element);
                }
                        }
                        strlcat(status_string, element, sizeof(status_string));
                        free(res);
                        free(element);
                }

-
-               setstatus(status_string);
-               sleep(update_interval -1);
+               XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+               XSync(dpy, False);
+               /*
+                * subtract delay time spend in function
+                * calls from the actual global delay time
+                */
+               sleep(UPDATE_INTERVAL - delay);
+               delay = 0;

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

+

        return 0;
 }
        return 0;
 }