used ccat() from concat.h for string concatenation

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 441c517..53de9cb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -26,6 +26,9 @@
 
 #include "strlcat.h"
 #include "strlcpy.h"
+#include "concat.h"
+
+char concat[];
 
 struct arg {
        char *(*func)();
@@ -91,24 +94,14 @@ static char *
 battery_perc(const char *battery)
 {
        int now, full, perc;
-       char batterynowfile[64];
-       char batteryfullfile[64];
        FILE *fp;
 
-       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));
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW);
 
-       fp = fopen(batterynowfile, "r");
-       if (fp == NULL ) {
+       fp = fopen(concat, "r");
+       if (fp == NULL) {
                fprintf(stderr, "Error opening battery file: %s: %s\n",
-                                               batterynowfile,
+                                               concat,
                                                strerror(errno));
                return smprintf(UNKNOWN_STR);
        }
@@ -116,9 +109,12 @@ battery_perc(const char *battery)
        fscanf(fp, "%i", &now);
        fclose(fp);
 
-       fp = fopen(batteryfullfile, "r");
+       ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
+
+       fp = fopen(concat, "r");
        if (fp == NULL) {
-               fprintf(stderr, "Error opening battery file: %s\n",
+               fprintf(stderr, "Error opening battery file: %s: %s\n",
+                                               concat,
                                                strerror(errno));
                return smprintf(UNKNOWN_STR);
        }
@@ -490,17 +486,17 @@ vol_perc(const char *snd_card)
        snd_mixer_selem_id_t *s_elem;
 
        snd_mixer_open(&handle, 0);
-       snd_mixer_attach(handle, snd_card);
+       snd_mixer_attach(handle, "default");
        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");
+       snd_mixer_selem_id_set_name(s_elem, snd_card);
        elem = snd_mixer_find_selem(handle, s_elem);
 
        if (elem == NULL) {
                snd_mixer_selem_id_free(s_elem);
                snd_mixer_close(handle);
-               perror("alsa error: ");
+               perror("alsa error");
                return smprintf(UNKNOWN_STR);
        }
 
@@ -520,16 +516,12 @@ wifi_perc(const char *wificard)
        int strength;
        char buf[255];
        char *datastart;
-       char path[64];
        char status[5];
-       char needle[strlen(wificard)+2];
        FILE *fp;
 
-       strlcpy(path, "/sys/class/net/", sizeof(path));
-       strlcat(path, wificard, sizeof(path));
-       strlcat(path, "/operstate", sizeof(path));
+       ccat(3, "/sys/class/net", wificard, "/operstate");
 
-       fp = fopen(path, "r");
+       fp = fopen(concat, "r");
 
        if(fp == NULL) {
                fprintf(stderr, "Error opening wifi operstate file: %s\n",
@@ -549,13 +541,12 @@ wifi_perc(const char *wificard)
                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);
 
-       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);
@@ -601,7 +592,6 @@ main(void)
        char *res, *element;
        struct arg argument;
 
-       stderr = stderr;
        dpy = XOpenDisplay(NULL);
 
        for (;;) {
@@ -621,10 +611,9 @@ main(void)
                        free(res);
                        free(element);
                }
+               XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+               XSync(dpy, False);
        }
-
-       XStoreName(dpy, DefaultRootWindow(dpy), status_string);
-       XSync(dpy, False);
        XCloseDisplay(dpy);
 
        return 0;