From a554c7403a0f1b6c29e07410a03599272aeaeaee Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Fri, 25 Dec 2015 00:26:26 -0800 Subject: 37434: POSIXBUILTINS "command" should prevent shell exit on errors from special builtins --- Src/exec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Src') diff --git a/Src/exec.c b/Src/exec.c index acc867c77..f14fc27a6 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -3475,10 +3475,10 @@ execcmd(Estate state, int input, int output, int how, int last1) restore_queue_signals(q); } else if (is_builtin || is_shfunc) { LinkList restorelist = 0, removelist = 0; + int do_save = 0; /* builtin or shell function */ - if (!forked && varspc) { - int do_save = 0; + if (!forked) { if (isset(POSIXBUILTINS)) { /* * If it's a function or special builtin --- save @@ -3497,7 +3497,7 @@ execcmd(Estate state, int input, int output, int how, int last1) if ((cflags & BINF_COMMAND) || !assign) do_save = 1; } - if (do_save) + if (do_save && varspc) save_params(state, varspc, &restorelist, &removelist); } if (varspc) { @@ -3643,6 +3643,8 @@ execcmd(Estate state, int input, int output, int how, int last1) } dont_queue_signals(); lastval = execbuiltin(args, assigns, (Builtin) hn); + if (do_save & BINF_COMMAND) + errflag &= ~ERRFLAG_ERROR; restore_queue_signals(q); fflush(stdout); if (save[1] == -2) { -- cgit 1.4.1