From owner-p4-projects@FreeBSD.ORG  Sat Jan 10 11:30:13 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E17B1065670; Sat, 10 Jan 2009 11:30:13 +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 CFB59106566B
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 11:30:12 +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 BEA158FC12
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 11:30:12 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ABUCqj041808
	for <perforce@freebsd.org>; Sat, 10 Jan 2009 11:30:12 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n0ABUCOk041806
	for perforce@freebsd.org; Sat, 10 Jan 2009 11:30:12 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 10 Jan 2009 11:30:12 GMT
Message-Id: <200901101130.n0ABUCOk041806@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 155900 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: Sat, 10 Jan 2009 11:30:14 -0000

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

Change 155900 by gabor@gabor_server on 2009/01/10 11:29:14

	- Use the GNU regex library for further testing and development

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/Makefile#16 edit
.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#76 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/Makefile#16 (text+ko) ====

@@ -17,8 +17,12 @@
 
 CFLAGS+= -std=c99 -Wall -pedantic
 
-LDADD=	-lz -lbz2
-DPADD=	${LIBZ} ${LIBBZ2}
+LDADD=	-lgnuregex -lz -lbz2
+DPADD=	${LIBGNUREGEX} ${LIBZ} ${LIBBZ2}
+
+.if !defined(WITHOUT_GNU_COMPAT)
+CFLAGS+= -I/usr/include/gnu
+.endif
 
 .if !defined(WITHOUT_NLS)
 NLS=	hu_HU.ISO8859-2

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

@@ -82,7 +82,7 @@
 };
 
 /* Flags passed to regcomp() and regexec() */
-int		 cflags;
+int		 cflags = 0;
 int		 eflags = REG_STARTEND;
 
 /* Shortcut for matching all cases like empty regex */
@@ -563,10 +563,7 @@
 
 	switch (grepbehave) {
 	case GREP_FIXED:
-		cflags |= REG_NOSPEC;
-		break;
 	case GREP_BASIC:
-		cflags |= REG_BASIC;
 		break;
 	case GREP_EXTENDED:
 		cflags |= REG_EXTENDED;