From 8e66c8e658c885e644b565894b40bc181dd067c9 Mon Sep 17 00:00:00 2001
From: jilles <jilles@FreeBSD.org>
Date: Thu, 28 Oct 2010 21:51:14 +0000
Subject: sh: Make double-quotes quote a '}' inside ${v#...} and ${v%...}.

Exp-run done by:	pav (with some other sh(1) changes)
PR:			bin/57554
---
 bin/sh/parser.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 9500d91..5c0d2b1 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -1234,7 +1234,8 @@ readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs)
 			case CENDVAR:	/* '}' */
 				if (level > 0 &&
 				    (state[level].category == TSTATE_VAR_OLD ||
-				    state[level].category == TSTATE_VAR_NEW)) {
+				    (state[level].category == TSTATE_VAR_NEW &&
+				     state[level].syntax == BASESYNTAX))) {
 					if (state[level].category == TSTATE_VAR_OLD)
 						state[level - 1].syntax = state[level].syntax;
 					else
-- 
cgit v1.1