Merge pull request #18 from R41z/master simplified run_command()
Aaron Marcher info@nulltime.net
Wed, 14 Sep 2016 16:47:28 +0200
1 files changed,
4 insertions(+),
12 deletions(-)
jump to
M
slstatus.c
→
slstatus.c
@@ -406,26 +406,18 @@
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); }