X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/1c8aa5318f13710defb4fb34288b8e6c444ac823..3468a6e368974ea222ab81c389e0800748541c42:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index af26fe7..cd6cc8f 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-
+#include <dirent.h>
 #include <err.h>
 #include <fcntl.h>
 #include <ifaddrs.h>
@@ -27,13 +27,14 @@
 
 #include "arg.h"
 
+#define LEN(x) (sizeof (x) / sizeof *(x))
+
 struct arg {
 	const char *(*func)();
 	const char *fmt;
 	const char *args;
 };
 
-static const char *bprintf(const char *fmt, ...);
 static const char *battery_perc(const char *bat);
 static const char *battery_power(const char *bat);
 static const char *battery_state(const char *bat);
@@ -51,6 +52,7 @@ static const char *ip(const char *iface);
 static const char *kernel_release(void);
 static const char *keyboard_indicators(void);
 static const char *load_avg(void);
+static const char *num_files(const char *dir);
 static const char *ram_free(void);
 static const char *ram_perc(void);
 static const char *ram_used(void);
@@ -67,13 +69,10 @@ static const char *username(void);
 static const char *vol_perc(const char *card);
 static const char *wifi_perc(const char *iface);
 static const char *wifi_essid(const char *iface);
-static void sighandler(const int signo);
-static void usage(const int eval);
 
 char *argv0;
 static unsigned short int delay = 0;
 static unsigned short int done;
-static unsigned short int dflag, oflag, nflag;
 static Display *dpy;
 
 #include "config.h"
@@ -107,12 +106,12 @@ battery_perc(const char *bat)
 	fp = fopen(path, "r");
 	if (fp == NULL) {
 		warn("Failed to open file %s", path);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%i", &perc);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%d", perc);
 }
@@ -128,12 +127,12 @@ battery_power(const char *bat)
 	fp = fopen(path, "r");
 	if (fp == NULL) {
 		warn("Failed to open file %s", path);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%i", &watts);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%d", (watts + 500000) / 1000000);
 }
