reshuffle libbb.h contents so that order of decls makes sense
Found bad typo in largefile support :)
diff --git a/coreutils/df.c b/coreutils/df.c
index c569dae..6ae3eed 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -29,7 +29,7 @@
#ifndef CONFIG_FEATURE_HUMAN_READABLE
static long kscale(long b, long bs)
{
- return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE;
+ return ( b * (long long) bs + 1024/2 ) / 1024;
}
#endif
@@ -38,7 +38,7 @@
long blocks_used;
long blocks_percent_used;
#ifdef CONFIG_FEATURE_HUMAN_READABLE
- unsigned long df_disp_hr = KILOBYTE;
+ unsigned long df_disp_hr = 1024;
#endif
int status = EXIT_SUCCESS;
unsigned opt;
@@ -56,7 +56,7 @@
disp_units_hdr = " Size";
}
if (opt & 2) {
- df_disp_hr = MEGABYTE;
+ df_disp_hr = 1024*1024;
disp_units_hdr = "1M-blocks";
}
#else
diff --git a/coreutils/du.c b/coreutils/du.c
index cae76af..a547b1e 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -27,7 +27,7 @@
#ifdef CONFIG_FEATURE_HUMAN_READABLE
# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
-static unsigned long disp_hr = KILOBYTE;
+static unsigned long disp_hr = 1024;
# else
static unsigned long disp_hr = 512;
# endif
@@ -180,11 +180,11 @@
}
if((opt & (1 << 10))) {
/* -m opt */
- disp_hr = MEGABYTE;
+ disp_hr = 1024*1024;
}
if((opt & (1 << 2))) {
/* -k opt */
- disp_hr = KILOBYTE;
+ disp_hr = 1024;
}
#else
opt_complementary = "H-L:L-H:s-d:d-s";
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 3fe55c3..1aee8b2 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -42,7 +42,7 @@
#endif
opt = getopt32(argc, argv, "m:p", &smode);
if(opt & 1) {
- mode = 0777;
+ mode = 0777;
if (!bb_parse_mode (smode, &mode)) {
bb_error_msg_and_die ("invalid mode `%s'", smode);
}