X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/c7f3a407f4f8d539fe68cbf7dde76876cbcbccaa..35f7862744288411600b5200e3612b4ed204092d:/slstatus.c?ds=inline

diff --git a/slstatus.c b/slstatus.c
index 404ead6..1a297f8 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,467 +1,638 @@
 /* See LICENSE file for copyright and license details. */
 
-/* global libraries */
 #include <alsa/asoundlib.h>
-#include <arpa/inet.h>
+#include <err.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
 #include <limits.h>
-#include <locale.h>
+#include <linux/wireless.h>
 #include <netdb.h>
+#include <pwd.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.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>
 
-/* local headers */
-#include "slstatus.h"
-#include "config.h"
+#undef strlcat
+#undef strlcpy
+
+#include "strlcat.h"
+#include "strlcpy.h"
+#include "concat.h"
+
+char concat[];
+
+struct arg {
+	char *(*func)();
+	const char *format;
+	const char *args;
+};
+
+static char *smprintf(const char *, ...);
+static char *battery_perc(const char *);
+static char *battery_state(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 *);
+static void sighandler(const int);
+
+static unsigned short int delay, done;
+static Display *dpy;
 
-/* set statusbar */
-void
-setstatus(const char *str)
-{
-    /* set WM_NAME via X11 */
-    XStoreName(dpy, DefaultRootWindow(dpy), str);
-    XSync(dpy, False);
-}
+#include "config.h"
 
-/* smprintf function */
-char *
+static char *
 smprintf(const char *fmt, ...)
 {
-    va_list fmtargs;
-    char *ret = NULL;
+	va_list ap;
+	char *ret;
+	int len;
 
-    va_start(fmtargs, fmt);
-    if (vasprintf(&ret, fmt, fmtargs) < 0)
-        return NULL;
-    va_end(fmtargs);
+	va_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
 
-    return ret;
+	ret = malloc(++len);
+	if (ret == NULL) {
+		perror("malloc");
+		exit(1);
+	}
+
+	va_start(ap, fmt);
+	vsnprintf(ret, len, fmt, ap);
+	va_end(ap);
+
+	return ret;
 }
 
-/* battery percentage */
-char *
+static char *
 battery_perc(const char *battery)
 {
-    int now, full, perc;
-    char batterynowfile[64] = "";
-    char batteryfullfile[64] = "";
-    FILE *fp;
-
-    /* generate battery nowfile path */
-    strcat(batterynowfile, batterypath);
-    strcat(batterynowfile, battery);
-    strcat(batterynowfile, "/");
-    strcat(batterynowfile, batterynow);
-
-    /* generate battery fullfile path */
-    strcat(batteryfullfile, batterypath);
-    strcat(batteryfullfile, battery);
-    strcat(batteryfullfile, "/");
-    strcat(batteryfullfile, batteryfull);
-
-    /* open battery now file */
-    if (!(fp = fopen(batterynowfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.%s",batterynowfile);
-        return smprintf("n/a");
-    }
-
-    /* read value */
-    fscanf(fp, "%i", &now);
-
-    /* close battery now file */
-    fclose(fp);
-
-    /* open battery full file */
-    if (!(fp = fopen(batteryfullfile, "r"))) {
-        fprintf(stderr, "Error opening battery file.");
-        return smprintf("n/a");
-    }
-
-    /* read value */
-    fscanf(fp, "%i", &full);
-
-    /* close battery full file */
-    fclose(fp);
-
-    /* calculate percent */
-    perc = now / (full / 100);
-
-    /* return perc as string */
-    return smprintf("%d%%", perc);
+	int perc;
+	FILE *fp;
+
+	ccat(3, "/sys/class/power_supply/", battery, "/capacity");
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Error opening battery file: %s", concat);
+		return smprintf(UNKNOWN_STR);
+	}
+	fscanf(fp, "%i", &perc);
+	fclose(fp);
+
+	return smprintf("%d%%", perc);
 }
 
-/* cpu percentage */
-char *
-cpu_perc(const char *null)
+static char *
+battery_state(const char *battery)
 {
-    int perc;
-    long double a[4], b[4];
-    FILE *fp;
+	char state[12]; 
+	FILE *fp;
+
+	ccat(3, "/sys/class/power_supply/", battery, "/status");
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Error opening battery file: %s", concat);
+		return smprintf(UNKNOWN_STR);
+	}
+	fscanf(fp, "%12s", state);
+	fclose(fp);
+
+	if (strcmp(state, "Charging") == 0)
+		return smprintf("+");
+	else if (strcmp(state, "Discharging") == 0)
+		return smprintf("-");
+	else if (strcmp(state, "Full") == 0)
+		return smprintf("=");
+	else
+		return smprintf("?");
+}
 
