From 6adf2aad38cf2f5a056f9014955807607bcb41b2 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 16 Jul 2010 19:26:38 +0200 Subject: [PATCH] hush: move msh/lash config into hush.c, no code changes Signed-off-by: Denys Vlasenko --- shell/Config.src | 23 ----------------------- shell/hush.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/shell/Config.src b/shell/Config.src index f6f0b6c94..c9c2439e7 100644 --- a/shell/Config.src +++ b/shell/Config.src @@ -62,29 +62,6 @@ config FEATURE_BASH_IS_NONE endchoice -config LASH - bool "lash (deprecated: aliased to hush)" - default n - select HUSH - help - lash is deprecated and will be removed, please migrate to hush. - -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. - -# The minix shell (adds just 30k) is quite complete and handles things -# like for/do/done, case/esac and all the things you expect a Bourne -# shell to do. It is not always pedantically correct about Bourne -# shell grammar (try running the shell testscript "tests/sh.testcases" -# on it and compare vs bash) but for most things it works quite well. -# It uses only vfork, so it can be used on uClinux systems. - - config SH_MATH_SUPPORT bool "POSIX math support" default y diff --git a/shell/hush.c b/shell/hush.c index 56a3f4b14..9208ec497 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -224,6 +224,20 @@ //config: This instructs hush to print commands before execution. //config: Adds ~300 bytes. //config: +//config:config LASH +//config: bool "lash (deprecated: aliased to hush)" +//config: default n +//config: select HUSH +//config: help +//config: lash is deprecated and will be removed, please migrate to 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. +//config: //usage:#define hush_trivial_usage NOUSAGE_STR //usage:#define hush_full_usage ""