 @@ -1,14 +1,14 @@
-/*	$NetBSD: eval.c,v 1.140.2.4 2018/08/25 11:45:40 martin Exp $	*/
+/*	$NetBSD: eval.c,v 1.140.2.5 2018/08/25 14:22:49 martin Exp $	*/
 /*-
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.140.2.4 2018/08/25 11:45:40 martin Exp $");
+__RCSID("$NetBSD: eval.c,v 1.140.2.5 2018/08/25 14:22:49 martin Exp $");
 #endif
 #endif /* not lint */
 #include <stdbool.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <limits.h>
 #include <unistd.h>
 #include <sys/fcntl.h>
 #include <sys/stat.h>
 @@ -211,27 +211,27 @@ evalcmd(int argc, char **argv)
 void
 evalstring(char *s, int flag)
+{
 	union node *n;
 	struct stackmark smark;
 	setstackmark(&smark);
 	setinputstring(s, 1, line_number);
 	while ((n = parsecmd(0)) != NEOF) {
 		XTRACE(DBG_EVAL, ("evalstring: "), showtree(n));
 		if (n && nflag == 0)
-			evaltree(n, flag | EV_MORE);
+			evaltree(n, flag);
 		popstackmark(&smark);
+	}
 	popfile();
 	popstackmark(&smark);
+}
 /*
  * Evaluate a parse tree.  The value is left in the global variable
  * exitstatus.
  */
 @@ -246,74 +246,73 @@ evaltree(union node *n, int flags)
 		VTRACE(DBG_EVAL, ("evaltree(%s) called\n",
 		    n == NULL ? "NULL" : "-n"));
 		if (nflag == 0)
 			exitstatus = 0;
 		goto out;
