From 79f9ab6771f127e8b2f9c56a4e2a70636e1f413e Mon Sep 17 00:00:00 2001
From: ross <ross@NetBSD.org>
Date: Tue, 12 Feb 2002 06:39:10 +0000
Subject: [PATCH] back this directory up a day, systems won't even boot
 (rc.subr splodes)

suggested back-to-the-drawing-board test: $ echo "${PWD:-notlikely}"
---
 bin/sh/Makefile | 4 ++--
 bin/sh/parser.c | 6 +++---
 bin/sh/show.c   | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/sh/Makefile b/bin/sh/Makefile
index 0b4a5d53f48f..003141d3e514 100644
--- a/bin/sh/Makefile
+++ b/bin/sh/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.55 2002/02/11 18:55:10 christos Exp $
+#	$NetBSD: Makefile,v 1.56 2002/02/12 06:39:10 ross Exp $
 #	@(#)Makefile	8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -19,7 +19,7 @@ DPADD+=	${LIBL} ${LIBEDIT} ${LIBTERMCAP}
 LFLAGS= -8	# 8-bit lex scanner for arithmetic
 YFLAGS=	-d
 
-CPPFLAGS+=-DSHELL -I. -I${.CURDIR} # -DDEBUG
+CPPFLAGS+=-DSHELL -I. -I${.CURDIR}
 
 .ifdef SMALLPROG
 CPPFLAGS+=-DSMALL
diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 97af4ff1c418..6f5a4c52042b 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.49 2002/02/11 18:57:19 christos Exp $	*/
+/*	$NetBSD: parser.c,v 1.50 2002/02/12 06:39:10 ross Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.49 2002/02/11 18:57:19 christos Exp $");
+__RCSID("$NetBSD: parser.c,v 1.50 2002/02/12 06:39:10 ross Exp $");
 #endif
 #endif /* not lint */
 
@@ -1006,7 +1006,7 @@ readtoken1(firstc, syntax, eofmark, striptabs)
 				PARSESUB();		/* parse substitution */
 				break;
 			case CENDVAR:	/* '}' */
-				if (varnest > 0 && !dblquote) {
+				if (varnest > 0) {
 					varnest--;
 					USTPUTC(CTLENDVAR, out);
 				} else {
diff --git a/bin/sh/show.c b/bin/sh/show.c
index f4cd03d9abb3..4fd150c65017 100644
--- a/bin/sh/show.c
+++ b/bin/sh/show.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.19 2002/02/11 18:54:30 christos Exp $	*/
+/*	$NetBSD: show.c,v 1.20 2002/02/12 06:39:11 ross Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -41,7 +41,7 @@
 #if 0
 static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: show.c,v 1.19 2002/02/11 18:54:30 christos Exp $");
+__RCSID("$NetBSD: show.c,v 1.20 2002/02/12 06:39:11 ross Exp $");
 #endif
 #endif /* not lint */
 
@@ -201,8 +201,8 @@ sharg(arg, fp)
 			if (subtype == VSLENGTH)
 				putc('#', fp);
 
-			while (*++p != '=')
-				putc(*p, fp);
+			while (*p != '=')
+				putc(*p++, fp);
 
 			if (subtype & VSNUL)
 				putc(':', fp);