From owner-svn-src-all@FreeBSD.ORG  Sat Apr  4 19:06:53 2009
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 5D4AE10656BF;
	Sat,  4 Apr 2009 19:06:53 +0000 (UTC)
	(envelope-from stefanf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4A4AC8FC25;
	Sat,  4 Apr 2009 19:06:53 +0000 (UTC)
	(envelope-from stefanf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n34J6rch078842;
	Sat, 4 Apr 2009 19:06:53 GMT (envelope-from stefanf@svn.freebsd.org)
Received: (from stefanf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n34J6raw078841;
	Sat, 4 Apr 2009 19:06:53 GMT (envelope-from stefanf@svn.freebsd.org)
Message-Id: <200904041906.n34J6raw078841@svn.freebsd.org>
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Sat, 4 Apr 2009 19:06:53 +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: r190698 - head/bin/sh
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: Sat, 04 Apr 2009 19:06:55 -0000

Author: stefanf
Date: Sat Apr  4 19:06:52 2009
New Revision: 190698
URL: http://svn.freebsd.org/changeset/base/190698

Log:
  Don't let trailing empty lines overwrite the result of the last command with 0.
  This affects the built-ins eval, fc, and trap and also the string passed to sh
  with the -c option.
  
  Submitted by:	Jilles Tjoelker

Modified:
  head/bin/sh/eval.c

Modified: head/bin/sh/eval.c
==============================================================================
--- head/bin/sh/eval.c	Sat Apr  4 17:48:38 2009	(r190697)
+++ head/bin/sh/eval.c	Sat Apr  4 19:06:52 2009	(r190698)
@@ -166,7 +166,8 @@ evalstring(char *s)
 	setstackmark(&smark);
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
-		evaltree(n, 0);
+		if (n != NULL)
+			evaltree(n, 0);
 		popstackmark(&smark);
 	}
 	popfile();