X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7246dc4381c6c95454672a5c1aff65a02d6d3747..9ac721c23fb640de2a6d1f84c84a79b2ccc26691:/components/run_command.c

diff --git a/components/run_command.c b/components/run_command.c
index 99f54ea..e00b478 100644
--- a/components/run_command.c
+++ b/components/run_command.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -11,17 +10,21 @@ run_command(const char *cmd)
 	char *p;
 	FILE *fp;
 
-	fp = popen(cmd, "r");
-	if (fp == NULL) {
-		warn("Failed to get command output for %s", cmd);
+	if (!(fp = popen(cmd, "r"))) {
+		warn("popen '%s':", cmd);
 		return NULL;
 	}
 	p = fgets(buf, sizeof(buf) - 1, fp);
-	pclose(fp);
-	if (!p)
+	if (pclose(fp) < 0) {
+		warn("pclose '%s':", cmd);
 		return NULL;
-	if ((p = strrchr(buf, '\n')) != NULL)
+	}
+	if (!p) {
+		return NULL;
+	}
+	if ((p = strrchr(buf, '\n'))) {
 		p[0] = '\0';
+	}
 
 	return buf[0] ? buf : NULL;
 }