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>

2 files changed, 3 insertions, 21 deletions

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
  */