emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disable length applet. ${#var} and echo -n "$var" | wc -c are portable equivalents

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2011-01-26 01:21:20 +01:00
parent f18a82d9b3
commit ea023eacad
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TEST_config_nommu
View File

@ -189,7 +189,6 @@ CONFIG_HOSTID=y
CONFIG_ID=y CONFIG_ID=y
CONFIG_INSTALL=y CONFIG_INSTALL=y
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
CONFIG_LENGTH=y
CONFIG_LN=y CONFIG_LN=y
CONFIG_LOGNAME=y CONFIG_LOGNAME=y
CONFIG_LS=y CONFIG_LS=y

1
TEST_config_noprintf
View File

@ -211,7 +211,6 @@ CONFIG_FALSE=y
# CONFIG_ID is not set # CONFIG_ID is not set
# CONFIG_INSTALL is not set # CONFIG_INSTALL is not set
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set # CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
# CONFIG_LENGTH is not set
# CONFIG_LN is not set # CONFIG_LN is not set
# CONFIG_LOGNAME is not set # CONFIG_LOGNAME is not set
# CONFIG_LS is not set # CONFIG_LS is not set

1
TEST_config_rh9
View File

@ -200,7 +200,6 @@ CONFIG_HOSTID=y
CONFIG_ID=y CONFIG_ID=y
CONFIG_INSTALL=y CONFIG_INSTALL=y
CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
CONFIG_LENGTH=y
CONFIG_LN=y CONFIG_LN=y
CONFIG_LOGNAME=y CONFIG_LOGNAME=y
CONFIG_LS=y CONFIG_LS=y

10
coreutils/Config.src
View File

@ -295,11 +295,11 @@ config FEATURE_INSTALL_LONG_OPTIONS
help help
Support long options for the install applet. Support long options for the install applet.
config LENGTH ####config LENGTH
bool "length" #### bool "length"
default y #### default y
help #### help
length is used to print out the length of a specified string. #### length is used to print out the length of a specified string.
config LN config LN
bool "ln" bool "ln"

2
coreutils/Kbuild.src
View File

@ -39,7 +39,7 @@ lib-$(CONFIG_HEAD) += head.o
lib-$(CONFIG_HOSTID) += hostid.o lib-$(CONFIG_HOSTID) += hostid.o
lib-$(CONFIG_ID) += id.o lib-$(CONFIG_ID) += id.o
lib-$(CONFIG_INSTALL) += install.o lib-$(CONFIG_INSTALL) += install.o
lib-$(CONFIG_LENGTH) += length.o #lib-$(CONFIG_LENGTH) += length.o
lib-$(CONFIG_LN) += ln.o lib-$(CONFIG_LN) += ln.o
lib-$(CONFIG_LOGNAME) += logname.o lib-$(CONFIG_LOGNAME) += logname.o
lib-$(CONFIG_LS) += ls.o lib-$(CONFIG_LS) += ls.o

0
coreutils/length.c → coreutils/length.c.disabled
View File

2
include/applets.src.h
View File

@ -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_KILLALL5(APPLET_ODDNAME(killall5, kill, BB_DIR_USR_BIN, BB_SUID_DROP, killall5))
IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP)) IF_KLOGD(APPLET(klogd, BB_DIR_SBIN, BB_SUID_DROP))
IF_LAST(APPLET(last, BB_DIR_USR_BIN, 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_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(linux32, setarch, BB_DIR_BIN, BB_SUID_DROP, linux32))
IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64)) IF_SETARCH(APPLET_ODDNAME(linux64, setarch, BB_DIR_BIN, BB_SUID_DROP, linux64))