simplified run_command()
authorAli H. Fardan <raiz@firemail.cc>
Wed, 14 Sep 2016 13:20:20 +0000 (16:20 +0300)
committerAli H. Fardan <raiz@firemail.cc>
Wed, 14 Sep 2016 13:20:20 +0000 (16:20 +0300)
slstatus.c

index fefdf6f70168a3f86ec9462cb7790be0b6ad0ecf..1a297f8bf6b161b516daa18a0ffe6f73d6a347f0 100644 (file)
@@ -406,26 +406,18 @@ ram_used(void)
 static char *
 run_command(const char* command)
 {
-       int good;
        FILE *fp = popen(command, "r");
-       char buffer[64] = "";
+       char buffer[64];
 
        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);
 }