reshuffle libbb.h contents so that order of decls makes sense

Found bad typo in largefile support :)
This commit is contained in:
Denis Vlasenko
2006-10-27 09:05:02 +00:00
parent 621204bbf6
commit dca0b707c0
6 changed files with 264 additions and 281 deletions

View File

@@ -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 @@ int df_main(int argc, char **argv)
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 @@ int df_main(int argc, char **argv)
disp_units_hdr = " Size";
}
if (opt & 2) {
df_disp_hr = MEGABYTE;
df_disp_hr = 1024*1024;
disp_units_hdr = "1M-blocks";
}
#else

View File

@@ -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 @@ int du_main(int argc, char **argv)
}
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";

View File

@@ -42,7 +42,7 @@ int mkdir_main (int argc, char **argv)
#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);
}