worked around the buffer overrun in smprintf()

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index c03a1d2..08866d2 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -29,7 +29,7 @@
 #include "strlcat.h"
 #include "strlcpy.h"
 
 #include "strlcat.h"
 #include "strlcpy.h"
 

-typedef char *(*op_fun) (const char *);
+typedef char *(*op_fun)();

 struct arg {
        op_fun func;
        const char *format;
 struct arg {
        op_fun func;
        const char *format;


@@ -39,26 +39,26 @@ struct arg {
 static void setstatus(const char *);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);
 static void setstatus(const char *);
 static char *smprintf(const char *, ...);
 static char *battery_perc(const char *);

-static char *cpu_perc(const char *);
+static char *cpu_perc(void);

 static char *datetime(const char *);
 static char *disk_free(const char *);
 static char *disk_perc(const char *);
 static char *disk_total(const char *);
 static char *disk_used(const char *);
 static char *datetime(const char *);
 static char *disk_free(const char *);
 static char *disk_perc(const char *);
 static char *disk_total(const char *);
 static char *disk_used(const char *);

-static char *entropy(const char *);
-static char *gid(const char *);
-static char *hostname(const char *);
+static char *entropy(void);
+static char *gid(void);
+static char *hostname(void);

 static char *ip(const char *);
 static char *ip(const char *);

-static char *load_avg(const char *);
-static char *ram_free(const char *);
-static char *ram_perc(const char *);
-static char *ram_used(const char *);
-static char *ram_total(const char *);
+static char *load_avg(void);
+static char *ram_free(void);
+static char *ram_perc(void);
+static char *ram_used(void);
+static char *ram_total(void);

 static char *run_command(const char *);
 static char *temp(const char *);
 static char *run_command(const char *);
 static char *temp(const char *);

-static char *uid(const char *);
-static char *uptime(const char *);
-static char *username(const char *);
+static char *uid(void);
+static char *uptime(void);
+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 *);


@@ -78,14 +78,18 @@ setstatus(const char *str)
 static char *
 smprintf(const char *fmt, ...)
 {
 static char *
 smprintf(const char *fmt, ...)
 {

-       va_list fmtargs;
+       va_list ap;
+       char tmp[120];

        char *ret = NULL;
 
        char *ret = NULL;
 

-       va_start(fmtargs, fmt);
-       if (vasprintf(&ret, fmt, fmtargs) < 0)
+       va_start(ap, fmt);
+       vsnprintf(tmp, sizeof(tmp)-1, fmt, ap);
+       tmp[strlen(tmp)+1] = '\0';
+
+       if (asprintf(&ret, "%s", tmp) < 0)

                return NULL;
                return NULL;

-       va_end(fmtargs);

 
 

+       va_end(ap);

        return ret;
 }
 
        return ret;
 }
 


@@ -93,23 +97,23 @@ 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] = "";
+       char batterynowfile[64];
+       char batteryfullfile[64];

        FILE *fp;
 
        FILE *fp;
 

-       strlcat(batterynowfile, batterypath, sizeof(batterynowfile));
+       strlcpy(batterynowfile, BATTERY_PATH, sizeof(batterynowfile));

        strlcat(batterynowfile, battery, sizeof(batterynowfile));
        strlcat(batterynowfile, "/", sizeof(batterynowfile));
        strlcat(batterynowfile, battery, sizeof(batterynowfile));
        strlcat(batterynowfile, "/", sizeof(batterynowfile));

-       strlcat(batterynowfile, batterynow, sizeof(batterynowfile));
+       strlcat(batterynowfile, BATTERY_NOW, sizeof(batterynowfile));

 
 

-       strlcat(batteryfullfile, batterypath, sizeof(batteryfullfile));
+       strlcpy(batteryfullfile, BATTERY_PATH, sizeof(batteryfullfile));

        strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
        strlcat(batteryfullfile, "/", sizeof(batteryfullfile));
        strlcat(batteryfullfile, battery, sizeof(batteryfullfile));
        strlcat(batteryfullfile, "/", sizeof(batteryfullfile));

