From owner-svn-src-user@FreeBSD.ORG  Wed Sep 14 00:40:01 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F0977106566B;
	Wed, 14 Sep 2011 00:40:00 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DD1E98FC1A;
	Wed, 14 Sep 2011 00:40:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8E0e0oI003257;
	Wed, 14 Sep 2011 00:40:00 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8E0e0qP003256;
	Wed, 14 Sep 2011 00:40:00 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201109140040.p8E0e0qP003256@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 14 Sep 2011 00:40:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225542 - user/gabor/grep/trunk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Sep 2011 00:40:01 -0000

Author: gabor
Date: Wed Sep 14 00:40:00 2011
New Revision: 225542
URL: http://svn.freebsd.org/changeset/base/225542

Log:
  - Failing fixncomp() does not always mean the pattern is invalid, e.g.
    MBS with REG_ICASE cannot be handled by the fast matcher. Furthermore,
    fastncomp() always catches fix patterns so the distinction is not
    really necessary, it just makes the code longer.
  
  Reported by:	aakuusta@gmail.com

Modified:
  user/gabor/grep/trunk/grep.c

Modified: user/gabor/grep/trunk/grep.c
==============================================================================
--- user/gabor/grep/trunk/grep.c	Tue Sep 13 23:28:04 2011	(r225541)
+++ user/gabor/grep/trunk/grep.c	Wed Sep 14 00:40:00 2011	(r225542)
@@ -685,29 +685,17 @@ main(int argc, char *argv[])
 	r_pattern = grep_calloc(patterns, sizeof(*r_pattern));
 
 	/* Check if cheating is allowed (always is for fgrep). */
-	if (grepbehave == GREP_FIXED) {
-		for (i = 0; i < patterns; ++i) {
-			c = fixncomp(&fg_pattern[i], pattern[i].pat,
-			    pattern[i].len, cflags);
+	for (i = 0; i < patterns; ++i) {
+		if (fastncomp(&fg_pattern[i], pattern[i].pat,
+		    pattern[i].len, cflags) != 0) {
+			/* Fall back to full regex library */
+			c = regcomp(&r_pattern[i], pattern[i].pat, cflags);
 			if (c != 0) {
 				regerror(c, &r_pattern[i], re_error,
 				    RE_ERROR_BUF);
 				errx(2, "%s", re_error);
 			}
 		}
-	} else {
-		for (i = 0; i < patterns; ++i) {
-			if (fastncomp(&fg_pattern[i], pattern[i].pat,
-			    pattern[i].len, cflags) != 0) {
-				/* Fall back to full regex library */
-				c = regcomp(&r_pattern[i], pattern[i].pat, cflags);
-				if (c != 0) {
-					regerror(c, &r_pattern[i], re_error,
-					    RE_ERROR_BUF);
-					errx(2, "%s", re_error);
-				}
-			}
-		}
 	}
 
 	if (lbflag)