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-w32-ea023eacad23f6a30cffe4f255a050b91748fc2f.tar.gz busybox-w32-ea023eacad23f6a30cffe4f255a050b91748fc2f.tar.bz2 busybox-w32-ea023eacad23f6a30cffe4f255a050b91748fc2f.zip |
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 | |||
189 | CONFIG_ID=y | 189 | CONFIG_ID=y |
190 | CONFIG_INSTALL=y | 190 | CONFIG_INSTALL=y |
191 | CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y | 191 | CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y |
192 | CONFIG_LENGTH=y | ||
193 | CONFIG_LN=y | 192 | CONFIG_LN=y |
194 | CONFIG_LOGNAME=y | 193 | CONFIG_LOGNAME=y |
195 | CONFIG_LS=y | 194 | 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 | |||
211 | # CONFIG_ID is not set | 211 | # CONFIG_ID is not set |
212 | # CONFIG_INSTALL is not set | 212 | # CONFIG_INSTALL is not set |
213 | # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set | 213 | # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set |
214 | # CONFIG_LENGTH is not set | ||
215 | # CONFIG_LN is not set | 214 | # CONFIG_LN is not set |
216 | # CONFIG_LOGNAME is not set | 215 | # CONFIG_LOGNAME is not set |
217 | # CONFIG_LS is not set | 216 | # 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 | |||
200 | CONFIG_ID=y | 200 | CONFIG_ID=y |
201 | CONFIG_INSTALL=y | 201 | CONFIG_INSTALL=y |
202 | CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y | 202 | CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y |
203 | CONFIG_LENGTH=y | ||
204 | CONFIG_LN=y | 203 | CONFIG_LN=y |
205 | CONFIG_LOGNAME=y | 204 | CONFIG_LOGNAME=y |
206 | CONFIG_LS=y | 205 | 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 | |||
295 | help | 295 | help |
296 | Support long options for the install applet. | 296 | Support long options for the install applet. |
297 | 297 | ||
298 | config LENGTH | 298 | ####config LENGTH |
299 | bool "length" | 299 | #### bool "length" |
300 | default y | 300 | #### default y |
301 | help | 301 | #### help |
302 | length is used to print out the length of a specified string. | 302 | #### length is used to print out the length of a specified string. |
303 | 303 | ||
304 | config LN | 304 | config LN |
305 | bool "ln" | 305 | 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 | |||
39 | lib-$(CONFIG_HOSTID) += hostid.o | 39 | lib-$(CONFIG_HOSTID) += hostid.o |
40 | lib-$(CONFIG_ID) += id.o | 40 | lib-$(CONFIG_ID) += id.o |
41 | lib-$(CONFIG_INSTALL) += install.o | 41 | lib-$(CONFIG_INSTALL) += install.o |
42 | lib-$(CONFIG_LENGTH) += length.o | 42 | #lib-$(CONFIG_LENGTH) += length.o |
43 | lib-$(CONFIG_LN) += ln.o | 43 | lib-$(CONFIG_LN) += ln.o |
44 | lib-$(CONFIG_LOGNAME) += logname.o | 44 | lib-$(CONFIG_LOGNAME) += logname.o |
45 | lib-$(CONFIG_LS) += ls.o | 45 | 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)) | |||
211 | IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall5)) | 211 | IF_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall5)) |
212 | IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP)) | 212 | IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP)) |
213 | IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP)) | 213 | IF_LAST(APPLET(last, BB_DIR_USR_BIN, BB_SUID_DROP)) |
214 | IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) | 214 | //IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) |
215 | IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP)) | 215 | IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP)) |
216 | IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) | 216 | IF_SETARCH(APPLET_ODDNAME(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32)) |
217 | IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) | 217 | IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) |