From owner-svn-src-all@FreeBSD.ORG  Sun Jan 13 19:19:41 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id ADA8231B;
 Sun, 13 Jan 2013 19:19:41 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 9EF9A6F0;
 Sun, 13 Jan 2013 19:19:41 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0DJJfap061657;
 Sun, 13 Jan 2013 19:19:41 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0DJJfNb061653;
 Sun, 13 Jan 2013 19:19:41 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201301131919.r0DJJfNb061653@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 13 Jan 2013 19:19:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r245381 - in head: bin/sh
 tools/regression/bin/sh/expansion
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sun, 13 Jan 2013 19:19:41 -0000

Author: jilles
Date: Sun Jan 13 19:19:40 2013
New Revision: 245381
URL: http://svnweb.freebsd.org/changeset/base/245381

Log:
  sh: Don't lose $? when backquoted command ends with semicolon or newline.
  
  An empty simple command was added and overwrote the exit status with 0.
  
  This affects `...` but not $(...).
  
  Example:
    v=`false;`; echo $?

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

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Sun Jan 13 16:57:11 2013	(r245380)
+++ head/bin/sh/parser.c	Sun Jan 13 19:19:40 2013	(r245381)
@@ -286,7 +286,8 @@ list(int nlflag, int erflag)
 				tokpushback++;
 			}
 			checkkwd = CHKNL | CHKKWD | CHKALIAS;
-			if (!nlflag && !erflag && tokendlist[peektoken()])
+			if (!nlflag && (erflag ? peektoken() == TEOF :
+			    tokendlist[peektoken()]))
 				return ntop;
 			break;
 		case TEOF:

Added: head/tools/regression/bin/sh/expansion/cmdsubst14.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/expansion/cmdsubst14.0	Sun Jan 13 19:19:40 2013	(r245381)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+! v=`false
+
+`

Added: head/tools/regression/bin/sh/expansion/cmdsubst15.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/expansion/cmdsubst15.0	Sun Jan 13 19:19:40 2013	(r245381)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+! v=`false;
+
+`