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.

2 files changed, 12 insertions, 5 deletions

diff --git a/coreutils/Config.in b/coreutils/Config.in
index 5d2965b47..4eb3db052 100644
--- a/coreutils/Config.in
+++ b/coreutils/Config.in
@@ -26,6 +26,13 @@ config CONFIG_CAT
           cat is used to concatenate files and print them to the standard
           output.  Enable this option if you wish to enable the 'cat' utility.
 
+config CONFIG_FEATURE_CAT_ESCAPE
+        bool "support -vetET"
+        depends on CONFIG_CAT
+        default n
+        help
+          Sheer bloat.
+
 config CONFIG_CHGRP
         bool "chgrp"
         default n
@@ -173,7 +180,7 @@ config CONFIG_DU
           du is used to report the amount of disk space used
           for specified files.
 
-config CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+config CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
         bool "Use a default blocksize of 1024 bytes (1K)"
         default y
         depends on CONFIG_DU
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 @@
 #include "busybox.h"
 
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
-# ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 static unsigned long disp_hr = KILOBYTE;
 # else
 static unsigned long disp_hr = 512;
 # endif
-#elif defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+#elif defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
 static unsigned int disp_k = 1;
 #else
 static unsigned int disp_k;     /* bss inits to 0 */
@@ -160,7 +160,7 @@ int du_main(int argc, char **argv)
         char *smax_print_depth;
         unsigned long opt;
 
-#ifdef CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+#ifdef CONFIG_FEATURE_DU_DEFUALT_BLOCKSIZE_1K
         if (getenv("POSIXLY_CORRECT")) {        /* TODO - a new libbb function? */
 #ifdef CONFIG_FEATURE_HUMAN_READABLE
                 disp_hr = 512;
@@ -194,7 +194,7 @@ int du_main(int argc, char **argv)
 #else
         bb_opt_complementally = "H-L:L-H:s-d:d-s";
         opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth);
-#if !defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
+#if !defined CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
         if((opt & (1 << 2))) {
                 /* -k opt */
                         disp_k = 1;