From 6c4c5c5b959ec8a2e85510bdf85339582f638f36 Mon Sep 17 00:00:00 2001
From: rsc <devnull@localhost>
Date: Mon, 26 Mar 2007 17:27:08 +0000
Subject: =?UTF-8?q?fix=20empty=20string=20interpolation=20bugs=20(Michael?=
 =?UTF-8?q?=20Teichgr=C3=A4ber)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cmd/mk/word.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'src/cmd/mk/word.c')

diff --git a/src/cmd/mk/word.c b/src/cmd/mk/word.c
index b0e344ea..f94c4fd7 100644
--- a/src/cmd/mk/word.c
+++ b/src/cmd/mk/word.c
@@ -97,12 +97,15 @@ nextword(char **s)
 	Word *head, *tail, *w;
 	Rune r;
 	char *cp;
+	int empty;
 
 	cp = *s;
 	b = newbuf();
+restart:
 	head = tail = 0;
 	while(*cp == ' ' || *cp == '\t')		/* leading white space */
 		cp++;
+	empty = 1;
 	while(*cp){
 		cp += chartorune(&r, cp);
 		switch(r)
@@ -114,6 +117,7 @@ nextword(char **s)
 		case '\\':
 		case '\'':
 		case '"':
+			empty = 0;
 			cp = shellt->expandquote(cp, r, b);
 			if(cp == 0){
 				fprint(2, "missing closing quote: %s\n", *s);
@@ -122,8 +126,12 @@ nextword(char **s)
 			break;
 		case '$':
 			w = varsub(&cp);
-			if(w == 0)
+			if(w == 0){
+				if(empty)
+					goto restart;
 				break;
+			}
+			empty = 0;
 			if(b->current != b->start){
 				bufcpy(b, w->s, strlen(w->s));
 				insert(b, 0);
@@ -147,6 +155,7 @@ nextword(char **s)
 				tail = tail->next;
 			break;
 		default:
+			empty = 0;
 			rinsert(b, r);
 			break;
 		}
-- 
cgit v1.2.3