X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/f28e2682fdea5991891bf5f784292dc8fe7603a5..ad03218fd54e01d612b19a0a569f440131cd5800:/slstatus.c?ds=sidebyside

diff --git a/slstatus.c b/slstatus.c
index f0d9544..a13bf3b 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -119,12 +119,6 @@ battery_state(const char *battery)
 	char state[12]; 
 	FILE *fp;
 
-	if (!state) {
-		warn("Failed to get battery state.");
-		return smprintf(UNKNOWN_STR);
-	}
-
-
 	ccat(3, "/sys/class/power_supply/", battery, "/status");
 	fp = fopen(concat, "r");
 	if (fp == NULL) {
@@ -278,9 +272,7 @@ hostname(void)
 	}
 
 	fgets(hostname, sizeof(hostname), fp);
-	/* FIXME: needs improvement */
-	memset(&hostname[strlen(hostname)], '\0',
-		sizeof(hostname) - strlen(hostname));
+	hostname[strlen(hostname)-1] = '\0';
 	fclose(fp);
 
 	return smprintf("%s", hostname);
@@ -414,26 +406,18 @@ ram_used(void)
 static char *
 run_command(const char* command)
 {
-	int good;
 	FILE *fp = popen(command, "r");
-	char buffer[64] = "";
+	char buffer[64] = '\0';
 
 	if (fp == NULL) {
 		warn("Could not get command output for: %s", command);
 		return smprintf(UNKNOWN_STR);
 	}
 
-	fgets(buffer, sizeof(buffer)-1, fp);
-	pclose(fp);
-	for (int i = 0 ; i != sizeof(buffer); i++) {
-		if (buffer[i] == '\0') {
-			good = 1;
-			break;
-		}
-	}
-	if (good)
-		buffer[strlen(buffer)-1] = '\0';
+	fgets(buffer, sizeof(buffer), fp);
+	buffer[sizeof(buffer)-1] = '\0';
 
+	pclose(fp);
 	return smprintf("%s", buffer);
 }