From owner-p4-projects@FreeBSD.ORG  Fri Jun 20 11:38:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 76230106567B; Fri, 20 Jun 2008 11:38:26 +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 381461065672
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 11:38:26 +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 2800F8FC15
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 11:38:26 +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 m5KBcPXF091294
	for <perforce@freebsd.org>; Fri, 20 Jun 2008 11:38:25 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5KBcPYO091292
	for perforce@freebsd.org; Fri, 20 Jun 2008 11:38:25 GMT
	(envelope-from gabor@freebsd.org)
Date: Fri, 20 Jun 2008 11:38:25 GMT
Message-Id: <200806201138.m5KBcPYO091292@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 143815 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 11:38:26 -0000

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

Change 143815 by gabor@gabor_server on 2008/06/20 11:37:51

	- Fix some regressions that went through
	
	Reported by:	Jaakko Heinonen <jh@saunalahti.fi>

Affected files ...

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

Differences ...

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

@@ -192,12 +192,15 @@
 /* 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)
-		strlcpy(ptr, &(ptr[1]), strlen(pat) - strlen(ptr));
-	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);
+	while (((ptr = strstr(pat, "|)"))) != NULL && (strstr(pat, "\\|)") != (ptr - 1))) {
+		strlcpy(ptr, &(ptr[1]), strlen(ptr));
+	}
+	while (((ptr = strstr(pat, "(|")) != NULL) && (strstr(pat, "(\\|") != ptr) && (strstr(pat, "\\(|") != (ptr - 1))) {
+		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+	}
+	while ((ptr = strstr(pat, "||")) != NULL) {
+		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+	}
 
 /* Work-around to allow * at the beginning of the regexp */
 	while (pat[0] == '*')