From owner-svn-src-head@FreeBSD.ORG  Sat Jun  4 11:28:42 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8AAB7106564A;
	Sat,  4 Jun 2011 11:28:42 +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 7A4A68FC16;
	Sat,  4 Jun 2011 11:28:42 +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 p54BSgDk008119;
	Sat, 4 Jun 2011 11:28:42 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p54BSgDj008116;
	Sat, 4 Jun 2011 11:28:42 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201106041128.p54BSgDj008116@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 4 Jun 2011 11:28:42 +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: r222676 - in head: bin/sh
	tools/regression/bin/sh/execution
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2011 11:28:42 -0000

Author: jilles
Date: Sat Jun  4 11:28:42 2011
New Revision: 222676
URL: http://svn.freebsd.org/changeset/base/222676

Log:
  sh: Honour -n while processing -c string.

Added:
  head/tools/regression/bin/sh/execution/set-n4.0   (contents, props changed)
Modified:
  head/bin/sh/eval.c

Modified: head/bin/sh/eval.c
==============================================================================
--- head/bin/sh/eval.c	Sat Jun  4 09:25:59 2011	(r222675)
+++ head/bin/sh/eval.c	Sat Jun  4 11:28:42 2011	(r222676)
@@ -165,7 +165,7 @@ evalstring(char *s, int flags)
 	setstackmark(&smark);
 	setinputstring(s, 1);
 	while ((n = parsecmd(0)) != NEOF) {
-		if (n != NULL) {
+		if (n != NULL && !nflag) {
 			if (flags_exit && preadateof())
 				evaltree(n, flags | EV_EXIT);
 			else

Added: head/tools/regression/bin/sh/execution/set-n4.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/execution/set-n4.0	Sat Jun  4 11:28:42 2011	(r222676)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+$SH -nc 'echo bad'