X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/914440b4fc3c5ecb7d9eedf4da6f2a1c7ec2e7a9..7baad64a4b26673b170b110899bdab0ebbdfd761:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index 89a3268..b05d915 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -1,6 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
-#include <errno.h>
 #include <locale.h>
 #include <signal.h>
 #include <stdio.h>
@@ -78,7 +76,7 @@ main(int argc, char *argv[])
 	sigaction(SIGTERM, &act, NULL);
 
 	if (!sflag && !(dpy = XOpenDisplay(NULL))) {
-		fprintf(stderr, "slstatus: cannot open display");
+		fprintf(stderr, "Cannot open display");
 		return 1;
 	}
 
@@ -87,8 +85,10 @@ main(int argc, char *argv[])
 
 		status[0] = '\0';
 		for (i = len = 0; i < LEN(args); i++) {
+			const char * res = args[i].func(args[i].args);
+			res = (res == NULL) ? unknown_str : res;
 			len += snprintf(status + len, sizeof(status) - len,
-			                args[i].fmt, args[i].func(args[i].args));
+			                args[i].fmt, res);
 
 			if (len >= sizeof(status)) {
 				status[sizeof(status) - 1] = '\0';