diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-16 19:26:38 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-07-16 19:26:38 +0200 |
commit | 6adf2aad38cf2f5a056f9014955807607bcb41b2 (patch) | |
tree | ca510c8d459aaf0fa56092446b01726be5e57553 | |
parent | 51ca7761a3579f3c3f7e771b39019e6e248a5171 (diff) | |
download | busybox-w32-6adf2aad38cf2f5a056f9014955807607bcb41b2.tar.gz busybox-w32-6adf2aad38cf2f5a056f9014955807607bcb41b2.tar.bz2 busybox-w32-6adf2aad38cf2f5a056f9014955807607bcb41b2.zip |
hush: move msh/lash config into hush.c, no code changes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | shell/Config.src | 23 | ||||
-rw-r--r-- | 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 | |||
62 | endchoice | 62 | endchoice |
63 | 63 | ||
64 | 64 | ||
65 | config LASH | ||
66 | bool "lash (deprecated: aliased to hush)" | ||
67 | default n | ||
68 | select HUSH | ||
69 | help | ||
70 | lash is deprecated and will be removed, please migrate to hush. | ||
71 | |||
72 | config MSH | ||
73 | bool "msh (deprecated: please use hush)" | ||
74 | default n | ||
75 | select HUSH | ||
76 | help | ||
77 | msh is deprecated and will be removed, please migrate to hush. | ||
78 | If there is a feature msh has but hush does not, please let us know. | ||
79 | |||
80 | # The minix shell (adds just 30k) is quite complete and handles things | ||
81 | # like for/do/done, case/esac and all the things you expect a Bourne | ||
82 | # shell to do. It is not always pedantically correct about Bourne | ||
83 | # shell grammar (try running the shell testscript "tests/sh.testcases" | ||
84 | # on it and compare vs bash) but for most things it works quite well. | ||
85 | # It uses only vfork, so it can be used on uClinux systems. | ||
86 | |||
87 | |||
88 | config SH_MATH_SUPPORT | 65 | config SH_MATH_SUPPORT |
89 | bool "POSIX math support" | 66 | bool "POSIX math support" |
90 | default y | 67 | 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 @@ | |||
224 | //config: This instructs hush to print commands before execution. | 224 | //config: This instructs hush to print commands before execution. |
225 | //config: Adds ~300 bytes. | 225 | //config: Adds ~300 bytes. |
226 | //config: | 226 | //config: |
227 | //config:config LASH | ||
228 | //config: bool "lash (deprecated: aliased to hush)" | ||
229 | //config: default n | ||
230 | //config: select HUSH | ||
231 | //config: help | ||
232 | //config: lash is deprecated and will be removed, please migrate to hush. | ||
233 | //config: | ||
234 | //config:config MSH | ||
235 | //config: bool "msh (deprecated: aliased to hush)" | ||
236 | //config: default n | ||
237 | //config: select HUSH | ||
238 | //config: help | ||
239 | //config: msh is deprecated and will be removed, please migrate to hush. | ||
240 | //config: | ||
227 | 241 | ||
228 | //usage:#define hush_trivial_usage NOUSAGE_STR | 242 | //usage:#define hush_trivial_usage NOUSAGE_STR |
229 | //usage:#define hush_full_usage "" | 243 | //usage:#define hush_full_usage "" |