-       strlcat(batteryfullfile, batteryfull, sizeof(batteryfullfile));
+       strlcat(batteryfullfile, BATTERY_FULL, sizeof(batteryfullfile));

 
        if (!(fp = fopen(batterynowfile, "r"))) {
                fprintf(stderr, "Error opening battery file: %s.\n", batterynowfile);
 
        if (!(fp = fopen(batterynowfile, "r"))) {
                fprintf(stderr, "Error opening battery file: %s.\n", batterynowfile);

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

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


@@ -117,7 +121,7 @@ battery_perc(const char *battery)
 
        if (!(fp = fopen(batteryfullfile, "r"))) {
                fprintf(stderr, "Error opening battery file.\n");
 
        if (!(fp = fopen(batteryfullfile, "r"))) {
                fprintf(stderr, "Error opening battery file.\n");

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

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


@@ -129,7 +133,7 @@ battery_perc(const char *battery)
 }
 
 static char *
 }
 
 static char *

-cpu_perc(const char *null)
+cpu_perc(void)

 {
        int perc;
        long double a[4], b[4];
 {
        int perc;
        long double a[4], b[4];


@@ -137,7 +141,7 @@ cpu_perc(const char *null)
 
        if (!(fp = fopen("/proc/stat","r"))) {
                fprintf(stderr, "Error opening stat file.\n");
 
        if (!(fp = fopen("/proc/stat","r"))) {
                fprintf(stderr, "Error opening stat file.\n");

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

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


@@ -148,7 +152,7 @@ cpu_perc(const char *null)
 
        if (!(fp = fopen("/proc/stat","r"))) {
                fprintf(stderr, "Error opening stat file.\n");
 
        if (!(fp = fopen("/proc/stat","r"))) {
                fprintf(stderr, "Error opening stat file.\n");

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

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


@@ -160,27 +164,14 @@ cpu_perc(const char *null)
 static char *
 datetime(const char *timeformat)
 {
 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 *


@@ -190,7 +181,7 @@ disk_free(const char *mountpoint)
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");

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


@@ -203,7 +194,7 @@ disk_perc(const char *mountpoint)
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");

-               return smprintf(unknowntext);
+               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));


@@ -217,7 +208,7 @@ disk_total(const char *mountpoint)
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");

-               return smprintf(unknowntext);
+               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);


@@ -230,21 +221,21 @@ disk_used(const char *mountpoint)
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");
 
        if (statvfs(mountpoint, &fs) < 0) {
                fprintf(stderr, "Could not get filesystem info.\n");

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

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

-entropy(const char *null)
+entropy(void)

 {
        int entropy = 0;
        FILE *fp;
 
        if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
                fprintf(stderr, "Could not open entropy file.\n");
 {
        int entropy = 0;
        FILE *fp;
 
        if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
                fprintf(stderr, "Could not open entropy file.\n");

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

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


@@ -253,27 +244,21 @@ entropy(const char *null)
 }
 
 static char *
 }
 
 static char *

-gid(const char *null)
+gid(void)

 {
 {

-       gid_t gid;
-
-       if ((gid = getgid()) < 0) {
-               fprintf(stderr, "Could no get gid.\n");
-               return smprintf(unknowntext);
-       } else
-               return smprintf("%d", gid);
-       return smprintf(unknowntext);
+       gid_t gid = getgid();
+       return smprintf("%d", gid);

 }
 
 static char *
 }
 
 static char *

-hostname(const char *null)
+hostname(void)

 {
        char hostname[HOST_NAME_MAX];
        FILE *fp;
 
        if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
                fprintf(stderr, "Could not open hostname file.\n");
 {
        char hostname[HOST_NAME_MAX];
        FILE *fp;
 
        if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
                fprintf(stderr, "Could not open hostname file.\n");

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

        }
 
        fscanf(fp, "%s\n", hostname);
        }
 
        fscanf(fp, "%s\n", hostname);


@@ -290,7 +275,7 @@ ip(const char *interface)
 
        if (getifaddrs(&ifaddr) == -1) {
                fprintf(stderr, "Error getting IP address.\n");
 
        if (getifaddrs(&ifaddr) == -1) {
                fprintf(stderr, "Error getting IP address.\n");

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

        }
 
        /* get the ip address */
        }
 
        /* get the ip address */


@@ -303,7 +288,7 @@ ip(const char *interface)
                if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
                        if (s != 0) {
                                fprintf(stderr, "Error getting IP address.\n");
                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);
+                               return smprintf(UNKNOWN_STR);

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


@@ -312,31 +297,31 @@ ip(const char *interface)
        /* free the address */
        freeifaddrs(ifaddr);
 
        /* free the address */
        freeifaddrs(ifaddr);
 

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

 }
 
 static char *
 }
 
 static char *

-load_avg(const char *null)
+load_avg(void)

 {
        double avgs[3];
 
        if (getloadavg(avgs, 3) < 0) {
                fprintf(stderr, "Error getting load avg.\n");
 {
        double avgs[3];
 
        if (getloadavg(avgs, 3) < 0) {
                fprintf(stderr, "Error getting load avg.\n");

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

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

-ram_free(const char *null)
+ram_free(void)

 {
        long free;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");
 {
        long free;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");

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

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


@@ -345,7 +330,7 @@ ram_free(const char *null)
 }
 
 static char *
 }
 
 static char *

-ram_perc(const char *null)
+ram_perc(void)

 {
        int perc;
        long total, free, buffers, cached;
 {
        int perc;
        long total, free, buffers, cached;


@@ -353,7 +338,7 @@ ram_perc(const char *null)
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");

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

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


@@ -367,14 +352,14 @@ ram_perc(const char *null)
 }
 
 static char *
 }
 
 static char *

-ram_total(const char *null)
+ram_total(void)

 {
        long total;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");
 {
        long total;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");

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

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


@@ -383,14 +368,14 @@ ram_total(const char *null)
 }
 
 static char *
 }
 
 static char *

-ram_used(const char *null)
+ram_used(void)

 {
        long free, total, buffers, cached, used;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");
 {
        long free, total, buffers, cached, used;
        FILE *fp;
 
        if (!(fp = fopen("/proc/meminfo", "r"))) {
                fprintf(stderr, "Error opening meminfo file.\n");

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

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


@@ -412,7 +397,7 @@ run_command(const char* command)
 
        if (!(fp = popen(command, "r"))) {
                fprintf(stderr, "Could not get command output for: %s.\n", command);
 
        if (!(fp = popen(command, "r"))) {
                fprintf(stderr, "Could not get command output for: %s.\n", command);

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

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


@@ -436,7 +421,7 @@ temp(const char *file)
 
        if (!(fp = fopen(file, "r"))) {
                fprintf(stderr, "Could not open temperature file.\n");
 
        if (!(fp = fopen(file, "r"))) {
                fprintf(stderr, "Could not open temperature file.\n");

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

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


@@ -445,7 +430,7 @@ temp(const char *file)
 }
 
 static char *
 }
 
 static char *

-uptime(const char *null)
+uptime(void)

 {
        struct sysinfo info;
        int hours = 0;
 {
        struct sysinfo info;
        int hours = 0;


@@ -459,7 +444,7 @@ uptime(const char *null)
 }
 
 static char *
 }
 
 static char *

-username(const char *null)
+username(void)

 {
        register struct passwd *pw;
        register uid_t uid;
 {
        register struct passwd *pw;
        register uid_t uid;


@@ -471,14 +456,14 @@ username(const char *null)
                return smprintf("%s", pw->pw_name);
        else {
                fprintf(stderr, "Could not get username.\n");
                return smprintf("%s", pw->pw_name);
        else {
                fprintf(stderr, "Could not get username.\n");

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

        }
 
        }
 

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

 }
 
 static char *
 }
 
 static char *

-uid(const char *null)
+uid(void)

 {
        register uid_t uid;
 
 {
        register uid_t uid;
 


@@ -488,10 +473,10 @@ uid(const char *null)
                return smprintf("%d", uid);
        else {
                fprintf(stderr, "Could not get uid.\n");
                return smprintf("%d", uid);
        else {
                fprintf(stderr, "Could not get uid.\n");

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

        }
 
        }
 

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

 }
 
 
 }
 
 


@@ -513,10 +498,10 @@ vol_perc(const char *soundcard)
        snd_mixer_selem_id_malloc(&mute_info);
        if (vol_info == NULL || mute_info == NULL) {
                fprintf(stderr, "Could not get alsa volume.\n");
        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);
+               return smprintf(UNKNOWN_STR);

        }
        }

-       snd_mixer_selem_id_set_name(vol_info, channel);
-       snd_mixer_selem_id_set_name(mute_info, channel);
+       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);
 
        pcm_mixer = snd_mixer_find_selem(handle, vol_info);
        mas_mixer = snd_mixer_find_selem(handle, mute_info);
 


@@ -556,17 +541,17 @@ wifi_perc(const char *wificard)
 
        if(!(fp = fopen(path, "r"))) {
                fprintf(stderr, "Error opening wifi operstate file.\n");
 
        if(!(fp = fopen(path, "r"))) {
                fprintf(stderr, "Error opening wifi operstate file.\n");

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

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

        }
 
        strlcpy(needle, wificard, sizeof(needle));
        }
 
        strlcpy(needle, wificard, sizeof(needle));


@@ -595,16 +580,16 @@ wifi_essid(const char *wificard)
        sprintf(wreq.ifr_name, wificard);
        if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
                fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
        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);
+               return smprintf(UNKNOWN_STR);

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

        }
 
        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);
 }


@@ -612,7 +597,9 @@ wifi_essid(const char *wificard)
 int
 main(void)
 {
 int
 main(void)
 {

-       char status_string[1024];
+       size_t i;
+       char status_string[4096];
+       char *res, *element;

        struct arg argument;
 
        if (!(dpy = XOpenDisplay(0x0))) {
        struct arg argument;
 
        if (!(dpy = XOpenDisplay(0x0))) {


@@ -622,12 +609,15 @@ main(void)
 
        for (;;) {
                memset(status_string, 0, sizeof(status_string));
 
        for (;;) {
                memset(status_string, 0, sizeof(status_string));

-               for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+               for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {

                        argument = args[i];
                        argument = args[i];

-                       char *res = argument.func(argument.args);
-                       char *element = smprintf(argument.format, res);
+                       if (argument.args == NULL)
+                               res = argument.func();
+                       else
+                               res = argument.func(argument.args);
+                       element = smprintf(argument.format, res);

                        if (element == NULL) {
                        if (element == NULL) {

-                               element = smprintf(unknowntext);
+                               element = smprintf(UNKNOWN_STR);

                                fprintf(stderr, "Failed to format output.\n");
                        }
                        strlcat(status_string, element, sizeof(status_string));
                                fprintf(stderr, "Failed to format output.\n");
                        }
                        strlcat(status_string, element, sizeof(status_string));


@@ -636,7 +626,7 @@ main(void)
                }
 
                setstatus(status_string);
                }
 
                setstatus(status_string);

-               sleep(update_interval -1);
+               sleep(UPDATE_INTERVAL -1);

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