FreeBSDの場合の修正

1 files changed, 8 insertions, 3 deletions

diff --git a/src/storage.c b/src/storage.c
index a6e21fa..5471a62 100644
--- a/src/storage.c
+++ b/src/storage.c
@@ -5,11 +5,16 @@
 
 const char *display_storage() {
   const char *iszfs = run_command_s("LC_ALL=C zpool list 2>&1");
-  if (strstr(iszfs, "command not found: zpool")) {
-    return run_command_s("zpool list | awk 'NR>1 {print $1 \": \" $3 \" / \" $2}' | "
-        "sed ':a;N;$!ba;s//, /g'");
+  if (!strstr(iszfs, "command not found: zpool")) {
+    return run_command_s("zpool list | "
+        "awk 'NR>1 {printf \"%s: %s / %s, \", $1, $3, $2}' | "
+        "awk '{sub(/, $/, \"\"); print}'");
   }
 
+  return run_command_s("df -h | "
+      "awk '/^\\/dev\\// {printf \"%s: %s / %s, \", $1, $3, $2}' | "
+      "awk '{sub(/, $/, \"\"); print}'");
+
   return run_command_s("df -h | awk 'NR>1 {print $1 \": \" $3 \" / \" $2}' | "
       "sed ':a;N;$!ba;s/\\n/, /g'");
 }