opened the file before the path concatenates, what an idiot

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index fa627df..a9aeecb 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,364 +1,675 @@
 /* See LICENSE file for copyright and license details. */
 
 /* See LICENSE file for copyright and license details. */
 

-/* global libraries */

 #include <alsa/asoundlib.h>
 #include <alsa/asoundlib.h>

+#include <arpa/inet.h>
+#include <fcntl.h>
+#include <ifaddrs.h>
+#include <limits.h>
+#include <linux/wireless.h>
+#include <locale.h>
+#include <netdb.h>
+#include <pwd.h>

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

+#include <sys/ioctl.h>
+#include <sys/stat.h>
+#include <sys/statvfs.h>
+#include <sys/socket.h>
+#include <sys/sysinfo.h>
+#include <sys/types.h>

 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 

-/* local libraries */
-#include "config.h"
+#undef strlcat
+#undef strlcpy
+
+#include "strlcat.h"
+#include "strlcpy.h"
+
+typedef char *(*op_fun)();
+struct arg {
+       op_fun func;
+       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 *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(void);
+static char *gid(void);
+static char *hostname(void);
+static char *ip(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 *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 *);

 
 

-/* functions */
-void setstatus(char *str);
-char *smprintf(char *fmt, ...);
-char *get_battery();
-char *get_cpu_temperature();
-char *get_cpu_usage();
-char *get_datetime();
-char *get_ram_usage();
-char *get_volume();
-char *get_wifi_signal();
-
-/* global variables */

 static Display *dpy;
 
 static Display *dpy;
 

-/* set statusbar (WM_NAME) */
-void
-setstatus(char *str)
+#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, ...)
+{
+       va_list ap;
+       char *ret;
+       int len;
+
+       va_start(ap, fmt);
+       len = vsnprintf(NULL, 0, fmt, ap);
+       va_end(ap);
+
+       ret = malloc(++len);
+       if (ret == NULL) {
+               perror("malloc");
+               exit(1);
+       }
+
+       va_start(ap, fmt);
+       vsnprintf(ret, len, fmt, ap);
+       va_end(ap);
+
+       return ret;
+}
+
+static char *
+battery_perc(const char *battery)

 {
 {

-    XStoreName(dpy, DefaultRootWindow(dpy), str);
-    XSync(dpy, False);
+       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));
+
+       fp = fopen(batterynowfile, "r");
+       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);
+
+       fp = fopen(batteryfullfile, "r");
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening battery file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "%i", &full);
+       fclose(fp);
+
+       perc = now / (full / 100);
+
+       return smprintf("%d%%", perc);

 }
 
 }
 

-/* smprintf function */
-char *
-smprintf(char *fmt, ...)
+static char *
+cpu_perc(void)

 {
 {

-    va_list fmtargs;
-    char *ret;
-    int len;
+       int perc;
+       long double a[4], b[4];
+       FILE *fp = fopen("/proc/stat","r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening stat file: %s\n",
+                                               strerror(errno));
+               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);
+
+       fp = fopen("/proc/stat","r");
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening stat file: %s\n",
+                                               strerror(errno));
+               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);
+}

 
 

-    va_start(fmtargs, fmt);
-    len = vsnprintf(NULL, 0, fmt, fmtargs);
-    va_end(fmtargs);
+static char *
+datetime(const char *timeformat)
+{
+       time_t t;
+       char timestr[80];

 
 

-    ret = malloc(++len);
-    if (ret == NULL) {
-        fprintf(stderr, "Malloc error.");
-        exit(1);
-    }
+       t = time(NULL);
+       if (strftime(timestr, sizeof(timestr), timeformat, localtime(&t)) == 0)
+               return smprintf(UNKNOWN_STR);

 
 

-    va_start(fmtargs, fmt);
-    vsnprintf(ret, len, fmt, fmtargs);
-    va_end(fmtargs);
+       return smprintf("%s", timestr);
+}

 
 

