From MAILER-DAEMON Mon Jul 04 01:03:57 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7b-0005DJ-U2
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7X-0005BF-RM
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7V-00059b-2I
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7U-00059K-Tq
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:48 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBq-0002qT-UT
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:18 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ45-00029h-8C
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:00:17 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBj-0002mk-IR
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:08:11 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBj-0002kq-79
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:08:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIjY-0005gp-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 00:39:04 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIjY-0005gp-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:39:04 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:53 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/04 04:39:03

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c (kwsprep): Use memset() and memcpy() when appropriate.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.262&tr2=1.263&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.7&tr2=1.8&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 01:04:04 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7h-0005G1-Pi
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:04:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7a-0005Bx-1U
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7V-00059t-JL
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7V-00059K-AN
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBo-0002pR-NG
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ43-00029h-2q
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:00:15 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBk-0002nS-RW
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:13 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBk-0002kq-I3
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:12 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIjX-0005gb-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 00:39:03 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIjX-0005gb-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:39:03 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:56 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.262 grep/ChangeLog:1.263
--- grep/ChangeLog:1.262	Mon Jul  4 04:29:10 2005
+++ grep/ChangeLog	Mon Jul  4 04:39:03 2005
@@ -4,6 +4,8 @@
 	  Replace uses of 0 for pointer values by NULL.
 	  Generalize use of existing U() macro to whole file.
 
+	* src/kwset.c (kwsprep): Use memset() and memcpy() when appropriate.
+
 2005-06-22  Charles Levert  <charles_levert@gna.org>
 
 	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,



From MAILER-DAEMON Mon Jul 04 01:04:04 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7k-0005GS-7d
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:04:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7a-0005Ce-Fu
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7W-0005AS-9j
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7V-00059K-TV
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:50 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBo-0002p5-43
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ42-00029h-Hz
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:00:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBn-0002oP-48
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:15 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBm-0002kq-PW
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIZy-0004KL-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 00:29:10 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIZy-0004KL-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:29:10 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:57 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.261 grep/ChangeLog:1.262
--- grep/ChangeLog:1.261	Thu Jun 23 00:55:58 2005
+++ grep/ChangeLog	Mon Jul  4 04:29:10 2005
@@ -1,3 +1,9 @@
+2005-07-04  Charles Levert  <charles_levert@gna.org>
+
+	* src/kwset.c: Readability changes.
+	  Replace uses of 0 for pointer values by NULL.
+	  Generalize use of existing U() macro to whole file.
+
 2005-06-22  Charles Levert  <charles_levert@gna.org>
 
 	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,



From MAILER-DAEMON Mon Jul 04 01:04:05 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7l-0005Gz-4q
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:04:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7a-0005Cf-H0
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7W-0005Ag-V3
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7W-00059K-6q
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:50 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBn-0002oq-T8
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:15 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ42-00029h-Ae
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:00:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBm-0002oF-Mc
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:08:15 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBm-0002kq-DV
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:08:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIZy-0004KS-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 00:29:10 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIZy-0004KS-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:29:11 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:57 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/04 04:29:10

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c: Readability changes.
	Replace uses of 0 for pointer values by NULL.
	Generalize use of existing U() macro to whole file.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.261&tr2=1.262&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 01:04:06 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7l-0005HP-Nq
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:04:05 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7a-0005By-1r
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:54 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7V-00059m-JL
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7V-00059K-43
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBo-0002pi-V5
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:17 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ43-00029h-Bc
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:00:15 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBk-0002nB-Bb
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:12 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBj-0002kq-Ry
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:11 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIjY-0005gj-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 00:39:04 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIjY-0005gj-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:39:04 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:57 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.7 grep/src/kwset.c:1.8
--- grep/src/kwset.c:1.7	Mon Jul  4 04:29:10 2005
+++ grep/src/kwset.c	Mon Jul  4 04:39:03 2005
@@ -388,12 +388,7 @@
   /* Initial values for the delta table; will be changed later.  The
      delta entry for a given character is the smallest depth of any
      node at which an outgoing edge is labeled by that character. */
-  if (kwset->mind < 256)
-    for (i = 0; i < NCHAR; ++i)
-      delta[i] = kwset->mind;
-  else
-    for (i = 0; i < NCHAR; ++i)
-      delta[i] = 255;
+  memset(delta, kwset->mind < UCHAR_MAX ? kwset->mind : UCHAR_MAX, NCHAR);
 
   /* Check if we can use the simple boyer-moore algorithm, instead
      of the hairy commentz-walter algorithm. */
@@ -473,8 +468,7 @@
 	for (i = 0; i < NCHAR; ++i)
 	  kwset->next[i] = next[U(trans[i])];
       else
-	for (i = 0; i < NCHAR; ++i)
-	  kwset->next[i] = next[i];
+	memcpy(kwset->next, next, NCHAR * sizeof(struct trie *));
     }
 
   /* Fix things up for any translation table. */
@@ -482,8 +476,7 @@
     for (i = 0; i < NCHAR; ++i)
       kwset->delta[i] = delta[U(trans[i])];
   else
-    for (i = 0; i < NCHAR; ++i)
-      kwset->delta[i] = delta[i];
+    memcpy(kwset->delta, delta, NCHAR);
 
   return NULL;
 }



From MAILER-DAEMON Mon Jul 04 01:04:06 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJ7m-0005Hb-1Y
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:04:06 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJ7a-0005Cv-T6
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:56 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJ7W-0005AB-3P
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:51 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJ7V-00059K-Gu
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:03:49 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBo-0002pL-Fr
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:08:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJ42-00029h-SW
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:00:14 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJBm-0002nz-7s
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:14 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJBl-0002kq-W9
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:08:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpIZy-0004KP-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 00:29:10 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpIZy-0004KP-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 00:29:10 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:03:58 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.6 grep/src/kwset.c:1.7
--- grep/src/kwset.c:1.6	Mon May  2 09:47:48 2005
+++ grep/src/kwset.c	Mon Jul  4 04:29:10 2005
@@ -46,6 +46,8 @@
 #define obstack_chunk_alloc malloc
 #define obstack_chunk_free free
 
