diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 14:54:38 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 14:54:38 +0100 |
commit | 73f743a381dc389287d2d0e56a2b7988f67c0bfc (patch) | |
tree | 9faae2512f091fd60aa5cc34c242ffab55543e2b | |
parent | 7caf1369f5a84196d8e1b75f2febbc63d963a548 (diff) | |
download | busybox-w32-73f743a381dc389287d2d0e56a2b7988f67c0bfc.tar.gz busybox-w32-73f743a381dc389287d2d0e56a2b7988f67c0bfc.tar.bz2 busybox-w32-73f743a381dc389287d2d0e56a2b7988f67c0bfc.zip |
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 a35198a3b..c056320f8 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
@@ -7,12 +7,6 @@ menu "Coreutils" | |||
7 | 7 | ||
8 | INSERT | 8 | INSERT |
9 | 9 | ||
10 | ####config LENGTH | ||
11 | #### bool "length" | ||
12 | #### default y | ||
13 | #### help | ||
14 | #### length is used to print out the length of a specified string. | ||
15 | |||
16 | comment "Common options" | 10 | comment "Common options" |
17 | 11 | ||
18 | config FEATURE_VERBOSE | 12 | config FEATURE_VERBOSE |
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src index c93aa63a1..8e2c097a3 100644 --- a/coreutils/Kbuild.src +++ b/coreutils/Kbuild.src | |||
@@ -10,8 +10,6 @@ lib-y:= | |||
10 | 10 | ||
11 | INSERT | 11 | INSERT |
12 | 12 | ||
13 | #lib-$(CONFIG_LENGTH) += length.o | ||
14 | |||
15 | lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty | 13 | lib-$(CONFIG_MORE) += cat.o # more uses it if stdout isn't a tty |
16 | lib-$(CONFIG_LESS) += cat.o # less too | 14 | lib-$(CONFIG_LESS) += cat.o # less too |
17 | lib-$(CONFIG_CRONTAB) += cat.o # crontab -l | 15 | lib-$(CONFIG_CRONTAB) += cat.o # crontab -l |
diff --git a/coreutils/length.c.disabled b/coreutils/length.c.disabled deleted file mode 100644 index aee898d22..000000000 --- a/coreutils/length.c.disabled +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Licensed under GPLv2, see file LICENSE in this source tree. | ||
4 | */ | ||
5 | |||
6 | /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */ | ||
7 | |||
8 | //usage:#define length_trivial_usage | ||
9 | //usage: "STRING" | ||
10 | //usage:#define length_full_usage "\n\n" | ||
11 | //usage: "Print STRING's length" | ||
12 | //usage: | ||
13 | //usage:#define length_example_usage | ||
14 | //usage: "$ length Hello\n" | ||
15 | //usage: "5\n" | ||
16 | |||
17 | #include "libbb.h" | ||
18 | |||
19 | /* This is a NOFORK applet. Be very careful! */ | ||
20 | |||
21 | int length_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | ||
22 | int length_main(int argc, char **argv) | ||
23 | { | ||
24 | if ((argc != 2) || (**(++argv) == '-')) { | ||
25 | bb_show_usage(); | ||
26 | } | ||
27 | |||
28 | printf("%u\n", (unsigned)strlen(*argv)); | ||
29 | |||
30 | return fflush_all(); | ||
31 | } | ||
diff --git a/include/applets.src.h b/include/applets.src.h index 82907e2a5..c72dca849 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)) | |||
82 | //IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3)) | 82 | //IF_E2FSCK(APPLET_ODDNAME(fsck.ext3, e2fsck, BB_DIR_SBIN, BB_SUID_DROP, fsck_ext3)) |
83 | IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP)) | 83 | IF_GETENFORCE(APPLET(getenforce, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
84 | IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP)) | 84 | IF_GETSEBOOL(APPLET(getsebool, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
85 | //IF_LENGTH(APPLET_NOFORK(length, length, BB_DIR_USR_BIN, BB_SUID_DROP, length)) | ||
86 | IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) | 85 | IF_LOAD_POLICY(APPLET(load_policy, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
87 | IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) | 86 | IF_MATCHPATHCON(APPLET(matchpathcon, BB_DIR_USR_SBIN, BB_SUID_DROP)) |
88 | //IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP)) | 87 | //IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP)) |