From owner-p4-projects@FreeBSD.ORG  Fri Jun 20 18:01:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA4391065677; Fri, 20 Jun 2008 18:01:04 +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 7B5A31065678
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 18:01:04 +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 79F118FC16
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 18:01:04 +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 m5KI14V7055465
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 18:01:04 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KI144D055463
	for perforce@freebsd.org; Fri, 20 Jun 2008 18:01:04 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 20 Jun 2008 18:01:04 GMT
Message-Id: <200806201801.m5KI144D055463@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 143829 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: Fri, 20 Jun 2008 18:01:05 -0000

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

Change 143829 by gabor@gabor_server on 2008/06/20 18:00:53

	- Rework the GNU compatibility part a bit, the workaround substitutions
	  are more accurate now

Affected files ...

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

Differences ...

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

@@ -187,37 +187,55 @@
 static void
 add_pattern(char *pat, size_t len)
 {
-	char	*ptr;
+	char	*ptr, *st;
 
 /* Workaround for our libc-regex library to match GNU behaviour.
    Our library rejects '|' with empty subexpressions.  Just cut out
    those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */
-	while (((ptr = strstr(pat, "|)"))) != NULL && (strstr(pat, "\\|)") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "|)"))) != NULL && (strstr(st, "\\|)") != (ptr - 1))) {
 		strlcpy(ptr, &(ptr[1]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "(|")) != NULL) && (strstr(pat, "(\\|") != ptr) && (strstr(pat, "\\(|") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "(|")) != NULL) && (strstr(st, "(\\|") != ptr) && (strstr(st, "\\(|") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "||")) != NULL) && (strstr(pat, "\\||") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "||")) != NULL) && (strstr(st, "\\||") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "*?")) != NULL) && (strstr(pat, "\\*?") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "*?")) != NULL) && (strstr(st, "\\*?") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "?*")) != NULL) && (strstr(pat, "\\?*") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "?*")) != NULL) && (strstr(st, "\\?*") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "**")) != NULL) && (strstr(pat, "\\**") != (ptr - 1)) && (strstr(pat, "\\(**") != (ptr - 2))) {
+	st = pat;
+	while (((ptr = strstr(st, "**")) != NULL) && (strstr(st, "\\**") != (ptr - 1)) && (strstr(st, "\\(**") != (ptr - 2))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while (((ptr = strstr(pat, "??")) != NULL) && (strstr(pat, "\\??") != (ptr - 1))) {
+	st = pat;
+	while (((ptr = strstr(st, "??")) != NULL) && (strstr(st, "\\??") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while ((ptr = strstr(pat, "^*")) != NULL) {
+	st = pat;
+	while ((ptr = strstr(st, "^*")) != NULL) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
-	while ((ptr = strstr(pat, "(*")) != NULL && (strstr(pat, "\\(*") != (ptr - 1))) {
+	st = pat;
+	while ((ptr = strstr(st, "(*")) != NULL && (strstr(st, "\\(*") != (ptr - 1))) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr;
 	}
 
 //	printf("PAT %s\n", pat);