From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 14:40:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 841241065681; Sat, 21 Jun 2008 14:40:25 +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 2DC271065679
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:25 +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 1F8F88FC0C
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:25 +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 m5LEeNX6049655
	for <perforce@freebsd.org>; Sat, 21 Jun 2008 14:40:23 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5LEeNfp049653
	for perforce@freebsd.org; Sat, 21 Jun 2008 14:40:23 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 21 Jun 2008 14:40:23 GMT
Message-Id: <200806211440.m5LEeNfp049653@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 143880 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, 21 Jun 2008 14:40:25 -0000

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

Change 143880 by gabor@gabor_server on 2008/06/21 14:40:13

	- Polish GNU compatibility blog

Affected files ...

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

Differences ...

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

@@ -195,76 +195,80 @@
    Our library rejects '|' with empty subexpressions.  Just cut out
    those parts, e.g. "(|a|b||c|)" will be "(a|b|c)" */
 	st = pat;
-	while (((ptr = strstr(st, "|)"))) != NULL && (strstr(st, "\\|)") != (ptr - 1))) {
-		strlcpy(ptr, &(ptr[1]), strlen(ptr));
+	while (((ptr = strstr(st, "|)"))) != NULL) {
+		if (strstr(st, "\\|)") != (ptr - 1))
+			strlcpy(ptr, &(ptr[1]), strlen(ptr));
 		st = ptr;
 	}
 	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(st, "(|")) != NULL) {
+		if ((strstr(st, "(\\|") != ptr) && (strstr(st, "\\(|") != (ptr - 1)))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = 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(st, "||")) != NULL) {
+		if (strstr(st, "\\||") != (ptr - 1))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = 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(st, "*?")) != NULL) {
+		if (strstr(st, "\\*?") != (ptr - 1))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = 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(st, "?*")) != NULL) {
+		if (strstr(st, "\\?*") != (ptr - 1))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr + 1;
 	}
 	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(st, "**")) != NULL) {
+		if ((strstr(st, "\\**") != (ptr - 1)) && (strstr(st, "\\(**") != (ptr - 2)))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = 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(st, "??")) != NULL) {
+		if (strstr(st, "\\??") != (ptr - 1))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr + 1;
 	}
 	st = pat;
 	while ((ptr = strstr(st, "^*")) != NULL) {
 		strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
-		st = ptr;
+		st = 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(st, "(*")) != NULL) {
+		if (strstr(st, "\\(*") != (ptr - 1))
+			strlcpy(&(ptr[1]), &(ptr[2]), strlen(ptr));
+		st = ptr + 1;
 	}
 	st = pat;
-/* XXX
-	while ((ptr = strstr(st, "{1")) != NULL && (strstr(st, "\\{1") != (ptr - 1))) {
-		st = ptr;
-	} */
 	if (Eflag) {
 		st = pat;
 		lbr = 0;
 		while ((ptr = strstr(st, "(")) != NULL) {
 			if (strstr(st, "\\(") != (ptr - 1))
 				lbr++;
-			st = &(ptr[1]);
+			st = ptr + 1;
 		}
 		st = pat;
 		rbr = 0;
 		while ((ptr = strstr(st, ")")) != NULL) {
 			if (strstr(st, "\\)") != (ptr - 1))
 				rbr++;
-			st = &(ptr[1]);
+			st = ptr + 1;
 		}
 		if (lbr != rbr) {
 			errx(2, "parentheses not balanced");
 		}
 	}
 
-///	printf("PAT %s\n", pat);
+//	printf("PAT %s\n", pat);
 
 /* Work-around to allow * at the beginning of the regexp */
 	while (pat[0] == '*')