X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/85dd971fb312f3c401937ea4ad118ecd701bee49..cf67aebec579e85b5012e7efef4af220bee8981e:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index 0dee744..6a338f9 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,8 +1,7 @@
 /* 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>
@@ -10,6 +9,7 @@
 #include <locale.h>
 #include <netdb.h>
 #include <pwd.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -20,795 +20,830 @@
 #include <sys/socket.h>
 #include <sys/sysinfo.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 
-/* statusbar configuration type and struct */
-typedef char *(*op_fun) (const char *);
+#undef strlcat
+#undef strlcpy
+
+#include "extern/arg.h"
+#include "extern/strlcat.h"
+#include "extern/concat.h"
+
 struct arg {
-	op_fun func;
-	const char *format;
+	char *(*func)();
+	const char *fmt;
 	const char *args;
 };
 
-/* function declarations */
-void setstatus(const char *str);
-char *smprintf(const char *fmt, ...);
-char *battery_perc(const char *battery);
-char *cpu_perc(const char *null);
-char *datetime(const char *timeformat);
-char *disk_free(const char *mountpoint);
-char *disk_perc(const char *mountpoint);
-char *disk_total(const char *mountpoint);
-char *disk_used(const char *mountpoint);
-char *entropy(const char *null);
-char *gid(const char *null);
-char *hostname(const char *null);
-char *ip(const char *interface);
-char *load_avg(const char *null);
-char *ram_free(const char *null);
-char *ram_perc(const char *null);
-char *ram_used(const char *null);
-char *ram_total(const char *null);
-char *run_command(const char *command);
-char *temp(const char *file);
-char *uid(const char *null);
-char *uptime(const char *null);
-char *username(const char *null);
-char *vol_perc(const char *soundcard);
-char *wifi_perc(const char *wificard);
-char *wifi_essid(const char *wificard);
-
-/* global variables */
+static char *smprintf(const char *fmt, ...);
+static char *battery_perc(const char *bat);
+static char *battery_state(const char *bat);
+static char *cpu_perc(void);
+static char *datetime(const char *fmt);
+static char *disk_free(const char *mnt);
+static char *disk_perc(const char *mnt);
+static char *disk_total(const char *mnt);
+static char *disk_used(const char *mnt);
+static char *entropy(void);
+static char *gid(void);
+static char *hostname(void);
+static char *ip(const char *iface);
+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 *cmd);
+static char *swap_free(void);
+static char *swap_perc(void);
+static char *swap_used(void);
+static char *swap_total(void);
+static char *temp(const char *file);
+static char *uid(void);
+static char *uptime(void);
+static char *username(void);
+static char *vol_perc(const char *card);
+static char *wifi_perc(const char *iface);
+static char *wifi_essid(const char *iface);
+static char *kernel_release(void);
+static void sighandler(const int signo);
+static void usage(void);
+
+char *argv0;
+char concat[];
+static unsigned short int delay = 0;
+static unsigned short int done;
+static unsigned short int dflag, oflag;
 static Display *dpy;
 
-/* configuration header */
 #include "config.h"
 
-/* set statusbar */
-void
-setstatus(const char *str)
-{
-	/* set WM_NAME via X11 */
-	XStoreName(dpy, DefaultRootWindow(dpy), str);
-	XSync(dpy, False);
-}
-
-/* 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_start(ap, fmt);
+	len = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	ret = malloc(++len);
+	if (ret == NULL) {
+		err(1, "malloc");
 	}
-	va_end(fmtargs);
+
+	va_start(ap, fmt);
+	vsnprintf(ret, len, fmt, ap);
+	va_end(ap);
 
 	return ret;
 }
 
-/* battery percentage */
-char *
-battery_perc(const char *battery)
+static char *
+battery_perc(const char *bat)
 {
-	int now, full, perc;
-	char batterynowfile[64] = "";
-	char batteryfullfile[64] = "";
+	int perc;
 	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.\n", batterynowfile);
-		return smprintf(unknowntext);
+	ccat(3, "/sys/class/power_supply/", bat, "/capacity");
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Failed to open file %s", concat);
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read value */
-	fscanf(fp, "%i", &now);
-
-	/* close battery now file */
+	fscanf(fp, "%i", &perc);
 	fclose(fp);
 
-	/* open battery full file */
-	if (!(fp = fopen(batteryfullfile, "r"))) {
-		fprintf(stderr, "Error opening battery file.\n");
-		return smprintf(unknowntext);
-	}
+	return smprintf("%d%%", perc);
+}
 
