From a2bd4b2b5cee06e89084910171341e729fc215e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Tue, 18 Jun 2024 01:43:55 +0900
Subject: =?UTF-8?q?FreeBSD:=20=E3=83=9B=E3=82=B9=E3=83=88=E5=90=8D?=
 =?UTF-8?q?=E3=81=A8=E3=83=A2=E3=83=87=E3=83=AB=E5=90=8D=E3=81=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/user.c | 63 ++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

(limited to 'src/user.c')

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