+#define U(c) ((unsigned char) (c))
+
 /* Balanced tree of edges and labels leaving a given trie node. */
 struct tree
 {
@@ -93,7 +95,7 @@
 
   kwset = (struct kwset *) malloc(sizeof (struct kwset));
   if (!kwset)
-    return 0;
+    return NULL;
 
   obstack_init(&kwset->obstack);
   kwset->words = 0;
@@ -102,18 +104,18 @@
   if (!kwset->trie)
     {
       kwsfree((kwset_t) kwset);
-      return 0;
+      return NULL;
     }
   kwset->trie->accepting = 0;
-  kwset->trie->links = 0;
-  kwset->trie->parent = 0;
-  kwset->trie->next = 0;
-  kwset->trie->fail = 0;
+  kwset->trie->links = NULL;
+  kwset->trie->parent = NULL;
+  kwset->trie->next = NULL;
+  kwset->trie->fail = NULL;
   kwset->trie->depth = 0;
   kwset->trie->shift = 0;
   kwset->mind = INT_MAX;
   kwset->maxd = -1;
-  kwset->target = 0;
+  kwset->target = NULL;
   kwset->trans = trans;
 
   return (kwset_t) kwset;
@@ -141,7 +143,7 @@
      installing new nodes when necessary. */
   while (len--)
     {
-      label = kwset->trans ? kwset->trans[(unsigned char) *--text] : *--text;
+      label = kwset->trans ? kwset->trans[U(*--text)] : *--text;
 
       /* Descend the tree of outgoing links for this trie node,
 	 looking for the current character and keeping track
@@ -169,17 +171,17 @@
 					       sizeof (struct tree));
 	  if (!link)
 	    return _("memory exhausted");
-	  link->llink = 0;
-	  link->rlink = 0;
+	  link->llink = NULL;
+	  link->rlink = NULL;
 	  link->trie = (struct trie *) obstack_alloc(&kwset->obstack,
 						     sizeof (struct trie));
 	  if (!link->trie)
 	    return _("memory exhausted");
 	  link->trie->accepting = 0;
-	  link->trie->links = 0;
+	  link->trie->links = NULL;
 	  link->trie->parent = trie;
-	  link->trie->next = 0;
-	  link->trie->fail = 0;
+	  link->trie->next = NULL;
+	  link->trie->fail = NULL;
 	  link->trie->depth = trie->depth + 1;
 	  link->trie->shift = 0;
 	  link->label = label;
@@ -273,7 +275,7 @@
   if (trie->depth > kwset->maxd)
     kwset->maxd = trie->depth;
 
-  return 0;
+  return NULL;
 }
 
 /* Enqueue the trie nodes referenced from the given tree in the
@@ -395,7 +397,7 @@
 
   /* Check if we can use the simple boyer-moore algorithm, instead
      of the hairy commentz-walter algorithm. */
-  if (kwset->words == 1 && kwset->trans == 0)
+  if (kwset->words == 1 && kwset->trans == NULL)
     {
       /* Looking for just one string.  Extract it from the trie. */
       kwset->target = obstack_alloc(&kwset->obstack, kwset->mind);
@@ -406,7 +408,7 @@
 	}
       /* Build the Boyer Moore delta.  Boy that's easy compared to CW. */
       for (i = 0; i < kwset->mind; ++i)
-	delta[(unsigned char) kwset->target[i]] = kwset->mind - (i + 1);
+	delta[U(kwset->target[i])] = kwset->mind - (i + 1);
       kwset->mind2 = kwset->mind;
       /* Find the minimal delta2 shift that we might make after
 	 a backwards match has failed. */
@@ -464,30 +466,28 @@
       /* Create a vector, indexed by character code, of the outgoing links
 	 from the root node. */
       for (i = 0; i < NCHAR; ++i)
-	next[i] = 0;
+	next[i] = NULL;
       treenext(kwset->trie->links, next);
 
-      if ((trans = kwset->trans) != 0)
+      if ((trans = kwset->trans) != NULL)
 	for (i = 0; i < NCHAR; ++i)
-	  kwset->next[i] = next[(unsigned char) trans[i]];
+	  kwset->next[i] = next[U(trans[i])];
       else
 	for (i = 0; i < NCHAR; ++i)
 	  kwset->next[i] = next[i];
     }
 
   /* Fix things up for any translation table. */
-  if ((trans = kwset->trans) != 0)
+  if ((trans = kwset->trans) != NULL)
     for (i = 0; i < NCHAR; ++i)
-      kwset->delta[i] = delta[(unsigned char) trans[i]];
+      kwset->delta[i] = delta[U(trans[i])];
   else
     for (i = 0; i < NCHAR; ++i)
       kwset->delta[i] = delta[i];
 
-  return 0;
+  return NULL;
 }
 
-#define U(C) ((unsigned char) (C))
-
 /* Fast boyer-moore search. */
 static size_t
 bmexec (kwset_t kws, char const *text, size_t size)
@@ -604,7 +604,7 @@
   lim = text + len;
   end = text;
   if ((d = kwset->mind) != 0)
