msh: delete this applet

It's deprecated since 2009 and interferes with make_single_applets.sh tests.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

12 files changed, 3 insertions, 31 deletions

diff --git a/configs/TEST_nommu_defconfig b/configs/TEST_nommu_defconfig
index 7fbbbecc7..6ff68a092 100644
--- a/configs/TEST_nommu_defconfig
+++ b/configs/TEST_nommu_defconfig
@@ -891,7 +891,6 @@ CONFIG_HUSH_FUNCTIONS=y
 CONFIG_HUSH_LOCAL=y
 CONFIG_HUSH_EXPORT_N=y
 CONFIG_HUSH_RANDOM_SUPPORT=y
-CONFIG_MSH=y
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
diff --git a/configs/TEST_noprintf_defconfig b/configs/TEST_noprintf_defconfig
index 3f85ee1df..4b2ef402a 100644
--- a/configs/TEST_noprintf_defconfig
+++ b/configs/TEST_noprintf_defconfig
@@ -898,7 +898,6 @@ CONFIG_FEATURE_SH_IS_NONE=y
 # CONFIG_FEATURE_BASH_IS_ASH is not set
 # CONFIG_FEATURE_BASH_IS_HUSH is not set
 CONFIG_FEATURE_BASH_IS_NONE=y
-# CONFIG_MSH is not set
 # CONFIG_SH_MATH_SUPPORT is not set
 # CONFIG_SH_MATH_SUPPORT_64 is not set
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
diff --git a/configs/TEST_rh9_defconfig b/configs/TEST_rh9_defconfig
index 34d8e31e2..52f3e4670 100644
--- a/configs/TEST_rh9_defconfig
+++ b/configs/TEST_rh9_defconfig
@@ -905,7 +905,6 @@ CONFIG_HUSH_FUNCTIONS=y
 CONFIG_HUSH_LOCAL=y
 CONFIG_HUSH_EXPORT_N=y
 CONFIG_HUSH_RANDOM_SUPPORT=y
-CONFIG_MSH=y
 CONFIG_SH_MATH_SUPPORT=y
 CONFIG_SH_MATH_SUPPORT_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
diff --git a/configs/android2_defconfig b/configs/android2_defconfig
index 20866c32b..9202320a4 100644
--- a/configs/android2_defconfig
+++ b/configs/android2_defconfig
@@ -952,7 +952,6 @@ CONFIG_CTTYHACK=y
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 CONFIG_FEATURE_SH_IS_NONE=y
diff --git a/configs/android_502_defconfig b/configs/android_502_defconfig
index bdca9eebb..1901bdbb0 100644
--- a/configs/android_502_defconfig
+++ b/configs/android_502_defconfig
@@ -1098,7 +1098,6 @@ CONFIG_CTTYHACK=y
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
diff --git a/configs/android_defconfig b/configs/android_defconfig
index 6ef81750e..ea6e8a79e 100644
--- a/configs/android_defconfig
+++ b/configs/android_defconfig
@@ -984,7 +984,6 @@ CONFIG_CTTYHACK=y
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 CONFIG_FEATURE_SH_IS_NONE=y
diff --git a/configs/android_ndk_defconfig b/configs/android_ndk_defconfig
index 35d03b42e..61871fcb1 100644
--- a/configs/android_ndk_defconfig
+++ b/configs/android_ndk_defconfig
@@ -1013,7 +1013,6 @@ CONFIG_CTTYHACK=y
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
 # CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 CONFIG_FEATURE_SH_IS_NONE=y
diff --git a/configs/cygwin_defconfig b/configs/cygwin_defconfig
index 6bfc973ef..54aa44470 100644
--- a/configs/cygwin_defconfig
+++ b/configs/cygwin_defconfig
@@ -955,7 +955,6 @@ CONFIG_HUSH_LOCAL=y
 CONFIG_HUSH_RANDOM_SUPPORT=y
 CONFIG_HUSH_EXPORT_N=y
 CONFIG_HUSH_MODE_X=y
-# CONFIG_MSH is not set
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
diff --git a/configs/freebsd_defconfig b/configs/freebsd_defconfig
index e3d04aedc..fadbca13b 100644
--- a/configs/freebsd_defconfig
+++ b/configs/freebsd_defconfig
@@ -931,7 +931,6 @@ CONFIG_ASH=y
 # CONFIG_HUSH_RANDOM_SUPPORT is not set
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
 CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_NONE is not set
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all
index 354cc1fcf..8dfdddd9f 100755
--- a/shell/ash_test/run-all
+++ b/shell/ash_test/run-all
@@ -59,9 +59,9 @@ do_test()
 if [ $# -lt 1 ]; then
     # All sub directories
     modules=`ls -d ash-*`
-    # If you want to test ash against hush and msh testsuites
-    # (have to copy hush_test and msh_test dirs to current dir first):
-    #modules=`ls -d ash-* hush_test/hush-* msh_test/msh-*`
+    # If you want to test ash against hush testsuite
+    # (have to copy hush_test dir to current dir first):
+    #modules=`ls -d ash-* hush_test/hush-*`
 
     for module in $modules; do
 	do_test $module
diff --git a/shell/hush.c b/shell/hush.c
index f5c1e5bc1..fc6db316e 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -268,17 +268,9 @@
 //config:	bool "memleak builtin (debugging)"
 //config:	default n
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:
-//config:config MSH
-//config:	bool "msh (deprecated: aliased to hush)"
-//config:	default n
-//config:	select HUSH
-//config:	help
-//config:	  msh is deprecated and will be removed, please migrate to hush.
 
 //applet:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP))
 //                       APPLET_ODDNAME:name  main  location    suid_type     help
-//applet:IF_MSH(         APPLET_ODDNAME(msh,  hush, BB_DIR_BIN, BB_SUID_DROP, hush))
 //applet:IF_SH_IS_HUSH(  APPLET_ODDNAME(sh,   hush, BB_DIR_BIN, BB_SUID_DROP, hush))
 //applet:IF_BASH_IS_HUSH(APPLET_ODDNAME(bash, hush, BB_DIR_BIN, BB_SUID_DROP, hush))
 
@@ -8808,16 +8800,6 @@ int hush_main(int argc, char **argv)
 }
 
 
-#if ENABLE_MSH
-int msh_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int msh_main(int argc, char **argv)
-{
-	bb_error_msg("msh is deprecated, please use hush instead");
-	return hush_main(argc, argv);
-}
-#endif
-
-
 /*
  * Built-ins
  */
diff --git a/testsuite/msh/msh-supports-underscores-in-variable-names b/testsuite/msh/msh-supports-underscores-in-variable-names
deleted file mode 100644
index 9c7834b37..000000000
--- a/testsuite/msh/msh-supports-underscores-in-variable-names
+++ /dev/null
@@ -1 +0,0 @@
-test "`busybox msh -c 'FOO_BAR=foo; echo $FOO_BAR'`" = foo