掃除

1 files changed, 8 insertions, 54 deletions

diff --git a/src/user.c b/src/user.c
index a3805d5..0f11cec 100644
--- a/src/user.c
+++ b/src/user.c
@@ -1,64 +1,18 @@
 #include "user.h"
+#include "common.h"
 
-#include <stdio.h>
-#include <string.h>
-
-void run_user_command(const char *command) {
-  char buf[64];
-#if defined(__NetBSD__) || defined(__FreeBSD__)
-  FILE *p = popen(command, "r");
-  if (!p) {
-    snprintf(buf, sizeof(buf), "「%s」コマンドを見つけられません。", command);
-    perror(buf);
-    return;
-  }
-
-  while (fgets(buf, sizeof(buf), p) != NULL) {
-    printf("%s", buf);
-  }
-
-  pclose(p);
-  // 
-#else
-  FILE *f = fopen(command, "r");
-  if (!f) {
-    snprintf(buf, sizeof(buf), "「%s」ファイルを見つけられません。", command);
-    perror(buf);
-    return;
-  }
-
-  while (fgets(buf, sizeof(buf), f) != NULL) {
-    printf("%s", buf);
-  }
-
-  fclose(f);
-#endif
-}
-
-void display_user_name() {
-  char buf[128];
-  FILE *p = popen("whoami", "r");
-  if (!p) {
-    fprintf(stderr, "「whoami」コマンドを実効に失敗");
-    return;
-  }
-
-  while (fgets(buf, sizeof(buf), p) != NULL) {
-    buf[strcspn(buf, "\n")] = '\0';
-    printf("%s", buf);
-  }
-
-  pclose(p);
+const char *display_user_name() {
+  return run_command_s("whoami");
 }
 
-void display_user_host() {
+const char *display_user_host() {
 #if defined(__OpenBSD__)
-  run_user_command("/etc/myname");
+  return run_command_s("cat /etc/myname");
 #elif defined(__NetBSD__)
-  run_user_command("hostname");
+  return run_command_s("hostname");
 #elif defined(__FreeBSD__)
-  run_user_command("sysctl -n kern.hostname");
+  return run_command_s("sysctl -n kern.hostname");
 #else
-  run_user_command("/etc/hostname");
+  return run_command_s("cat /etc/hostname");
 #endif
 }