From owner-svn-src-all@FreeBSD.ORG  Thu Oct  8 17:11:02 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 7AA7F106566B;
	Thu,  8 Oct 2009 17:11:02 +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 68D738FC14;
	Thu,  8 Oct 2009 17:11:02 +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 n98HB2x6028250;
	Thu, 8 Oct 2009 17:11:02 GMT (envelope-from stefanf@svn.freebsd.org)
Received: (from stefanf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98HB2eV028248;
	Thu, 8 Oct 2009 17:11:02 GMT (envelope-from stefanf@svn.freebsd.org)
Message-Id: <200910081711.n98HB2eV028248@svn.freebsd.org>
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Thu, 8 Oct 2009 17:11:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r197862 - stable/7/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: Thu, 08 Oct 2009 17:11:02 -0000

Author: stefanf
Date: Thu Oct  8 17:11:01 2009
New Revision: 197862
URL: http://svn.freebsd.org/changeset/base/197862

Log:
  Merge r191009.
  > Parse 'cmd1 && ! cmd2 | cmd3' correctly, the bang should apply to the entire
  > pipeline cmd2 | cmd3 and not just cmd2.

Modified:
  stable/7/bin/sh/   (props changed)
  stable/7/bin/sh/parser.c

Modified: stable/7/bin/sh/parser.c
==============================================================================
--- stable/7/bin/sh/parser.c	Thu Oct  8 16:05:17 2009	(r197861)
+++ stable/7/bin/sh/parser.c	Thu Oct  8 17:11:01 2009	(r197862)
@@ -250,6 +250,7 @@ pipeline(void)
 	int negate;
 
 	negate = 0;
+	checkkwd = 2;
 	TRACE(("pipeline: entered\n"));
 	while (readtoken() == TNOT)
 		negate = !negate;