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

diff --git a/components/disk.c b/components/disk.c
index 2ce260b..bf69875 100644
--- a/components/disk.c
+++ b/components/disk.c
@@ -17,13 +17,12 @@ disk_free(const char *mnt)
 	}
 
 	return bprintf("%f",
-	               (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024);
+	               (float)fs.f_frsize * (float)fs.f_bavail / 1024 / 1024 / 1024);
 }
 
 const char *
 disk_perc(const char *mnt)
 {
-	int perc;
 	struct statvfs fs;
 
 	if (statvfs(mnt, &fs) < 0) {
@@ -31,9 +30,8 @@ disk_perc(const char *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 *
@@ -47,7 +45,7 @@ disk_total(const char *mnt)
 	}
 
 	return bprintf("%f",
-	               (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
+	               (float)fs.f_frsize * (float)fs.f_blocks / 1024 / 1024 / 1024);
 }
 
 const char *
@@ -61,6 +59,6 @@ disk_used(const char *mnt)
 	}
 
 	return bprintf("%f",
-	               (float)fs.f_bsize * ((float)fs.f_blocks -
+	               (float)fs.f_frsize * ((float)fs.f_blocks -
 	               (float)fs.f_bfree) / 1024 / 1024 / 1024);
 }