 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.c,v 1.75 2010/11/14 19:43:38 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.76 2010/11/14 19:49:16 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.75 2010/11/14 19:43:38 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.76 2010/11/14 19:49:16 christos Exp $");
 #endif
 #endif /* not lint */
 #include <stdlib.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() */
 #include "syntax.h"
 #include "options.h"
 @@ -886,77 +886,69 @@ breakloop:
 #define PARSEREDIR()	{goto parseredir; parseredir_return:;}
 #define PARSESUB()	{goto parsesub; parsesub_return:;}
 #define PARSEBACKQOLD()	{oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;}
 #define PARSEBACKQNEW()	{oldstyle = 0; goto parsebackq; parsebackq_newreturn:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
 /*
  * Keep track of nested doublequotes in dblquote and doublequotep.
  * We use dblquote for the first 32 levels, and we expand to a malloc'ed
  * region for levels above that. Usually we never need to malloc.
  * This code assumes that an int is 32 bits. We don't use uint32_t,
  * because the rest of the code does not.
  */
-#define VN (varnest - insub)
+#define ISDBLQUOTE() ((varnest < 32) ? (dblquote & (1 << varnest)) : \
-#define ISDBLQUOTE() ((VN < 32) ? (dblquote & (1 << VN)) : \
+    (dblquotep[(varnest / 32) - 1] & (1 << (varnest % 32))))
     (dblquotep[(VN / 32) - 1] & (1 << (VN % 32))))
 #define SETDBLQUOTE() \
-    do { \
+    if (varnest < 32) \
-	    TRACE(("setdblquote %d\n", varnest)); \
+	dblquote |= (1 << varnest); \
-	    if (varnest < 32) \
+    else \
-		    dblquote |= (1 << varnest); \
+	dblquotep[(varnest / 32) - 1] |= (1 << (varnest % 32))
 	    else \
 		    dblquotep[(varnest / 32) - 1] |= (1 << (varnest % 32));\
     } while (/*CONSTCOND*/0)
 #define CLRDBLQUOTE() \
-    do { \
+    if (varnest < 32) \
-	    TRACE(("clrdblquote %d\n", varnest)); \
+	dblquote &= ~(1 << varnest); \
-	    if (varnest < 32) \
+    else \
-		    dblquote &= ~(1 << varnest); \
+	dblquotep[(varnest / 32) - 1] &= ~(1 << (varnest % 32))
 	    else \
 		    dblquotep[(varnest / 32) - 1] &= ~(1 << (varnest % 32)); \
     } while (/*CONSTCOND*/0)
 STATIC int
 readtoken1(int firstc, char const *syn, char *eofmark, int striptabs)
+{
 	char const * volatile syntax = syn;
 	int c = firstc;
 	char * volatile out;
 	int len;
 	char line[EOFMARKLEN + 1];
 	struct nodelist *bqlist;
 	volatile int quotef;
 	int * volatile dblquotep = NULL;
 	volatile size_t maxnest = 32;
 	volatile int dblquote;
 	volatile size_t varnest;	/* levels of variables expansion */
 	volatile int arinest;	/* levels of arithmetic expansion */
 	volatile int parenlevel;	/* levels of parens in arithmetic */
 	volatile int oldstyle;
 	volatile int insub;
 	char const * volatile prevsyntax;	/* syntax before arithmetic */
 #ifdef __GNUC__
 	prevsyntax = NULL;	/* XXX gcc4 */
 #endif
 	startlinno = plinno;
 	dblquote = 0;
 	varnest = 0;
-	insub = 0;
+	if (syntax == DQSYNTAX) {
 	if (syntax == DQSYNTAX)
 		SETDBLQUOTE();
+	}
 	quotef = 0;
 	bqlist = NULL;
 	arinest = 0;
 	parenlevel = 0;
 	STARTSTACKSTR(out);
 	loop: {	/* for each line, until end of word */
 #if ATTY
 		if (c == '\034' && doprompt
 		 && attyset() && ! equal(termval(), "emacs")) {
 			attyline();
 			if (syntax == BASESYNTAX)
 				return readtoken();
 @@ -992,34 +984,30 @@ readtoken1(int firstc, char const *syn,
 				if (c == PEOF) {
 					USTPUTC('\\', out);
 					pungetc();
 					break;
+				}
 				if (c == '\n') {
 					if (doprompt)
 						setprompt(2);
 					else
 						setprompt(0);
 					break;
+				}
 				quotef = 1;
 				TRACE(("varnest=%d doubleq=%d c=%c\n",
 				    varnest, ISDBLQUOTE(), c));
 				if (ISDBLQUOTE() && c != '\\' &&
 				    c != '`' && c != '$' &&
-				    (c != '"' || eofmark != NULL)) {
+				    (c != '"' || eofmark != NULL))
-					USTPUTC(CTLESC, out);
+					USTPUTC('\\', out);
 					USTPUTC(CTLESC, out);
 				if (SQSYNTAX[c] == CCTL)
 					USTPUTC(CTLESC, out);
 				else if (eofmark == NULL) {
 					USTPUTC(CTLQUOTEMARK, out);
 					USTPUTC(c, out);
 					if (varnest != 0)
 						USTPUTC(CTLQUOTEEND, out);
 					break;
+				}
 				USTPUTC(c, out);
 				break;
 			case CSQUOTE:
 				if (syntax != SQSYNTAX) {
 @@ -1070,27 +1058,26 @@ readtoken1(int firstc, char const *syn,
 						USTPUTC(CTLQUOTEEND, out);
 					syntax = BASESYNTAX;
 					CLRDBLQUOTE();
 				} else {
 					syntax = DQSYNTAX;
 					SETDBLQUOTE();
 					USTPUTC(CTLQUOTEMARK, out);
+				}
 				break;
 			case CVAR:	/* '$' */
 				PARSESUB();		/* parse substitution */
 				break;
 			case CENDVAR:	/* CLOSEBRACE */
 				insub = 0;
 				if (varnest > 0 && !ISDBLQUOTE()) {
 					varnest--;
 					USTPUTC(CTLENDVAR, out);
 				} else {
 					USTPUTC(c, out);
+				}
 				break;
 			case CLP:	/* '(' in arithmetic */
 				parenlevel++;
 				USTPUTC(c, out);
 				break;
 			case CRP:	/* ')' in arithmetic */
 				if (parenlevel > 0) {
 @@ -1343,29 +1330,27 @@ badsub:			synerror("Bad substitution");
 						subtype++;
 					else
 						pungetc();
 					break;
+				}
+			}
 		} else {
 			pungetc();
+		}
 		if (ISDBLQUOTE() || arinest)
 			flags |= VSQUOTE;
 		*(stackblock() + typeloc) = subtype | flags;
 		if (subtype != VSNORMAL) {
 			TRACE(("varnest=%d subtype=%d\n", varnest, subtype));
 			varnest++;
 			insub = 1;
 			if (varnest >= maxnest) {
 				dblquotep = ckrealloc(dblquotep, maxnest / 8);
 				dblquotep[(maxnest / 32) - 1] = 0;
 				maxnest += 32;
+			}
+		}
+	}
 	goto parsesub_return;
+}
 /*
  * Called to parse command substitutions.  Newstyle is set if the command