* archival/bunzip2.c (bunzip2_main): Do not remove files if writing to standard

[oweals/busybox.git] / coreutils / df.c

diff --git a/coreutils/df.c b/coreutils/df.c
index 485076f90e863fe827f52f6470d865513a162620..0e9e5d61a4dfaadf061cae25e3977fe5046bf49f 100644 (file)
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -2,8 +2,8 @@
 /*
  * Mini df implementation for busybox
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
+ * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
  * based on original code by (I think) Bruce Perens <bruce@pixar.com>.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,13 +24,14 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <mntent.h>
 #include <sys/vfs.h>
 #include <getopt.h>
 #include "busybox.h"
 
 extern const char mtab_file[]; /* Defined in utility.c */
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
 static unsigned long df_disp_hr = KILOBYTE; 
 #endif
 
@@ -39,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);
@@ -59,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);
-               }
-#ifdef BB_FEATURE_HUMAN_READABLE
-               switch (df_disp_hr) {
-                       case MEGABYTE:
-                               base = KILOBYTE;
-                               break;
-                       case KILOBYTE:
-                               base = 1;
-                               break;
-                       default:
-                               base = 0;
+                       device = find_real_root_device_name(device);
+                       if(device==NULL)
+                               return FALSE;
                }
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
                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
        }
@@ -100,13 +92,13 @@ extern int df_main(int argc, char **argv)
        char disp_units_hdr[80] = "1k-blocks"; /* default display is kilobytes */
 
        while ((opt = getopt(argc, argv, "k"
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
        "hm"
 #endif
 )) > 0)
        {
                switch (opt) {
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
                        case 'h':
                                df_disp_hr = 0;
                                strcpy(disp_units_hdr, "     Size");