emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: NOMMU fix for hush-psubst/tick6.tests

Browse Source 
function                                             old     new   delta
hush_main                                           1759    1766      +7

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-12-13 18:44:07 +01:00
parent 9cabd17e55
commit 49142d48bd
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell/hush.c
View File

@ -10187,6 +10187,11 @@ int hush_main(int argc, char **argv)
optarg++; optarg++;
G.depth_of_loop = bb_strtou(optarg, &optarg, 16); G.depth_of_loop = bb_strtou(optarg, &optarg, 16);
# endif # 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 # if ENABLE_HUSH_FUNCTIONS
/* nommu uses re-exec trick for "... | func | ...", /* nommu uses re-exec trick for "... | func | ...",
* should allow "return". * should allow "return".
@ -10274,6 +10279,7 @@ int hush_main(int argc, char **argv)
G.global_argc--; G.global_argc--;
G.global_argv++; G.global_argv++;
#if !BB_MMU
if (builtin_argc) { if (builtin_argc) {
/* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */ /* -c 'builtin' [BARGV...] "" ARG0 [ARG1...] */
const struct built_in_command *x; const struct built_in_command *x;
@ -10287,6 +10293,7 @@ int hush_main(int argc, char **argv)
} }
goto final_return; goto final_return;
} }
#endif
script = G.global_argv[0]; script = G.global_argv[0];
if (!script) if (!script)