fixed vol_perc() typo and added % sign again

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 163b44e..fa91cce 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,19 +63,14 @@ 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, ...)
 {


@@ -102,43 +98,18 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
 static char *
 battery_perc(const char *battery)
 {

-       int now, full, perc;
-       char batterynowfile[64];
-       char batteryfullfile[64];
-       FILE *fp = fopen(batterynowfile, "r");
-
-       strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));
-       strlcat(batterynowfile, battery, sizeof(batterynowfile));
-       strlcat(batterynowfile, "/", sizeof(batterynowfile));
-       strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));
-
-       strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
-       strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
-       strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));
-
-       if (fp == NULL ) {
-               fprintf(stderr, "Error opening battery file: %s: %s\n",
-                                               batterynowfile,
-                                               strerror(errno));
-               return smprintf(UNKNOWN_STR);
-       }
-
-       fscanf(fp, "%i", &now);
-       fclose(fp);
+       int perc;
+       FILE *fp;

 
 

-       fp = fopen(batteryfullfile, "r");
+       ccat(3, "/sys/class/power_supply/", battery, "/capacity");
+       fp = fopen(concat, "r");

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

-               fprintf(stderr, "Error opening battery file: %s\n",
-                                               strerror(errno));
+               warn("Error opening battery file: %s", concat);

                return smprintf(UNKNOWN_STR);
        }
                return smprintf(UNKNOWN_STR);
        }

-
-       fscanf(fp, "%i", &full);
+       fscanf(fp, "%i", &perc);

        fclose(fp);
 
        fclose(fp);
 

-       perc = now / (full / 100);
-

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


@@ -150,27 +121,26 @@ cpu_perc(void)
        FILE *fp = fopen("/proc/stat","r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/stat","r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
+               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);
 
                return smprintf(UNKNOWN_STR);
        }
 
        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);

 
        fp = fopen("/proc/stat","r");
        if (fp == NULL) {
 
        fp = fopen("/proc/stat","r");
        if (fp == NULL) {

-               fprintf(stderr, "Error opening stat file: %s\n",
-                                               strerror(errno));
+               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]));
                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]));

+

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


@@ -193,10 +163,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: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");

                return smprintf(UNKNOWN_STR);
        }
                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);
 }
 


@@ -207,12 +177,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: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");

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

+

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


@@ -222,8 +192,7 @@ 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: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -236,8 +205,7 @@ 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: %s\n",
-                                               strerror(errno));
+               warn("Could not get filesystem info");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -251,20 +219,20 @@ entropy(void)
        FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Could not open entropy file.\n");
+               warn("Could not open entropy file");

                return smprintf(UNKNOWN_STR);
        }
 
        fscanf(fp, "%d", &entropy);
        fclose(fp);
                return smprintf(UNKNOWN_STR);
        }
 
        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 *
 }
 
 static char *


@@ -274,8 +242,7 @@ hostname(void)
        FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Could not open hostname file: %s\n",
-                                               strerror(errno));
+               warn("Could not open hostname file");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -284,6 +251,7 @@ hostname(void)
        memset(&hostname[strlen(hostname)-1], '\0',
                sizeof(hostname) - strlen(hostname));
        fclose(fp);
        memset(&hostname[strlen(hostname)-1], '\0',
                sizeof(hostname) - strlen(hostname));
        fclose(fp);

+

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


@@ -295,12 +263,10 @@ 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: %s\n",
-                                               strerror(errno));
+               warn("Error getting IP address");

                return smprintf(UNKNOWN_STR);
        }
 
                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;


@@ -310,14 +276,13 @@ ip(const char *interface)
 
                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");
+                               warnx("Error getting IP address.");

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

-       /* free the address */

        freeifaddrs(ifaddr);
 
        return smprintf(UNKNOWN_STR);
        freeifaddrs(ifaddr);
 
        return smprintf(UNKNOWN_STR);


@@ -329,7 +294,7 @@ 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");
+               warnx("Error getting load avg.");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -343,13 +308,13 @@ ram_free(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");

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

+

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


@@ -361,8 +326,7 @@ ram_perc(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -373,6 +337,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);
 }
 


@@ -383,13 +348,13 @@ ram_total(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");

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

+

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


@@ -400,8 +365,7 @@ ram_used(void)
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {
        FILE *fp = fopen("/proc/meminfo", "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Error opening meminfo file: %s\n",
-                                               strerror(errno));
+               warn("Error opening meminfo file");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -412,6 +376,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);
 }
 


@@ -420,11 +385,10 @@ run_command(const char* command)
 {
        int good;
        FILE *fp = popen(command, "r");
 {
        int good;
        FILE *fp = popen(command, "r");

-       char buffer[64];
+       char buffer[64] = "";

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

-               fprintf(stderr, "Could not get command output for: %s: %s\n",
-                                               command, strerror(errno));
+               warn("Could not get command output for: %s", command);

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -438,6 +402,7 @@ run_command(const char* command)
        }
        if (good)
                buffer[strlen(buffer)-1] = '\0';
        }
        if (good)
                buffer[strlen(buffer)-1] = '\0';

+

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


