diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-26 01:21:20 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-26 01:21:20 +0100 |
| commit | ea023eacad23f6a30cffe4f255a050b91748fc2f (patch) | |
| tree | 4e4c1f19c75f27cefa52bcf96b7b4f0ff536a3e6 | |
| parent | f18a82d9b320146e367217aba6664b1efb1be68c (diff) | |
| download | busybox-ea023eacad23f6a30cffe4f255a050b91748fc2f.tar.gz | |
disable length applet. ${#var} and echo -n "$var" | wc -c are portable equivalents
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | TEST_config_nommu | 1 | ||||
| -rw-r--r-- | TEST_config_noprintf | 1 | ||||
| -rw-r--r-- | TEST_config_rh9 | 1 | ||||
| -rw-r--r-- | coreutils/Config.src | 10 | ||||
| -rw-r--r-- | coreutils/Kbuild.src | 2 | ||||
| -rw-r--r-- | coreutils/length.c.disabled (renamed from coreutils/length.c) | 0 | ||||
| -rw-r--r-- | include/applets.src.h | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/TEST_config_nommu b/TEST_config_nommu index 18f448391..905f65296 100644 --- a/TEST_config_nommu +++ b/TEST_config_nommu @@ -189,7 +189,6 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y diff --git a/TEST_config_noprintf b/TEST_config_noprintf index 22525ecb6..b72e12856 100644 --- a/TEST_config_noprintf +++ b/TEST_config_noprintf @@ -211,7 +211,6 @@ CONFIG_FALSE=y # CONFIG_ID is not set # CONFIG_INSTALL is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set -# CONFIG_LENGTH is not set # CONFIG_LN is not set # CONFIG_LOGNAME is not set # CONFIG_LS is not set diff --git a/TEST_config_rh9 b/TEST_config_rh9 index e45608351..23094e391 100644 --- a/TEST_config_rh9 +++ b/TEST_config_rh9 @@ -200,7 +200,6 @@ CONFIG_HOSTID=y CONFIG_ID=y CONFIG_INSTALL=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LENGTH=y CONFIG_LN=y CONFIG_LOGNAME=y CONFIG_LS=y diff --git a/coreutils/Config.src b/coreutils/Config.src index c2fd73e59..1a044f96c 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src @@ -295,11 +295,11 @@ config FEATURE_INSTALL_LONG_OPTIONS help Support long options for the install applet. -config LENGTH - bool "length" - default y - help - length is used to print out the length of a specified string. +####config LENGTH +#### bool "length" +#### default y +#### help +#### length is used to print out the length of a specified string. config LN bool "ln" diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index 4ea0fa50a..6a41c8318 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -39,7 +39,7 @@ lib-$(CONFIG_HEAD) += head.o lib-$(CONFIG_HOSTID) += hostid.o lib-$(CONFIG_ID) += id.o lib-$(CONFIG_INSTALL) += install.o -lib-$(CONFIG_LENGTH) += length.o +#lib-$(CONFIG_LENGTH) += length.o lib-$(CONFIG_LN) += ln.o lib-$(CONFIG_LOGNAME) += logname.o lib-$(CONFIG_LS) += ls.o diff --git a/coreutils/length.c b/coreutils/length.c.disabled index 7f0b48ccd..7f0b48ccd 100644 --- a/coreutils/length.c +++ b/coreutils/length.c.disabled diff --git a/include/applets.src.h b/include/applets.src.h index fa7d0cc55..133f376a3 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -211,7 +211,7 @@ IF_KILLALL(APPLET_ODDNAME(killall, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall)) IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall5)) IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP)) IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP)) -IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) +//IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP)) IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) |