check daemon() return value

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 9272c54..0a0f743 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -400,7 +400,7 @@ static char *
 run_command(const char *cmd)
 {
        FILE *fp;
-       char buf[64] = "n/a";
+       char buf[1024] = "n/a";
 
        fp = popen(cmd, "r");
        if (fp == NULL) {
@@ -408,9 +408,11 @@ run_command(const char *cmd)
                return smprintf(UNKNOWN_STR);
        }
        fgets(buf, sizeof(buf)-1, fp);
-       buf[strlen(buf)-1] = '\0';
        pclose(fp);
 
+       buf[strlen(buf)] = '\0';
+       strtok(buf, "\n");
+
        return smprintf("%s", buf);
 }
 
@@ -619,8 +621,8 @@ main(int argc, char *argv[])
        if (dflag && oflag) {
                usage();
        }
-       if (dflag) {
-               (void)daemon(1, 1);
+       if (dflag && daemon(1, 1) < 0) {
+               err(1, "daemon");
        }
 
        memset(&act, 0, sizeof(act));