svn commit: r267878 - stable/10/usr.bin/grep

[Glen Barber]

Author: gjb
Date: Wed Jun 25 18:59:43 2014
New Revision: 267878
URL: http://svnweb.freebsd.org/changeset/base/267878

Log:
  MFC r267693:
    Fix a bug in bsdgrep(1) where patterns are not correctly
    detected.
  
    Certain criteria must be met for this bug to show up:
  
     * the -w flag is specified, and
     * neither -o or --color are specified, and
     * the pattern is part of another word in the line, and
     * the other word that contains the pattern occurs first
  
  PR:		181973
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/usr.bin/grep/util.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/grep/util.c
==============================================================================
--- stable/10/usr.bin/grep/util.c	Wed Jun 25 17:54:36 2014	(r267877)
+++ stable/10/usr.bin/grep/util.c	Wed Jun 25 18:59:43 2014	(r267878)
@@ -336,7 +336,7 @@ procline(struct str *l, int nottext)
 		}
 
 		/* One pass if we are not recording matches */
-		if ((color == NULL && !oflag) || qflag || lflag)
+		if (!wflag && ((color == NULL && !oflag) || qflag || lflag))
 			break;
 
 		if (st == (size_t)pmatch.rm_so)