-    mch = 0;
+    mch = NULL;
   else
     {
       mch = text, accept = kwset->trie;
@@ -614,7 +614,7 @@
   if (len >= 4 * kwset->mind)
     qlim = lim - 4 * kwset->mind;
   else
-    qlim = 0;
+    qlim = NULL;
 
   while (lim - end >= d)
     {
@@ -624,8 +624,8 @@
 	  while ((d = delta[c = *end]) && end < qlim)
 	    {
 	      end += d;
-	      end += delta[(unsigned char) *end];
-	      end += delta[(unsigned char) *end];
+	      end += delta[U(*end)];
+	      end += delta[U(*end)];
 	    }
 	  ++end;
 	}
@@ -643,7 +643,7 @@
       d = trie->shift;
       while (beg > text)
 	{
-	  c = trans ? trans[(unsigned char) *--beg] : *--beg;
+	  c = trans ? trans[U(*--beg)] : *--beg;
 	  tree = trie->links;
 	  while (tree && c != tree->label)
 	    if (c < tree->label)
@@ -694,7 +694,7 @@
       d = trie->shift;
       while (beg > text)
 	{
-	  c = trans ? trans[(unsigned char) *--beg] : *--beg;
+	  c = trans ? trans[U(*--beg)] : *--beg;
 	  tree = trie->links;
 	  while (tree && c != tree->label)
 	    if (c < tree->label)
@@ -744,10 +744,10 @@
 	 struct kwsmatch *kwsmatch)
 {
   struct kwset const *kwset = (struct kwset *) kws;
-  if (kwset->words == 1 && kwset->trans == 0)
+  if (kwset->words == 1 && kwset->trans == NULL)
     {
       size_t ret = bmexec (kws, text, size);
-      if (kwsmatch != 0 && ret != (size_t) -1)
+      if (kwsmatch != NULL && ret != (size_t) -1)
 	{
 	  kwsmatch->index = 0;
 	  kwsmatch->offset[0] = ret;
@@ -766,6 +766,6 @@
   struct kwset *kwset;
 
   kwset = (struct kwset *) kws;
-  obstack_free(&kwset->obstack, 0);
+  obstack_free(&kwset->obstack, NULL);
   free(kws);
 }



From MAILER-DAEMON Mon Jul 04 01:25:32 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSP-0002PN-Ax
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJS1-0002Gs-AR
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRw-0002Du-4u
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRv-0002DP-RP
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:55 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWJ-0003eG-Qi
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOX-0002Us-Tk
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:21:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJUy-0003aq-Sk
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJUy-0003aI-NI
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:04 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJFi-0000LO-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 01:12:18 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJFi-0000LO-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:12:18 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:18 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/04 05:12:17

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c (kwsprep): Optimize search for mind2 value by
	starting from the end of the target[] array.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.264&tr2=1.265&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 01:25:39 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSP-0002PT-T8
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJS1-0002Gv-85
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRw-0002EQ-Ue
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRw-0002DP-JD
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWJ-0003dq-6a
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOX-0002Us-8t
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:21:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJV0-0003bT-Hp
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:06 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJV0-0003aI-Ef
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:06 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJ8T-00006x-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 01:04:49 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJ8T-00006x-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:04:49 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:20 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/04 05:04:48

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c (kwsprep): Move three variable declarations to
	the single {}-block where they are used.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.263&tr2=1.264&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.8&tr2=1.9&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 01:25:39 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSP-0002PO-HI
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJS1-0002Gr-AH
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRw-0002E0-2g
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRv-0002DP-Vn
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWJ-0003e6-JZ
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOX-0002Us-Mk
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:21:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJUz-0003ax-5n
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJUy-0003aI-Vg
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJFh-0000LL-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 01:12:17 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJFh-0000LL-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:12:17 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:18 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.9 grep/src/kwset.c:1.10
--- grep/src/kwset.c:1.9	Mon Jul  4 05:04:48 2005
+++ grep/src/kwset.c	Mon Jul  4 05:12:17 2005
@@ -393,6 +393,8 @@
      of the hairy commentz-walter algorithm. */
   if (kwset->words == 1 && kwset->trans == NULL)
     {
+      char c;
+
       /* Looking for just one string.  Extract it from the trie. */
       kwset->target = obstack_alloc(&kwset->obstack, kwset->mind);
       for (i = kwset->mind - 1, curr = kwset->trie; i >= 0; --i)
@@ -406,9 +408,11 @@
       kwset->mind2 = kwset->mind;
       /* Find the minimal delta2 shift that we might make after
 	 a backwards match has failed. */
-      for (i = 0; i < kwset->mind - 1; ++i)
-	if (kwset->target[i] == kwset->target[kwset->mind - 1])
-	  kwset->mind2 = kwset->mind - (i + 1);
+      c = kwset->target[kwset->mind - 1];
+      for (i = kwset->mind - 2; i >= 0; --i)
+	if (kwset->target[i] == c)
+	  break;
+      kwset->mind2 = kwset->mind - (i + 1);
     }
   else
     {



From MAILER-DAEMON Mon Jul 04 01:25:41 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSP-0002PL-13
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:25 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJS1-0002Gt-Af
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRv-0002Dg-Ry
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRv-0002DP-Gh
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:55 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWK-0003eM-0J
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:28 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOY-0002Us-3a
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:21:26 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJUx-0003aS-Up
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:04 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJUx-0003aI-Pl
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJJX-0000RP-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 01:16:15 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJJX-0000RP-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:16:15 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:17 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.10 grep/src/kwset.c:1.11
--- grep/src/kwset.c:1.10	Mon Jul  4 05:12:17 2005
+++ grep/src/kwset.c	Mon Jul  4 05:16:15 2005
@@ -405,7 +405,6 @@
       /* Build the Boyer Moore delta.  Boy that's easy compared to CW. */
       for (i = 0; i < kwset->mind; ++i)
 	delta[U(kwset->target[i])] = kwset->mind - (i + 1);
-      kwset->mind2 = kwset->mind;
       /* Find the minimal delta2 shift that we might make after
 	 a backwards match has failed. */
       c = kwset->target[kwset->mind - 1];



From MAILER-DAEMON Mon Jul 04 01:28:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJV8-0002qc-A5
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJV5-0002pY-PT
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJV2-0002oA-TJ
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJV2-0002o0-Qz
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:08 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJZU-0003ui-BF
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:32:44 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJRi-0002Yp-DW
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:24:42 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJEB-00032n-2n
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:10:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJEA-00032j-TQ
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:10:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJ8S-00006q-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 01:04:48 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJ8S-00006q-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:04:48 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:28:13 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.263 grep/ChangeLog:1.264
--- grep/ChangeLog:1.263	Mon Jul  4 04:39:03 2005
+++ grep/ChangeLog	Mon Jul  4 05:04:48 2005
@@ -6,6 +6,9 @@
 
 	* src/kwset.c (kwsprep): Use memset() and memcpy() when appropriate.
 
+	* src/kwset.c (kwsprep): Move three variable declarations to
+	  the single {}-block where they are used.
+
 2005-06-22  Charles Levert  <charles_levert@gna.org>
 
 	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,



From MAILER-DAEMON Mon Jul 04 01:28:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJV8-0002qh-H8
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:14 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJV5-0002ps-Pp
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJV3-0002oH-3y
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:09 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJV2-0002o0-Vm
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:28:09 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJZU-0003ua-5V
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:32:44 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJRi-0002Yp-73
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:24:42 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJEB-00032v-CL
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:10:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJEB-00032s-5O
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:10:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJ8S-00006u-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 01:04:48 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJ8S-00006u-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:04:48 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:28:13 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.8 grep/src/kwset.c:1.9
--- grep/src/kwset.c:1.8	Mon Jul  4 04:39:03 2005
+++ grep/src/kwset.c	Mon Jul  4 05:04:48 2005
@@ -378,10 +378,9 @@
 {
   register struct kwset *kwset;
   register int i;
-  register struct trie *curr, *fail;
+  register struct trie *curr;
   register char const *trans;
   unsigned char delta[NCHAR];
-  struct trie *last, *next[NCHAR];
 
   kwset = (struct kwset *) kws;
 
@@ -413,6 +412,9 @@
     }
   else
     {
+      register struct trie *fail;
+      struct trie *last, *next[NCHAR];
+
       /* Traverse the nodes of the trie in level order, simultaneously
 	 computing the delta table, failure function, and shift function. */
       for (curr = last = kwset->trie; curr; curr = curr->next)



From MAILER-DAEMON Mon Jul 04 01:28:38 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSO-0002PH-HQ
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJS1-0002Gu-Ak
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRw-0002EF-Ty
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRw-0002DP-3d
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:56 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWJ-0003dv-Bo
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOX-0002Us-Fn
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:21:25 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJUz-0003b6-Gz
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:05 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJUz-0003aI-8w
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 01:28:05 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJFh-0000LH-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 01:12:17 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJFh-0000LH-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:12:17 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:17 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.264 grep/ChangeLog:1.265
--- grep/ChangeLog:1.264	Mon Jul  4 05:04:48 2005
+++ grep/ChangeLog	Mon Jul  4 05:12:17 2005
@@ -9,6 +9,9 @@
 	* src/kwset.c (kwsprep): Move three variable declarations to
 	  the single {}-block where they are used.
 
+	* src/kwset.c (kwsprep): Optimize search for mind2 value by
+	  starting from the end of the target[] array.
+
 2005-06-22  Charles Levert  <charles_levert@gna.org>
 
 	* grep/autogen.sh, grep/src/Makefile.am, grep/tests/backref.sh,



From MAILER-DAEMON Mon Jul 04 01:28:44 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpJSO-0002PK-PW
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpJRz-0002En-70
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:25:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpJRv-0002DZ-GQ
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpJRv-0002DP-AT
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:24:55 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJWK-0003eX-7T
	for grep-commit@gnu.org; Mon, 04 Jul 2005 01:29:28 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpJOY-0002Us-AB
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:21:26 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpJUx-0003aL-KU
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:03 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpJUx-0003aI-Fq
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 01:28:03 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpJJX-0000RS-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 01:16:15 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpJJX-0000RS-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 01:16:15 -0400
Cc: 
Subject: grep/src kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jul 2005 05:25:17 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/04 05:16:15

Modified files:
	src            : kwset.c 

Log message:
	Misplaced line, now superflous from last commit, removed.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 21:27:04 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDI-0003JE-OB
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:04 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDD-0003FO-B9
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcDA-0003CW-A7
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD8-0003Bd-3F
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:54 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcHJ-000771-Or
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:31:13 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc9G-0007m2-OR
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:22:54 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpbwV-0006Gp-LZ
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:09:43 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpbwV-0006Ga-Et
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:09:43 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpbqZ-00018v-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 21:03:36 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpbqZ-00018v-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:03:36 -0400
Cc: 
Subject: grep ./ChangeLog doc/grep.texi doc/grep.1
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:02 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/05 01:03:33

Modified files:
	.              : ChangeLog 
	doc            : grep.texi grep.1 

Log message:
	* doc/grep.texi: Add missing green color in GREP_COLORS description.
	* doc/grep.1: Fix typo and reorganize GREP_COLORS documentation.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.265&tr2=1.266&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.texi.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/doc/grep.1.diff?tr1=1.31&tr2=1.32&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 21:27:08 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDL-0003KI-1N
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDE-0003GP-CK
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:01 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcDA-0003Dl-UE
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:57 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD9-0003Bd-9M
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:55 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcFy-0006zI-8k
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:29:50 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc7v-0007m2-AE
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:21:31 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpcAE-0006ld-GW
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:23:54 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcAE-0006la-Aq
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:23:54 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dpc4J-0003VR-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 21:17:47 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dpc4J-0003VR-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:17:47 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:05 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.11 grep/src/kwset.c:1.12
--- grep/src/kwset.c:1.11	Mon Jul  4 05:16:15 2005
+++ grep/src/kwset.c	Tue Jul  5 01:17:41 2005
@@ -121,6 +121,10 @@
   return (kwset_t) kwset;
 }
 
+/* This upper bound is valid for CHAR_BIT >= 4 and
+   exact for CHAR_BIT in { 4..11, 13, 15, 17, 19 }. */
+#define DEPTH_SIZE (CHAR_BIT + CHAR_BIT/2)
+
 /* Add the given string to the contents of the keyword set.  Return NULL
    for success, an error message otherwise. */
 const char *
@@ -131,8 +135,8 @@
   register unsigned char label;
   register struct tree *link;
   register int depth;
-  struct tree *links[12];
-  enum { L, R } dirs[12];
+  struct tree *links[DEPTH_SIZE];
+  enum { L, R } dirs[DEPTH_SIZE];
   struct tree *t, *r, *l, *rl, *lr;
 
   kwset = (struct kwset *) kws;



From MAILER-DAEMON Mon Jul 04 21:27:23 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDQ-0003LQ-Fo
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDD-0003FG-FV
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcD7-0003C1-MG
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD7-0003Bd-GK
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:53 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcHM-00077X-7A
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:31:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc9J-0007m2-5k
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:22:57 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpbwS-0006GA-Hj
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:40 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpbwS-0006G7-Bq
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:40 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpbqY-00018N-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 21:03:34 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpbqY-00018N-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:03:34 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:05 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.265 grep/ChangeLog:1.266
--- grep/ChangeLog:1.265	Mon Jul  4 05:12:17 2005
+++ grep/ChangeLog	Tue Jul  5 01:03:31 2005
@@ -1,3 +1,8 @@
+2005-07-05  Charles Levert  <charles_levert@gna.org>
+
+	* doc/grep.texi: Add missing green color in GREP_COLORS description.
+	* doc/grep.1: Fix typo and reorganize GREP_COLORS documentation.
+
 2005-07-04  Charles Levert  <charles_levert@gna.org>
 
 	* src/kwset.c: Readability changes.



From MAILER-DAEMON Mon Jul 04 21:28:05 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDt-0003Qw-4u
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:41 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDI-0003Hc-Ss
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcDA-0003DX-AX
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:00 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD9-0003Bd-4x
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:55 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcFy-0006zQ-F3
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:29:50 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc7v-0007m2-G7
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:21:31 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpcAD-0006lR-5j
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:23:53 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcAD-0006lO-0a
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:23:53 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dpc4D-0003V3-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 21:17:41 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dpc4D-0003V3-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:17:42 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:08 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.266 grep/ChangeLog:1.267
--- grep/ChangeLog:1.266	Tue Jul  5 01:03:31 2005
+++ grep/ChangeLog	Tue Jul  5 01:17:41 2005
@@ -3,6 +3,12 @@
 	* doc/grep.texi: Add missing green color in GREP_COLORS description.
 	* doc/grep.1: Fix typo and reorganize GREP_COLORS documentation.
 
+	* src/kwset.c (DEPTH_SIZE): New macro to anticipate
+	  architectures/compilers where CHAR_BIT is not 8 (we assume it
+	  won't be less than 4, which would be non-standard and unlikely).
+	  Checked to hold for CHAR_BIT up to 1023 (and maybe more)!
+	* src/kwset.c (kwsincr): Use DEPTH_SIZE in two array declarations.
+
 2005-07-04  Charles Levert  <charles_levert@gna.org>
 
 	* src/kwset.c: Readability changes.



From MAILER-DAEMON Mon Jul 04 21:29:08 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDp-0003QC-Vx
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:38 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDD-0003FK-FW
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcD7-0003CH-Vd
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:54 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD7-0003Bd-Kk
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:53 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcHL-00077R-W3
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:31:16 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc9J-0007m2-0Y
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:22:57 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpbwT-0006GK-Bx
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpbwT-0006GH-6O
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpbqY-00018Y-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 21:03:34 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpbqY-00018Y-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:03:34 -0400
Cc: 
Subject: Changes to grep/doc/grep.1
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:06 -0000

Index: grep/doc/grep.1
diff -u grep/doc/grep.1:1.31 grep/doc/grep.1:1.32
--- grep/doc/grep.1:1.31	Tue Jun 21 15:22:58 2005
+++ grep/doc/grep.1	Tue Jul  5 01:03:33 2005
@@ -12,7 +12,7 @@
 .de Id
 .ds Dt \\$4
 ..
-.Id $Id: grep.1,v 1.31 2005/06/21 15:22:58 charles_levert Exp $
+.Id $Id: grep.1,v 1.32 2005/07/05 01:03:33 charles_levert Exp $
 .TH GREP 1 \*(Dt "GNU Project"
 .SH NAME
 grep, egrep, fgrep \- print lines matching a pattern
@@ -127,34 +127,15 @@
 terminal driver interprets some of it as commands.
 .TP
 .BI \-\^\-color[=\fIWHEN\fR] ", " \-\^\-colour[=\fIWHEN\fR]
-Surround the matching strings, matchings lines, context lines, file
+Surround the matching strings, matching lines, context lines, file
 names, line numbers, octet offsets, and separators (for fields and
 groups of context lines) with escape sequences to display them in color
 on the terminal.
 The colors are defined by the environment variable
-.B GREP_COLORS
-and default to `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' for bold red
-matched text, default matching lines, default context lines,
-magenta file names, green line numbers, green octet offsets,
-and cyan separators.
-Note that the `ml' setting, if any, remains in effect just before the
-`mt' setting kicks in.
-See the Select Graphic Rendition (SGR, for character attributes)
-section in the documentation of the text terminal that is used
-for permissible values (semicolon-separated lists of integers)
-and their meaning.
-.B GREP_COLORS
-also supports a boolean `ne' capability (with no `=...' part) to not
-clear to the end of line using Erase in Line (EL) to Right (`\\33[K')
-each time a colorized item ends (needed on terminals on which EL is not
-supported; otherwise useful on terminals where the `back_color_erase'
-(`bce') boolean terminfo capability is not specified, when the chosen
-highlight colors do not affect the background, or when EL is too slow
-to bother doing or causes too much flicker).
+.BR GREP_COLORS .
 The deprecated environment variable
 .B GREP_COLOR
-is still supported, but its setting does not have priority; it defaults to
-`01;31' (bold red) which only covers the color for matched text.
+is still supported, but its setting does not have priority.
 .I WHEN
 is `never', `always', or `auto'.
 .TP
@@ -743,11 +724,31 @@
 Deprecated in favor of
 .BR GREP_COLORS ,
 which has priority.
-Specifies the marker for highlighting.
+It can only specify the marker for highlighting matched text and
+defaults to `01;31' (bold red).
 .TP
 .B GREP_COLORS
-Specifies the markers for highlighting matched text, file names,
-line numbers, octet offsets, and separators.
+Specifies the markers for highlighting matched text (mt), matching lines
+(ml), context lines (cx), file names (fn), line numbers (ln), octet
+offsets (bn), and separators (se, for fields and groups of context lines).
+It is a colon-separated list of color specification assignments.
+The default is `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' which means
+bold red, default, default, magenta, green, green, and cyan, all text
+foregrounds on the default background.
+Note that the `ml' setting, if any, remains in effect just before the
+`mt' setting kicks in.
+See the Select Graphic Rendition (SGR, for character attributes)
+section in the documentation of the text terminal that is used
+for permissible values (semicolon-separated lists of integers)
+and their meaning.
+.B GREP_COLORS
+also supports a boolean `ne' capability (with no `=...' part) to not
+clear to the end of line using Erase in Line (EL) to Right (`\\33[K')
+each time a colorized item ends (needed on terminals on which EL is not
+supported; otherwise useful on terminals where the `back_color_erase'
+(`bce') boolean terminfo capability is not specified, when the chosen
+highlight colors do not affect the background, or when EL is too slow
+to bother doing or causes too much flicker).
 .TP
 \fBLC_ALL\fP, \fBLC_COLLATE\fP, \fBLANG\fP
 These variables specify the



From MAILER-DAEMON Mon Jul 04 21:30:03 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpcDs-0003Qt-OS
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 21:27:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpcDD-0003FL-9D
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:59 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpcD8-0003Cf-Lh
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:55 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpcD7-0003Bd-Sn
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:26:53 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcHL-00077H-Qv
	for grep-commit@gnu.org; Mon, 04 Jul 2005 21:31:15 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpc9I-0007m2-F8
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:22:56 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpbwU-0006Gd-E7
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:42 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpbwU-0006Ga-18
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 21:09:42 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpbqZ-00018k-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 21:03:35 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpbqZ-00018k-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:03:35 -0400
Cc: 
Subject: Changes to grep/doc/grep.texi
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 01:27:07 -0000

Index: grep/doc/grep.texi
diff -u grep/doc/grep.texi:1.54 grep/doc/grep.texi:1.55
--- grep/doc/grep.texi:1.54	Tue Jun 21 15:22:58 2005
+++ grep/doc/grep.texi	Tue Jul  5 01:03:32 2005
@@ -616,8 +616,8 @@
 and separators (se, for fields and groups of context lines).
 It is a colon-separated list of color specification assignments.
 The default is `mt=01;31:ml=:cx=:fn=35:ln=32:bn=32:se=36' which means
-bold red, default, default, magenta, green, and cyan, all text foregrounds
-on the default background.
+bold red, default, default, magenta, green, green, and cyan, all text
+foregrounds on the default background.
 Note that the `ml' setting, if any, remains in effect just before the
 `mt' setting kicks in.
 See the Select Graphic Rendition (SGR, for character attributes)



From MAILER-DAEMON Mon Jul 04 22:00:37 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dpcjk-0002aC-P3
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 22:00:36 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dpcjg-0002Xc-Ah
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:00:32 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dpcje-0002Wp-3K
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:00:30 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dpcjd-0002W4-RY
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:00:29 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpclS-0000LS-Ie
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:02:22 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DpcdP-0001IS-4J
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:54:03 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpcTG-0007xX-2x
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:43:34 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcTF-0007ux-Px
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 21:43:33 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dpc4K-0003Vd-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 21:17:48 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dpc4K-0003Vd-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 21:17:48 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 02:00:34 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/05 01:17:41

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c (DEPTH_SIZE): New macro to anticipate
	architectures/compilers where CHAR_BIT is not 8 (we assume it
	won't be less than 4, which would be non-standard and unlikely).
	Checked to hold for CHAR_BIT up to 1023 (and maybe more)!
	* src/kwset.c (kwsincr): Use DEPTH_SIZE in two array declarations.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.266&tr2=1.267&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.11&tr2=1.12&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 22:26:55 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dpd8k-0006lK-Dz
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dpd8W-0006gC-AK
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:12 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dpd8L-0006Y1-QP
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dpd8L-0006Wv-Jn
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:01 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpdBf-0001kJ-MQ
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpd3b-0001xd-BK
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 22:21:07 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpdAW-0001gn-H8
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 22:28:16 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpdAW-0001gQ-D3
	for grep-cvs-logs@gnu.org; Mon, 04 Jul 2005 22:28:16 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpcpW-00013G-00
	for <grep-cvs-logs@gnu.org>; Mon, 04 Jul 2005 22:06:34 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpcpW-00013G-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 22:06:34 -0400
Cc: 
Subject: grep ./ChangeLog src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 02:26:24 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/05 02:06:29

Modified files:
	.              : ChangeLog 
	src            : kwset.c 

Log message:
	* src/kwset.c (kwsincr): When a second obstack_alloc() call fails,
	free what the first one successfully allocated by popping it
	off the top of the obstack, before returning in error, just
	to keep things clean.
	* src/kwset.c (kwsprep): Verify return value of obstack_alloc()
	and return a memory exhausted error if so.  This function had
	a prototype to return such errors, but never did.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.267&tr2=1.268&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/kwset.c.diff?tr1=1.12&tr2=1.13&r1=text&r2=text




From MAILER-DAEMON Mon Jul 04 22:28:36 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Dpd9O-0006qA-4W
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 22:27:07 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Dpd8f-0006kf-Vb
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:24 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Dpd8L-0006YA-Sq
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:02 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Dpd8L-0006Wv-PR
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:26:01 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpdBe-0001kD-Vw
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:29:27 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpd3b-0001xd-5n
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:21:07 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpdAX-0001gy-Ot
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:28:18 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpdAX-0001gQ-Ia
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:28:17 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpcpS-00012l-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 22:06:30 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpcpS-00012l-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 22:06:30 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 02:27:04 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.267 grep/ChangeLog:1.268
--- grep/ChangeLog:1.267	Tue Jul  5 01:17:41 2005
+++ grep/ChangeLog	Tue Jul  5 02:06:28 2005
@@ -9,6 +9,14 @@
 	  Checked to hold for CHAR_BIT up to 1023 (and maybe more)!
 	* src/kwset.c (kwsincr): Use DEPTH_SIZE in two array declarations.
 
+	* src/kwset.c (kwsincr): When a second obstack_alloc() call fails,
+	  free what the first one successfully allocated by popping it
+	  off the top of the obstack, before returning in error, just
+	  to keep things clean.
+	* src/kwset.c (kwsprep): Verify return value of obstack_alloc()
+	  and return a memory exhausted error if so.  This function had
+	  a prototype to return such errors, but never did.
+
 2005-07-04  Charles Levert  <charles_levert@gna.org>
 
 	* src/kwset.c: Readability changes.



From MAILER-DAEMON Mon Jul 04 22:31:43 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DpdDo-0000VS-Kg
	for mharc-grep-commit@gnu.org; Mon, 04 Jul 2005 22:31:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DpdDi-0000Sv-PJ
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:31:35 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DpdDc-0000PA-Mm
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:31:29 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DpdDc-0000OM-Hr
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:31:28 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpdHU-0002JE-7i
	for grep-commit@gnu.org; Mon, 04 Jul 2005 22:35:28 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1Dpd9Q-00023X-AU
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:27:08 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DpcvR-00013S-GG
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:12:41 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DpcvR-00013O-8Z
	for grep-cvs-diffs@gnu.org; Mon, 04 Jul 2005 22:12:41 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DpcpT-00012u-00
	for <grep-cvs-diffs@gnu.org>; Mon, 04 Jul 2005 22:06:31 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DpcpT-00012u-00@savannah.gnu.org>
Date: Mon, 04 Jul 2005 22:06:31 -0400
Cc: 
Subject: Changes to grep/src/kwset.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 05 Jul 2005 02:31:37 -0000

Index: grep/src/kwset.c
diff -u grep/src/kwset.c:1.12 grep/src/kwset.c:1.13
--- grep/src/kwset.c:1.12	Tue Jul  5 01:17:41 2005
+++ grep/src/kwset.c	Tue Jul  5 02:06:29 2005
@@ -180,7 +180,10 @@
 	  link->trie = (struct trie *) obstack_alloc(&kwset->obstack,
 						     sizeof (struct trie));
 	  if (!link->trie)
-	    return _("memory exhausted");
+	    {
+	      obstack_free(&kwset->obstack, link);
+	      return _("memory exhausted");
+	    }
 	  link->trie->accepting = 0;
 	  link->trie->links = NULL;
 	  link->trie->parent = trie;
@@ -401,6 +404,8 @@
 
       /* Looking for just one string.  Extract it from the trie. */
       kwset->target = obstack_alloc(&kwset->obstack, kwset->mind);
+      if (!kwset->target)
+	return _("memory exhausted");
       for (i = kwset->mind - 1, curr = kwset->trie; i >= 0; --i)
 	{
 	  kwset->target[i] = curr->links->label;



From MAILER-DAEMON Thu Jul 07 01:34:24 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DqP1i-0008Qj-2N
	for mharc-grep-commit@gnu.org; Thu, 07 Jul 2005 01:34:22 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DqP1d-0008NR-4T
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:34:17 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DqP1c-0008Mj-6D
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:34:16 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DqP1c-0008MZ-36
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:34:16 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqP6O-00017l-Sd
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:39:12 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DqOxd-0004qw-AG
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:30:09 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DqP6L-00017R-Pz
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:39:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqP6L-00017L-Lq
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:39:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DqOzv-0001Fp-00
	for <grep-cvs-diffs@gnu.org>; Thu, 07 Jul 2005 01:32:31 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DqOzv-0001Fp-00@savannah.gnu.org>
Date: Thu, 07 Jul 2005 01:32:31 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2005 05:34:19 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.268 grep/ChangeLog:1.269
--- grep/ChangeLog:1.268	Tue Jul  5 02:06:28 2005
+++ grep/ChangeLog	Thu Jul  7 05:32:28 2005
@@ -1,3 +1,7 @@
+2005-07-07  Charles Levert  <charles_levert@gna.org>
+
+	* src/grep.c: Remove all xm capability code.
+
 2005-07-05  Charles Levert  <charles_levert@gna.org>
 
 	* doc/grep.texi: Add missing green color in GREP_COLORS description.



From MAILER-DAEMON Thu Jul 07 01:57:56 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DqPOV-0005g4-U5
	for mharc-grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DqPOL-0005dj-Q7
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:46 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DqPOJ-0005d0-WF
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:44 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DqPOJ-0005bb-EG
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:43 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqPQO-000286-2t
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:59:52 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DqPHc-0005F0-8r
	for grep-cvs-logs@gnu.org; Thu, 07 Jul 2005 01:50:48 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DqPPJ-00020g-16
	for grep-cvs-logs@gnu.org; Thu, 07 Jul 2005 01:58:45 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqPPI-00020b-Q0
	for grep-cvs-logs@gnu.org; Thu, 07 Jul 2005 01:58:44 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DqOzw-0001G1-00
	for <grep-cvs-logs@gnu.org>; Thu, 07 Jul 2005 01:32:32 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DqOzw-0001G1-00@savannah.gnu.org>
Date: Thu, 07 Jul 2005 01:32:32 -0400
Cc: 
Subject: grep ./ChangeLog src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2005 05:57:48 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/07 05:32:30

Modified files:
	.              : ChangeLog 
	src            : grep.c 

Log message:
	* src/grep.c: Remove all xm capability code.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.268&tr2=1.269&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.111&tr2=1.112&r1=text&r2=text




From MAILER-DAEMON Thu Jul 07 01:57:57 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DqPOW-0005gF-Lf
	for mharc-grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:56 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DqPON-0005eB-IP
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:48 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DqPOK-0005dB-Kh
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DqPOJ-0005bb-PV
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:57:44 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqPQM-00027u-In
	for grep-commit@gnu.org; Thu, 07 Jul 2005 01:59:50 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DqPHa-0005F0-Pj
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:50:46 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DqPPQ-000217-Bm
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:58:52 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DqPPQ-00020b-5m
	for grep-cvs-diffs@gnu.org; Thu, 07 Jul 2005 01:58:52 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1DqOzw-0001Ft-00
	for <grep-cvs-diffs@gnu.org>; Thu, 07 Jul 2005 01:32:32 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1DqOzw-0001Ft-00@savannah.gnu.org>
Date: Thu, 07 Jul 2005 01:32:32 -0400
Cc: 
Subject: Changes to grep/src/grep.c
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Jul 2005 05:57:53 -0000

Index: grep/src/grep.c
diff -u grep/src/grep.c:1.111 grep/src/grep.c:1.112
--- grep/src/grep.c:1.111	Wed Jun 22 01:47:43 2005
+++ grep/src/grep.c	Thu Jul  7 05:32:30 2005
@@ -79,9 +79,6 @@
 /* If nonzero, use grep_color marker.  */
 static int color_option;
 
-/* If nonzero, do pseudo-markup instead of actual colors.  */
-static int pseudo_markup;
-
 /* If nonzero, show only the part of a line matching the expression. */
 static int only_matching;
 
@@ -224,36 +221,12 @@
 static const char *
 color_cap_ne_fct(void)
 {
-  if (pseudo_markup)
-    return "makes no sense after the \"xm\" capability; ignored";
-
   sgr_start = "\33[%sm";
   sgr_end   = "\33[m";
 
   return NULL;
 }
 
-static const char *
-color_cap_xm_fct(void)
-{
-  /* This experimental feature should stay undocumented for now.  */
-  pseudo_markup = 1;
-
-  sgr_start = "<grep:%s>";
-  sgr_end   = "</grep:%s>";
-
-  /* The user can just redefine them to the empty string afterwards.  */
-  grep_color     = "matched-text";
-  filename_color = "filename";
-  line_num_color = "line-number";
-  byte_num_color = "byte-offset";
-  sep_color      = "separator";
-  mlines_color   = "matching-line";
-  context_color  = "context-line";
-
-  return NULL;
-}
-
 /* For GREP_COLORS.  */
 static struct color_cap color_dict[] =
   {
@@ -265,7 +238,6 @@
     { "ml", &mlines_color,	NULL },			/* matching lines */
     { "cx", &context_color,	NULL },			/* context lines */
     { "ne", NULL,		color_cap_ne_fct },	/* no EL on SGR_* */
-    { "xm", NULL,		color_cap_xm_fct },	/* pseudo-markup */
     { NULL, NULL,		NULL }
   };
 
@@ -818,12 +790,7 @@
 	print_line_head(b, lim, SEP_CHAR_MATCH);
       else
 	{
-	  if (pseudo_markup >= 0)
-	    {
-	      PR_SGR_START(mlines_color);
-	      if (pseudo_markup)
-		pseudo_markup = -1;
-	    }
+	  PR_SGR_START(mlines_color);
 	  fwrite (beg, sizeof (char), match_offset, stdout);
 	}
 
@@ -857,15 +824,12 @@
 
   if (tail_size > 0)
     {
-      if (pseudo_markup >= 0)
-	PR_SGR_START(color);
+      PR_SGR_START(color);
       fwrite(beg, 1, tail_size, stdout);
       beg += tail_size;
+      PR_SGR_END(color);
     }
 
-  if (tail_size > 0 || pseudo_markup < 0)
-    PR_SGR_END(color);
-
   return beg;
 }
 
@@ -888,11 +852,6 @@
 
       if (!only_matching && *line_color);
 	beg = print_line_tail(beg, lim, line_color);
-
-      /* This global is modified by print_line_middle()
-	 and checked by print_line_tail().  Now reset it.  */
-      if (pseudo_markup < 0)
-	pseudo_markup = 1;
     }
 
   if (!only_matching && lim > beg)



From MAILER-DAEMON Tue Jul 26 23:12:56 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DxcLn-0004jm-JI
	for mharc-grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DxcLj-0004hJ-Ky
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:51 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DxcLd-0004do-5L
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:45 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DxcLd-0004ct-20
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:45 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcSF-000514-0c
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:19:35 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DxcGm-0004hF-Fm
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:07:44 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1Dxc5Z-0004By-PV
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 22:56:10 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1Dxc5Z-0004Bu-LS
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 22:56:09 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dxbuf-0004QQ-00
	for <grep-cvs-diffs@gnu.org>; Tue, 26 Jul 2005 22:44:53 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dxbuf-0004QQ-00@savannah.gnu.org>
Date: Tue, 26 Jul 2005 22:44:53 -0400
Cc: 
Subject: Changes to grep/ChangeLog
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2005 03:12:53 -0000

Index: grep/ChangeLog
diff -u grep/ChangeLog:1.269 grep/ChangeLog:1.270
--- grep/ChangeLog:1.269	Thu Jul  7 05:32:28 2005
+++ grep/ChangeLog	Wed Jul 27 02:44:53 2005
@@ -1,3 +1,8 @@
+2005-07-26  Charles Levert  <charles_levert@gna.org>
+
+	* tests/pcre.sh: New file.  Add test 1.
+	* tests/Makefile.am: Add pcre.sh to TESTS.
+
 2005-07-07  Charles Levert  <charles_levert@gna.org>
 
 	* src/grep.c: Remove all xm capability code.



From MAILER-DAEMON Tue Jul 26 23:13:05 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DxcLr-0004mX-Hx
	for mharc-grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:59 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DxcLl-0004h2-GN
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DxcLf-0004fr-Qm
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DxcLf-0004ct-4U
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:47 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcP9-0004qd-AX
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:16:23 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DxcDg-0004hF-PA
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:04:32 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DxcMA-0004if-Uz
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:13:19 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcMA-0004iA-PE
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:13:18 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dxbuf-0004QZ-00
	for <grep-cvs-diffs@gnu.org>; Tue, 26 Jul 2005 22:44:53 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dxbuf-0004QZ-00@savannah.gnu.org>
Date: Tue, 26 Jul 2005 22:44:53 -0400
Cc: 
Subject: Changes to grep/tests/Makefile.am
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2005 03:12:57 -0000

Index: grep/tests/Makefile.am
diff -u grep/tests/Makefile.am:1.10 grep/tests/Makefile.am:1.11
--- grep/tests/Makefile.am:1.10	Wed Apr 27 20:30:53 2005
+++ grep/tests/Makefile.am	Wed Jul 27 02:44:53 2005
@@ -2,7 +2,7 @@
 
 AWK=@AWK@
 
-TESTS = warning.sh khadafy.sh spencer1.sh bre.sh ere.sh \
+TESTS = warning.sh khadafy.sh spencer1.sh bre.sh ere.sh pcre.sh \
         status.sh empty.sh options.sh backref.sh file.sh foad1.sh \
         fmbtest.sh
 EXTRA_DIST = $(TESTS) \



From MAILER-DAEMON Tue Jul 26 23:13:03 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DxcLu-0004nj-3n
	for mharc-grep-commit@gnu.org; Tue, 26 Jul 2005 23:13:02 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DxcLl-0004i2-9Y
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:53 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DxcLf-0004fX-6K
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:48 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DxcLe-0004ct-Vr
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:47 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcP9-0004qn-HX
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:16:23 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DxcDh-0004hF-25
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:04:33 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DxcM6-0004iD-VU
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:13:15 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcM6-0004iA-Pd
	for grep-cvs-diffs@gnu.org; Tue, 26 Jul 2005 23:13:14 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dxbug-0004Qj-00
	for <grep-cvs-diffs@gnu.org>; Tue, 26 Jul 2005 22:44:54 -0400
To: grep-cvs-diffs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dxbug-0004Qj-00@savannah.gnu.org>
Date: Tue, 26 Jul 2005 22:44:54 -0400
Cc: 
Subject: Changes to grep/tests/pcre.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2005 03:12:58 -0000





From MAILER-DAEMON Tue Jul 26 23:15:14 2005
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1DxcM4-0004tH-Gz
	for mharc-grep-commit@gnu.org; Tue, 26 Jul 2005 23:13:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1DxcLs-0004jL-9T
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:13:02 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1DxcLh-0004fw-Uu
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:50 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1DxcLf-0004ct-Cv
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:12:47 -0400
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcP9-0004qV-1j
	for grep-commit@gnu.org; Tue, 26 Jul 2005 23:16:23 -0400
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.34) id 1DxcDg-0004hF-Il
	for grep-cvs-logs@gnu.org; Tue, 26 Jul 2005 23:04:32 -0400
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.34) id 1DxcMB-0004io-Q6
	for grep-cvs-logs@gnu.org; Tue, 26 Jul 2005 23:13:20 -0400
Received: from [199.232.41.3] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.34) id 1DxcMB-0004iA-JO
	for grep-cvs-logs@gnu.org; Tue, 26 Jul 2005 23:13:19 -0400
Received: from savannah.gnu.org ([127.0.0.1])
	by savannah.gnu.org with smtp (Exim 3.35 #1 (Debian))
	id 1Dxbug-0004Qq-00
	for <grep-cvs-logs@gnu.org>; Tue, 26 Jul 2005 22:44:54 -0400
To: grep-cvs-logs@gnu.org
From: Charles Levert <charles_levert@gna.org>
Message-Id: <E1Dxbug-0004Qq-00@savannah.gnu.org>
Date: Tue, 26 Jul 2005 22:44:54 -0400
Cc: 
Subject: grep ./ChangeLog tests/Makefile.am tests/pcre.sh
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: bug-grep@gnu.org
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/grep-commit>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 27 Jul 2005 03:13:07 -0000

CVSROOT:	/cvsroot/grep
Module name:	grep
Branch: 	
Changes by:	Charles Levert <charles_levert@savannah.gnu.org>	05/07/27 02:44:53

Modified files:
	.              : ChangeLog 
	tests          : Makefile.am 
Added files:
	tests          : pcre.sh 

Log message:
	New pcre.sh regression test file (for "grep -P").

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.269&tr2=1.270&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/pcre.sh?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/Makefile.am.diff?tr1=1.10&tr2=1.11&r1=text&r2=text