@@ -448,13 +413,13 @@ temp(const char *file)
        FILE *fp = fopen(file, "r");
 
        if (fp == NULL) {
        FILE *fp = fopen(file, "r");
 
        if (fp == NULL) {

-               fprintf(stderr, "Could not open temperature file: %s\n",
-                                                       strerror(errno));
+               warn("Could not open temperature file");

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

+

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


@@ -475,82 +440,55 @@ 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: %s\n",
-                                       strerror(errno));
+       if (pw == NULL) {
+               warn("Could not get username");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 

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

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

-       /* FIXME: WHY USE register modifier? */
-       register uid_t uid;
-
-       uid = geteuid();
-
-       if (uid)
-               return smprintf("%d", uid);
-       else {
-               fprintf(stderr, "Could not get uid.\n");
-               return smprintf(UNKNOWN_STR);
-       }
-
-       return smprintf(UNKNOWN_STR);
+       return smprintf("%d", geteuid());

 }
 
 
 static char *
 vol_perc(const char *soundcard)
 {
 }
 
 
 static char *
 vol_perc(const char *soundcard)
 {

-       int mute = 0;
-       long vol = 0, max = 0, min = 0;
+       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_attach(handle, soundcard);
        snd_mixer_selem_register(handle, NULL, NULL);
        snd_mixer_load(handle);
 
        snd_mixer_open(&handle, 0);
        snd_mixer_attach(handle, soundcard);
        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, "Master");
+       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");
+       if (elem == NULL) {
+               snd_mixer_selem_id_free(s_elem);
+               snd_mixer_close(handle);
+               warn("Failed to get volume percentage for: %s.", soundcard);

                return smprintf(UNKNOWN_STR);
        }
                return smprintf(UNKNOWN_STR);
        }

-       snd_mixer_selem_id_set_name(vol_info, ALSA_CHANNEL);
-       snd_mixer_selem_id_set_name(mute_info, ALSA_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((snd_mixer_elem_t *)pcm_mixer, &min, &max);
-       snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)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)
-               snd_mixer_close(handle);

 
 

-       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 *
 }
 
 static char *


@@ -559,18 +497,15 @@ wifi_perc(const char *wificard)
        int strength;
        char buf[255];
        char *datastart;
        int strength;
        char buf[255];
        char *datastart;

-       char path[64];

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

-       char needle[strlen(wificard)+2];
-       FILE *fp = fopen(path, "r");
+       FILE *fp;
+
+       ccat(3, "/sys/class/net/", wificard, "/operstate");

 
 

-       strlcpy(path, "/sys/class/net/", sizeof(path));
-       strlcat(path, wificard, sizeof(path));
-       strlcat(path, "/operstate", sizeof(path));
+       fp = fopen(concat, "r");

 
 

-       if(fp == NULL) {
-               fprintf(stderr, "Error opening wifi operstate file: %s\n",
-                                                       strerror(errno));
+       if (fp == NULL) {
+               warn("Error opening wifi operstate file");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 


@@ -581,24 +516,23 @@ wifi_perc(const char *wificard)
 
        fp = fopen("/proc/net/wireless", "r");
        if (fp == NULL) {
 
        fp = fopen("/proc/net/wireless", "r");
        if (fp == NULL) {

-               fprintf(stderr, "Error opening wireless file: %s\n",
-                                               strerror(errno));
+               warn("Error opening wireless file");

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 

-       strlcpy(needle, wificard, sizeof(needle));
-       strlcat(needle, ":", sizeof(needle));
+       ccat(2, wificard, ":");

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

-       datastart = strstr(buf, needle);
+       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);
        if (datastart != NULL) {
                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);
 }
 


@@ -612,40 +546,52 @@ wifi_essid(const char *wificard)
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
        sprintf(wreq.ifr_name, wificard);
        memset(&wreq, 0, sizeof(struct iwreq));
        wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
        sprintf(wreq.ifr_name, wificard);

-       if(sockfd == -1) {
-               fprintf(stderr, "Cannot open socket for interface: %s: %s\n",
-                                               wificard, strerror(errno));
+       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) {
                return smprintf(UNKNOWN_STR);
        }
        wreq.u.essid.pointer = id;
        if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {

-               fprintf(stderr, "Get ESSID ioctl failed for interface %s: %s\n",
-                                               wificard, strerror(errno));
+               warn("Get ESSID ioctl failed for interface %s", wificard);

                return smprintf(UNKNOWN_STR);
        }
 
                return smprintf(UNKNOWN_STR);
        }
 

+       close(sockfd);
+

        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
                return smprintf(UNKNOWN_STR);
        else
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
        if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
                return smprintf(UNKNOWN_STR);
        else
                return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 

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

 int
 main(void)
 {
        size_t i;
        char status_string[4096];
 int
 main(void)
 {
        size_t i;
        char status_string[4096];

-       char *res, *element;
+       char *res, *element, *status_old;

        struct arg argument;
        struct arg argument;

+       struct sigaction act;

 
 

-       dpy = XOpenDisplay(0x0);
-       if (!dpy) {
-               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);
+
+       XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
+
+       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)


@@ -655,17 +601,26 @@ main(void)
                        element = smprintf(argument.format, res);
                        if (element == NULL) {
                                element = smprintf(UNKNOWN_STR);
                        element = smprintf(argument.format, res);
                        if (element == NULL) {
                                element = smprintf(UNKNOWN_STR);

-                               fprintf(stderr, "Failed to format output.\n");
+                               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;

        }
 
        }
 

+       XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+       XSync(dpy, False);
+

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

+

        return 0;
 }
        return 0;
 }