X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/c60af317f3cb49381258c2480636a7b390b9ff3b..6cab2d57199edd8cc9e292ded04558fe9279962b:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index f39a2dc..e6e726e 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -20,6 +20,7 @@
 #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>
@@ -29,7 +30,6 @@
 
 #include "extern/arg.h"
 #include "extern/strlcat.h"
-#include "extern/strlcpy.h"
 #include "extern/concat.h"
 
 struct arg {
@@ -68,6 +68,7 @@ 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 set_status(const char *str);
 static void sighandler(const int signo);
 static void usage(void);
@@ -404,19 +405,22 @@ ram_used(void)
 static char *
 run_command(const char *cmd)
 {
+	char *nlptr;
 	FILE *fp;
-	char buf[1024] = "n/a";
+	char buf[1024] = UNKNOWN_STR;
 
 	fp = popen(cmd, "r");
 	if (fp == NULL) {
 		warn("Failed to get command output for %s", cmd);
 		return smprintf(UNKNOWN_STR);
 	}
-	fgets(buf, sizeof(buf)-1, fp);
+	fgets(buf, sizeof(buf), fp);
 	pclose(fp);
-
 	buf[strlen(buf)] = '\0';
-	strtok(buf, "\n");
+
+	if ((nlptr = strstr(buf, "\n")) != NULL) {
+		nlptr[0] = '\0';
+	}
 
 	return smprintf("%s", buf);
 }
@@ -424,7 +428,7 @@ run_command(const char *cmd)
 static char *
 swap_free(void)
 {
-	long free;
+	long total, free;
 	FILE *fp;
 	char buf[2048];
 	size_t bytes_read;
@@ -439,7 +443,13 @@ swap_free(void)
 	buf[bytes_read] = '\0';
 	fclose(fp);
 	if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-		warn("Failed to read /proc/meminfo\n");
+		warn("Failed to read from /proc/meminfo");
+		return smprintf(UNKNOWN_STR);
+	}
+
+	match = strstr(buf, "SwapTotal");
+	sscanf(match, "SwapTotal: %ld kB\n", &total);
+	if (total == 0) {
 		return smprintf(UNKNOWN_STR);
 	}
 
@@ -467,15 +477,18 @@ swap_perc(void)
 	buf[bytes_read] = '\0';
 	fclose(fp);
 	if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-		warn("Failed to read /proc/meminfo\n");
+		warn("Failed to read from /proc/meminfo");
 		return smprintf(UNKNOWN_STR);
 	}
 
-	match = strstr(buf, "SwapCached");
-	sscanf(match, "SwapCached: %ld kB\n", &cached);
-
 	match = strstr(buf, "SwapTotal");
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
+	if (total == 0) {
+		return smprintf(UNKNOWN_STR);
+	}
+
+	match = strstr(buf, "SwapCached");
+	sscanf(match, "SwapCached: %ld kB\n", &cached);
 
 	match = strstr(buf, "SwapFree");
 	sscanf(match, "SwapFree: %ld kB\n", &free);
@@ -501,12 +514,15 @@ swap_total(void)
 	buf[bytes_read] = '\0';
 	fclose(fp);
 	if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-		warn("Failed to read /proc/meminfo\n");
+		warn("Failed to read from /proc/meminfo");
 		return smprintf(UNKNOWN_STR);
 	}
 
 	match = strstr(buf, "SwapTotal");
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
+	if (total == 0) {
+		return smprintf(UNKNOWN_STR);
+	}
 
 	return smprintf("%f", (float)total / 1024 / 1024);
 }
@@ -529,15 +545,18 @@ swap_used(void)
 	buf[bytes_read] = '\0';
 	fclose(fp);
 	if (bytes_read == 0 || bytes_read == sizeof(buf)) {
-		warn("Failed to read /proc/meminfo\n");
+		warn("Failed to read from /proc/meminfo");
 		return smprintf(UNKNOWN_STR);
 	}
 
-	match = strstr(buf, "SwapCached");
-	sscanf(match, "SwapCached: %ld kB\n", &cached);
-
 	match = strstr(buf, "SwapTotal");
 	sscanf(match, "SwapTotal: %ld kB\n", &total);
+	if (total == 0) {
+		return smprintf(UNKNOWN_STR);
+	}
+
+	match = strstr(buf, "SwapCached");
+	sscanf(match, "SwapCached: %ld kB\n", &cached);
 
 	match = strstr(buf, "SwapFree");
 	sscanf(match, "SwapFree: %ld kB\n", &free);
@@ -706,6 +725,16 @@ wifi_essid(const char *iface)
 		return smprintf("%s", (char *)wreq.u.essid.pointer);
 }
 
+static char *
+kernel_release(void)
+{
+	struct utsname udata;
+	if (uname(&udata) < 0)
+		return smprintf(UNKNOWN_STR);
+
+	return smprintf("%s", udata.release);
+}
+
 static void
 set_status(const char *str)
 {
@@ -732,7 +761,7 @@ int
 main(int argc, char *argv[])
 {
 	unsigned short int i;
-	char status_string[4096];
+	char status_string[2048];
 	char *res, *element;
 	struct arg argument;
 	struct sigaction act;
@@ -784,7 +813,8 @@ main(int argc, char *argv[])
 				element = smprintf(UNKNOWN_STR);
 				warnx("Failed to format output");
 			}
-			strlcat(status_string, element, sizeof(status_string));
+			if (strlcat(status_string, element, sizeof(status_string)) >= sizeof(status_string))
+				warnx("Output too long");
 			free(res);
 			free(element);
 		}