 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.c,v 1.108 2016/03/27 14:34:46 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.109 2016/03/27 14:35:30 christos 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.
 @@ -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[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.108 2016/03/27 14:34:46 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.109 2016/03/27 14:35:30 christos Exp $");
 #endif
 #endif /* not lint */
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
 #include "shell.h"
 #include "parser.h"
 #include "nodes.h"
 #include "expand.h"	/* defines rmescapes() */
 #include "eval.h"	/* defines commandname */
 #include "redir.h"	/* defines copyfd() */
 @@ -1081,119 +1081,115 @@ cleanup_state_stack(VSS *stack)
 /*
  * Called to parse command substitutions.  oldstyle is true if the command
  * is enclosed inside `` (otherwise it was enclosed in "$( )")
+ *
  * Internally nlpp is a pointer to the head of the linked
  * list of commands (passed by reference), and savelen is the number of
  * characters on the top of the stack which must be preserved.
  */
 static char *
 parsebackq(VSS *const stack, char * const in,
     struct nodelist **const pbqlist, const int oldstyle)
+{
 	struct nodelist **nlpp;
-	int savepbq;
+	const int savepbq = parsebackquote;
 	union node *n;
 	char *out;
 	char *str = NULL;
 	char *pout;
 	char *volatile sstr = str;
 	struct jmploc jmploc;
 	struct jmploc *const savehandler = handler;
-	int savelen;
+	const int savelen = in - stackblock();
 	int saveprompt;
 	savepbq = parsebackquote;
 	if (setjmp(jmploc.loc)) {
 		if (sstr)
 			ckfree(__UNVOLATILE(sstr));
 		cleanup_state_stack(stack);
 		parsebackquote = 0;
 		handler = savehandler;
 		longjmp(handler->loc, 1);
+	}
 	INTOFF;
 	out = in;
 	sstr = str = NULL;
 	savelen = out - stackblock();
 	if (savelen > 0) {
 		sstr = str = ckmalloc(savelen);
 		memcpy(str, stackblock(), savelen);
+	}
 	handler = &jmploc;
 	INTON;
         if (oldstyle) {
                 /* We must read until the closing backquote, giving special
                    treatment to some slashes, and then push the string and
                    reread it as input, interpreting it normally.  */
                 int pc;
                 int psavelen;
                 char *pstr;
 		/*
 		 * Because the entire `...` is read here, we don't
 		 * need to bother the state stack.  That will be used
 		 * (as appropriate) when the processed string is re-read.
 		 */
-                STARTSTACKSTR(pout);
+                STARTSTACKSTR(out);
 		for (;;) {
 			if (needprompt) {
 				setprompt(2);
 				needprompt = 0;
+			}
 			switch (pc = pgetc()) {
 			case '`':
 				goto done;
 			case '\\':
                                 if ((pc = pgetc()) == '\n') {
 					plinno++;
 					if (doprompt)
 						setprompt(2);
 					else
 						setprompt(0);
 					/*
 					 * If eating a newline, avoid putting
 					 * the newline into the new character
 					 * stream (via the STPUTC after the
 					 * switch).
 					 */
 					continue;
+				}
                                 if (pc != '\\' && pc != '`' && pc != '$'
                                     && (!ISDBLQUOTE() || pc != '"'))
-                                        STPUTC('\\', pout);
+                                        STPUTC('\\', out);
 				break;
 			case '\n':
 				plinno++;
 				needprompt = doprompt;
 				break;
 			case PEOF:
 			        startlinno = plinno;
 				synerror("EOF in backquote substitution");
  				break;
 			default:
 				break;
+			}
-			STPUTC(pc, pout);
+			STPUTC(pc, out);
+                }
 done:
-                STPUTC('\0', pout);
+                STPUTC('\0', out);
-                psavelen = pout - stackblock();
+                psavelen = out - stackblock();
                 if (psavelen > 0) {
-			pstr = grabstackstr(pout);
+			pstr = grabstackstr(out);
 			setinputstring(pstr, 1);
+                }
+        }
 	nlpp = pbqlist;
 	while (*nlpp)
 		nlpp = &(*nlpp)->next;
 	*nlpp = stalloc(sizeof(struct nodelist));
 	(*nlpp)->next = NULL;
 	parsebackquote = oldstyle;
 	if (oldstyle) {
 		saveprompt = doprompt;
 		doprompt = 0;
 @@ -1210,45 +1206,46 @@ done:
 			synexpect(TRP, 0);
+		}
+	}
 	(*nlpp)->n = n;
         if (oldstyle) {
 		/*
 		 * Start reading from old file again, ignoring any pushed back
 		 * tokens left from the backquote parsing
 		 */
                 popfile();
 		tokpushback = 0;
+	}
 	while (stackblocksize() <= savelen)
 		growstackblock();
-	STARTSTACKSTR(pout);
+	STARTSTACKSTR(out);
 	if (str) {
-		memcpy(pout, str, savelen);
+		memcpy(out, str, savelen);
-		STADJUST(savelen, pout);
+		STADJUST(savelen, out);
 		INTOFF;
 		ckfree(str);
 		sstr = str = NULL;
 		INTON;
+	}
 	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || ISDBLQUOTE())
-		USTPUTC(CTLBACKQ | CTLQUOTE, pout);
+		USTPUTC(CTLBACKQ | CTLQUOTE, out);
 	else
-		USTPUTC(CTLBACKQ, pout);
+		USTPUTC(CTLBACKQ, out);
-	return pout;
+	return out;
+}
 STATIC int
 readtoken1(int firstc, char const *syn, char *eofmark, int striptabs)
+{
 	int c = firstc;
 	char * out;
 	int len;
 	char line[EOFMARKLEN + 1];
 	struct nodelist *bqlist;
 	int quotef;
 	VSS static_stack;
 	VSS *stack = &static_stack;