Set {r,t}xbytes 0 before incrementing them on OBSD

[slstatus.git] / components / disk.c

diff --git a/components/disk.c b/components/disk.c
index 3d8140e..00deea2 100644 (file)
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,5 +1,7 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
@@ -10,27 +12,25 @@ disk_free(const char *mnt)
        struct statvfs fs;
 
        if (statvfs(mnt, &fs) < 0) {
-               fprintf(stderr, "Failed to get filesystem info");
+               warn("statvfs '%s':", mnt);
                return NULL;
        }
 
-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+       return fmt_scaled(fs.f_frsize * fs.f_bavail);
 }
 
 const char *
 disk_perc(const char *mnt)
 {
-       int perc;
        struct statvfs fs;
 
        if (statvfs(mnt, &fs) < 0) {
-               fprintf(stderr, "Failed to get filesystem info");
+               warn("statvfs '%s':", mnt);
                return NULL;
        }
 
-       perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks));
-
-       return bprintf("%d", perc);
+       return bprintf("%d", (int)(100 *
+                      (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
 }
 
 const char *
@@ -39,11 +39,11 @@ disk_total(const char *mnt)
        struct statvfs fs;
 
        if (statvfs(mnt, &fs) < 0) {
-               fprintf(stderr, "Failed to get filesystem info");
+               warn("statvfs '%s':", mnt);
                return NULL;
        }
 
-       return bprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+       return fmt_scaled(fs.f_frsize * fs.f_blocks);
 }
 
 const char *
@@ -52,9 +52,9 @@ disk_used(const char *mnt)
        struct statvfs fs;
 
        if (statvfs(mnt, &fs) < 0) {
-               fprintf(stderr, "Failed to get filesystem info");
+               warn("statvfs '%s':", mnt);
                return NULL;
        }
 
-       return bprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024);
+       return fmt_scaled(fs.f_frsize * (fs.f_blocks - fs.f_bfree));
 }