svn commit: r197862 - stable/7/bin/sh

[Stefan Farfeleder]

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;