diff options
| author | Rob Landley <rob@landley.net> | 2006-04-25 22:40:53 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2006-04-25 22:40:53 +0000 |
| commit | 5fe8d5b9c5930497ecf47817ec3af66bebec52c0 (patch) | |
| tree | b9cccd00d8ba8b9e7df50e6aaa76a7ed5145b0c1 /coreutils/du.c | |
| parent | 7818a422bc9a9dee61b1c3d87786d1724fb9b20a (diff) | |
| download | busybox-w32-5fe8d5b9c5930497ecf47817ec3af66bebec52c0.tar.gz busybox-w32-5fe8d5b9c5930497ecf47817ec3af66bebec52c0.tar.bz2 busybox-w32-5fe8d5b9c5930497ecf47817ec3af66bebec52c0.zip | |
Convert a chunk of usage.h to USE_ and SKIP_ (more to do there), and fix a
DEFALT typo in du while I was there.
Diffstat (limited to 'coreutils/du.c')
| -rw-r--r-- | coreutils/du.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/coreutils/du.c b/coreutils/du.c index 38790f83b..b204a025a 100644 --- a/coreutils/du.c +++ b/coreutils/du.c | |||
| @@ -31,12 +31,12 @@ | |||
| 31 | #include "busybox.h" | 31 | #include "busybox.h" |
| 32 | 32 | ||
| 33 | #ifdef CONFIG_FEATURE_HUMAN_READABLE | 33 | #ifdef CONFIG_FEATURE_HUMAN_READABLE |
| 34 | # ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K | 34 | # ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K |
| 35 | static unsigned long disp_hr = KILOBYTE; | 35 | static unsigned long disp_hr = KILOBYTE; |
| 36 | # else | 36 | # else |
| 37 | static unsigned long disp_hr = 512; | 37 | static unsigned long disp_hr = 512; |
| 38 | # endif | 38 | # endif |
| 39 | #elif defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K | 39 | #elif defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K |
| 40 | static unsigned int disp_k = 1; | 40 | static unsigned int disp_k = 1; |
| 41 | #else | 41 | #else |
| 42 | static unsigned int disp_k; /* bss inits to 0 */ | 42 | static unsigned int disp_k; /* bss inits to 0 */ |
| @@ -160,7 +160,7 @@ int du_main(int argc, char **argv) | |||
| 160 | char *smax_print_depth; | 160 | char *smax_print_depth; |
| 161 | unsigned long opt; | 161 | unsigned long opt; |
| 162 | 162 | ||
| 163 | #ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K | 163 | #ifdef CONFIG_FEATURE_DU_DEFUALT_BLOCKSIZE_1K |
| 164 | if (getenv("POSIXLY_CORRECT")) { /* TODO - a new libbb function? */ | 164 | if (getenv("POSIXLY_CORRECT")) { /* TODO - a new libbb function? */ |
| 165 | #ifdef CONFIG_FEATURE_HUMAN_READABLE | 165 | #ifdef CONFIG_FEATURE_HUMAN_READABLE |
| 166 | disp_hr = 512; | 166 | disp_hr = 512; |
| @@ -194,7 +194,7 @@ int du_main(int argc, char **argv) | |||
| 194 | #else | 194 | #else |
| 195 | bb_opt_complementally = "H-L:L-H:s-d:d-s"; | 195 | bb_opt_complementally = "H-L:L-H:s-d:d-s"; |
| 196 | opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth); | 196 | opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth); |
| 197 | #if !defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K | 197 | #if !defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K |
| 198 | if((opt & (1 << 2))) { | 198 | if((opt & (1 << 2))) { |
| 199 | /* -k opt */ | 199 | /* -k opt */ |
| 200 | disp_k = 1; | 200 | disp_k = 1; |