From ea023eacad23f6a30cffe4f255a050b91748fc2f Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 26 Jan 2011 01:21:20 +0100
Subject: disable length applet. ${#var} and echo -n "$var" | wc -c are
 portable equivalents

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 coreutils/Config.src        | 10 +++++-----
 coreutils/Kbuild.src        |  2 +-
 coreutils/length.c          | 22 ----------------------
 coreutils/length.c.disabled | 22 ++++++++++++++++++++++
 4 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 coreutils/length.c
 create mode 100644 coreutils/length.c.disabled

(limited to 'coreutils')

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
deleted file mode 100644
index 7f0b48ccd..000000000
--- a/coreutils/length.c
+++ /dev/null
@@ -1,22 +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. */
-
-#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/coreutils/length.c.disabled b/coreutils/length.c.disabled
new file mode 100644
index 000000000..7f0b48ccd
--- /dev/null
+++ b/coreutils/length.c.disabled
@@ -0,0 +1,22 @@
+/* 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. */
+
+#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();
+}
-- 
cgit v1.2.3