diff options
-rw-r--r-- | shell/hush.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/shell/hush.c b/shell/hush.c index 219158f18..f9b5623fd 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
@@ -10187,6 +10187,11 @@ int hush_main(int argc, char **argv) | |||
10187 | optarg++; | 10187 | optarg++; |
10188 | G.depth_of_loop = bb_strtou(optarg, &optarg, 16); | 10188 | G.depth_of_loop = bb_strtou(optarg, &optarg, 16); |
10189 | # endif | 10189 | # endif |
10190 | /* Suppress "killed by signal" message, -$ hack is used | ||
10191 | * for subshells: echo `sh -c 'kill -9 $$'` | ||
10192 | * should be silent. | ||
10193 | */ | ||
10194 | IF_HUSH_JOB(G.run_list_level = 1;) | ||
10190 | # if ENABLE_HUSH_FUNCTIONS | 10195 | # if ENABLE_HUSH_FUNCTIONS |
10191 | /* nommu uses re-exec trick for "... | func | ...", | 10196 | /* nommu uses re-exec trick for "... | func | ...", |
10192 | * should allow "return". | 10197 | * should allow "return". |
@@ -10274,6 +10279,7 @@ int hush_main(int argc, char **argv) | |||
10274 | 10279 | ||
10275 | G.global_argc--; | 10280 | G.global_argc--; |
10276 | G.global_argv++; | 10281 | G.global_argv++; |
10282 | #if !BB_MMU | ||
10277 | if (builtin_argc) { | 10283 | if (builtin_argc) { |
10278 | /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */ | 10284 | /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */ |
10279 | const struct built_in_command *x; | 10285 | const struct built_in_command *x; |
@@ -10287,6 +10293,7 @@ int hush_main(int argc, char **argv) | |||
10287 | } | 10293 | } |
10288 | goto final_return; | 10294 | goto final_return; |
10289 | } | 10295 | } |
10296 | #endif | ||
10290 | 10297 | ||
10291 | script = G.global_argv[0]; | 10298 | script = G.global_argv[0]; |
10292 | if (!script) | 10299 | if (!script) |