From owner-svn-src-all@FreeBSD.ORG  Fri Jan 27 21:22:08 2012
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 27BCA106567C;
	Fri, 27 Jan 2012 21:22:08 +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 1184C8FC12;
	Fri, 27 Jan 2012 21:22:08 +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 q0RLM7n6061076;
	Fri, 27 Jan 2012 21:22:07 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0RLM71E061074;
	Fri, 27 Jan 2012 21:22:07 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201201272122.q0RLM71E061074@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Fri, 27 Jan 2012 21:22:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230625 - stable/9/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: Fri, 27 Jan 2012 21:22:08 -0000

Author: jilles
Date: Fri Jan 27 21:22:07 2012
New Revision: 230625
URL: http://svn.freebsd.org/changeset/base/230625

Log:
  MFC r228937: sh: Do not force special builtins non-special in optimized
  command substitition.
  
  This is not necessary: errors are already caught in evalbackcmd() and
  forcelocal handles changes to variables.
  
  Note that this depends on r223024.

Modified:
  stable/9/bin/sh/eval.c
Directory Properties:
  stable/9/bin/sh/   (props changed)

Modified: stable/9/bin/sh/eval.c
==============================================================================
--- stable/9/bin/sh/eval.c	Fri Jan 27 20:53:37 2012	(r230624)
+++ stable/9/bin/sh/eval.c	Fri Jan 27 21:22:07 2012	(r230625)
@@ -983,7 +983,6 @@ evalcommand(union node *cmd, int flags, 
 			memout.nextc = memout.buf;
 			memout.bufsize = 64;
 			mode |= REDIR_BACKQ;
-			cmdentry.special = 0;
 		}
 		savecmdname = commandname;
 		savetopfile = getcurrentfile();
@@ -1004,7 +1003,7 @@ evalcommand(union node *cmd, int flags, 
 		 * If there is no command word, redirection errors should
 		 * not be fatal but assignment errors should.
 		 */
-		if (argc == 0 && !(flags & EV_BACKCMD))
+		if (argc == 0)
 			cmdentry.special = 1;
 		listsetvar(cmdenviron, cmdentry.special ? 0 : VNOSET);
 		if (argc > 0)