From owner-svn-src-all@FreeBSD.ORG  Sat Feb  5 15:02:19 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 61F19106564A;
	Sat,  5 Feb 2011 15:02:19 +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 5045A8FC13;
	Sat,  5 Feb 2011 15:02:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p15F2JXZ031420;
	Sat, 5 Feb 2011 15:02:19 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15F2J3k031417;
	Sat, 5 Feb 2011 15:02:19 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201102051502.p15F2J3k031417@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 5 Feb 2011 15:02:19 +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: r218325 - in head: bin/sh
	tools/regression/bin/sh/execution
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, 05 Feb 2011 15:02:19 -0000

Author: jilles
Date: Sat Feb  5 15:02:19 2011
New Revision: 218325
URL: http://svn.freebsd.org/changeset/base/218325

Log:
  sh: Fix two things about {(...)} <redir:
  
  * In {(...) <redir1;} <redir2, do not drop redir1.
  * Maintain the difference between (...) <redir and {(...)} <redir:
    In (...) <redir, the redirection is performed in the child, while in
    {(...)} <redir it should be performed in the parent (like {(...); :;}
    <redir)

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

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Sat Feb  5 14:08:51 2011	(r218324)
+++ head/bin/sh/parser.c	Sat Feb  5 15:02:19 2011	(r218325)
@@ -389,8 +389,10 @@ command(void)
 	union node *cp, **cpp;
 	union node *redir, **rpp;
 	int t;
+	int is_subshell;
 
 	checkkwd = CHKNL | CHKKWD | CHKALIAS;
+	is_subshell = 0;
 	redir = NULL;
 	n1 = NULL;
 	rpp = &redir;
@@ -558,6 +560,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 		if (readtoken() != TRP)
 			synexpect(TRP);
 		checkkwd = CHKKWD | CHKALIAS;
+		is_subshell = 1;
 		break;
 	case TBEGIN:
 		n1 = list(0, 0);
@@ -596,7 +599,7 @@ TRACE(("expecting DO got %s %s\n", tokna
 	tokpushback++;
 	*rpp = NULL;
 	if (redir) {
-		if (n1->type != NSUBSHELL) {
+		if (!is_subshell) {
 			n2 = (union node *)stalloc(sizeof (struct nredir));
 			n2->type = NREDIR;
 			n2->nredir.n = n1;

Added: head/tools/regression/bin/sh/execution/redir5.0
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/tools/regression/bin/sh/execution/redir5.0	Sat Feb  5 15:02:19 2011	(r218325)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+
+{ (echo bad) >/dev/null; } </dev/null