2e989ef23
Denys Vlasenko
2017-07-03
Subject
msh: delete this applet
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
configs/TEST_nommu_defconfig +0 -1configs/TEST_noprintf_defconfig +0 -1configs/TEST_rh9_defconfig +0 -1configs/android2_defconfig +0 -1configs/android_502_defconfig +0 -1configs/android_defconfig +0 -1configs/android_ndk_defconfig +0 -1configs/cygwin_defconfig +0 -1configs/freebsd_defconfig +0 -1shell/ash_test/run-all +3 -3shell/hush.c +0 -18testsuite/msh/msh-supports-underscores-in-variable-names +0 -1
configs/TEST_nommu_defconfig+0 -1
| @@ -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 | |
configs/TEST_noprintf_defconfig+0 -1
| @@ -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 | |
configs/TEST_rh9_defconfig+0 -1
| @@ -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 | |
configs/android2_defconfig+0 -1
| @@ -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 | |
configs/android_502_defconfig+0 -1
| @@ -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 | |
configs/android_defconfig+0 -1
| @@ -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 | |
configs/android_ndk_defconfig+0 -1
| @@ -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 | |
configs/cygwin_defconfig+0 -1
| @@ -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 | |
configs/freebsd_defconfig+0 -1
| @@ -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 | |
shell/ash_test/run-all+3 -3
| @@ -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 | |
shell/hush.c+0 -18
| @@ -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 | |
| */ | |
testsuite/msh/msh-supports-underscores-in-variable-names+0 -1
| @@ -1 +0,0 @@ | |
| - | test "`busybox msh -c 'FOO_BAR=foo; echo $FOO_BAR'`" = foo |