diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-27 18:07:29 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-05-27 18:07:29 +0200 |
commit | e6f6d829403156797fabc4690d497fdf7cd6f7d1 (patch) | |
tree | d2118b46c4bfca2ae806f24d28046eda9190eab5 /shell | |
parent | 20cc390b9bb33cd0ab05c8bbfcd24babad7ec204 (diff) | |
download | busybox-w32-1_14_1.tar.gz busybox-w32-1_14_1.tar.bz2 busybox-w32-1_14_1.zip |
hush: more fixes from trunk; bump version to 1.14.11_14_1
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r-- | shell/Config.in | 7 | ||||
-rw-r--r-- | shell/hush.c | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/shell/Config.in b/shell/Config.in index 6cc11ce80..57969f02c 100644 --- a/shell/Config.in +++ b/shell/Config.in | |||
@@ -232,6 +232,13 @@ config HUSH_FUNCTIONS | |||
232 | help | 232 | help |
233 | Enable support for shell functions in hush. +800 bytes. | 233 | Enable support for shell functions in hush. +800 bytes. |
234 | 234 | ||
235 | config HUSH_EXPORT_N | ||
236 | bool "Support export '-n' option" | ||
237 | default n | ||
238 | depends on HUSH | ||
239 | help | ||
240 | Enable support for export '-n' option in hush. It is a bash extension. | ||
241 | |||
235 | config LASH | 242 | config LASH |
236 | bool "lash (deprecated: aliased to hush)" | 243 | bool "lash (deprecated: aliased to hush)" |
237 | default n | 244 | default n |
diff --git a/shell/hush.c b/shell/hush.c index 8c3e7c551..735cb4cee 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -50,7 +50,6 @@ | |||
50 | * | 50 | * |
51 | * TODOs: | 51 | * TODOs: |
52 | * grep for "TODO" and fix (some of them are easy) | 52 | * grep for "TODO" and fix (some of them are easy) |
53 | * $var refs in function do not pick up values set by "var=val func" | ||
54 | * builtins: ulimit | 53 | * builtins: ulimit |
55 | * follow IFS rules more precisely, including update semantics | 54 | * follow IFS rules more precisely, including update semantics |
56 | * | 55 | * |
@@ -4110,8 +4109,11 @@ static int run_list(struct pipe *pi) | |||
4110 | } | 4109 | } |
4111 | #endif | 4110 | #endif |
4112 | #if ENABLE_HUSH_FUNCTIONS | 4111 | #if ENABLE_HUSH_FUNCTIONS |
4113 | if (G.flag_return_in_progress == 1) | 4112 | if (G.flag_return_in_progress == 1) { |
4114 | goto check_jobs_and_break; | 4113 | /* same as "goto check_jobs_and_break" */ |
4114 | checkjobs(NULL); | ||
4115 | break; | ||
4116 | } | ||
4115 | #endif | 4117 | #endif |
4116 | } else if (pi->followup == PIPE_BG) { | 4118 | } else if (pi->followup == PIPE_BG) { |
4117 | /* What does bash do with attempts to background builtins? */ | 4119 | /* What does bash do with attempts to background builtins? */ |