@@ -141,33 +140,38 @@ battery_power(const char *bat)
 static const char *
 battery_state(const char *bat)
 {
-	char path[PATH_MAX];
-	char state[12];
 	FILE *fp;
+	struct {
+		char *state;
+		char *symbol;
+	} map[] = {
+		{ "Charging",    "+" },
+		{ "Discharging", "-" },
+		{ "Full",        "=" },
+		{ "Unknown",     "/" },
+	};
+	size_t i;
 	int n;
+	char path[PATH_MAX], state[12];
 
 	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
 	fp = fopen(path, "r");
 	if (fp == NULL) {
 		warn("Failed to open file %s", path);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%12s", state);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
-	if (strcmp(state, "Charging") == 0) {
-		return "+";
-	} else if (strcmp(state, "Discharging") == 0) {
-		return "-";
-	} else if (strcmp(state, "Full") == 0) {
-		return "=";
-	} else if (strcmp(state, "Unknown") == 0) {
-		return "/";
-	} else {
-		return "?";
+	for (i = 0; i < LEN(map); i++) {
+		if (!strcmp(map[i].state, state)) {
+			break;
+		}
 	}
+
+	return (i == LEN(map)) ? "?" : map[i].symbol;
 }
 
 static const char *
@@ -179,12 +183,12 @@ cpu_freq(void)
 	fp = fopen("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%i", &freq);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%d", (freq + 500) / 1000);
 }
@@ -199,12 +203,12 @@ cpu_perc(void)
 	fp = fopen("/proc/stat", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/stat");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
 	fclose(fp);
 	if (n != 4)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	delay++;
 	sleep(delay);
@@ -212,12 +216,12 @@ cpu_perc(void)
 	fp = fopen("/proc/stat", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/stat");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
 	fclose(fp);
 	if (n != 4)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	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 bprintf("%d", perc);
@@ -230,7 +234,7 @@ datetime(const char *fmt)
 
 	t = time(NULL);
 	if (strftime(buf, sizeof(buf), fmt, localtime(&t)) == 0)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return buf;
 }
@@ -242,7 +246,7 @@ disk_free(const char *mnt)
 
 	if (statvfs(mnt, &fs) < 0) {
 		warn("Failed to get filesystem info");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
@@ -256,7 +260,7 @@ disk_perc(const char *mnt)
 
 	if (statvfs(mnt, &fs) < 0) {
 		warn("Failed to get filesystem info");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
@@ -271,7 +275,7 @@ disk_total(const char *mnt)
 
 	if (statvfs(mnt, &fs) < 0) {
 		warn("Failed to get filesystem info");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
@@ -284,7 +288,7 @@ disk_used(const char *mnt)
 
 	if (statvfs(mnt, &fs) < 0) {
 		warn("Failed to get filesystem info");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
@@ -299,12 +303,12 @@ entropy(void)
 	fp= fopen("/proc/sys/kernel/random/entropy_avail", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/sys/kernel/random/entropy_avail");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%d", &num);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%d", num);
 }
@@ -320,7 +324,7 @@ hostname(void)
 {
 	if (gethostname(buf, sizeof(buf)) == -1) {
 		warn("hostname");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return buf;
@@ -335,7 +339,7 @@ ip(const char *iface)
 
 	if (getifaddrs(&ifaddr) == -1) {
 		warn("Failed to get IP address for interface %s", iface);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) {
@@ -346,7 +350,7 @@ ip(const char *iface)
 		if ((strcmp(ifa->ifa_name, iface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) {
 			if (s != 0) {
 				warnx("Failed to get IP address for interface %s", iface);
-				return UNKNOWN_STR;
+				return unknown_str;
 			}
 			return bprintf("%s", host);
 		}
@@ -354,7 +358,7 @@ ip(const char *iface)
 
 	freeifaddrs(ifaddr);
 
-	return UNKNOWN_STR;
+	return unknown_str;
 }
 
 static const char *
@@ -363,7 +367,7 @@ kernel_release(void)
 	struct utsname udata;
 
 	if (uname(&udata) < 0) {
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%s", udata.release);
@@ -374,6 +378,11 @@ keyboard_indicators(void)
 {
 	Display *dpy = XOpenDisplay(NULL);
 	XKeyboardState state;
+
+	if (dpy == NULL) {
+		warnx("XOpenDisplay failed");
+		return unknown_str;
+	}
 	XGetKeyboardControl(dpy, &state);
 	XCloseDisplay(dpy);
 
@@ -396,12 +405,35 @@ load_avg(void)
 
 	if (getloadavg(avgs, 3) < 0) {
 		warnx("Failed to get the load avg");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]);
 }
 
+static const char *
+num_files(const char *dir)
+{
+	struct dirent *dp;
+	DIR *fd;
+	int num = 0;
+
+	if ((fd = opendir(dir)) == NULL) {
+		warn("Failed to get number of files in directory %s", dir);
+		return unknown_str;
+	}
+
+	while ((dp = readdir(fd)) != NULL) {
+		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
+			continue; /* skip self and parent */
+		num++;
+	}
+
+	closedir(fd);
+
+	return bprintf("%d", num);
+}
+
 static const char *
 ram_free(void)
 {
@@ -412,12 +444,12 @@ ram_free(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "MemFree: %ld kB\n", &free);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%f", (float)free / 1024 / 1024);
 }
@@ -431,7 +463,7 @@ ram_perc(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 ||
 	    fscanf(fp, "MemFree: %ld kB\n", &free) != 1 ||
@@ -445,7 +477,7 @@ ram_perc(void)
 
 scanerr:
 	fclose(fp);
-	return UNKNOWN_STR;
+	return unknown_str;
 }
 
 static const char *
@@ -458,12 +490,12 @@ ram_total(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "MemTotal: %ld kB\n", &total);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%f", (float)total / 1024 / 1024);
 }
@@ -477,7 +509,7 @@ ram_used(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	if (fscanf(fp, "MemTotal: %ld kB\n", &total) != 1 ||
 	    fscanf(fp, "MemFree: %ld kB\n", &free) != 1 ||
@@ -491,7 +523,7 @@ ram_used(void)
 
 scanerr:
 	fclose(fp);
-	return UNKNOWN_STR;
+	return unknown_str;
 }
 
 static const char *
@@ -503,16 +535,16 @@ run_command(const char *cmd)
 	fp = popen(cmd, "r");
 	if (fp == NULL) {
 		warn("Failed to get command output for %s", cmd);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	p = fgets(buf, sizeof(buf) - 1, fp);
 	pclose(fp);
 	if (!p)
-		return UNKNOWN_STR;
+		return unknown_str;
 	if ((p = strrchr(buf, '\n')) != NULL)
 		p[0] = '\0';
 
-	return buf[0] ? buf : UNKNOWN_STR;
+	return buf[0] ? buf : unknown_str;
 }
 
 static const char *
@@ -526,22 +558,22 @@ swap_free(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
 		warn("swap_free: read error");
 		fclose(fp);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	fclose(fp);
 
 	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
 
 	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapFree: %ld kB\n", &free);
 
 	return bprintf("%f", (float)free / 1024 / 1024);
@@ -558,26 +590,26 @@ swap_perc(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
 		warn("swap_perc: read error");
 		fclose(fp);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	fclose(fp);
 
 	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
 
 	if ((match = strstr(buf, "SwapCached")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapCached: %ld kB\n", &cached);
 
 	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapFree: %ld kB\n", &free);
 
 	return bprintf("%d", 100 * (total - free - cached) / total);
@@ -594,17 +626,17 @@ swap_total(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
 		warn("swap_total: read error");
 		fclose(fp);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	fclose(fp);
 
 	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
 
 	return bprintf("%f", (float)total / 1024 / 1024);
@@ -621,25 +653,25 @@ swap_used(void)
 	fp = fopen("/proc/meminfo", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/meminfo");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	if ((bytes_read = fread(buf, sizeof(char), sizeof(buf) - 1, fp)) == 0) {
 		warn("swap_used: read error");
 		fclose(fp);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	fclose(fp);
 
 	if ((match = strstr(buf, "SwapTotal")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
 
 	if ((match = strstr(buf, "SwapCached")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapCached: %ld kB\n", &cached);
 
 	if ((match = strstr(buf, "SwapFree")) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 	sscanf(match, "SwapFree: %ld kB\n", &free);
 
 	return bprintf("%f", (float)(total - free - cached) / 1024 / 1024);
@@ -654,12 +686,12 @@ temp(const char *file)
 	fp = fopen(file, "r");
 	if (fp == NULL) {
 		warn("Failed to open file %s", file);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	n = fscanf(fp, "%d", &temp);
 	fclose(fp);
 	if (n != 1)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	return bprintf("%d", temp / 1000);
 }
@@ -685,7 +717,7 @@ username(void)
 
 	if (pw == NULL) {
 		warn("Failed to get username");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	return bprintf("%s", pw->pw_name);
@@ -708,20 +740,20 @@ vol_perc(const char *card)
 	afd = open(card, O_RDONLY | O_NONBLOCK);
 	if (afd == -1) {
 		warn("Cannot open %s", card);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	if (ioctl(afd, SOUND_MIXER_READ_DEVMASK, &devmask) == -1) {
 		warn("Cannot get volume for %s", card);
 		close(afd);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
-	for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) {
+	for (i = 0; i < LEN(vnames); i++) {
 		if (devmask & (1 << i) && !strcmp("vol", vnames[i])) {
 			if (ioctl(afd, MIXER_READ(i), &v) == -1) {
 				warn("vol_perc: ioctl");
 				close(afd);
-				return UNKNOWN_STR;
+				return unknown_str;
 			}
 		}
 	}
@@ -744,18 +776,18 @@ wifi_perc(const char *iface)
 	fp = fopen(path, "r");
 	if (fp == NULL) {
 		warn("Failed to open file %s", path);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	p = fgets(status, 5, fp);
 	fclose(fp);
 	if(!p || strcmp(status, "up\n") != 0) {
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	fp = fopen("/proc/net/wireless", "r");
 	if (fp == NULL) {
 		warn("Failed to open file /proc/net/wireless");
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	for (i = 0; i < 3; i++) {
@@ -764,10 +796,10 @@ wifi_perc(const char *iface)
 	}
 	fclose(fp);
 	if (i < 2 || !p)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	if ((datastart = strstr(buf, iface)) == NULL)
-		return UNKNOWN_STR;
+		return unknown_str;
 
 	datastart = (datastart+(strlen(iface)+1));
 	sscanf(datastart + 1, " %*d   %d  %*d  %*d		  %*d	   %*d		%*d		 %*d	  %*d		 %*d", &perc);
@@ -788,80 +820,68 @@ wifi_essid(const char *iface)
 
 	if (sockfd == -1) {
 		warn("Failed to get ESSID for interface %s", iface);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 	wreq.u.essid.pointer = id;
 	if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) {
 		warn("Failed to get ESSID for interface %s", iface);
-		return UNKNOWN_STR;
+		return unknown_str;
 	}
 
 	close(sockfd);
 
 	if (strcmp(id, "") == 0)
-		return UNKNOWN_STR;
+		return unknown_str;
 	else
 		return id;
 }
 
 static void
-sighandler(const int signo)
+terminate(const int signo)
 {
-	if (signo == SIGTERM || signo == SIGINT) {
-		done = 1;
-	}
+	done = 1;
 }
 
 static void
-usage(const int eval)
+usage(void)
 {
-	fprintf(stderr, "usage: %s [-d] [-o] [-n] [-v] [-h]\n", argv0);
-	exit(eval);
+	fprintf(stderr, "usage: %s [-s]\n", argv0);
+	exit(1);
 }
 
 int
 main(int argc, char *argv[])
 {
-	unsigned short int i;
-	char status_string[MAXLEN];
-	char *element;
 	struct arg argument;
 	struct sigaction act;
-	size_t len;
+	size_t i, len;
+	int sflag = 0;
+	char status_string[MAXLEN];
+	char *element;
 
 	ARGBEGIN {
-		case 'd':
-			dflag = 1;
-			break;
-		case 'o':
-			oflag = 1;
-			break;
-		case 'n':
-			nflag = 1;
+		case 's':
+			sflag = 1;
 			break;
-		case 'v':
-			printf("slstatus (C) 2016-2017 slstatus engineers\n");
-			return 0;
-		case 'h':
-			usage(0);
 		default:
-			usage(1);
+			usage();
 	} ARGEND
 
-	if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) {
-		usage(1);
-	}
-	if (dflag && daemon(1, 1) < 0) {
-		err(1, "daemon");
+	if (argc) {
+		usage();
 	}
 
 	memset(&act, 0, sizeof(act));
-	act.sa_handler = sighandler;
-	sigaction(SIGINT,  &act, 0);
-	sigaction(SIGTERM, &act, 0);
+	act.sa_handler = terminate;
+	sigaction(SIGINT,  &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
 
-	if (!oflag) {
+	if (!sflag) {
 		dpy = XOpenDisplay(NULL);
+		if (!dpy) {
+			fprintf(stderr, "slstatus: cannot open display");
+			exit(1);
+		}
 	}
 
 	setlocale(LC_ALL, "");
@@ -869,8 +889,7 @@ main(int argc, char *argv[])
 	while (!done) {
 		status_string[0] = '\0';
 
-		for (element = status_string, i = len = 0;
-		     i < sizeof(args) / sizeof(args[0]);
+		for (element = status_string, i = len = 0; i < LEN(args);
 		     ++i, element += len) {
 			argument = args[i];
 			len = snprintf(element, sizeof(status_string)-1 - len,
@@ -882,26 +901,23 @@ main(int argc, char *argv[])
 			}
 		}
 
-		if (oflag) {
-			printf("%s\n", status_string);
-		} else if (nflag) {
+		if (sflag) {
 			printf("%s\n", status_string);
-			done = 1;
 		} else {
 			XStoreName(dpy, DefaultRootWindow(dpy), status_string);
 			XSync(dpy, False);
 		}
 
-		if ((UPDATE_INTERVAL - delay) <= 0) {
+		if ((update_interval - delay) <= 0) {
 			delay = 0;
 			continue;
 		} else {
-			sleep(UPDATE_INTERVAL - delay);
+			sleep(update_interval - delay);
 			delay = 0;
 		}
 	}
 
-	if (!oflag) {
+	if (!sflag) {
 		XStoreName(dpy, DefaultRootWindow(dpy), NULL);
 		XCloseDisplay(dpy);
 	}