Bladeren bron

simplified run_command()

master
Ali H. Fardan 8 jaren geleden
bovenliggende
commit
35f7862744
1 gewijzigde bestanden met toevoegingen van 4 en 12 verwijderingen
  1. +4
    -12
      slstatus.c

+ 4
- 12
slstatus.c Bestand weergeven

@@ -406,26 +406,18 @@ ram_used(void)
static char * static char *
run_command(const char* command) run_command(const char* command)
{ {
int good;
FILE *fp = popen(command, "r"); FILE *fp = popen(command, "r");
char buffer[64] = "";
char buffer[64];


if (fp == NULL) { if (fp == NULL) {
warn("Could not get command output for: %s", command); warn("Could not get command output for: %s", command);
return smprintf(UNKNOWN_STR); 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); return smprintf("%s", buffer);
} }




Laden…
Annuleren
Opslaan