diff options
| author | Denys Vlasenko | 2017-07-03 16:56:37 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2017-07-03 16:56:37 +0200 |
| commit | 2e989ef232e35750df573898077dd356003705b2 (patch) | |
| tree | 82b5cd9e138106ce4083be6c9c368a95e4b9941a /shell | |
| parent | f82be93c1cd30e8168e91433bcce9fca58f7d0c8 (diff) | |
| download | busybox-2e989ef232e35750df573898077dd356003705b2.zip busybox-2e989ef232e35750df573898077dd356003705b2.tar.gz | |
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>
Diffstat (limited to 'shell')
| -rwxr-xr-x | shell/ash_test/run-all | 6 | ||||
| -rw-r--r-- | shell/hush.c | 18 |
2 files changed, 3 insertions, 21 deletions
diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all index 354cc1f..8dfdddd 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 f5c1e5b..fc6db31 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 */ |