Update web page...

[oweals/busybox.git] / df.c

diff --git a/df.c b/df.c
index 776fceb2801f8b9d3db8aab0bb628f11ae6704a0..8cb13fa6d8f7de1f91b52ec6f7f3187f65a56d5b 100644 (file)
--- a/df.c
+++ b/df.c
@@ -40,9 +40,6 @@ static int do_df(char *device, const char *mount_point)
        struct statfs s;
        long blocks_used;
        long blocks_percent_used;
-#ifdef BB_FEATURE_HUMAN_READABLE
-       long base;
-#endif 
 
        if (statfs(mount_point, &s) != 0) {
                perror_msg("%s", mount_point);
@@ -60,32 +57,26 @@ static int do_df(char *device, const char *mount_point)
                if (strcmp(device, "/dev/root") == 0) {
                        /* Adjusts device to be the real root device,
                         * or leaves device alone if it can't find it */
-                       find_real_root_device_name( device);
+                       device = find_real_root_device_name(device);
+                       if(device==NULL)
+                               return FALSE;
                }
 #ifdef BB_FEATURE_HUMAN_READABLE
-               switch (df_disp_hr) {
-                       case MEGABYTE:
-                               base = KILOBYTE;
-                               break;
-                       case KILOBYTE:
-                               base = 1;
-                               break;
-                       default:
-                               base = 0;
-               }
                printf("%-20s %9s ", device,
-                          make_human_readable_str(s.f_blocks * (s.f_bsize/KILOBYTE), base));
+                               make_human_readable_str(s.f_blocks, s.f_bsize, df_disp_hr));
+
                printf("%9s ",
-                          make_human_readable_str((s.f_blocks - s.f_bfree) * (s.f_bsize/KILOBYTE), base));
+                               make_human_readable_str( (s.f_blocks - s.f_bfree), s.f_bsize, df_disp_hr));
+
                printf("%9s %3ld%% %s\n",
-                          make_human_readable_str(s.f_bavail * (s.f_bsize/KILOBYTE), base),
-                          blocks_percent_used, mount_point);
+                               make_human_readable_str(s.f_bavail, s.f_bsize, df_disp_hr),
+                               blocks_percent_used, mount_point);
 #else
                printf("%-20s %9ld %9ld %9ld %3ld%% %s\n",
                                device,
-                               (long) (s.f_blocks * (s.f_bsize / KILOBYTE)),
-                               (long) ((s.f_blocks - s.f_bfree) * (s.f_bsize / KILOBYTE)),
-                               (long) (s.f_bavail * (s.f_bsize / KILOBYTE)),
+                               (long) (s.f_blocks * (s.f_bsize / (double)KILOBYTE)),
+                               (long) ((s.f_blocks - s.f_bfree)*(s.f_bsize/(double)KILOBYTE)),
+                               (long) (s.f_bavail * (s.f_bsize / (double)KILOBYTE)),
                                blocks_percent_used, mount_point);
 #endif
        }