From: eplanet <emeric.planet@gmail.com>
Date: Tue, 16 Aug 2016 07:29:08 +0000 (+0200)
Subject: Print empty string for not mounted disks. (#148)
X-Git-Tag: 2.11~22
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fde5ebfa1e5132bf33957ace30c70263038391ad;p=i3%2Fi3status

Print empty string for not mounted disks. (#148)

An empty string becomes the default value for format_not_mounted parameter
for any disk entry. This avoids printing erroneous values when a
filesystem is not mounted.
---

diff --git a/man/i3status.man b/man/i3status.man
index 32bc6e6..d0ca2a0 100644
--- a/man/i3status.man
+++ b/man/i3status.man
@@ -249,9 +249,7 @@ is assumed to be "percentage_avail" and low_threshold to be set to 0, which
 implies no coloring at all.
 
 You can define a different format with the option "format_not_mounted"
-which is used if the path does not exist or is not a mount point. So you can just empty
-the output for the given path with adding +format_not_mounted=""+
-to the config section.
+which is used if the path does not exist or is not a mount point. Defaults to "".
 
 *Example order*: +disk /mnt/usbstick+
 
diff --git a/src/print_disk_info.c b/src/print_disk_info.c
index edc69ac..624a8e2 100644
--- a/src/print_disk_info.c
+++ b/src/print_disk_info.c
@@ -130,13 +130,15 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch
 #else
     struct statvfs buf;
 
+    if (format_not_mounted == NULL) {
+        format_not_mounted = "";
+    }
+
     if (statvfs(path, &buf) == -1) {
         /* If statvfs errors, e.g., due to the path not existing,
          * we use the format for a not mounted device. */
-        if (format_not_mounted != NULL) {
-            format = format_not_mounted;
-        }
-    } else if (format_not_mounted != NULL) {
+        format = format_not_mounted;
+    } else {
         FILE *mntentfile = setmntent("/etc/mtab", "r");
         struct mntent *m;
         bool found = false;