掃除

1 files changed, 4 insertions, 24 deletions

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 <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-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\""));
 }