X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ee5ec756218c852385c5ba5ef0f75b47ba59ec39..b0401b13bb78bacde9d10b00766830cbeb2c90f6:/components/disk.c

diff --git a/components/disk.c b/components/disk.c
index 2ce260b..9d2284e 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -1,7 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <sys/statvfs.h>
 
 #include "../util.h"
@@ -12,28 +10,25 @@ disk_free(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+		warn("statvfs '%s':", mnt);
 		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)
 {
-	int perc;
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+		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 *
@@ -42,12 +37,11 @@ disk_total(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+		warn("statvfs '%s':", mnt);
 		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 *
@@ -56,11 +50,9 @@ disk_used(const char *mnt)
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
-		fprintf(stderr, "statvfs '%s': %s\n", mnt, strerror(errno));
+		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(fs.f_frsize * (fs.f_blocks - fs.f_bfree), 1024);
 }