-    /* open stat file */
-    if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        return smprintf("n/a");
-    }
+static char *
+cpu_perc(void)
+{
+	int perc;
+	long double a[4], b[4];
+	FILE *fp = fopen("/proc/stat","r");
 
-    /* read values */
-    fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
+	if (fp == NULL) {
+		warn("Error opening stat file");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* close stat file */
-    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);
 
-    /* open stat file */
-    if (!(fp = fopen("/proc/stat","r"))) {
-        fprintf(stderr, "Error opening stat file.");
-        return smprintf("n/a");
-    }
+	fp = fopen("/proc/stat","r");
+	if (fp == NULL) {
+		warn("Error opening stat file");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* read values */
-    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]);
+	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]));
 
-    /* close stat file */
-    fclose(fp);
+	return smprintf("%d%%", perc);
+}
 
-    /* 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]));
+static char *
+datetime(const char *timeformat)
+{
+	time_t t;
+	char timestr[80];
+
+	t = time(NULL);
+	if (strftime(timestr, sizeof(timestr), timeformat, localtime(&t)) == 0)
+		return smprintf(UNKNOWN_STR);
 
-    /* return perc as string */
-    return smprintf("%d%%", perc);
+	return smprintf("%s", timestr);
 }
 
-/* date and time */
-char *
-datetime(const char *timeformat)
+static char *
+disk_free(const char *mountpoint)
 {
-    time_t tm;
-    size_t bufsize = 64;
-    char *buf = malloc(bufsize);
-
-    /* get time in format */
-    time(&tm);
-    setlocale(LC_TIME, "");
-    if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
-        setlocale(LC_TIME, "C");
-        fprintf(stderr, "Strftime failed.\n");
-        return smprintf("n/a");
-    }
-
-    setlocale(LC_TIME, "C");
-    /* return time */
-    char *ret = smprintf("%s", buf);
-    free(buf);
-    return ret;
+	struct statvfs fs;
+
+	if (statvfs(mountpoint, &fs) < 0) {
+		warn("Could not get filesystem info");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
 }
 
-/* disk usage percentage */
-char *
+static char *
 disk_perc(const char *mountpoint)
 {
-    int perc = 0;
-    struct statvfs fs;
+	int perc = 0;
+	struct statvfs fs;
 
-    /* try to open mountpoint */
-    if (statvfs(mountpoint, &fs) < 0) {
-        fprintf(stderr, "Could not get filesystem info.\n");
-        return smprintf("n/a");
-    }
+	if (statvfs(mountpoint, &fs) < 0) {
+		warn("Could not get filesystem info");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* calculate percent */
-    perc = 100 * (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks));
+	perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 
-    /* return perc */
-    return smprintf("%d%%", perc);
+	return smprintf("%d%%", perc);
 }
 
-/* entropy available */
-char *
-entropy(const char *null)
+static char *
+disk_total(const char *mountpoint)
 {
-    int entropy = 0;
-    FILE *fp;
+	struct statvfs fs;
 
-    /* open entropy file */
-    if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
-        fprintf(stderr, "Could not open entropy file.\n");
-        return smprintf("n/a");
-    }
+	if (statvfs(mountpoint, &fs) < 0) {
+		warn("Could not get filesystem info");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* extract entropy */
-    fscanf(fp, "%d", &entropy);
+	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+}
 
-    /* close entropy file */
-    fclose(fp);
+static char *
+disk_used(const char *mountpoint)
+{
+	struct statvfs fs;
 
-    /* return entropy */
-    return smprintf("%d", entropy);
+	if (statvfs(mountpoint, &fs) < 0) {
+		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);
 }
 
-/* hostname */
-char *
-hostname(const char *null)
+static char *
+entropy(void)
 {
-    char hostname[HOST_NAME_MAX];
-    FILE *fp;
+	int entropy = 0;
+	FILE *fp = fopen("/proc/sys/kernel/random/entropy_avail", "r");
 
-    /* open hostname file */
-    if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
-        fprintf(stderr, "Could not open hostname file.\n");
-        return smprintf("n/a");
-    }
+	if (fp == NULL) {
+		warn("Could not open entropy file");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* extract hostname */
-    fscanf(fp, "%s\n", hostname);
+	fscanf(fp, "%d", &entropy);
+	fclose(fp);
 
-    /* close hostname file */
-    fclose(fp);
+	return smprintf("%d", entropy);
+}
 
