SunOS: CPUとホスト名の表示の修正

2 files changed, 4 insertions, 4 deletions

diff --git a/src/cpu.c b/src/cpu.c
index 780cba1..72d86f6 100644
--- a/src/cpu.c
+++ b/src/cpu.c
@@ -16,9 +16,9 @@ const char *display_cpu() {
                   "sed 's/(TM)//' | sed 's/CPU //' | sed 's/Processor//' && "
                   "echo \" (\" && sysctl -n hw.ncpu && echo \" core)\"");
 #elif defined(__sun)
-  return run_command_s("psrinfo -pv | tail -1 | sed 's/(r)//g' | "
-                       "sed 's/ CPU//' | sed 's/^ *//' && "
-                       "echo \" (\" && psrinfo -p && echo \" core)\"");
+  return run_command_s("psrinfo -pv | tail -1 | "
+      "sed 's/(r)//g; s/ CPU//; s/^ *//; s/ $//' | awk '{$1=$1};1' && "
+      "echo \" (\" && psrinfo -p && echo \" core)\"");
 #elif defined(__linux__)
   char buf[20];
   long int val;
diff --git a/src/host.c b/src/host.c
index 77020ae..985b90a 100644
--- a/src/host.c
+++ b/src/host.c
@@ -95,7 +95,7 @@ void display_host_model() {
   free((void *)cmd);
 #elif defined(__sun)
   const char *cmd = run_host_command("smbios | grep \"Product\" | "
-      "sed 's/ Product: //' | head -1");
+      "sed 's/ Product: //' | awk '{$1=$1};1' | head -1");
   if (!cmd) return;
   printf("%s", cmd);
   free((void *)cmd);