* 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 6a81086cb19f00439d6f34ae0bbe15d5dc899277..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
@@ -31,8 +31,8 @@
 #include "busybox.h"
 
 extern const char mtab_file[]; /* Defined in utility.c */
-#ifdef BB_FEATURE_HUMAN_READABLE
-static unsigned long df_disp_hr = 1; 
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
+static unsigned long df_disp_hr = KILOBYTE; 
 #endif
 
 static int do_df(char *device, const char *mount_point)
@@ -61,15 +61,15 @@ static int do_df(char *device, const char *mount_point)
                        if(device==NULL)
                                return FALSE;
                }
-#ifdef BB_FEATURE_HUMAN_READABLE
+#ifdef CONFIG_FEATURE_HUMAN_READABLE
                printf("%-20s %9s ", device,
-                               make_human_readable_str(s.f_blocks, s.f_bsize/KILOBYTE, df_disp_hr));
+                               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, df_disp_hr));
+                               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, df_disp_hr),
+                               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",
@@ -92,19 +92,19 @@ 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");
                                break;
                        case 'm':
-                               df_disp_hr = KILOBYTE;
+                               df_disp_hr = MEGABYTE;
                                strcpy(disp_units_hdr, "1M-blocks");
                                break;
 #endif