From owner-p4-projects@FreeBSD.ORG  Tue Jun 17 19:52:45 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4FE6E1065678; Tue, 17 Jun 2008 19:52:45 +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 119091065674
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 19:52:45 +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 ED59E8FC18
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 19:52:44 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5HJqiIH095954
	for <perforce@freebsd.org>; Tue, 17 Jun 2008 19:52:44 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5HJqinG095952
	for perforce@freebsd.org; Tue, 17 Jun 2008 19:52:44 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 17 Jun 2008 19:52:44 GMT
Message-Id: <200806171952.m5HJqinG095952@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 143665 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: Tue, 17 Jun 2008 19:52:45 -0000

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

Change 143665 by gabor@gabor_server on 2008/06/17 19:52:15

	- Pass REG_EXTENDED to regexec if -E is given
	- GNU compatibility: allow * at the beginning of a subexpression

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#23 edit
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#28 edit

Differences ...

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

@@ -199,6 +199,16 @@
 	while ((ptr = strstr(pat, "||")) != NULL)
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1);
 
+/* Work-around to allow * at the beginning of a subexpression */
+	while (pat[0] == '*')
+		pat++;
+	while ((ptr = strstr(pat, "(*")) != NULL)
+		strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1);
+	while ((ptr = strstr(pat, "|*")) != NULL)
+		strlcpy(&(ptr[1]), &(ptr[2]), strlen(pat) - strlen(ptr) - 1);
+
+	printf("PAT: %s\n", pat);
+
 	if (!xflag && (len == 0 || matchall)) {
 		matchall = 1;
 		return;
@@ -357,6 +367,7 @@
 		case 'E':
 			Fflag = Gflag = 0;
 			Eflag++;
+			eflags |= REG_EXTENDED;
 			break;
 		case 'e':
 			add_patterns(optarg);

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