-    return ret;
+static char *
+disk_free(const char *mountpoint)
+{
+       struct statvfs fs;
+
+       if (statvfs(mountpoint, &fs) < 0) {
+               fprintf(stderr, "Could not get filesystem info: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+       return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);

 }
 
 }
 

-/* battery percentage */
-char *
-get_battery()
+static char *
+disk_perc(const char *mountpoint)

 {
 {

-    int now, full, perc;
-    FILE *fp;
+       int perc = 0;
+       struct statvfs fs;

 
 

-    /* open battery now file */
-    if (!(fp = fopen(batterynowfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.");
-        exit(1);
-    }
+       if (statvfs(mountpoint, &fs) < 0) {
+               fprintf(stderr, "Could not get filesystem info: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-    /* read value */
-    fscanf(fp, "%i", &now);
+       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
+       return smprintf("%d%%", perc);
+}
+
+static char *
+disk_total(const char *mountpoint)
+{
+       struct statvfs fs;

 
 

-    /* close battery now file */
-    fclose(fp);
+       if (statvfs(mountpoint, &fs) < 0) {
+               fprintf(stderr, "Could not get filesystem info: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-    /* open battery full file */
-    if (!(fp = fopen(batteryfullfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.");
-        exit(1);
-    }
+       return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+}
+
+static char *
+disk_used(const char *mountpoint)
+{
+       struct statvfs fs;
+
+       if (statvfs(mountpoint, &fs) < 0) {
+               fprintf(stderr, "Could not get filesystem info: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+}

 
 

-    /* read value */
-    fscanf(fp, "%i", &full);
+static char *
+entropy(void)
+{
+       int entropy = 0;
+       FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Could not open entropy file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "%d", &entropy);
+       fclose(fp);
+       return smprintf("%d", entropy);
+}

 
 

-    /* close battery full file */
-    fclose(fp);
+static char *
+gid(void)
+{
+       gid_t gid = getgid();
+       return smprintf("%d", gid);
+}

 
 

-    /* calculate percent */
-    perc = now / (full / 100);
+static char *
+hostname(void)
+{
+       char hostname[HOST_NAME_MAX];
+       FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Could not open hostname file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fgets(hostname, sizeof(hostname), fp);
+       /* FIXME: needs improvement */
+       memset(&hostname[strlen(hostname)-1], '\0',
+               sizeof(hostname) - strlen(hostname));
+       fclose(fp);
+       return smprintf("%s", hostname);
+}

 
 

-    /* return perc as string */
-    return smprintf("%d%%", perc);
+static char *
+ip(const char *interface)
+{
+       struct ifaddrs *ifaddr, *ifa;
+       int s;
+       char host[NI_MAXHOST];
+
+       if (getifaddrs(&ifaddr) == -1) {
+               fprintf(stderr, "Error getting IP address: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       /* get the ip address */
+       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);
+
+               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(UNKNOWN_STR);
+                       }
+                       return smprintf("%s", host);
+               }
+       }
+
+       /* free the address */
+       freeifaddrs(ifaddr);
+
+       return smprintf(UNKNOWN_STR);

 }
 
 }
 

-/* cpu temperature */
-char *
-get_cpu_temperature()
+static char *
+load_avg(void)

 {
 {

-    int temperature;
-    FILE *fp;
+       double avgs[3];

 
 

-    /* open temperature file */
-    if (!(fp = fopen(tempfile, "r"))) {
-        fprintf(stderr, "Could not open temperature file.\n");
-        exit(1);
-    }
+       if (getloadavg(avgs, 3) < 0) {
+               fprintf(stderr, "Error getting load avg.\n");
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-    /* extract temperature */
-    fscanf(fp, "%d", &temperature);
+       return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
+}
+
+static char *
+ram_free(void)
+{
+       long free;
+       FILE *fp = fopen("/proc/meminfo", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening meminfo file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "MemFree: %ld kB\n", &free);
+       fclose(fp);
+       return smprintf("%f", (float)free / 1024 / 1024);
+}

 
 

-    /* close temperature file */
-    fclose(fp);
+static char *
+ram_perc(void)
+{
+       int perc;
+       long total, free, buffers, cached;
+       FILE *fp = fopen("/proc/meminfo", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening meminfo file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "MemTotal: %ld kB\n", &total);
+       fscanf(fp, "MemFree: %ld kB\n", &free);
+       fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
+       fscanf(fp, "Cached: %ld kB\n", &cached);
+
+       fclose(fp);
+       perc = 100 * ((total - free) - (buffers + cached)) / total;
+       return smprintf("%d%%", perc);
+}

 
 

-    /* return temperature in degrees */
-    return smprintf("%d°C", temperature / 1000);
+static char *
+ram_total(void)
+{
+       long total;
+       FILE *fp = fopen("/proc/meminfo", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening meminfo file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "MemTotal: %ld kB\n", &total);
+       fclose(fp);
+       return smprintf("%f", (float)total / 1024 / 1024);

 }
 
 }
 

-/* cpu percentage */
-char *
-get_cpu_usage()
+static char *
+ram_used(void)

 {
 {

-    int perc;
-    long double a[4], b[4];
-    FILE *fp;
+       long free, total, buffers, cached, used;
+       FILE *fp = fopen("/proc/meminfo", "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening meminfo file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "MemTotal: %ld kB\n", &total);
+       fscanf(fp, "MemFree: %ld kB\n", &free);
+       fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
+       fscanf(fp, "Cached: %ld kB\n", &cached);
+
+       fclose(fp);
+       used = total - free - buffers - cached;
+       return smprintf("%f", (float)used / 1024 / 1024);
+}

 
 

-    /* open stat file */
-    if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        exit(1);
-    }
+static char *
+run_command(const char* command)
+{
+       int good;
+       FILE *fp = popen(command, "r");
+       char buffer[64];
+
+       if (fp == NULL) {
+               fprintf(stderr, "Could not get command output for: %s: %s\n",
+                                               command, strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fgets(buffer, sizeof(buffer)-1, fp);
+       pclose(fp);
+       for (int i = 0 ; i != sizeof(buffer); i++) {
+               if (buffer[i] == '\0') {
+                       good = 1;
+                       break;
+               }
+       }
+       if (good)
+               buffer[strlen(buffer)-1] = '\0';
+       return smprintf("%s", buffer);
+}

 
 

-    /* read values */
-    fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
+static char *
+temp(const char *file)
+{
+       int temperature;
+       FILE *fp = fopen(file, "r");
+
+       if (fp == NULL) {
+               fprintf(stderr, "Could not open temperature file: %s\n",
+                                                       strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fscanf(fp, "%d", &temperature);
+       fclose(fp);
+       return smprintf("%d°C", temperature / 1000);
+}

 
 

-    /* close stat file */
-    fclose(fp);
+static char *
+uptime(void)
+{
+       struct sysinfo info;
+       int hours = 0;
+       int minutes = 0;

 
 

-    /* wait a second (for avg values) */
-    sleep(1);
+       sysinfo(&info);
+       hours = info.uptime / 3600;
+       minutes = (info.uptime - hours * 3600 ) / 60;

 
 

-    /* open stat file */
-    if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        exit(1);
-    }
+       return smprintf("%dh %dm", hours, minutes);
+}

 
 

-    /* read values */
-    fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
+static char *
+username(void)
+{
+       register struct passwd *pw;
+       register uid_t uid;

 
 

-    /* close stat file */
-    fclose(fp);
+       uid = geteuid();
+       pw = getpwuid(uid);

 
 

-    /* calculate avg in this second */
-    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]));
+       if (pw)
+               return smprintf("%s", pw->pw_name);
+       else {
+               fprintf(stderr, "Could not get username: %s\n",
+                                       strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }

 
 

-    /* return perc as string */
-    return smprintf("%d%%", perc);
+       return smprintf(UNKNOWN_STR);

 }
 
 }
 

-/* date and time */
-char *
-get_datetime()
+static char *
+uid(void)

 {
 {

-    time_t tm;
-    size_t bufsize = 19;
-    char *buf = malloc(bufsize);
-
-    /* get time in format */
-    time(&tm);
-    if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-        fprintf(stderr, "Strftime failed.\n");
-        exit(1);
-    }
-
-    /* return time */
-    return smprintf("%s", buf);
+       /* 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);

 }
 
 }
 

-/* ram percentage */
-char *
-get_ram_usage()
+
+static char *
+vol_perc(const char *soundcard)

 {
 {

-    int perc;
-    long total, free, buffers, cached;
-    FILE *fp;
-
-    /* open meminfo file */
-    if (!(fp = fopen("/proc/meminfo", "r"))) {
-        fprintf(stderr, "Error opening meminfo file.");
-        exit(1);
-    }
-
-    /* read the values */
-    fscanf(fp, "MemTotal: %ld kB\n", &total);
-    fscanf(fp, "MemFree: %ld kB\n", &free);
-    fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
-    fscanf(fp, "Cached: %ld kB\n", &cached);
-
-    /* close meminfo file */
-    fclose(fp);
-
-    /* calculate percentage */
-    perc = 100 * ((total - free) - (buffers + cached)) / total;
-
-    /* return perc as string */
-    return smprintf("%d%%", perc);
+       int mute = 0;
+       long vol = 0, max = 0, min = 0;
+       snd_mixer_t *handle;
+       snd_mixer_elem_t *pcm_mixer, *mas_mixer;
+       snd_mixer_selem_id_t *vol_info, *mute_info;
+
+       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(&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(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);

 }
 
 }
 

-/* alsa volume percentage */
-char *
-get_volume()
+static char *
+wifi_perc(const char *wificard)

 {
 {

-    int mute = 0;
-    long vol = 0, max = 0, min = 0;
-
-    /* get volume from alsa */
-    snd_mixer_t *handle;
-    snd_mixer_elem_t *pcm_mixer, *mas_mixer;
-    snd_mixer_selem_id_t *vol_info, *mute_info;
-    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(&vol_info);
-    snd_mixer_selem_id_malloc(&mute_info);
-    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((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);
-
-    /* return the string (mute) */
-    if (!mute)
-        return smprintf("mute");
-    else
-        return smprintf("%d%%", (vol * 100) / max);
+       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));
+
+       fp = fopen(path, "r");
+
+       if(fp == NULL) {
+               fprintf(stderr, "Error opening wifi operstate file: %s\n",
+                                                       strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       fgets(status, 5, fp);
+       fclose(fp);
+       if(strcmp(status, "up\n") != 0)
+               return smprintf(UNKNOWN_STR);
+
+       fp = fopen("/proc/net/wireless", "r");
+       if (fp == NULL) {
+               fprintf(stderr, "Error opening wireless file: %s\n",
+                                               strerror(errno));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       strlcpy(needle, wificard, sizeof(needle));
+       strlcat(needle, ":", sizeof(needle));
+       fgets(buf, sizeof(buf), fp);
+       fgets(buf, sizeof(buf), fp);
+       fgets(buf, sizeof(buf), fp);
+
+       datastart = strstr(buf, needle);
+       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);

 }
 
 }
 

-/* wifi percentage */
-char *
-get_wifi_signal()
+static char *
+wifi_essid(const char *wificard)

 {
 {

-    int bufsize = 255;
-    int strength;
-    char buf[bufsize];
-    char *datastart;
-    char path_start[16] = "/sys/class/net/";
-    char path_end[11] = "/operstate";
-    char path[32];
-    char status[5];
-    char needle[sizeof wificard + 1];
-    FILE *fp;
-
-    /* generate the path name */
-    memset(path, 0, sizeof path);
-    strcat(path, path_start);
-    strcat(path, wificard);
-    strcat(path, path_end);
-
-    /* open wifi file */
-    if(!(fp = fopen(path, "r"))) {
-        fprintf(stderr, "Error opening wifi operstate file.");
-        exit(1);
-    }
-
-    /* read the status */
-    fgets(status, 5, fp);
-
-    /* close wifi file */
-    fclose(fp);
-
-    /* check if interface down */
-    if(strcmp(status, "up\n") != 0){
-        return "n/a";
-    }
-
-    /* open wifi file */
-    if (!(fp = fopen("/proc/net/wireless", "r"))) {
-        fprintf(stderr, "Error opening wireless file.");
-        exit(1);
-    }
-
-    /* extract the signal strength */
-    strcpy(needle, wificard);
-    strcat(needle, ":");
-    fgets(buf, bufsize, fp);
-    fgets(buf, bufsize, fp);
-    fgets(buf, bufsize, fp);
-    if ((datastart = strstr(buf, needle)) != NULL) {
-        datastart = strstr(buf, ":");
-        sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
-    }
-
-    /* close wifi file */
-    fclose(fp);
-
-    /* return strength in percent */
-    return smprintf("%d%%", strength);
+       char id[IW_ESSID_MAX_SIZE+1];
+       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);
+       if(sockfd == -1) {
+               fprintf(stderr, "Cannot open socket for interface: %s: %s\n",
+                                               wificard, strerror(errno));
+               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));
+               return smprintf(UNKNOWN_STR);
+       }
+
+       if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
+               return smprintf(UNKNOWN_STR);
+       else
+               return smprintf("%s", (char *)wreq.u.essid.pointer);

 }
 
 }
 

-/* main function */

 int
 int

-main()
+main(void)

 {
 {

-    char status[1024];
-    char *battery = NULL;
-    char *cpu_temperature = NULL;
-    char *cpu_usage = NULL;
-    char *datetime = NULL;
-    char *ram_usage = NULL;
-    char *volume = NULL;
-    char *wifi_signal = NULL;
-
-    /* open display */
-    if (!(dpy = XOpenDisplay(0x0))) {
-        fprintf(stderr, "Cannot open display!\n");
-        exit(1);
-    }
-
-    /* return status every second */
-    for (;;) {
-        /* assign the values */
-        battery = get_battery();
-        cpu_temperature = get_cpu_temperature();
-        cpu_usage = get_cpu_usage();
-        datetime = get_datetime();
-        ram_usage = get_ram_usage();
-        volume = get_volume();
-        wifi_signal = get_wifi_signal();
-
-        /* return the status */
-        sprintf(status, FORMATSTRING, ARGUMENTS);
-        setstatus(status);
-
-        /* free the values */
-        free(battery);
-        free(cpu_temperature);
-        free(cpu_usage);
-        free(datetime);
-        free(ram_usage);
-        free(volume);
-        free(wifi_signal);
-    }
-
-    /* close display */
-    XCloseDisplay(dpy);
-
-    /* exit successfully */
-    return 0;
+       size_t i;
+       char status_string[4096];
+       char *res, *element;
+       struct arg argument;
+
+       dpy = XOpenDisplay(0x0);
+       if (!dpy) {
+               fprintf(stderr, "Cannot open display!\n");
+               exit(1);
+       }
+
+       for (;;) {
+               memset(status_string, 0, sizeof(status_string));
+               for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+                       argument = args[i];
+                       if (argument.args == NULL)
+                               res = argument.func();
+                       else
+                               res = argument.func(argument.args);
+                       element = smprintf(argument.format, res);
+                       if (element == NULL) {
+                               element = smprintf(UNKNOWN_STR);
+                               fprintf(stderr, "Failed to format output.\n");
+                       }
+                       strlcat(status_string, element, sizeof(status_string));
+                       free(res);
+                       free(element);
+               }
+
+               setstatus(status_string);
+               sleep(UPDATE_INTERVAL -1);
+       }
+
+       XCloseDisplay(dpy);
+       return 0;

 }
 }