-    /* return entropy */
-    return smprintf("%s", hostname);
+static char *
+gid(void)
+{
+	return smprintf("%d", getgid());
+}
+
+static char *
+hostname(void)
+{
+	char hostname[HOST_NAME_MAX];
+	FILE *fp = fopen("/proc/sys/kernel/hostname", "r");
+
+	if (fp == NULL) {
+		warn("Could not open hostname file");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	fgets(hostname, sizeof(hostname), fp);
+	hostname[strlen(hostname)-1] = '\0';
+	fclose(fp);
+
+	return smprintf("%s", hostname);
 }
 
-/* ip address */
-char *
+static char *
 ip(const char *interface)
 {
-    struct ifaddrs *ifaddr, *ifa;
-    int s;
-    char host[NI_MAXHOST];
-
-    /* check if getting ip address works */
-    if (getifaddrs(&ifaddr) == -1)
-    {
-        fprintf(stderr, "Error getting IP address.");
-        return smprintf("n/a");
-    }
-
-    /* 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.");
-                return smprintf("n/a");
-            }
-            return smprintf("%s", host);
-        }
-    }
-
-    /* free the address */
-    freeifaddrs(ifaddr);
-
-    /* return n/a if nothing works */
-    return smprintf("n/a");
+	struct ifaddrs *ifaddr, *ifa;
+	int s;
+	char host[NI_MAXHOST];
+
+	if (getifaddrs(&ifaddr) == -1) {
+		warn("Error getting IP address");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	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) {
+				warnx("Error getting IP address.");
+				return smprintf(UNKNOWN_STR);
+			}
+			return smprintf("%s", host);
+		}
+	}
+
+	freeifaddrs(ifaddr);
+
+	return smprintf(UNKNOWN_STR);
+}
+
+static char *
+load_avg(void)
+{
+	double avgs[3];
+
+	if (getloadavg(avgs, 3) < 0) {
+		warnx("Error getting load avg.");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
 }
 
-/* ram percentage */
-char *
-ram_perc(const char *null)
+static char *
+ram_free(void)
 {
-    int perc;
-    long total, free, buffers, cached;
-    FILE *fp;
-
-    /* open meminfo file */
-    if (!(fp = fopen("/proc/meminfo", "r"))) {
-        fprintf(stderr, "Error opening meminfo file.");
-        return smprintf("n/a");
-    }
-
-    /* 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);
+	long free;
+	FILE *fp = fopen("/proc/meminfo", "r");
+
+	if (fp == NULL) {
+		warn("Error opening meminfo file");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	fscanf(fp, "MemFree: %ld kB\n", &free);
+	fclose(fp);
+
+	return smprintf("%f", (float)free / 1024 / 1024);
 }
 
-/* temperature */
-char *
+static char *
+ram_perc(void)
+{
+	int perc;
+	long total, free, buffers, cached;
+	FILE *fp = fopen("/proc/meminfo", "r");
+
+	if (fp == NULL) {
+		warn("Error opening meminfo file");
+		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);
+}
+
+static char *
+ram_total(void)
+{
+	long total;
+	FILE *fp = fopen("/proc/meminfo", "r");
+
+	if (fp == NULL) {
+		warn("Error opening meminfo file");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	fscanf(fp, "MemTotal: %ld kB\n", &total);
+	fclose(fp);
+
+	return smprintf("%f", (float)total / 1024 / 1024);
+}
+
+static char *
+ram_used(void)
+{
+	long free, total, buffers, cached, used;
+	FILE *fp = fopen("/proc/meminfo", "r");
+
+	if (fp == NULL) {
+		warn("Error opening meminfo file");
+		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);
+}
+
+static char *
+run_command(const char* command)
+{
+	FILE *fp = popen(command, "r");
+	char buffer[64];
+
+	if (fp == NULL) {
+		warn("Could not get command output for: %s", command);
+		return smprintf(UNKNOWN_STR);
+	}
+
+	fgets(buffer, sizeof(buffer), fp);
+	buffer[sizeof(buffer)-1] = '\0';
+
+	pclose(fp);
+	return smprintf("%s", buffer);
+}
+
+static char *
 temp(const char *file)
 {
-    int temperature;
-    FILE *fp;
+	int temperature;
+	FILE *fp = fopen(file, "r");
+
+	if (fp == NULL) {
+		warn("Could not open temperature file");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	fscanf(fp, "%d", &temperature);
+	fclose(fp);
+
+	return smprintf("%d°C", temperature / 1000);
+}
+
+static char *
+uptime(void)
+{
+	struct sysinfo info;
+	int hours = 0;
+	int minutes = 0;
+
+	sysinfo(&info);
+	hours = info.uptime / 3600;
+	minutes = (info.uptime - hours * 3600 ) / 60;
+
+	return smprintf("%dh %dm", hours, minutes);
+}
 
-    /* open temperature file */
-    if (!(fp = fopen(file, "r"))) {
-        fprintf(stderr, "Could not open temperature file.\n");
-        return smprintf("n/a");
-    }
+static char *
+username(void)
+{
+	uid_t uid = geteuid();
+	struct passwd *pw = getpwuid(uid);
 
-    /* extract temperature */
-    fscanf(fp, "%d", &temperature);
+	if (pw == NULL) {
+		warn("Could not get username");
+		return smprintf(UNKNOWN_STR);
+	}
 
-    /* close temperature file */
-    fclose(fp);
+	return smprintf("%s", pw->pw_name);
+}
 
-    /* return temperature in degrees */
-    return smprintf("%d°C", temperature / 1000);
+static char *
+uid(void)
+{
+	return smprintf("%d", geteuid());
 }
 
-/* alsa volume percentage */
-char *
+
+static char *
 vol_perc(const char *soundcard)
 {
-    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);
+	long int vol, max, min;
+	snd_mixer_t *handle;
+	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_selem_id_malloc(&s_elem);
+	snd_mixer_selem_id_set_name(s_elem, "Master");
+	elem = snd_mixer_find_selem(handle, s_elem);
+
+	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);
+	}
+
+	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));
 }
 
