commit ad03218fd54e01d612b19a0a569f440131cd5800
parent 5609b9d9dec24b8771280e9eace955fe17663236
Author: Aaron Marcher <info@nulltime.net>
Date: Wed, 14 Sep 2016 16:47:28 +0200
Merge pull request #18 from R41z/master
simplified run_command()
Diffstat:
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/slstatus.c b/slstatus.c
@@ -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] = '\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);
}