fallingsky04
/
slstatus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #18 from R41z/master 

simplified run_command()
This commit is contained in:
Aaron Marcher 2016-09-14 16:47:28 +02:00 committed by GitHub
parent 5609b9d9de 561de544e7
commit ad03218fd5
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
slstatus.c
View File

@ -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] = '\0';
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); fgets(buffer, sizeof(buffer), fp);
pclose(fp); buffer[sizeof(buffer)-1] = '\0';
for (int i = 0 ; i != sizeof(buffer); i++) {
if (buffer[i] == '\0') {
good = 1;
break;
}
}
if (good)
buffer[strlen(buffer)-1] = '\0';
pclose(fp);
return smprintf("%s", buffer); return smprintf("%s", buffer);
} }