From b6e3f6cb5d1051777c35988f201e6730525e3389 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Wed, 19 Jun 2024 23:52:56 +0900 Subject: =?UTF-8?q?=E6=8E=83=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/uptime.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) (limited to 'src/uptime.c') diff --git a/src/uptime.c b/src/uptime.c index 22b8356..56ea6b7 100644 --- a/src/uptime.c +++ b/src/uptime.c @@ -1,33 +1,13 @@ #include "uptime.h" +#include "common.h" #include -#include -#include - -void run_uptime_command(const char *command) { - char buf[128]; - - FILE *p = popen(command, "r"); - if (!p) { - fprintf(stderr, "起動時間コマンドを実効に失敗: %s", command); - return; - } - - while (fgets(buf, sizeof(buf), p) != NULL) { - buf[strcspn(buf, "\n")] = '\0'; - printf("%s", buf); - } - - pclose(p); -} void display_days() { - run_uptime_command("uptime | awk '{print $3}' && echo \" days\""); + printf("%s", run_command_s("uptime | awk '{print $3}' && echo \" days\"")); } void display_time() { - /* run_uptime_command("uptime | awk '{print $3}' | sed 's/,//' | " */ - /* "sed 's/:/ hours, /' && echo \" mins\""); */ - run_uptime_command("uptime | awk '{print $5}' | sed 's/,//' | " - "sed 's/:/ hours, /' && echo \" mins\""); + printf("%s", run_command_s("uptime | awk '{print $5}' | sed 's/,//' | " + "sed 's/:/ hours, /' && echo \" mins\"")); } -- cgit v1.2.3