X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/f62d626d9b7958362fcf3605bcd2280295c0a30c..e1c5476291cf35693c072327cc5a0261983e1573:/slstatus.c diff --git a/slstatus.c b/slstatus.c index 21cda51..b593765 100644 --- a/slstatus.c +++ b/slstatus.c @@ -405,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); }