diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-13 18:44:07 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-13 18:44:07 +0100 |
| commit | 49142d48bd12c87d52e1316050f5cf4749e64e51 (patch) | |
| tree | 3a0c812ac96bd1432773e3308a8cd0ac2c6019bb | |
| parent | 9cabd17e555db8f1a48e1cd5db0a8a7a947bced9 (diff) | |
| download | busybox-49142d48bd12c87d52e1316050f5cf4749e64e51.tar.gz | |
hush: NOMMU fix for hush-psubst/tick6.tests
function old new delta
hush_main 1759 1766 +7
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -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) optarg++; G.depth_of_loop = bb_strtou(optarg, &optarg, 16); # endif + /* Suppress "killed by signal" message, -$ hack is used + * for subshells: echo `sh -c 'kill -9 $$'` + * should be silent. + */ + IF_HUSH_JOB(G.run_list_level = 1;) # if ENABLE_HUSH_FUNCTIONS /* nommu uses re-exec trick for "... | func | ...", * should allow "return". @@ -10274,6 +10279,7 @@ int hush_main(int argc, char **argv) G.global_argc--; G.global_argv++; +#if !BB_MMU if (builtin_argc) { /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */ const struct built_in_command *x; @@ -10287,6 +10293,7 @@ int hush_main(int argc, char **argv) } goto final_return; } +#endif script = G.global_argv[0]; if (!script) |