-/* wifi percentage */
-char *
+static char *
 wifi_perc(const char *wificard)
 {
-    int bufsize = 255;
-    int strength;
-    char buf[bufsize];
-    char *datastart;
-    char path[64];
-    char status[5];
-    char needle[sizeof wificard + 1];
-    FILE *fp;
-
-    /* generate the path name */
-    memset(path, 0, sizeof path);
-    strcat(path, "/sys/class/net/");
-    strcat(path, wificard);
-    strcat(path, "/operstate");
-
-    /* open wifi file */
-    if(!(fp = fopen(path, "r"))) {
-        fprintf(stderr, "Error opening wifi operstate file.");
-        return smprintf("n/a");
-    }
-
-    /* read the status */
-    fgets(status, 5, fp);
-
-    /* close wifi file */
-    fclose(fp);
-
-    /* check if interface down */
-    if(strcmp(status, "up\n") != 0){
-        return smprintf("n/a");
-    }
-
-    /* open wifi file */
-    if (!(fp = fopen("/proc/net/wireless", "r"))) {
-        fprintf(stderr, "Error opening wireless file.");
-        return smprintf("n/a");
-    }
-
-    /* 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);
+	int strength;
+	char buf[255];
+	char *datastart;
+	char status[5];
+	FILE *fp;
+
+	ccat(3, "/sys/class/net/", wificard, "/operstate");
+
+	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)
+		return smprintf(UNKNOWN_STR);
+
+	fp = fopen("/proc/net/wireless", "r");
+	if (fp == NULL) {
+		warn("Error opening wireless file");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	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);
+
+	return smprintf("%d%%", strength);
+}
+
+static char *
+wifi_essid(const char *wificard)
+{
+	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) {
+		warn("Cannot open socket for interface: %s", wificard);
+		return smprintf(UNKNOWN_STR);
+	}
+	wreq.u.essid.pointer = id;
+	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
+		warn("Get ESSID ioctl failed for interface %s", wificard);
+		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);
+}
+
+static void
+sighandler(const int signo)
+{
+	if (signo == SIGTERM || signo == SIGINT)
+		done = 1;
 }
 
-/* main function */
 int
-main()
+main(void)
 {
-    char status_string[1024];
-    struct arg argument;
-
-    /* try to open display */
-    if (!(dpy = XOpenDisplay(0x0))) {
-        fprintf(stderr, "Cannot open display!\n");
-        exit(1);
-    }
-
-    /* return status every interval */
-    for (;;) {
-        /* clear the string */
-        memset(status_string, 0, sizeof(status_string));
-
-        /* generate status_string */
-        for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
-            argument = args[i];
-            char *res = argument.func(argument.args);
-            char *element = smprintf(argument.format, res);
-            strcat(status_string, element);
-            free(res);
-            free(element);
-        }
-
-        /* return the statusbar */
-        setstatus(status_string);
-
-        /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
-        sleep(update_interval -1);
-    }
-
-    /* close display */
-    XCloseDisplay(dpy);
-
-    /* exit successfully */
-    return 0;
+	unsigned short int i;
+	char status_string[4096];
+	char *res, *element;
+	struct arg argument;
+	struct sigaction act;
+
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sighandler;
+	sigaction(SIGINT,  &act, 0);
+	sigaction(SIGTERM, &act, 0);
+
+	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)
+				res = argument.func();
+			else
+				res = argument.func(argument.args);
+			element = smprintf(argument.format, res);
+			if (element == NULL) {
+				element = smprintf(UNKNOWN_STR);
+				warnx("Failed to format output.");
+			}
+			strlcat(status_string, element, sizeof(status_string));
+			free(res);
+			free(element);
+		}
+		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), NULL);
+	XSync(dpy, False);
+
+	XCloseDisplay(dpy);
+
+	return 0;
 }