 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.c,v 1.111 2016/03/27 14:39:33 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.112 2016/03/27 14:40:20 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.111 2016/03/27 14:39:33 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.112 2016/03/27 14:40:20 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() */
 @@ -1169,27 +1169,26 @@ drop_state_level(VSS *stack)
 	--stack->cur;
 	return stack;
+}
 static inline void
 cleanup_state_stack(VSS *stack)
+{
 	while (stack->prev != NULL) {
 		stack->cur = 0;
 		stack = drop_state_level(stack);
+	}
+}
 #define	PARSEREDIR()	{goto parseredir; parseredir_return:;}
 #define	PARSESUB()	{goto parsesub; parsesub_return:;}
 #define	PARSEARITH()	{goto parsearith; parsearith_return:;}
 /*
  * The following macros all assume the existance of a local var "stack"
  * which contains a pointer to the current struct stackstate
  */
 /*
  * These are macros rather than inline funcs to avoid code churn as much
  * as possible - they replace macros of the same name used previously.
  */
 #define	ISDBLQUOTE()	(currentstate(stack)->ts_quoted & QS)
 @@ -1360,26 +1359,114 @@ done:
 		sstr = str = NULL;
 		INTON;
+	}
 	parsebackquote = savepbq;
 	handler = savehandler;
 	if (arinest || ISDBLQUOTE())
 		USTPUTC(CTLBACKQ | CTLQUOTE, out);
 	else
 		USTPUTC(CTLBACKQ, out);
 	return out;
+}
 /*
  * Parse a redirection operator.  The parameter "out" points to a string
  * specifying the fd to be redirected.  It is guaranteed to be either ""
  * or a numeric string (for now anyway).  The parameter "c" contains the
  * first character of the redirection operator.
+ *
  * Note the string "out" is on the stack, which we are about to clobber,
  * so process it first...
  */
 static void
 parseredir(const char *out,  int c)
+{
 	union node *np;
 	int fd;
 	fd = (*out == '\0') ? -1 : atoi(out);
 	np = stalloc(sizeof(struct nfile));
 	if (c == '>') {
 		if (fd < 0)
 			fd = 1;
 		c = pgetc();
 		if (c == '>')
 			np->type = NAPPEND;
 		else if (c == '|')
 			np->type = NCLOBBER;
 		else if (c == '&')
 			np->type = NTOFD;
 		else {
 			np->type = NTO;
 			pungetc();
+		}
 	} else {	/* c == '<' */
 		if (fd < 0)
 			fd = 0;
 		switch (c = pgetc()) {
 		case '<':
 			if (sizeof (struct nfile) != sizeof (struct nhere)) {
 				np = stalloc(sizeof(struct nhere));
 				np->nfile.fd = 0;
+			}
 			np->type = NHERE;
 			heredoc = stalloc(sizeof(struct heredoc));
 			heredoc->here = np;
 			if ((c = pgetc()) == '-') {
 				heredoc->striptabs = 1;
 			} else {
 				heredoc->striptabs = 0;
 				pungetc();
+			}
 			break;
 		case '&':
 			np->type = NFROMFD;
 			break;
 		case '>':
 			np->type = NFROMTO;
 			break;
 		default:
 			np->type = NFROM;
 			pungetc();
 			break;
+		}
+	}
 	np->nfile.fd = fd;
 	redirnode = np;		/* this is the "value" of TRENODE */
+}
 /*
  * The lowest level basic tokenizer.
+ *
  * The next input byte (character) is in firstc, syn says which
  * syntax tables we are to use (basic, single or double quoted, or arith)
  * and magicq (used with sqsyntax and dqsyntax only) indicates that the
  * quote character itself is not special (used parsing here docs and similar)
+ *
  * The result is the type of the next token (its value, when there is one,
  * is saved in the relevant global var - must fix that someday!) which is
  * also saved for re-reading ("lasttoken").
+ *
  * Overall, this routine does far more parsing than it is supposed to.
  * That will also need fixing, someday...
  */
 STATIC int
 readtoken1(int firstc, char const *syn, int magicq)
+{
 	int c = firstc;
 	char * out;
 	int len;
 	struct nodelist *bqlist;
 	int quotef;
 	VSS static_stack;
 	VSS *stack = &static_stack;
 	stack->prev = NULL;
 	stack->cur = 0;
 @@ -1563,108 +1650,43 @@ endword:
 	if (varnest != 0) {
 		cleanup_state_stack(stack);
 		startlinno = plinno;
 		/* { */
 		synerror("Missing '}'");
+	}
 	USTPUTC('\0', out);
 	len = out - stackblock();
 	out = stackblock();
 	if (!magicq) {
 		if ((c == '<' || c == '>')
 		 && quotef == 0
 		 && (*out == '\0' || is_number(out))) {
-			PARSEREDIR();
+			parseredir(out, c);
 			cleanup_state_stack(stack);
 			return lasttoken = TREDIR;
 		} else {
 			pungetc();
+		}
+	}
 	quoteflag = quotef;
 	backquotelist = bqlist;
 	grabstackblock(len);
 	wordtext = out;
 	cleanup_state_stack(stack);
 	return lasttoken = TWORD;
 /* end of readtoken routine */
 /*
  * Parse a redirection operator.  The variable "out" points to a string
  * specifying the fd to be redirected.  The variable "c" contains the
  * first character of the redirection operator.
  */
 parseredir: {
 	char fd[64];
 	union node *np;
 	strlcpy(fd, out, sizeof(fd));
 	np = stalloc(sizeof(struct nfile));
 	if (c == '>') {
 		np->nfile.fd = 1;
 		c = pgetc();
 		if (c == '>')
 			np->type = NAPPEND;
 		else if (c == '|')
 			np->type = NCLOBBER;
 		else if (c == '&')
 			np->type = NTOFD;
 		else {
 			np->type = NTO;
 			pungetc();
 	} else {	/* c == '<' */
 		np->nfile.fd = 0;
 		switch (c = pgetc()) {
 		case '<':
 			if (sizeof (struct nfile) != sizeof (struct nhere)) {
 				np = stalloc(sizeof(struct nhere));
 				np->nfile.fd = 0;
 			np->type = NHERE;
 			heredoc = stalloc(sizeof(struct heredoc));
 			heredoc->here = np;
 			if ((c = pgetc()) == '-') {
 				heredoc->striptabs = 1;
 			} else {
 				heredoc->striptabs = 0;
 				pungetc();
 			break;
 		case '&':
 			np->type = NFROMFD;
 			break;
 		case '>':
 			np->type = NFROMTO;
 			break;
 		default:
 			np->type = NFROM;
 			pungetc();
 			break;
 	if (*fd != '\0')
 		np->nfile.fd = number(fd);
 	redirnode = np;
 	goto parseredir_return;
 /*
  * Parse a substitution.  At this point, we have read the dollar sign
  * and nothing else.
  */
 parsesub: {
 	char buf[10];
 	int subtype;
 	int typeloc;
 	int flags;
 	char *p;
 	static const char types[] = "}-+?=";
 	int i;
 	int linno;