| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 13:54:38 (GMT) |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 13:54:38 (GMT) |
| commit | 73f743a381dc389287d2d0e56a2b7988f67c0bfc (patch) | |
| tree | 9faae2512f091fd60aa5cc34c242ffab55543e2b | |
| parent | 7caf1369f5a84196d8e1b75f2febbc63d963a548 (diff) | |
| download | busybox-73f743a381dc389287d2d0e56a2b7988f67c0bfc.zip busybox-73f743a381dc389287d2d0e56a2b7988f67c0bfc.tar.gz busybox-73f743a381dc389287d2d0e56a2b7988f67c0bfc.tar.bz2 | |
Remove remnants of disabled "length" applet
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | coreutils/Config.src | 6 | ||||
| -rw-r--r-- | coreutils/Kbuild.src | 2 | ||||
| -rw-r--r-- | coreutils/length.c.disabled | 31 | ||||
| -rw-r--r-- | include/applets.src.h | 1 |
4 files changed, 0 insertions, 40 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index a35198a..c056320 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src @@ -7,12 +7,6 @@ menu "Coreutils" INSERT -####config LENGTH -#### bool "length" -#### default y -#### help -#### length is used to print out the length of a specified string. - comment "Common options" config FEATURE_VERBOSE diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index c93aa63..8e2c097 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src @@ -10,8 +10,6 @@ lib-y:= INSERT -#lib-$(CONFIG_LENGTH) += length.o - lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty lib-$(CONFIG_LESS) += cat.o # less too lib-$(CONFIG_CRONTAB) += cat.o # crontab -l diff --git a/coreutils/length.c.disabled b/coreutils/length.c.disabled deleted file mode 100644 index aee898d..0000000 --- a/coreutils/length.c.disabled +++ b/dev/null @@ -1,31 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * Licensed under GPLv2, see file LICENSE in this source tree. - */ - -/* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ - -//usage:#define length_trivial_usage -//usage: "STRING" -//usage:#define length_full_usage "\n\n" -//usage: "Print STRING's length" -//usage: -//usage:#define length_example_usage -//usage: "$ length Hello\n" -//usage: "5\n" - -#include "libbb.h" - -/* This is a NOFORK applet. Be very careful! */ - -int length_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int length_main(int argc, char **argv) -{ - if ((argc != 2) || (**(++argv) == '-')) { - bb_show_usage(); - } - - printf("%u\n", (unsigned)strlen(*argv)); - - return fflush_all(); -} diff --git a/include/applets.src.h b/include/applets.src.h index 82907e2..c72dca8 100644 --- a/include/applets.src.h +++ b/include/applets.src.h @@ -82,7 +82,6 @@ IF_DUMPLEASES(APPLET(dumpleases, BB_DIR_USR_BIN, BB_SUID_DROP)) //IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3)) IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP)) -//IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) //IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP)) |