From owner-svn-src-all@FreeBSD.ORG  Mon Apr 13 19:10:56 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 D3BDA106564A;
	Mon, 13 Apr 2009 19:10:56 +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 C288A8FC16;
	Mon, 13 Apr 2009 19:10:56 +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 n3DJAuQc080725;
	Mon, 13 Apr 2009 19:10:56 GMT (envelope-from stefanf@svn.freebsd.org)
Received: (from stefanf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3DJAuqp080724;
	Mon, 13 Apr 2009 19:10:56 GMT (envelope-from stefanf@svn.freebsd.org)
Message-Id: <200904131910.n3DJAuqp080724@svn.freebsd.org>
From: Stefan Farfeleder <stefanf@FreeBSD.org>
Date: Mon, 13 Apr 2009 19:10:56 +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: r191009 - 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: Mon, 13 Apr 2009 19:10:57 -0000

Author: stefanf
Date: Mon Apr 13 19:10:56 2009
New Revision: 191009
URL: http://svn.freebsd.org/changeset/base/191009

Log:
  Parse 'cmd1 && ! cmd2 | cmd3' correctly, the bang should apply to the entire
  pipeline cmd2 | cmd3 and not just cmd2.
  
  PR:		130298
  Submitted by:	Jilles Tjoelker

Modified:
  head/bin/sh/parser.c

Modified: head/bin/sh/parser.c
==============================================================================
--- head/bin/sh/parser.c	Mon Apr 13 18:56:53 2009	(r191008)
+++ head/bin/sh/parser.c	Mon Apr 13 19:10:56 2009	(r191009)
@@ -250,6 +250,7 @@ pipeline(void)
 	int negate;
 
 	negate = 0;
+	checkkwd = 2;
 	TRACE(("pipeline: entered\n"));
 	while (readtoken() == TNOT)
 		negate = !negate;