X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/4fc4983502243b916acac7d61c09529ee744d759..3fc2872d1b3e62903a4af49326d42c97c11911d5:/components/disk.c

diff --git a/components/disk.c b/components/disk.c
index a225421..15a221b 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,64 +1,58 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
 
 const char *
-disk_free(const char *mnt)
+disk_free(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return bprintf("%f",
-	               (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+	return fmt_human(fs.f_frsize * fs.f_bavail, 1024);
 }
 
 const char *
-disk_perc(const char *mnt)
+disk_perc(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return bprintf("%d", 100 *
-				   (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)));
+	return bprintf("%d", (int)(100 *
+	               (1.0f - ((float)fs.f_bavail / (float)fs.f_blocks))));
 }
 
 const char *
-disk_total(const char *mnt)
+disk_total(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return bprintf("%f",
-	               (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+	return fmt_human(fs.f_frsize * fs.f_blocks, 1024);
 }
 
 const char *
-disk_used(const char *mnt)
+disk_used(const char *path)
 {
 	struct statvfs fs;
 
-	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+	if (statvfs(path, &fs) < 0) {
+		warn("statvfs '%s':", path);
 		return NULL;
 	}
 
-	return bprintf("%f",
-	               (float)fs.f_bsize * ((float)fs.f_blocks -
-	               (float)fs.f_bfree) / 1024 / 1024 / 1024);
+	return fmt_human(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
 }