 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.c,v 1.114 2016/03/31 16:12:52 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.115 2016/03/31 23:11:05 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.114 2016/03/31 16:12:52 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.115 2016/03/31 23:11:05 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() */
 @@ -99,27 +99,27 @@ union node *redirnode;
 struct heredoc *heredoc;
 int quoteflag;			/* set if (part of) last token was quoted */
 int startlinno;			/* line # where last token started */
 int funclinno;			/* line # where the current function started */
 STATIC union node *list(int, int);
 STATIC union node *andor(void);
 STATIC union node *pipeline(void);
 STATIC union node *command(void);
 STATIC union node *simplecmd(union node **, union node *);
 STATIC union node *makename(void);
 STATIC void parsefname(void);
-STATIC void slurp_heredoc(char *const, int, int);
+STATIC void slurp_heredoc(char *const, const int, const int);
 STATIC void readheredocs(void);
 STATIC int peektoken(void);
 STATIC int readtoken(void);
 STATIC int xxreadtoken(void);
 STATIC int readtoken1(int, char const *, int);
 STATIC int noexpand(char *);
 STATIC void synexpect(int, const char *) __dead;
 STATIC void synerror(const char *) __dead;
 STATIC void setprompt(int);
 static const char EOFhere[] = "EOF reading here (<<) document";
 @@ -749,27 +749,27 @@ checkend(int c, char * const eofmark, co
 		c = PEOF;
 		plinno++;
 		needprompt = doprompt;
+	}
 	return (c);
+}
 /*
  * Input any here documents.
  */
 STATIC void
-slurp_heredoc(char *const eofmark, int striptabs, int sq)
+slurp_heredoc(char *const eofmark, const int striptabs, const int sq)
+{
 	int c;
 	char *out;
 	c = pgetc();
 	/*
 	 * If we hit EOF on the input, and the eofmark is a null string ('')
 	 * we consider this empty line to be the eofmark, and exit without err.
 	 */
 	if (c == PEOF && *eofmark != '\0')
 		synerror(EOFhere);
 @@ -842,46 +842,39 @@ readheredocs(void)
 			setprompt(2);
 			needprompt = 0;
+		}
 		slurp_heredoc(here->eofmark, here->striptabs,
 		    here->here->nhere.type == NHERE);
 		n = stalloc(sizeof(struct narg));
 		n->narg.type = NARG;
 		n->narg.next = NULL;
 		n->narg.text = wordtext;
 		n->narg.backquote = backquotelist;
 		here->here->nhere.doc = n;
 void
 parse_heredoc(union node *n)
 	if (n->narg.type != NARG)
 		abort();
 	if (n->narg.text[0] == '\0')		/* nothing to do */
 		return;
 	setinputstring(n->narg.text, 1);
 	readtoken1(pgetc(), DQSYNTAX, 1);
-	n->narg.text = wordtext;
+		if (here->here->nhere.type == NHERE)
-	n->narg.backquote = backquotelist;
+			continue;
-	popfile();
+		/*
 		 * Now "parse" here docs that have unquoted eofmarkers.
 		 */
 		setinputstring(wordtext, 1);
 		readtoken1(pgetc(), DQSYNTAX, 1);
 		n->narg.text = wordtext;
 		n->narg.backquote = backquotelist;
 		popfile();
+	}
+}
 STATIC int
 peektoken(void)
+{
 	int t;
 	t = readtoken();
 	tokpushback++;
 	return (t);
+}
 STATIC int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.h,v 1.20 2016/03/27 14:39:33 christos Exp $	*/
+/*	$NetBSD: parser.h,v 1.21 2016/03/31 23:11:05 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.
 @@ -71,16 +71,15 @@
 /*
  * NEOF is returned by parsecmd when it encounters an end of file.  It
  * must be distinct from NULL, so we use the address of a variable that
  * happens to be handy.
  */
 extern int tokpushback;
 #define NEOF ((union node *)&tokpushback)
 extern int whichprompt;		/* 1 == PS1, 2 == PS2 */
 union node *parsecmd(int);
 void fixredir(union node *, const char *, int);
 void parse_heredoc(union node *);
 int goodname(char *);
 const char *getprompt(void *);