PERFORCE change 155900 for review

Gabor Kovesdan gabor at FreeBSD.org
Sat Jan 10 03:30:14 PST 2009


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

Change 155900 by gabor at 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;


More information about the p4-projects mailing list