Add ram and swap components on FreeBSD

[slstatus.git] / components / run_command.c

diff --git a/components/run_command.c b/components/run_command.c
index 2041ae4..e00b478 100644 (file)
--- a/components/run_command.c
+++ b/components/run_command.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.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) {
-               fprintf(stderr, "popen '%s': %s\n", cmd, strerror(errno));
+       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;
 }