-	/* read value */
-	fscanf(fp, "%i", &full);
+static char *
+battery_state(const char *bat)
+{
+	char state[12];
+	FILE *fp;
 
-	/* close battery full file */
+	ccat(3, "/sys/class/power_supply/", bat, "/status");
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Failed to open file %s", concat);
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	fscanf(fp, "%12s", state);
 	fclose(fp);
 
-	/* calculate percent */
-	perc = now / (full / 100);
-
-	/* return perc as string */
-	return smprintf("%d%%", perc);
+	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("?");
+	}
 }
 
-/* cpu percentage */
-char *
-cpu_perc(const char *null)
+static char *
+cpu_perc(void)
 {
 	int perc;
 	long double a[4], b[4];
 	FILE *fp;
 
-	/* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
-		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/stat", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/stat");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read values */
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
-
-	/* close stat file */
 	fclose(fp);
 
-	/* wait a second (for avg values) */
-	sleep(1);
+	delay++;
+	sleep(delay);
 
-	/* open stat file */
-	if (!(fp = fopen("/proc/stat","r"))) {
-		fprintf(stderr, "Error opening stat file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/stat", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/stat");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read values */
 	fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
-
-	/* close stat file */
 	fclose(fp);
 
-	/* 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]));
-
-	/* return perc as string */
 	return smprintf("%d%%", perc);
 }
 
-/* date and time */
-char *
-datetime(const char *timeformat)
+static char *
+datetime(const char *fmt)
 {
-	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 str[80];
 
-	/* get time in format */
-	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(str, sizeof(str), fmt, localtime(&t)) == 0) {
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	setlocale(LC_TIME, "C");
-	/* return time */
-	char *ret = smprintf("%s", buf);
-	free(buf);
-	return ret;
+	return smprintf("%s", str);
 }
 
-/* disk free */
-char *
-disk_free(const char *mountpoint)
+static char *
+disk_free(const char *mnt)
 {
 	struct statvfs fs;
 
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+	if (statvfs(mnt, &fs) < 0) {
+		warn("Failed to get filesystem info");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* return free */
 	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
 }
 
-/* disk usage percentage */
-char *
-disk_perc(const char *mountpoint)
+static char *
+disk_perc(const char *mnt)
 {
-	int perc = 0;
+	int perc;
 	struct statvfs fs;
 
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+	if (statvfs(mnt, &fs) < 0) {
+		warn("Failed to get filesystem info");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* calculate percent */
 	perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
 
-	/* return perc */
 	return smprintf("%d%%", perc);
 }
 
-/* disk total */
-char *
-disk_total(const char *mountpoint)
+static char *
+disk_total(const char *mnt)
 {
 	struct statvfs fs;
 
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+	if (statvfs(mnt, &fs) < 0) {
+		warn("Failed to get filesystem info");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* return total */
 	return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
 }
 
-/* disk used */
-char *
-disk_used(const char *mountpoint)
+static char *
+disk_used(const char *mnt)
 {
 	struct statvfs fs;
 
-	/* try to open mountpoint */
-	if (statvfs(mountpoint, &fs) < 0) {
-		fprintf(stderr, "Could not get filesystem info.\n");
-		return smprintf(unknowntext);
+	if (statvfs(mnt, &fs) < 0) {
+		warn("Failed to get filesystem info");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* return used */
 	return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
 }
 
-/* entropy available */
-char *
-entropy(const char *null)
+static char *
+entropy(void)
 {
-	int entropy = 0;
+	int num;
 	FILE *fp;
 
-	/* open entropy file */
-	if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) {
-		fprintf(stderr, "Could not open entropy file.\n");
-		return smprintf(unknowntext);
+	fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* extract entropy */
-	fscanf(fp, "%d", &entropy);
-
-	/* close entropy file */
+	fscanf(fp, "%d", &num);
 	fclose(fp);
 
-	/* return entropy */
-	return smprintf("%d", entropy);
+	return smprintf("%d", num);
 }
 
-/* gid */
-char *
-gid(const char *null)
+static char *
+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);
+	return smprintf("%d", getgid());
 }
 
-/* hostname */
-char *
-hostname(const char *null)
+static char *
+hostname(void)
 {
-	char hostname[HOST_NAME_MAX];
-	FILE *fp;
+	char buf[HOST_NAME_MAX];
 
-	/* open hostname file */
-	if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) {
-		fprintf(stderr, "Could not open hostname file.\n");
-		return smprintf(unknowntext);
+	if (gethostname(buf, sizeof(buf)) == -1) {
+		warn("hostname");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* extract hostname */
-	fscanf(fp, "%s\n", hostname);
-
-	/* close hostname file */
-	fclose(fp);
-
-	/* return entropy */
-	return smprintf("%s", hostname);
+	return smprintf("%s", buf);
 }
 
-/* ip address */
-char *
-ip(const char *interface)
+static char *
+ip(const char *iface)
 {
 	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.\n");
-		return smprintf(unknowntext);
+		warn("Failed to get IP address for interface %s", iface);
+		return smprintf("%s", 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 ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
 			if (s != 0) {
-				fprintf(stderr, "Error getting IP address.\n");
-				return smprintf(unknowntext);
+				warnx("Failed to get IP address for interface %s", iface);
+				return smprintf("%s", UNKNOWN_STR);
 			}
 			return smprintf("%s", host);
 		}
 	}
 
-	/* free the address */
 	freeifaddrs(ifaddr);
 
-	return smprintf(unknowntext);
+	return smprintf("%s", UNKNOWN_STR);
 }
 
-/* load avg */
-char *
-load_avg(const char *null)
+static char *
+load_avg(void)
 {
 	double avgs[3];
 
-	/* try to get load avg */
 	if (getloadavg(avgs, 3) < 0) {
-		fprintf(stderr, "Error getting load avg.\n");
-		return smprintf(unknowntext);
+		warnx("Failed to get the load avg");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* return it */
 	return smprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
 }
 
-/* ram free */
-char *
-ram_free(const char *null)
+static char *
+ram_free(void)
 {
 	long free;
 	FILE *fp;
 
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read the values */
 	fscanf(fp, "MemFree: %ld kB\n", &free);
-
-	/* close meminfo file */
 	fclose(fp);
 
-	/* return free ram as string */
 	return smprintf("%f", (float)free / 1024 / 1024);
 }
 
-/* ram percentage */
-char *
-ram_perc(const char *null)
+static char *
+ram_perc(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.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* 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);
+	return smprintf("%d%%", 100 * ((total - free) - (buffers + cached)) / total);
 }
 
-/* ram total */
-char *
-ram_total(const char *null)
+static char *
+ram_total(void)
 {
 	long total;
 	FILE *fp;
 
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read the values */
 	fscanf(fp, "MemTotal: %ld kB\n", &total);
-
-	/* close meminfo file */
 	fclose(fp);
 
-	/* return total ram as string */
 	return smprintf("%f", (float)total / 1024 / 1024);
 }
 
-/* ram used */
-char *
-ram_used(const char *null)
+static char *
+ram_used(void)
 {
-	long free, total, buffers, cached, used;
+	long free, total, buffers, cached;
 	FILE *fp;
 
-	/* open meminfo file */
-	if (!(fp = fopen("/proc/meminfo", "r"))) {
-		fprintf(stderr, "Error opening meminfo file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* 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 used */
-	used = total - free - buffers - cached;
+	return smprintf("%f", (float)(total - free - buffers - cached) / 1024 / 1024);
+}
+
+static char *
+run_command(const char *cmd)
+{
+	char *nlptr;
+	FILE *fp;
+	char buf[1024] = UNKNOWN_STR;
+
+	fp = popen(cmd, "r");
+	if (fp == NULL) {
+		warn("Failed to get command output for %s", cmd);
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	fgets(buf, sizeof(buf), fp);
+	pclose(fp);
+	buf[strlen(buf)] = '\0';
+
+	if ((nlptr = strstr(buf, "\n")) != NULL) {
+		nlptr[0] = '\0';
+	}
 
-	/* return used ram as string */
-	return smprintf("%f", (float)used / 1024 / 1024);
+	return smprintf("%s", buf);
 }
 
-/* custom shell command */
-char *
-run_command(const char* command)
+static char *
+swap_free(void)
 {
-	int good;
+	long total, free;
 	FILE *fp;
-	char buffer[64];
+	char buf[2048];
+	size_t bytes_read;
+	char *match;
 
-	/* try to open the command output */
-	if (!(fp = popen(command, "r"))) {
-		fprintf(stderr, "Could not get command output for: %s.\n", command);
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* get command output text, save it to buffer */
-	fgets(buffer, sizeof(buffer) - 1, fp);
+	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+		warn("swap_free: read error");
+		fclose(fp);
+		return smprintf("%s", UNKNOWN_STR);
+	}
 
-	/* close it again */
-	pclose(fp);
+	buf[bytes_read] = '\0';
+	fclose(fp);
 
-	/* add nullchar at the end */
-	for (int i = 0 ; i != sizeof(buffer); i++) {
-		if (buffer[i] == '\0') {
-			good = 1;
-			break;
-		}
+	if ((match = strstr(buf, "SwapTotal")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
 	}
-	if (good) {
-		buffer[strlen(buffer) - 1] = '\0';
+	sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+	if ((match = strstr(buf, "SwapFree")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
 	}
+	sscanf(match, "SwapFree: %ld kB\n", &free);
 
-	/* return the output */
-	return smprintf("%s", buffer);
+	return smprintf("%f", (float)free / 1024 / 1024);
 }
 
-/* temperature */
-char *
-temp(const char *file)
+static char *
+swap_perc(void)
 {
-	int temperature;
+	long total, free, cached;
 	FILE *fp;
+	char buf[2048];
+	size_t bytes_read;
+	char *match;
 
-	/* open temperature file */
-	if (!(fp = fopen(file, "r"))) {
-		fprintf(stderr, "Could not open temperature file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* extract temperature */
-	fscanf(fp, "%d", &temperature);
+	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+		warn("swap_perc: read error");
+		fclose(fp);
+		return smprintf("%s", UNKNOWN_STR);
+	}
 
-	/* close temperature file */
+	buf[bytes_read] = '\0';
 	fclose(fp);
 
-	/* return temperature in degrees */
-	return smprintf("%d°C", temperature / 1000);
+	if ((match = strstr(buf, "SwapTotal")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+	if ((match = strstr(buf, "SwapCached")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapCached: %ld kB\n", &cached);
+
+	if ((match = strstr(buf, "SwapFree")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapFree: %ld kB\n", &free);
+
+	return smprintf("%d%%", 100 * (total - free - cached) / total);
 }
 
-/* uptime */
-char *
-uptime(const char *null)
+static char *
+swap_total(void)
 {
-	struct sysinfo info;
-	int hours = 0;
-	int minutes = 0;
+	long total;
+	FILE *fp;
+	char buf[2048];
+	size_t bytes_read;
+	char *match;
 
-	/* get info */
-	sysinfo(&info);
-	hours = info.uptime / 3600;
-	minutes = (info.uptime - hours * 3600 ) / 60;
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+		warn("swap_total: read error");
+		fclose(fp);
+		return smprintf("%s", UNKNOWN_STR);
+	}
+
+	buf[bytes_read] = '\0';
+	fclose(fp);
 
-	/* return it */
-	return smprintf("%dh %dm", hours, minutes);
+	if ((match = strstr(buf, "SwapTotal")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+	return smprintf("%f", (float)total / 1024 / 1024);
 }
 
-/* username */
-char *
-username(const char *null)
+static char *
+swap_used(void)
 {
-	register struct passwd *pw;
-	register uid_t uid;
+	long total, free, cached;
+	FILE *fp;
+	char buf[2048];
+	size_t bytes_read;
+	char *match;
+
+	fp = fopen("/proc/meminfo", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/meminfo");
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf), fp)) == 0) {
+		warn("swap_used: read error");
+		fclose(fp);
+		return smprintf("%s", UNKNOWN_STR);
+	}
 
-	/* get the values */
-	uid = geteuid();
-	pw = getpwuid(uid);
+	buf[bytes_read] = '\0';
+	fclose(fp);
 
-	/* if it worked, return */
-	if (pw) {
-		return smprintf("%s", pw->pw_name);
-	} else {
-		fprintf(stderr, "Could not get username.\n");
-		return smprintf(unknowntext);
+	if ((match = strstr(buf, "SwapTotal")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapTotal: %ld kB\n", &total);
+
+	if ((match = strstr(buf, "SwapCached")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapCached: %ld kB\n", &cached);
+
+	if ((match = strstr(buf, "SwapFree")) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
+	}
+	sscanf(match, "SwapFree: %ld kB\n", &free);
+
+	return smprintf("%f", (float)(total - free - cached) / 1024 / 1024);
+}
+
+static char *
+temp(const char *file)
+{
+	int temp;
+	FILE *fp;
+
+	fp = fopen(file, "r");
+	if (fp == NULL) {
+		warn("Failed to open file %s", file);
+		return smprintf("%s", UNKNOWN_STR);
 	}
+	fscanf(fp, "%d", &temp);
+	fclose(fp);
 
-	return smprintf(unknowntext);
+	return smprintf("%d°C", temp / 1000);
 }
 
-/* uid */
-char *
-uid(const char *null)
+static char *
+uptime(void)
 {
-	register uid_t uid;
+	struct sysinfo info;
+	int h = 0;
+	int m = 0;
 
-	/* get the values */
-	uid = geteuid();
+	sysinfo(&info);
+	h = info.uptime / 3600;
+	m = (info.uptime - h * 3600 ) / 60;
 
-	/* if it worked, return */
-	if (uid) {
-		return smprintf("%d", uid);
-	} else {
-		fprintf(stderr, "Could not get uid.\n");
-		return smprintf(unknowntext);
+	return smprintf("%dh %dm", h, m);
+}
+
+static char *
+username(void)
+{
+	uid_t uid = geteuid();
+	struct passwd *pw = getpwuid(uid);
+
+	if (pw == NULL) {
+		warn("Failed to get username");
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	return smprintf(unknowntext);
+	return smprintf("%s", pw->pw_name);
+}
+
+static char *
+uid(void)
+{
+	return smprintf("%d", geteuid());
 }
 
 
-/* alsa volume percentage */
-char *
-vol_perc(const char *soundcard)
+static char *
+vol_perc(const char *card)
 {
-	int mute = 0;
-	long vol = 0, max = 0, min = 0;
+	int mute;
+	long int vol, max, min;
 	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;
 
-	/* open everything */
 	snd_mixer_open(&handle, 0);
-	snd_mixer_attach(handle, soundcard);
+	snd_mixer_attach(handle, card);
 	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);
 
-	/* prepare everything */
-	snd_mixer_selem_id_malloc(&vol_info);
-	snd_mixer_selem_id_malloc(&mute_info);
-	/* check */
-	if (vol_info == NULL || mute_info == NULL) {
-		fprintf(stderr, "Could not get alsa volume.\n");
-		return smprintf(unknowntext);
+	if (elem == NULL) {
+		snd_mixer_selem_id_free(s_elem);
+		snd_mixer_close(handle);
+		warn("Failed to get volume percentage for %s", card);
+		return smprintf("%s", UNKNOWN_STR);
 	}
-	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);
 
-	/* get the 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);
+	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_get_playback_switch(elem, 0, &mute);
 
-	/* clean up */
-	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);
-	}
+	snd_mixer_selem_id_free(s_elem);
+	snd_mixer_close(handle);
 
-	/* return the string (mute) */
-	if (!mute) {
+	if (!mute)
 		return smprintf("mute");
-	} else {
-		return smprintf("%d%%", (vol * 100) / max);
-	}
+	else if (max == 0)
+		return smprintf("0%%");
+	else
+		return smprintf("%lu%%", ((uint_fast16_t)(vol * 100) / max));
 }
 
-/* wifi percentage */
-char *
-wifi_perc(const char *wificard)
+static char *
+wifi_perc(const char *iface)
 {
-	int bufsize = 255;
-	int strength;
-	char buf[bufsize];
+	int perc;
+	char buf[255];
 	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.\n");
-		return smprintf(unknowntext);
+	ccat(3, "/sys/class/net/", iface, "/operstate");
+	fp = fopen(concat, "r");
+	if (fp == NULL) {
+		warn("Failed to open file %s", concat);
+		return smprintf("%s", UNKNOWN_STR);
 	}
-
-	/* read the status */
 	fgets(status, 5, fp);
-
-	/* close wifi file */
 	fclose(fp);
-
-	/* check if interface down */
 	if(strcmp(status, "up\n") != 0) {
-		return smprintf(unknowntext);
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* open wifi file */
-	if (!(fp = fopen("/proc/net/wireless", "r"))) {
-		fprintf(stderr, "Error opening wireless file.\n");
-		return smprintf(unknowntext);
+	fp = fopen("/proc/net/wireless", "r");
+	if (fp == NULL) {
+		warn("Failed to open file /proc/net/wireless");
+		return smprintf("%s", UNKNOWN_STR);
 	}
+	ccat(2, iface, ":");
+	fgets(buf, sizeof(buf), fp);
+	fgets(buf, sizeof(buf), fp);
+	fgets(buf, sizeof(buf), fp);
+	fclose(fp);
 
-	/* 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);
+	if ((datastart = strstr(buf, concat)) == NULL) {
+		return smprintf("%s", UNKNOWN_STR);
 	}
+	datastart = (datastart+(strlen(iface)+1));
+	sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &perc);
 
-	/* close wifi file */
-	fclose(fp);
-
-	/* return strength in percent */
-	return smprintf("%d%%", strength);
+	return smprintf("%d%%", perc);
 }
 
-/* wifi essid */
-char *
-wifi_essid(const char *wificard)
+static char *
+wifi_essid(const char *iface)
 {
 	char id[IW_ESSID_MAX_SIZE+1];
-	int sockfd;
+	int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
 	struct iwreq wreq;
 
-	/* prepare */
 	memset(&wreq, 0, sizeof(struct iwreq));
 	wreq.u.essid.length = IW_ESSID_MAX_SIZE+1;
+	snprintf(wreq.ifr_name, sizeof(wreq.ifr_name), "%s", iface);
 
-	/* set the interface */
-	sprintf(wreq.ifr_name, wificard);
-
-	/* check */
-	if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) {
-		fprintf(stderr, "Cannot open socket for interface: %s\n", wificard);
-		return smprintf(unknowntext);
+	if (sockfd == -1) {
+		warn("Failed to get ESSID for interface %s", iface);
+		return smprintf("%s", UNKNOWN_STR);
 	}
 	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);
+		warn("Failed to get ESSID for interface %s", iface);
+		return smprintf("%s", UNKNOWN_STR);
 	}
 
-	/* return the essid */
-	if (strcmp((char *)wreq.u.essid.pointer, "") == 0) {
-		return smprintf(unknowntext);
-	} else {
+	close(sockfd);
+
+	if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
+		return smprintf("%s", UNKNOWN_STR);
+	else
 		return smprintf("%s", (char *)wreq.u.essid.pointer);
+}
+
+static char *
+kernel_release(void)
+{
+	struct utsname udata;
+	if (uname(&udata) < 0)
+		return smprintf("%s", UNKNOWN_STR);
+
+	return smprintf("%s", udata.release);
+}
+
+static void
+sighandler(const int signo)
+{
+	if (signo == SIGTERM || signo == SIGINT) {
+		done = 1;
 	}
 }
 
-/* main function */
+static void
+usage(void)
+{
+	fprintf(stderr, "usage: %s [-dhov]\n", argv0);
+	exit(1);
+}
+
 int
-main(void)
+main(int argc, char *argv[])
 {
-	char status_string[1024];
+	unsigned short int i;
+	char status_string[2048];
+	char *res, *element;
 	struct arg argument;
+	struct sigaction act;
 
-	/* try to open display */
-	if (!(dpy = XOpenDisplay(0x0))) {
-		fprintf(stderr, "Cannot open display!\n");
-		exit(1);
+	ARGBEGIN {
+		case 'd':
+			dflag = 1;
+			break;
+		case 'o':
+			oflag = 1;
+			break;
+		case 'v':
+			printf("slstatus %s (C) 2016 slstatus engineers\n", VERSION);
+			return 0;
+		default:
+			usage();
+	} ARGEND
+
+	if (dflag && oflag) {
+		usage();
+	}
+	if (dflag && daemon(1, 1) < 0) {
+		err(1, "daemon");
 	}
 
-	/* return status every interval */
-	for (;;) {
-		/* clear the string */
-		memset(status_string, 0, sizeof(status_string));
+	memset(&act, 0, sizeof(act));
+	act.sa_handler = sighandler;
+	sigaction(SIGINT,  &act, 0);
+	sigaction(SIGTERM, &act, 0);
 
-		/* generate status_string */
-		for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
+	if (!oflag) {
+		dpy = XOpenDisplay(NULL);
+	}
+
+	setlocale(LC_ALL, "");
+
+	while (!done) {
+		status_string[0] = '\0';
+
+		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++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.fmt, res);
 			if (element == NULL) {
-				element = smprintf(unknowntext);
-				fprintf(stderr, "Failed to format output.\n");
+				element = smprintf("%s", UNKNOWN_STR);
+				warnx("Failed to format output");
 			}
-			strcat(status_string, element);
+			if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string))
+				warnx("Output too long");
 			free(res);
 			free(element);
 		}
 
-		/* return the statusbar */
-		setstatus(status_string);
+		if (!oflag) {
+			XStoreName(dpy, DefaultRootWindow(dpy), status_string);
+			XSync(dpy, False);
+		} else {
+			printf("%s\n", status_string);
+		}
 
-		/* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
-		sleep(update_interval -1);
+		if ((UPDATE_INTERVAL - delay) <= 0) {
+			delay = 0;
+			continue;
+		} else {
+			sleep(UPDATE_INTERVAL - delay);
+			delay = 0;
+		}
 	}
 
-	/* close display */
-	XCloseDisplay(dpy);
+	if (!oflag) {
+		XStoreName(dpy, DefaultRootWindow(dpy), NULL);
+		XCloseDisplay(dpy);
+	}
 
-	/* exit successfully */
 	return 0;
 }