aboutsummaryrefslogtreecommitdiff
path: root/coreutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:02 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-27 09:05:02 +0000
commitdca0b707c0f0998670f8e69600cc30d94e9b217b (patch)
treebf0291a625fee415b6500007b0ec90880104f962 /coreutils
parent621204bbf6750f1ba3977b43bb35375ddda6b5ae (diff)
downloadbusybox-w32-dca0b707c0f0998670f8e69600cc30d94e9b217b.tar.gz
busybox-w32-dca0b707c0f0998670f8e69600cc30d94e9b217b.tar.bz2
busybox-w32-dca0b707c0f0998670f8e69600cc30d94e9b217b.zip
reshuffle libbb.h contents so that order of decls makes sense
Found bad typo in largefile support :)
Diffstat (limited to 'coreutils')
-rw-r--r--coreutils/df.c6
-rw-r--r--coreutils/du.c6
-rw-r--r--coreutils/mkdir.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/df.c b/coreutils/df.c
index c569dae33..6ae3eed33 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -29,7 +29,7 @@
29#ifndef CONFIG_FEATURE_HUMAN_READABLE 29#ifndef CONFIG_FEATURE_HUMAN_READABLE
30static long kscale(long b, long bs) 30static long kscale(long b, long bs)
31{ 31{
32 return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE; 32 return ( b * (long long) bs + 1024/2 ) / 1024;
33} 33}
34#endif 34#endif
35 35
@@ -38,7 +38,7 @@ int df_main(int argc, char **argv)
38 long blocks_used; 38 long blocks_used;
39 long blocks_percent_used; 39 long blocks_percent_used;
40#ifdef CONFIG_FEATURE_HUMAN_READABLE 40#ifdef CONFIG_FEATURE_HUMAN_READABLE
41 unsigned long df_disp_hr = KILOBYTE; 41 unsigned long df_disp_hr = 1024;
42#endif 42#endif
43 int status = EXIT_SUCCESS; 43 int status = EXIT_SUCCESS;
44 unsigned opt; 44 unsigned opt;
@@ -56,7 +56,7 @@ int df_main(int argc, char **argv)
56 disp_units_hdr = " Size"; 56 disp_units_hdr = " Size";
57 } 57 }
58 if (opt & 2) { 58 if (opt & 2) {
59 df_disp_hr = MEGABYTE; 59 df_disp_hr = 1024*1024;
60 disp_units_hdr = "1M-blocks"; 60 disp_units_hdr = "1M-blocks";
61 } 61 }
62#else 62#else
diff --git a/coreutils/du.c b/coreutils/du.c
index cae76af38..a547b1e14 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -27,7 +27,7 @@
27 27
28#ifdef CONFIG_FEATURE_HUMAN_READABLE 28#ifdef CONFIG_FEATURE_HUMAN_READABLE
29# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K 29# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
30static unsigned long disp_hr = KILOBYTE; 30static unsigned long disp_hr = 1024;
31# else 31# else
32static unsigned long disp_hr = 512; 32static unsigned long disp_hr = 512;
33# endif 33# endif
@@ -180,11 +180,11 @@ int du_main(int argc, char **argv)
180 } 180 }
181 if((opt & (1 << 10))) { 181 if((opt & (1 << 10))) {
182 /* -m opt */ 182 /* -m opt */
183 disp_hr = MEGABYTE; 183 disp_hr = 1024*1024;
184 } 184 }
185 if((opt & (1 << 2))) { 185 if((opt & (1 << 2))) {
186 /* -k opt */ 186 /* -k opt */
187 disp_hr = KILOBYTE; 187 disp_hr = 1024;
188 } 188 }
189#else 189#else
190 opt_complementary = "H-L:L-H:s-d:d-s"; 190 opt_complementary = "H-L:L-H:s-d:d-s";
diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 3fe55c395..1aee8b2b5 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -42,7 +42,7 @@ int mkdir_main (int argc, char **argv)
42#endif 42#endif
43 opt = getopt32(argc, argv, "m:p", &smode); 43 opt = getopt32(argc, argv, "m:p", &smode);
44 if(opt & 1) { 44 if(opt & 1) {
45 mode = 0777; 45 mode = 0777;
46 if (!bb_parse_mode (smode, &mode)) { 46 if (!bb_parse_mode (smode, &mode)) {
47 bb_error_msg_and_die ("invalid mode `%s'", smode); 47 bb_error_msg_and_die ("invalid mode `%s'", smode);
48 } 48 }