X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/7246dc4381c6c95454672a5c1aff65a02d6d3747..062f33f8742c645a3b436f609a19219106a8af75:/components/disk.c

diff --git a/components/disk.c b/components/disk.c
index 90a8e0b..998ad47 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <err.h>
+#include <errno.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
@@ -11,27 +12,25 @@ disk_free(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		warn("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_human_2(fs.f_frsize * fs.f_bavail, "B");
 }
 
 const char *
 disk_perc(const char *mnt)
 {
-	int perc;
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		warn("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 *
@@ -40,11 +39,11 @@ disk_total(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		warn("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_human_2(fs.f_frsize * fs.f_blocks, "B");
 }
 
 const char *
@@ -53,9 +52,9 @@ disk_used(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		warn("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_human_2(fs.f_frsize * (fs.f_blocks - fs.f_bfree), "B");
 }