commit 229d2ace9de253e01a486a518301168ebb695b96
author Elliott Hughes <enh@google.com> Mon Dec 03 08:15:25 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 03 08:15:25 2012 -0800
tree f59426e06e363b7bcf4fa393cb40ce07fc9b2991
parent 376448c03249ff6c9f584b80c886fc616b95339a
parent b8db1e093d412f57263dc597dbac14c377945781

am b8db1e09: am 777991d9: Merge "Fixed improper size displaying in \'df\' utility"

* commit 'b8db1e093d412f57263dc597dbac14c377945781':
  Fixed improper size displaying in 'df' utility

toolbox/df.c

diff --git a/toolbox/df.c b/toolbox/df.c
index 63940a1..9cd0743 100644
--- a/toolbox/df.c
+++ b/toolbox/df.c
@@ -9,16 +9,22 @@
 static void printsize(long long n)
 {
     char unit = 'K';
-    n /= 1024;
-    if (n > 1024) {
+    long long t;
+
+    n *= 10;
+
+    if (n > 1024*1024*10) {
         n /= 1024;
         unit = 'M';
     }
-    if (n > 1024) {
+
+    if (n > 1024*1024*10) {
         n /= 1024;
         unit = 'G';
     }
-    printf("%4lld%c", n, unit);
+
+    t = (n + 512) / 1024;
+    printf("%4lld.%1lld%c", t/10, t%10, unit);
 }
 
 static void df(char *s, int always) {
@@ -41,7 +47,7 @@
 }
 
 int df_main(int argc, char *argv[]) {
-    printf("Filesystem             Size   Used   Free   Blksize\n");
+    printf("Filesystem               Size     Used     Free   Blksize\n");
     if (argc == 1) {
         char s[2000];
         FILE *f = fopen("/proc/mounts", "r");