 @@ -1,14 +1,14 @@
-/*	$NetBSD: parser.c,v 1.69 2008/08/23 10:05:52 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.70 2008/11/05 22:04:43 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.69 2008/08/23 10:05:52 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.70 2008/11/05 22:04:43 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"
 @@ -1384,26 +1384,27 @@ parsebackq: {
 		str = ckmalloc(savelen);
 		memcpy(str, stackblock(), savelen);
+	}
 	savehandler = handler;
 	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.  */
                 char *pout;
                 int pc;
                 int psavelen;
                 int nparen = 0;
                 char *pstr;
                 STARTSTACKSTR(pout);
 		for (;;) {
 			if (needprompt) {
 				setprompt(2);
 				needprompt = 0;
+			}
 			switch (pc = pgetc()) {
 			case '`':
 				goto done;
 @@ -1416,43 +1417,53 @@ parsebackq: {
 						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);
 				break;
 			case '(':
 				nparen++;
 				break;
 			case ')':
 				if (--nparen < 0)
 				    synerror("`)' unexpected");
 				break;
 			case '\n':
 				plinno++;
 				needprompt = doprompt;
 				break;
 			case PEOF:
 			        startlinno = plinno;
 				synerror("EOF in backquote substitution");
  				break;
 			default:
 				break;
+			}
 			STPUTC(pc, pout);
+                }
 done:
 		if (nparen)
 			synerror("Missing `)'");
                 STPUTC('\0', pout);
                 psavelen = pout - stackblock();
                 if (psavelen > 0) {
 			pstr = grabstackstr(pout);
 			setinputstring(pstr, 1);
+                }
+        }
 	nlpp = &bqlist;
 	while (*nlpp)
 		nlpp = &(*nlpp)->next;
 	*nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist));
 	(*nlpp)->next = NULL;
 	parsebackquote = oldstyle;