From owner-svn-src-all@FreeBSD.ORG  Fri May 20 16:03:37 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F8571065672;
	Fri, 20 May 2011 16:03:37 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44CA88FC1F;
	Fri, 20 May 2011 16:03:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4KG3bs5091208;
	Fri, 20 May 2011 16:03:37 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4KG3bAa091205;
	Fri, 20 May 2011 16:03:37 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201105201603.p4KG3bAa091205@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 20 May 2011 16:03:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222134 - in head: bin/sh tools/regression/bin/sh/parser
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 May 2011 16:03:37 -0000

Author: jilles
Date: Fri May 20 16:03:36 2011
New Revision: 222134
URL: http://svn.freebsd.org/changeset/base/222134

Log:
  sh: Allow terminating a heredoc with a terminator at EOF without a newline.
  
  This is sometimes used with eval or old-style command substitution, and most
  shells other than ash derivatives allow it.
  
  It can also be used with scripts that violate POSIX's requirement on the
  application that they end in a newline (scripts must be text files except
  that line length is unlimited).
  
  Example:
  v=`cat <<EOF
  foo
  EOF`
  echo $v
  
  This commit does not add support for the similar construct with new-style
  command substitution, like
  v=$(cat <<EOF
  foo
  EOF)
  This continues to require a newline after the terminator.

Added:
  head/tools/regression/bin/sh/parser/heredoc11.0   (contents, props changed)
Modified:
  head/bin/sh/parser.c

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Fri May 20 15:48:08 2011	(r222133)
+++ head/bin/sh/parser.c	Fri May 20 16:03:36 2011	(r222134)
@@ -1513,10 +1513,12 @@ checkend: {
 
 				p = line;
 				for (q = eofmark + 1 ; *q && *p == *q ; p++, q++);
-				if (*p == '\n' && *q == '\0') {
+				if ((*p == '\0' || *p == '\n') && *q == '\0') {
 					c = PEOF;
-					plinno++;
-					needprompt = doprompt;
+					if (*p == '\n') {
+						plinno++;
+						needprompt = doprompt;
+					}
 				} else {
 					pushstring(line, strlen(line), NULL);
 				}

Added: head/tools/regression/bin/sh/parser/heredoc11.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/parser/heredoc11.0	Fri May 20 16:03:36 2011	(r222134)
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+failures=''
+
+check() {
+	if eval "[ $* ]"; then
+		:
+	else
+		echo "Failed: $*"
+		failures=x$failures
+	fi
+}
+
+check '`cat <<EOF
+foo
+EOF` = foo'
+
+check '"`cat <<EOF
+foo
+EOF`" = foo'
+
+check '`eval "cat <<EOF
+foo
+EOF"` = foo'
+
+test "x$failures" = x