From 754430692e122839e535b94d1847ff6e79c09e4e Mon Sep 17 00:00:00 2001
From: jilles <jilles@FreeBSD.org>
Date: Tue, 20 Apr 2010 22:20:31 +0000
Subject: [PATCH] MFC r199282: sh: Allow a newline before "in" in a for
 command, as required by POSIX.

---
 bin/sh/parser.c                       |  4 +++-
 tools/regression/bin/sh/parser/for1.0 | 29 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tools/regression/bin/sh/parser/for1.0

diff --git a/bin/sh/parser.c b/bin/sh/parser.c
index 73d628eb7e67..cbd66bc0bd1b 100644
--- a/bin/sh/parser.c
+++ b/bin/sh/parser.c
@@ -365,7 +365,9 @@ TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
 		n1 = (union node *)stalloc(sizeof (struct nfor));
 		n1->type = NFOR;
 		n1->nfor.var = wordtext;
-		if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) {
+		while (readtoken() == TNL)
+			;
+		if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) {
 			app = &ap;
 			while (readtoken() == TWORD) {
 				n2 = (union node *)stalloc(sizeof (struct narg));
diff --git a/tools/regression/bin/sh/parser/for1.0 b/tools/regression/bin/sh/parser/for1.0
new file mode 100644
index 000000000000..f4b38d41414e
--- /dev/null
+++ b/tools/regression/bin/sh/parser/for1.0
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+nl='
+'
+list=' a b c'
+for s1 in "$nl" " "; do
+	for s2 in "$nl" ";"; do
+		for s3 in "$nl" " "; do
+			r=''
+			eval "for i${s1}in ${list}${s2}do${s3}r=\"\$r \$i\"; done"
+			[ "$r" = "$list" ] || exit 1
+		done
+	done
+done
+set -- $list
+for s2 in "$nl" " " ";"; do # s2=";" is an extension to POSIX
+	for s3 in "$nl" " "; do
+		r=''
+		eval "for i${s2}do${s3}r=\"\$r \$i\"; done"
+		[ "$r" = "$list" ] || exit 1
+	done
+done
+for s1 in "$nl" " "; do
+	for s2 in "$nl" ";"; do
+		for s3 in "$nl" " "; do
+			eval "for i${s1}in${s2}do${s3}exit 1; done"
+		done
+	done
+done