+	}
 #ifndef SMALL
 	displayhist = 1;	/* show history substitutions done with fc */
 #endif
 	CTRACE(DBG_EVAL, ("pid %d, evaltree(%p: %s(%d), %#x) called\n",
 	    getpid(), n, NODETYPENAME(n->type), n->type, flags));
 	switch (n->type) {
 	case NSEMI:
-		evaltree(n->nbinary.ch1, (sflags & EV_TESTED) |
+		evaltree(n->nbinary.ch1, flags & EV_TESTED);
 		    (n->nbinary.ch2 ? EV_MORE : 0));
 		if (nflag || evalskip)
 			goto out;
 		evaltree(n->nbinary.ch2, flags);
 		break;
 	case NAND:
-		evaltree(n->nbinary.ch1, EV_TESTED | EV_MORE);
+		evaltree(n->nbinary.ch1, EV_TESTED);
 		if (nflag || evalskip || exitstatus != 0)
 			goto out;
 		evaltree(n->nbinary.ch2, flags);
 		break;
 	case NOR:
-		evaltree(n->nbinary.ch1, EV_TESTED | EV_MORE);
+		evaltree(n->nbinary.ch1, EV_TESTED);
 		if (nflag || evalskip || exitstatus == 0)
 			goto out;
 		evaltree(n->nbinary.ch2, flags);
 		break;
 	case NREDIR:
 		expredir(n->nredir.redirect);
 		if (xflag && n->nredir.redirect) {
 			union node *rn;
 			out2str(expandstr(ps4val(), line_number));
 			out2str("using redirections:");
 			for (rn = n->nredir.redirect; rn; rn = rn->nfile.next)
 				(void) outredir(&errout, rn, ' ');
 			out2str(" do\n");
 			flushout(&errout);
+		}
 		redirect(n->nredir.redirect, REDIR_PUSH | REDIR_KEEP);
 		evaltree(n->nredir.n, flags);
 		popredir();
 		if (xflag && n->nredir.redirect) {
 			out2str(expandstr(ps4val(), line_number));
 			out2str("done\n");
 			flushout(&errout);
+		}
 		break;
 	case NSUBSHELL:
-		evalsubshell(n, flags & ~EV_MORE);
+		evalsubshell(n, flags);
 		do_etest = !(flags & EV_TESTED);
 		break;
 	case NBACKGND:
-		evalsubshell(n, flags & ~EV_MORE);
+		evalsubshell(n, flags);
 		break;
 	case NIF: {
-		evaltree(n->nif.test, EV_TESTED | EV_MORE);
+		evaltree(n->nif.test, EV_TESTED);
 		if (nflag || evalskip)
 			goto out;
 		if (exitstatus == 0)
 			evaltree(n->nif.ifpart, flags);
 		else if (n->nif.elsepart)
 			evaltree(n->nif.elsepart, flags);
 		else
 			exitstatus = 0;
 		break;
+	}
 	case NWHILE:
 	case NUNTIL:
 		evalloop(n, sflags);
 @@ -321,31 +320,31 @@ evaltree(union node *n, int flags)
 	case NFOR:
 		evalfor(n, sflags);
 		break;
 	case NCASE:
 		evalcase(n, sflags);
 		break;
 	case NDEFUN:
 		CTRACE(DBG_EVAL, ("Defining fn %s @%d%s\n", n->narg.text,
 		    n->narg.lineno, fnline1 ? " LINENO=1" : ""));
 		defun(n->narg.text, n->narg.next, n->narg.lineno);
 		exitstatus = 0;
 		break;
 	case NNOT:
-		evaltree(n->nnot.com, (sflags & EV_MORE) | EV_TESTED);
+		evaltree(n->nnot.com, EV_TESTED);
 		exitstatus = !exitstatus;
 		break;
 	case NDNOT:
-		evaltree(n->nnot.com, (sflags & EV_MORE) | EV_TESTED);
+		evaltree(n->nnot.com, EV_TESTED);
 		if (exitstatus != 0)
 			exitstatus = 1;
 		break;
 	case NPIPE:
 		evalpipe(n);
 		do_etest = !(flags & EV_TESTED);
 		break;
 	case NCMD:
 		evalcommand(n, flags, NULL);
 		do_etest = !(flags & EV_TESTED);
 		break;
 	default:
 #ifdef NODETYPENAME
 @@ -369,46 +368,46 @@ evalloop(union node *n, int flags)
+{
 	int status;
 	loopnest++;
 	status = 0;
 	CTRACE(DBG_EVAL,  ("evalloop %s:", NODETYPENAME(n->type)));
 	VXTRACE(DBG_EVAL, (" "), showtree(n->nbinary.ch1));
 	VXTRACE(DBG_EVAL, ("evalloop    do: "), showtree(n->nbinary.ch2));
 	VTRACE(DBG_EVAL,  ("evalloop  done\n"));
 	CTRACE(DBG_EVAL,  ("\n"));
 	for (;;) {
-		evaltree(n->nbinary.ch1, EV_TESTED | EV_MORE);
+		evaltree(n->nbinary.ch1, EV_TESTED);
 		if (nflag)
 			break;
 		if (evalskip) {
  skipping:		if (evalskip == SKIPCONT && --skipcount <= 0) {
 				evalskip = SKIPNONE;
 				continue;
+			}
 			if (evalskip == SKIPBREAK && --skipcount <= 0)
 				evalskip = SKIPNONE;
 			break;
+		}
 		if (n->type == NWHILE) {
 			if (exitstatus != 0)
 				break;
 		} else {
 			if (exitstatus == 0)
 				break;
+		}
-		evaltree(n->nbinary.ch2, (flags & EV_TESTED) | EV_MORE);
+		evaltree(n->nbinary.ch2, flags & EV_TESTED);
 		status = exitstatus;
 		if (evalskip)
 			goto skipping;
+	}
 	loopnest--;
 	exitstatus = status;
+}
 STATIC void
 evalfor(union node *n, int flags)
+{
 @@ -421,43 +420,38 @@ evalfor(union node *n, int flags)
 	status = nflag ? exitstatus : 0;
 	setstackmark(&smark);
 	arglist.lastp = &arglist.list;
 	for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
 		if (evalskip)
 			goto out;
+	}
 	*arglist.lastp = NULL;
 	loopnest++;
 	for (sp = arglist.list ; sp ; sp = sp->next) {
 		int f = flags & (EV_TESTED | EV_MORE);
 		if (sp->next)
 			f |= EV_MORE;
 		if (xflag) {
 			out2str(expandstr(ps4val(), line_number));
 			out2str("for ");
 			out2str(n->nfor.var);
 			out2c('=');
 			out2shstr(sp->text);
 			out2c('\n');
 			flushout(&errout);
+		}
 		setvar(n->nfor.var, sp->text, 0);
-		evaltree(n->nfor.body, f);
+		evaltree(n->nfor.body, flags & EV_TESTED);
 		status = exitstatus;
 		if (nflag)
 			break;
 		if (evalskip) {
 			if (evalskip == SKIPCONT && --skipcount <= 0) {
 				evalskip = SKIPNONE;
 				continue;
+			}
 			if (evalskip == SKIPBREAK && --skipcount <= 0)
 				evalskip = SKIPNONE;
 			break;
+		}
+	}
 @@ -483,28 +477,27 @@ evalcase(union node *n, int flags)
 	line_number = n->ncase.lineno;
 	expandarg(n->ncase.expr, &arglist, EXP_TILDE);
 	for (cp = n->ncase.cases; cp && evalskip == 0; cp = cp->nclist.next) {
 		for (patp = cp->nclist.pattern; patp; patp = patp->narg.next) {
 			line_number = patp->narg.lineno;
 			if (casematch(patp, arglist.list->text)) {
 				while (cp != NULL && evalskip == 0 &&
 				    nflag == 0) {
 					if (cp->type == NCLISTCONT)
 						ncp = cp->nclist.next;
 					else
 						ncp = NULL;
 					line_number = cp->nclist.lineno;
-					evaltree(cp->nclist.body,
+					evaltree(cp->nclist.body, flags);
 					    ncp ? (flags | EV_MORE) : flags);
 					status = exitstatus;
 					cp = ncp;
+				}
 				goto out;
+			}
+		}
+	}
  out:
 	exitstatus = status;
 	popstackmark(&smark);
+}
 @@ -955,28 +948,26 @@ evalcommand(union node *cmd, int flgs, s
+	}
 	/* Fork off a child process if necessary. */
 	if (cmd->ncmd.backgnd || (trap[0] && (flags & EV_EXIT) != 0)
 	 || ((cmdentry.cmdtype == CMDNORMAL || cmdentry.cmdtype == CMDUNKNOWN)
 	     && (flags & EV_EXIT) == 0)
 	 || ((flags & EV_BACKCMD) != 0 &&
 	    ((cmdentry.cmdtype != CMDBUILTIN && cmdentry.cmdtype != CMDSPLBLTIN)
 		 || cmdentry.u.bltin == dotcmd
 		 || cmdentry.u.bltin == evalcmd))) {
 		INTOFF;
 		jp = makejob(cmd, 1);
 		mode = cmd->ncmd.backgnd;
 		if (mode)
 			flags &= ~EV_MORE;
 		if (flags & EV_BACKCMD) {
 			mode = FORK_NOJOB;
 			if (sh_pipe(pip) < 0)
 				error("Pipe call failed");
+		}
 #ifdef DO_SHAREDVFORK
 		/* It is essential that if DO_SHAREDVFORK is defined that the
 		 * child's address space is actually shared with the parent as
 		 * we rely on this.
 		 */
 		if (usefork == 0 && cmdentry.cmdtype == CMDNORMAL) {
 			pid_t	pid;
 			int serrno;
 @@ -1058,26 +1049,27 @@ evalcommand(union node *cmd, int flgs, s
+			}
 			close(pip[0]);
 			movefd(pip[1], 1);
+		}
 		flags |= EV_EXIT;
+	}
 	/* This is the child process if a fork occurred. */
 	/* Execute the command. */
 	switch (cmdentry.cmdtype) {
 	case CMDFUNCTION:
 		VXTRACE(DBG_EVAL, ("Shell function:  "), trargs(argv));
 		redirect(cmd->ncmd.redirect, flags & EV_MORE ? REDIR_PUSH : 0);
 		redirect(cmd->ncmd.redirect, REDIR_PUSH);
 		saveparam = shellparam;
 		shellparam.malloc = 0;
 		shellparam.reset = 1;
 		shellparam.nparam = argc - 1;
 		shellparam.p = argv + 1;
 		shellparam.optnext = NULL;
 		INTOFF;
 		savelocalvars = localvars;
 		localvars = NULL;
 		reffunc(cmdentry.u.func);
 		INTON;
 		if (setjmp(jmploc.loc)) {
 			if (exception == EXSHELLPROC) {
 @@ -1116,28 +1108,27 @@ evalcommand(union node *cmd, int flgs, s
 		if (++funcnest > 1000)
 			error("too many nested function calls");
 		evaltree(getfuncnode(cmdentry.u.func), flags & EV_TESTED);
 		funcnest--;
 		INTOFF;
 		unreffunc(cmdentry.u.func);
 		poplocalvars();
 		localvars = savelocalvars;
 		funclinebase = savefuncline;
 		funclineabs = savefuncabs;
 		freeparam(&shellparam);
 		shellparam = saveparam;
 		handler = savehandler;
-		if (flags & EV_MORE)
+		popredir();
 			popredir();
 		INTON;
 		if (evalskip == SKIPFUNC) {
 			evalskip = SKIPNONE;
 			skipcount = 0;
+		}
 		if (flags & EV_EXIT)
 			exitshell(exitstatus);
 		break;
 	case CMDBUILTIN:
 	case CMDSPLBLTIN:
 		VXTRACE(DBG_EVAL, ("builtin command:  "), trargs(argv));
 		mode = (cmdentry.u.bltin == execcmd) ? 0 : REDIR_PUSH;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: eval.h,v 1.19 2016/05/09 21:03:10 kre Exp $	*/
+/*	$NetBSD: eval.h,v 1.19.8.1 2018/08/25 14:22:49 martin Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -66,14 +66,13 @@ enum skipstate {
 enum skipstate current_skipstate(void);
 void stop_skipping(void);	/* reset internal skipping state to SKIPNONE */
 /*
  * Only for use by reset() in init.c!
  */
 void reset_eval(void);
 /* flags in argument to evaltree */
 #define EV_EXIT		0x01	/* exit after evaluating tree */
 #define EV_TESTED	0x02	/* exit status is checked; ignore -e flag */
 #define EV_BACKCMD	0x04	/* command executing within back quotes */
 #define EV_MORE		0x08	/* more commands in this sub-shell */