diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-21 00:05:51 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-08-21 00:05:51 +0200 |
| commit | 1cc4b13917c51acce1ce0d8a2cb58ab97f3756d2 (patch) | |
| tree | 974a54823fcf0c9846d29c55c6da0177a4f56796 /shell | |
| parent | 263cff9a2f4480cd922ecff5e382e8fd804957eb (diff) | |
msh: aliased to hush
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/Config.in | 7 | ||||
| -rw-r--r-- | shell/Kbuild | 1 | ||||
| -rw-r--r-- | shell/hush.c | 9 | ||||
| -rw-r--r-- | shell/msh_unused.c (renamed from shell/msh.c) | 0 |
4 files changed, 13 insertions, 4 deletions
diff --git a/shell/Config.in b/shell/Config.in index 126dba8e5..cf151933b 100644 --- a/shell/Config.in +++ b/shell/Config.in @@ -24,9 +24,9 @@ config FEATURE_SH_IS_HUSH #### select LASH #### bool "lash" -config FEATURE_SH_IS_MSH - select MSH - bool "msh" +####config FEATURE_SH_IS_MSH +#### select MSH +#### bool "msh" config FEATURE_SH_IS_NONE bool "none" @@ -260,6 +260,7 @@ config LASH config MSH bool "msh (deprecated: please use hush)" default n + select HUSH help msh is deprecated and will be removed, please migrate to hush. If there is a feature msh has but hush does not, please let us know. diff --git a/shell/Kbuild b/shell/Kbuild index 8b693ecc3..4d4741eff 100644 --- a/shell/Kbuild +++ b/shell/Kbuild @@ -7,6 +7,5 @@ lib-y:= lib-$(CONFIG_ASH) += ash.o ash_ptr_hack.o lib-$(CONFIG_HUSH) += hush.o match.o -lib-$(CONFIG_MSH) += msh.o lib-$(CONFIG_CTTYHACK) += cttyhack.o lib-$(CONFIG_SH_MATH_SUPPORT) += math.o diff --git a/shell/hush.c b/shell/hush.c index 5698bb5a5..7ac29ace2 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -6746,6 +6746,15 @@ int lash_main(int argc, char **argv) } #endif +#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/shell/msh.c b/shell/msh_unused.c index fe85a8170..fe85a8170 100644 --- a/shell/msh.c +++ b/shell/msh_unused.c |