From owner-p4-projects@FreeBSD.ORG  Sun Aug 10 11:47:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3DF641065671; Sun, 10 Aug 2008 11:47:26 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DE18E106564A
	for <perforce@freebsd.org>; Sun, 10 Aug 2008 11:47:25 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D364D8FC0A
	for <perforce@freebsd.org>; Sun, 10 Aug 2008 11:47:25 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7ABlPRI084767
	for <perforce@freebsd.org>; Sun, 10 Aug 2008 11:47:25 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7ABlPcX084765
	for perforce@freebsd.org; Sun, 10 Aug 2008 11:47:25 GMT
	(envelope-from gabor@freebsd.org)
Date: Sun, 10 Aug 2008 11:47:25 GMT
Message-Id: <200808101147.m7ABlPcX084765@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 147076 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 10 Aug 2008 11:47:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=147076

Change 147076 by gabor@gabor_server on 2008/08/10 11:47:24

	- Fall back to regexec() if --color or -o is set because the fixed
	  string code doesn't handle them.  If I can fix it then
	  we can revert this change.

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#73 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/grep.c#73 (text+ko) ====

@@ -599,10 +599,13 @@
  */
 		for (i = 0; i < patterns; ++i) {
 			/* Check if cheating is allowed (always is for fgrep). */
-			if (grepbehave == GREP_FIXED)
+			if (grepbehave == GREP_FIXED && !color && !oflag)
 				fgrepcomp(&fg_pattern[i], pattern[i]);
 			else {
+				if (oflag || color)
+					goto fallback;
 				if (fastcomp(&fg_pattern[i], pattern[i])) {
+fallback:
 					/* Fall back to full regex library */
 					c = regcomp(&r_pattern[i], pattern[i], cflags);
 					if (c != 0) {