emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

msh: delete this applet

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

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2017-07-03 16:56:37 +02:00
parent f82be93c1c
commit 2e989ef232
12 changed files with 3 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configs/TEST_nommu_defconfig
View File

@ -891,7 +891,6 @@ CONFIG_HUSH_FUNCTIONS=y
CONFIG_HUSH_LOCAL=y CONFIG_HUSH_LOCAL=y
CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_EXPORT_N=y
CONFIG_HUSH_RANDOM_SUPPORT=y CONFIG_HUSH_RANDOM_SUPPORT=y
CONFIG_MSH=y
CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT=y
CONFIG_SH_MATH_SUPPORT_64=y CONFIG_SH_MATH_SUPPORT_64=y
CONFIG_FEATURE_SH_EXTRA_QUIET=y CONFIG_FEATURE_SH_EXTRA_QUIET=y

1
configs/TEST_noprintf_defconfig
View File

@ -898,7 +898,6 @@ CONFIG_FEATURE_SH_IS_NONE=y
# CONFIG_FEATURE_BASH_IS_ASH is not set # CONFIG_FEATURE_BASH_IS_ASH is not set
# CONFIG_FEATURE_BASH_IS_HUSH is not set # CONFIG_FEATURE_BASH_IS_HUSH is not set
CONFIG_FEATURE_BASH_IS_NONE=y CONFIG_FEATURE_BASH_IS_NONE=y
# CONFIG_MSH is not set
# CONFIG_SH_MATH_SUPPORT is not set # CONFIG_SH_MATH_SUPPORT is not set
# CONFIG_SH_MATH_SUPPORT_64 is not set # CONFIG_SH_MATH_SUPPORT_64 is not set
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_EXTRA_QUIET is not set

1
configs/TEST_rh9_defconfig
View File

@ -905,7 +905,6 @@ CONFIG_HUSH_FUNCTIONS=y
CONFIG_HUSH_LOCAL=y CONFIG_HUSH_LOCAL=y
CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_EXPORT_N=y
CONFIG_HUSH_RANDOM_SUPPORT=y CONFIG_HUSH_RANDOM_SUPPORT=y
CONFIG_MSH=y
CONFIG_SH_MATH_SUPPORT=y CONFIG_SH_MATH_SUPPORT=y
CONFIG_SH_MATH_SUPPORT_64=y CONFIG_SH_MATH_SUPPORT_64=y
CONFIG_FEATURE_SH_EXTRA_QUIET=y CONFIG_FEATURE_SH_EXTRA_QUIET=y

1
configs/android2_defconfig
View File

@ -952,7 +952,6 @@ CONFIG_CTTYHACK=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X 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_ASH is not set
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
CONFIG_FEATURE_SH_IS_NONE=y CONFIG_FEATURE_SH_IS_NONE=y

1
configs/android_502_defconfig
View File

@ -1098,7 +1098,6 @@ CONFIG_CTTYHACK=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X 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_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set # CONFIG_FEATURE_SH_IS_NONE is not set

1
configs/android_defconfig
View File

@ -984,7 +984,6 @@ CONFIG_CTTYHACK=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X 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_ASH is not set
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
CONFIG_FEATURE_SH_IS_NONE=y CONFIG_FEATURE_SH_IS_NONE=y

1
configs/android_ndk_defconfig
View File

@ -1013,7 +1013,6 @@ CONFIG_CTTYHACK=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X 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_ASH is not set
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
CONFIG_FEATURE_SH_IS_NONE=y CONFIG_FEATURE_SH_IS_NONE=y

1
configs/cygwin_defconfig
View File

@ -955,7 +955,6 @@ CONFIG_HUSH_LOCAL=y
CONFIG_HUSH_RANDOM_SUPPORT=y CONFIG_HUSH_RANDOM_SUPPORT=y
CONFIG_HUSH_EXPORT_N=y CONFIG_HUSH_EXPORT_N=y
CONFIG_HUSH_MODE_X=y CONFIG_HUSH_MODE_X=y
# CONFIG_MSH is not set
CONFIG_FEATURE_SH_IS_ASH=y CONFIG_FEATURE_SH_IS_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set # CONFIG_FEATURE_SH_IS_NONE is not set

1
configs/freebsd_defconfig
View File

@ -931,7 +931,6 @@ CONFIG_ASH=y
# CONFIG_HUSH_RANDOM_SUPPORT is not set # CONFIG_HUSH_RANDOM_SUPPORT is not set
# CONFIG_HUSH_EXPORT_N is not set # CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X 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_ASH=y
# CONFIG_FEATURE_SH_IS_HUSH is not set # CONFIG_FEATURE_SH_IS_HUSH is not set
# CONFIG_FEATURE_SH_IS_NONE is not set # CONFIG_FEATURE_SH_IS_NONE is not set

6
shell/ash_test/run-all
View File

@ -59,9 +59,9 @@ do_test()
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
# All sub directories # All sub directories
modules=`ls -d ash-*` modules=`ls -d ash-*`
# If you want to test ash against hush and msh testsuites # If you want to test ash against hush testsuite
# (have to copy hush_test and msh_test dirs to current dir first): # (have to copy hush_test dir to current dir first):
#modules=`ls -d ash-* hush_test/hush-* msh_test/msh-*` #modules=`ls -d ash-* hush_test/hush-*`
for module in $modules; do for module in $modules; do
do_test $module do_test $module

18
shell/hush.c
View File

@ -268,17 +268,9 @@
//config: bool "memleak builtin (debugging)" //config: bool "memleak builtin (debugging)"
//config: default n //config: default n
//config: depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH //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:IF_HUSH(APPLET(hush, BB_DIR_BIN, BB_SUID_DROP))
// APPLET_ODDNAME:name main location suid_type help // 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_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)) //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 * Built-ins
*/ */

1
testsuite/msh/msh-supports-underscores-in-variable-names
View File

@ -1 +0,0 @@
test "`busybox msh -c 'FOO_BAR=foo; echo $FOO_BAR'`" = foo