From MAILER-DAEMON Thu Jun 02 18:26:33 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b8b4T-0000bk-Ex
	for mharc-grep-commit@gnu.org; Thu, 02 Jun 2016 18:26:33 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55266)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8b4P-0000ai-FR
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:26:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8b4L-0003lw-PP
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:26:28 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33314)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8b4L-0003lm-La
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:26:25 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 6C26C220153; Thu,  2 Jun 2016 22:26:25 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-13-g81ccbaa
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c7526623f458084cbe947f0e1b43f328481b2ca3
X-Git-Newrev: 81ccbaa009d4147840f480991ed74845841a436e
Message-Id: <20160602222625.6C26C220153@vcs.savannah.gnu.org>
Date: Thu,  2 Jun 2016 22:26:25 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jun 2016 22:26:32 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  81ccbaa009d4147840f480991ed74845841a436e (commit)
       via  4e9899f18fdda1fe19a26f7e1a3e40e87f8c7f2c (commit)
       via  966f6586fbce3081ce6e5e2f9b55301b0ec3d2b4 (commit)
       via  022c13e4754d3e79aa551040cd9983682a3382ef (commit)
       via  a3d42de483a29c1da381f5c3dad87cbbc86a5c70 (commit)
      from  c7526623f458084cbe947f0e1b43f328481b2ca3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=81ccbaa009d4147840f480991ed74845841a436e


commit 81ccbaa009d4147840f480991ed74845841a436e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:24:38 2016 -0700

    grep: simplify -F Aho-Corasick a bit
    
    This removes some tuning that complicates the code without providing
    performance benefits that I could measure (GCC 6.1, x86-64).
    (acexec_trans): Do not hand-unroll.  Unduplicate the code for a
    transition step.
    
    * src/kwset.c (struct kwset.kwsexec, bmexec, acexec_trans, acexec)

diff --git a/src/kwset.c b/src/kwset.c
index d14972f..7391990 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -932,110 +932,62 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
   struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
-  unsigned char c;
   struct tree const *tree;
   char const *trans;
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
     return SIZE_MAX;
-  if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
+  trans = kwset->trans;
+  if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
 
   next = kwset->next;
-  trans = kwset->trans;
+  trie = kwset->trie;
   lim = text + len;
   tp = text;
 
-  if (kwset->trie->accepting)
+  if (!trie->accepting)
     {
-      trie = kwset->trie;
-      goto match;
-    }
-
-  trie = next[U(tr (trans, *tp++))];
+      unsigned char c = tr (trans, *tp++);
 
-  while (true)
-    {
-      if (tp < lim - 8)
+      while (true)
         {
-          while (!trie)
+          while (! (trie = next[c]))
             {
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              if (tp >= lim - 8)
-                break;
-              trie = next[U(tr (trans, *tp++))];
+              if (tp >= lim)
+                return SIZE_MAX;
+              c = tr (trans, *tp++);
             }
-        }
-
-      while (!trie)
-        {
-          if (tp >= lim)
-            return SIZE_MAX;
-          trie = next[U(tr (trans, *tp++))];
-        }
 
-      if (trie->accepting)
-        goto match;
-      if (tp >= lim)
-        return SIZE_MAX;
-      c = tr (trans, *tp++);
-      tree = trie->links;
-
-      while (true)
-        {
-          if (c == tree->label)
+          while (true)
             {
-              trie = tree->trie;
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
                 return SIZE_MAX;
               c = tr (trans, *tp++);
-              tree = trie->links;
-            }
-          else
-            {
-              tree = c < tree->label ? tree->llink : tree->rlink;
-              if (! tree)
+
+              for (tree = trie->links; c != tree->label; )
                 {
-                  trie = trie->fail;
-                  if (!trie)
-                    break;
-                  if (trie->accepting)
+                  tree = c < tree->label ? tree->llink : tree->rlink;
+                  if (! tree)
                     {
-                      --tp;
-                      goto match;
+                      trie = trie->fail;
+                      if (!trie)
+                        goto next_trie;
+                      if (trie->accepting)
+                        {
+                          --tp;
+                          goto match;
+                        }
+                      tree = trie->links;
                     }
-                  tree = trie->links;
                 }
+              trie = tree->trie;
             }
+        next_trie:;
         }
-
-      trie = next[c];
     }
 
  match:
@@ -1051,7 +1003,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
         {
           struct trie const *accept1;
           char const *left1;
-          c = tr (trans, *tp++);
+          unsigned char c = tr (trans, *tp++);
           tree = trie->links;
           while (tree && c != tree->label)
             tree = c < tree->label ? tree->llink : tree->rlink;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=4e9899f18fdda1fe19a26f7e1a3e40e87f8c7f2c


commit 81ccbaa009d4147840f480991ed74845841a436e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:24:38 2016 -0700

    grep: simplify -F Aho-Corasick a bit
    
    This removes some tuning that complicates the code without providing
    performance benefits that I could measure (GCC 6.1, x86-64).
    (acexec_trans): Do not hand-unroll.  Unduplicate the code for a
    transition step.
    
    * src/kwset.c (struct kwset.kwsexec, bmexec, acexec_trans, acexec)

diff --git a/src/kwset.c b/src/kwset.c
index d14972f..7391990 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -932,110 +932,62 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
   struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
-  unsigned char c;
   struct tree const *tree;
   char const *trans;
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
     return SIZE_MAX;
-  if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
+  trans = kwset->trans;
+  if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
 
   next = kwset->next;
-  trans = kwset->trans;
+  trie = kwset->trie;
   lim = text + len;
   tp = text;
 
-  if (kwset->trie->accepting)
+  if (!trie->accepting)
     {
-      trie = kwset->trie;
-      goto match;
-    }
-
-  trie = next[U(tr (trans, *tp++))];
+      unsigned char c = tr (trans, *tp++);
 
-  while (true)
-    {
-      if (tp < lim - 8)
+      while (true)
         {
-          while (!trie)
+          while (! (trie = next[c]))
             {
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              if (tp >= lim - 8)
-                break;
-              trie = next[U(tr (trans, *tp++))];
+              if (tp >= lim)
+                return SIZE_MAX;
+              c = tr (trans, *tp++);
             }
-        }
-
-      while (!trie)
-        {
-          if (tp >= lim)
-            return SIZE_MAX;
-          trie = next[U(tr (trans, *tp++))];
-        }
 
-      if (trie->accepting)
-        goto match;
-      if (tp >= lim)
-        return SIZE_MAX;
-      c = tr (trans, *tp++);
-      tree = trie->links;
-
-      while (true)
-        {
-          if (c == tree->label)
+          while (true)
             {
-              trie = tree->trie;
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
                 return SIZE_MAX;
               c = tr (trans, *tp++);
-              tree = trie->links;
-            }
-          else
-            {
-              tree = c < tree->label ? tree->llink : tree->rlink;
-              if (! tree)
+
+              for (tree = trie->links; c != tree->label; )
                 {
-                  trie = trie->fail;
-                  if (!trie)
-                    break;
-                  if (trie->accepting)
+                  tree = c < tree->label ? tree->llink : tree->rlink;
+                  if (! tree)
                     {
-                      --tp;
-                      goto match;
+                      trie = trie->fail;
+                      if (!trie)
+                        goto next_trie;
+                      if (trie->accepting)
+                        {
+                          --tp;
+                          goto match;
+                        }
+                      tree = trie->links;
                     }
-                  tree = trie->links;
                 }
+              trie = tree->trie;
             }
+        next_trie:;
         }
-
-      trie = next[c];
     }
 
  match:
@@ -1051,7 +1003,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
         {
           struct trie const *accept1;
           char const *left1;
-          c = tr (trans, *tp++);
+          unsigned char c = tr (trans, *tp++);
           tree = trie->links;
           while (tree && c != tree->label)
             tree = c < tree->label ? tree->llink : tree->rlink;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=966f6586fbce3081ce6e5e2f9b55301b0ec3d2b4


commit 81ccbaa009d4147840f480991ed74845841a436e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:24:38 2016 -0700

    grep: simplify -F Aho-Corasick a bit
    
    This removes some tuning that complicates the code without providing
    performance benefits that I could measure (GCC 6.1, x86-64).
    (acexec_trans): Do not hand-unroll.  Unduplicate the code for a
    transition step.
    
    * src/kwset.c (struct kwset.kwsexec, bmexec, acexec_trans, acexec)

diff --git a/src/kwset.c b/src/kwset.c
index d14972f..7391990 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -932,110 +932,62 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
   struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
-  unsigned char c;
   struct tree const *tree;
   char const *trans;
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
     return SIZE_MAX;
-  if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
+  trans = kwset->trans;
+  if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
 
   next = kwset->next;
-  trans = kwset->trans;
+  trie = kwset->trie;
   lim = text + len;
   tp = text;
 
-  if (kwset->trie->accepting)
+  if (!trie->accepting)
     {
-      trie = kwset->trie;
-      goto match;
-    }
-
-  trie = next[U(tr (trans, *tp++))];
+      unsigned char c = tr (trans, *tp++);
 
-  while (true)
-    {
-      if (tp < lim - 8)
+      while (true)
         {
-          while (!trie)
+          while (! (trie = next[c]))
             {
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              if (tp >= lim - 8)
-                break;
-              trie = next[U(tr (trans, *tp++))];
+              if (tp >= lim)
+                return SIZE_MAX;
+              c = tr (trans, *tp++);
             }
-        }
-
-      while (!trie)
-        {
-          if (tp >= lim)
-            return SIZE_MAX;
-          trie = next[U(tr (trans, *tp++))];
-        }
 
-      if (trie->accepting)
-        goto match;
-      if (tp >= lim)
-        return SIZE_MAX;
-      c = tr (trans, *tp++);
-      tree = trie->links;
-
-      while (true)
-        {
-          if (c == tree->label)
+          while (true)
             {
-              trie = tree->trie;
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
                 return SIZE_MAX;
               c = tr (trans, *tp++);
-              tree = trie->links;
-            }
-          else
-            {
-              tree = c < tree->label ? tree->llink : tree->rlink;
-              if (! tree)
+
+              for (tree = trie->links; c != tree->label; )
                 {
-                  trie = trie->fail;
-                  if (!trie)
-                    break;
-                  if (trie->accepting)
+                  tree = c < tree->label ? tree->llink : tree->rlink;
+                  if (! tree)
                     {
-                      --tp;
-                      goto match;
+                      trie = trie->fail;
+                      if (!trie)
+                        goto next_trie;
+                      if (trie->accepting)
+                        {
+                          --tp;
+                          goto match;
+                        }
+                      tree = trie->links;
                     }
-                  tree = trie->links;
                 }
+              trie = tree->trie;
             }
+        next_trie:;
         }
-
-      trie = next[c];
     }
 
  match:
@@ -1051,7 +1003,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
         {
           struct trie const *accept1;
           char const *left1;
-          c = tr (trans, *tp++);
+          unsigned char c = tr (trans, *tp++);
           tree = trie->links;
           while (tree && c != tree->label)
             tree = c < tree->label ? tree->llink : tree->rlink;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=022c13e4754d3e79aa551040cd9983682a3382ef


commit 81ccbaa009d4147840f480991ed74845841a436e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:24:38 2016 -0700

    grep: simplify -F Aho-Corasick a bit
    
    This removes some tuning that complicates the code without providing
    performance benefits that I could measure (GCC 6.1, x86-64).
    (acexec_trans): Do not hand-unroll.  Unduplicate the code for a
    transition step.
    
    * src/kwset.c (struct kwset.kwsexec, bmexec, acexec_trans, acexec)

diff --git a/src/kwset.c b/src/kwset.c
index d14972f..7391990 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -932,110 +932,62 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
   struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
-  unsigned char c;
   struct tree const *tree;
   char const *trans;
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
     return SIZE_MAX;
-  if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
+  trans = kwset->trans;
+  if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
 
   next = kwset->next;
-  trans = kwset->trans;
+  trie = kwset->trie;
   lim = text + len;
   tp = text;
 
-  if (kwset->trie->accepting)
+  if (!trie->accepting)
     {
-      trie = kwset->trie;
-      goto match;
-    }
-
-  trie = next[U(tr (trans, *tp++))];
+      unsigned char c = tr (trans, *tp++);
 
-  while (true)
-    {
-      if (tp < lim - 8)
+      while (true)
         {
-          while (!trie)
+          while (! (trie = next[c]))
             {
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              if (tp >= lim - 8)
-                break;
-              trie = next[U(tr (trans, *tp++))];
+              if (tp >= lim)
+                return SIZE_MAX;
+              c = tr (trans, *tp++);
             }
-        }
-
-      while (!trie)
-        {
-          if (tp >= lim)
-            return SIZE_MAX;
-          trie = next[U(tr (trans, *tp++))];
-        }
 
-      if (trie->accepting)
-        goto match;
-      if (tp >= lim)
-        return SIZE_MAX;
-      c = tr (trans, *tp++);
-      tree = trie->links;
-
-      while (true)
-        {
-          if (c == tree->label)
+          while (true)
             {
-              trie = tree->trie;
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
                 return SIZE_MAX;
               c = tr (trans, *tp++);
-              tree = trie->links;
-            }
-          else
-            {
-              tree = c < tree->label ? tree->llink : tree->rlink;
-              if (! tree)
+
+              for (tree = trie->links; c != tree->label; )
                 {
-                  trie = trie->fail;
-                  if (!trie)
-                    break;
-                  if (trie->accepting)
+                  tree = c < tree->label ? tree->llink : tree->rlink;
+                  if (! tree)
                     {
-                      --tp;
-                      goto match;
+                      trie = trie->fail;
+                      if (!trie)
+                        goto next_trie;
+                      if (trie->accepting)
+                        {
+                          --tp;
+                          goto match;
+                        }
+                      tree = trie->links;
                     }
-                  tree = trie->links;
                 }
+              trie = tree->trie;
             }
+        next_trie:;
         }
-
-      trie = next[c];
     }
 
  match:
@@ -1051,7 +1003,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
         {
           struct trie const *accept1;
           char const *left1;
-          c = tr (trans, *tp++);
+          unsigned char c = tr (trans, *tp++);
           tree = trie->links;
           while (tree && c != tree->label)
             tree = c < tree->label ? tree->llink : tree->rlink;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=a3d42de483a29c1da381f5c3dad87cbbc86a5c70


commit 81ccbaa009d4147840f480991ed74845841a436e
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:24:38 2016 -0700

    grep: simplify -F Aho-Corasick a bit
    
    This removes some tuning that complicates the code without providing
    performance benefits that I could measure (GCC 6.1, x86-64).
    (acexec_trans): Do not hand-unroll.  Unduplicate the code for a
    transition step.
    
    * src/kwset.c (struct kwset.kwsexec, bmexec, acexec_trans, acexec)

diff --git a/src/kwset.c b/src/kwset.c
index d14972f..7391990 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -932,110 +932,62 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
   struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
-  unsigned char c;
   struct tree const *tree;
   char const *trans;
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
     return SIZE_MAX;
-  if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
+  trans = kwset->trans;
+  if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
 
   next = kwset->next;
-  trans = kwset->trans;
+  trie = kwset->trie;
   lim = text + len;
   tp = text;
 
-  if (kwset->trie->accepting)
+  if (!trie->accepting)
     {
-      trie = kwset->trie;
-      goto match;
-    }
-
-  trie = next[U(tr (trans, *tp++))];
+      unsigned char c = tr (trans, *tp++);
 
-  while (true)
-    {
-      if (tp < lim - 8)
+      while (true)
         {
-          while (!trie)
+          while (! (trie = next[c]))
             {
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              trie = next[U(tr (trans, *tp++))];
-              if (trie)
-                break;
-              if (tp >= lim - 8)
-                break;
-              trie = next[U(tr (trans, *tp++))];
+              if (tp >= lim)
+                return SIZE_MAX;
+              c = tr (trans, *tp++);
             }
-        }
-
-      while (!trie)
-        {
-          if (tp >= lim)
-            return SIZE_MAX;
-          trie = next[U(tr (trans, *tp++))];
-        }
 
-      if (trie->accepting)
-        goto match;
-      if (tp >= lim)
-        return SIZE_MAX;
-      c = tr (trans, *tp++);
-      tree = trie->links;
-
-      while (true)
-        {
-          if (c == tree->label)
+          while (true)
             {
-              trie = tree->trie;
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
                 return SIZE_MAX;
               c = tr (trans, *tp++);
-              tree = trie->links;
-            }
-          else
-            {
-              tree = c < tree->label ? tree->llink : tree->rlink;
-              if (! tree)
+
+              for (tree = trie->links; c != tree->label; )
                 {
-                  trie = trie->fail;
-                  if (!trie)
-                    break;
-                  if (trie->accepting)
+                  tree = c < tree->label ? tree->llink : tree->rlink;
+                  if (! tree)
                     {
-                      --tp;
-                      goto match;
+                      trie = trie->fail;
+                      if (!trie)
+                        goto next_trie;
+                      if (trie->accepting)
+                        {
+                          --tp;
+                          goto match;
+                        }
+                      tree = trie->links;
                     }
-                  tree = trie->links;
                 }
+              trie = tree->trie;
             }
+        next_trie:;
         }
-
-      trie = next[c];
     }
 
  match:
@@ -1051,7 +1003,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
         {
           struct trie const *accept1;
           char const *left1;
-          c = tr (trans, *tp++);
+          unsigned char c = tr (trans, *tp++);
           tree = trie->links;
           while (tree && c != tree->label)
             tree = c < tree->label ? tree->llink : tree->rlink;

-----------------------------------------------------------------------

Summary of changes:
 NEWS              |    6 +
 src/dfasearch.c   |    2 +-
 src/kwsearch.c    |   18 ++-
 src/kwset.c       |  421 +++++++++++++++++++++++++++++++++++++++--------------
 src/kwset.h       |    5 +-
 src/searchutils.c |    4 +-
 6 files changed, 335 insertions(+), 121 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Jun 02 18:37:58 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b8bFW-00020p-Mu
	for mharc-grep-commit@gnu.org; Thu, 02 Jun 2016 18:37:58 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57159)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bFU-00020V-45
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:37:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bFR-0006FN-OU
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:37:55 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33412)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bFR-0006FI-Kw
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:37:53 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 501A3220153; Thu,  2 Jun 2016 22:37:53 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-14-g3d5b898
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 81ccbaa009d4147840f480991ed74845841a436e
X-Git-Newrev: 3d5b898958b922995935f5d803c271696d127a8a
Message-Id: <20160602223753.501A3220153@vcs.savannah.gnu.org>
Date: Thu,  2 Jun 2016 22:37:53 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jun 2016 22:37:57 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  3d5b898958b922995935f5d803c271696d127a8a (commit)
      from  81ccbaa009d4147840f480991ed74845841a436e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3d5b898958b922995935f5d803c271696d127a8a


commit 3d5b898958b922995935f5d803c271696d127a8a
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Thu Jun 2 15:37:10 2016 -0700

    maint: correct attribution
    
    * build-aux/git-log-fix: Fix attribution of primary Aho-Corasick patch

diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix
index b06803a..909a06f 100644
--- a/build-aux/git-log-fix
+++ b/build-aux/git-log-fix
@@ -2,6 +2,10 @@
 # option.  It specifies what changes to make to each given SHA1's commit
 # log and metadata, using Perl-eval'able expressions.
 
+a3d42de483a29c1da381f5c3dad87cbbc86a5c70
+# Correct the author:
+s/Paul Eggert  <eggert\@cs.ucla.edu>/Norihiro Tanaka  <noritnk\@kcn.ne.jp>/
+
 074842d3e3054714a495252e582886f0e4ace4e4
 # Correct spelling of name:
 s/Mercer/Meixner/

-----------------------------------------------------------------------

Summary of changes:
 build-aux/git-log-fix |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Jun 02 18:49:26 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b8bQc-0003cS-31
	for mharc-grep-commit@gnu.org; Thu, 02 Jun 2016 18:49:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58641)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bQZ-0003cK-Km
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:49:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bQY-0008Gv-Jg
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:49:23 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33487)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b8bQY-0008Gr-G4
	for grep-commit@gnu.org; Thu, 02 Jun 2016 18:49:22 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 3DF0D220153; Thu,  2 Jun 2016 22:49:20 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-15-g3ddf995
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3d5b898958b922995935f5d803c271696d127a8a
X-Git-Newrev: 3ddf995f9c9651d8ca8a6d23655e956cb807fb36
Message-Id: <20160602224922.3DF0D220153@vcs.savannah.gnu.org>
Date: Thu,  2 Jun 2016 22:49:20 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Jun 2016 22:49:24 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  3ddf995f9c9651d8ca8a6d23655e956cb807fb36 (commit)
      from  3d5b898958b922995935f5d803c271696d127a8a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=3ddf995f9c9651d8ca8a6d23655e956cb807fb36


commit 3ddf995f9c9651d8ca8a6d23655e956cb807fb36
Author: Norihiro Tanaka <noritnk@kcn.ne.jp>
Date:   Thu Jun 2 15:48:56 2016 -0700

    dfa: more simplification of dfaexec_main
    
    * src/dfa.c (dfaexec_main): Failure at an acceptable position and demand
    to build state is unlikely.  So go next loop without checking them after
    a newline.  This commit induces no semantic change.

diff --git a/src/dfa.c b/src/dfa.c
index c57b33a..4e47b39 100644
--- a/src/dfa.c
+++ b/src/dfa.c
@@ -3372,8 +3372,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl,
 
           s = allow_nl ? d->newlines[s1] : 0;
         }
-
-      if (d->fails[s])
+      else if (d->fails[s])
         {
           if (d->success[s] & sbit[*p])
             goto done;
@@ -3386,8 +3385,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl,
         }
       else
         {
-          if (!d->trans[s])
-            build_state (s, d);
+          build_state (s, d);
           trans = d->trans;
         }
     }

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sat Jun 04 00:58:55 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1b93fj-0000ji-Ol
	for mharc-grep-commit@gnu.org; Sat, 04 Jun 2016 00:58:55 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50147)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b93fh-0000jb-HU
	for grep-commit@gnu.org; Sat, 04 Jun 2016 00:58:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b93ff-0006Hp-Vd
	for grep-commit@gnu.org; Sat, 04 Jun 2016 00:58:53 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:48612)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1b93ff-0006Hl-RD
	for grep-commit@gnu.org; Sat, 04 Jun 2016 00:58:51 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 967A2220153; Sat,  4 Jun 2016 04:58:51 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-17-g2f56378
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3ddf995f9c9651d8ca8a6d23655e956cb807fb36
X-Git-Newrev: 2f56378c77591707d5c5d922f2ffb7442c894af8
Message-Id: <20160604045851.967A2220153@vcs.savannah.gnu.org>
Date: Sat,  4 Jun 2016 04:58:51 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Jun 2016 04:58:55 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  2f56378c77591707d5c5d922f2ffb7442c894af8 (commit)
       via  c269bec26e884cfe2d47293cd5fdfc6dc8f70923 (commit)
      from  3ddf995f9c9651d8ca8a6d23655e956cb807fb36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=2f56378c77591707d5c5d922f2ffb7442c894af8


commit 2f56378c77591707d5c5d922f2ffb7442c894af8
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Fri Jun 3 21:57:52 2016 -0700

    tests: fix similar bug in exit status test
    
    * tests/grep-dir (status_range): New shell function.
    Use it to fix bug where $? was not saved properly.

diff --git a/tests/grep-dir b/tests/grep-dir
index de14d62..7f8d6ca 100755
--- a/tests/grep-dir
+++ b/tests/grep-dir
@@ -12,14 +12,20 @@ else
   l=2 u=127 L=2 U=127
 fi
 
-echo x | grep -f a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -if a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -Ff a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -Fif a/; { test $? -ge $L && test $? -le $U; } || fail=1
+status_range ()
+{
+  status=$?
+  { test $1 -le $status && test $status -le $2; } || fail=1
+}
 
-grep -f a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -if a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -Ff a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -Fif a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
+echo x | grep -f a/; status_range $L $U
+echo x | grep -if a/; status_range $L $U
+echo x | grep -Ff a/; status_range $L $U
+echo x | grep -Fif a/; status_range $L $U
+
+grep -f a/ < /dev/null; status_range $l $u
+grep -if a/ < /dev/null; status_range $l $u
+grep -Ff a/ < /dev/null; status_range $l $u
+grep -Fif a/ < /dev/null; status_range $l $u
 
 Exit $fail

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c269bec26e884cfe2d47293cd5fdfc6dc8f70923


commit 2f56378c77591707d5c5d922f2ffb7442c894af8
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Fri Jun 3 21:57:52 2016 -0700

    tests: fix similar bug in exit status test
    
    * tests/grep-dir (status_range): New shell function.
    Use it to fix bug where $? was not saved properly.

diff --git a/tests/grep-dir b/tests/grep-dir
index de14d62..7f8d6ca 100755
--- a/tests/grep-dir
+++ b/tests/grep-dir
@@ -12,14 +12,20 @@ else
   l=2 u=127 L=2 U=127
 fi
 
-echo x | grep -f a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -if a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -Ff a/; { test $? -ge $L && test $? -le $U; } || fail=1
-echo x | grep -Fif a/; { test $? -ge $L && test $? -le $U; } || fail=1
+status_range ()
+{
+  status=$?
+  { test $1 -le $status && test $status -le $2; } || fail=1
+}
 
-grep -f a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -if a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -Ff a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
-grep -Fif a/ < /dev/null; { test $? -ge $l && test $? -le $u; } || fail=1
+echo x | grep -f a/; status_range $L $U
+echo x | grep -if a/; status_range $L $U
+echo x | grep -Ff a/; status_range $L $U
+echo x | grep -Fif a/; status_range $L $U
+
+grep -f a/ < /dev/null; status_range $l $u
+grep -if a/ < /dev/null; status_range $l $u
+grep -Ff a/ < /dev/null; status_range $l $u
+grep -Fif a/ < /dev/null; status_range $l $u
 
 Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 tests/grep-dir |   22 ++++++++++++++--------
 tests/status   |    3 ++-
 2 files changed, 16 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Jun 09 12:42:08 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1bB320-00020b-Lx
	for mharc-grep-commit@gnu.org; Thu, 09 Jun 2016 12:42:08 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:48897)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1bB31x-00020S-Tw
	for grep-commit@gnu.org; Thu, 09 Jun 2016 12:42:07 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1bB31v-0000X9-6G
	for grep-commit@gnu.org; Thu, 09 Jun 2016 12:42:04 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:59666)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1bB31v-0000X3-2T
	for grep-commit@gnu.org; Thu, 09 Jun 2016 12:42:03 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id B1F24220133; Thu,  9 Jun 2016 16:42:02 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-23-g856e3f2
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f56378c77591707d5c5d922f2ffb7442c894af8
X-Git-Newrev: 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Message-Id: <20160609164202.B1F24220133@vcs.savannah.gnu.org>
Date: Thu,  9 Jun 2016 16:42:02 +0000 (UTC)
From: jim@meyering.net (Jim Meyering)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Jun 2016 16:42:07 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  856e3f2ee8c65ff49d67185ca124f6d674b2077b (commit)
       via  37e0f2a8af7fb5db26890fab7f9c9ad84e12c47c (commit)
       via  dcb30d3d8b0ef4c5ec97d7cb5f6cbdfe3f4cac03 (commit)
       via  945853c3387d9b7c87a84f1d02cb68760f44b816 (commit)
       via  6fd679315fbee367cfee643cfcc910b0ae4e7542 (commit)
       via  60b285496490172c358c0ee128df41ba890e06d9 (commit)
      from  2f56378c77591707d5c5d922f2ffb7442c894af8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=856e3f2ee8c65ff49d67185ca124f6d674b2077b


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=37e0f2a8af7fb5db26890fab7f9c9ad84e12c47c


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=dcb30d3d8b0ef4c5ec97d7cb5f6cbdfe3f4cac03


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=945853c3387d9b7c87a84f1d02cb68760f44b816


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=6fd679315fbee367cfee643cfcc910b0ae4e7542


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

http://git.savannah.gnu.org/cgit/grep.git/commit/?id=60b285496490172c358c0ee128df41ba890e06d9


commit 856e3f2ee8c65ff49d67185ca124f6d674b2077b
Author: Zev Weiss <zev@bewilderbeest.net>
Date:   Tue Jun 7 01:37:43 2016 -0500

    grep: do pagesize initialization and buffer allocation earlier
    
    * src/grep.c (reset, main): We're going to need pagesize and buffer
    initialized anyway, so we might as well do so unconditionally early on
    rather than checking on every call to reset().
    http://bugs.gnu.org/23717

diff --git a/src/grep.c b/src/grep.c
index d01bc4f..302e4d7 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -769,16 +769,6 @@ all_zeros (char const *buf, size_t size)
 static bool
 reset (int fd, struct stat const *st)
 {
-  if (! pagesize)
-    {
-      pagesize = getpagesize ();
-      if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
-        abort ();
-      bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize)
-                  + pagesize + sizeof (uword));
-      buffer = xmalloc (bufalloc);
-    }
-
   bufbeg = buflim = ALIGN_TO (buffer + 1, pagesize);
   bufbeg[-1] = eolbyte;
   bufdesc = fd;
@@ -2252,6 +2242,12 @@ main (int argc, char **argv)
   set_program_name (argv[0]);
   program_name = argv[0];
 
+  pagesize = getpagesize ();
+  if (pagesize == 0 || 2 * pagesize + 1 <= pagesize)
+    abort ();
+  bufalloc = (ALIGN_TO (INITIAL_BUFSIZE, pagesize) + pagesize + sizeof (uword));
+  buffer = xmalloc (bufalloc);
+
   keys = NULL;
   keycc = 0;
   with_filenames = false;

-----------------------------------------------------------------------

Summary of changes:
 src/dfa.c       |    2 +-
 src/dfasearch.c |    2 +-
 src/grep.c      |  105 ++++++++++++++++++++++++++-----------------------------
 3 files changed, 51 insertions(+), 58 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Mon Jun 13 18:15:26 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1bCa8k-0006Tb-Em
	for mharc-grep-commit@gnu.org; Mon, 13 Jun 2016 18:15:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45232)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bCa8i-0006Sr-2c
	for grep-commit@gnu.org; Mon, 13 Jun 2016 18:15:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bCa8g-0000Js-RV
	for grep-commit@gnu.org; Mon, 13 Jun 2016 18:15:23 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:55079)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bCa8g-0000Jo-OJ
	for grep-commit@gnu.org; Mon, 13 Jun 2016 18:15:22 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 5DA70220114; Mon, 13 Jun 2016 22:15:22 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-24-g258a78f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 856e3f2ee8c65ff49d67185ca124f6d674b2077b
X-Git-Newrev: 258a78f03685ee99fe36b2ccddb7e491c5a5bf36
Message-Id: <20160613221522.5DA70220114@vcs.savannah.gnu.org>
Date: Mon, 13 Jun 2016 22:15:22 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 13 Jun 2016 22:15:25 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  258a78f03685ee99fe36b2ccddb7e491c5a5bf36 (commit)
      from  856e3f2ee8c65ff49d67185ca124f6d674b2077b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=258a78f03685ee99fe36b2ccddb7e491c5a5bf36


commit 258a78f03685ee99fe36b2ccddb7e491c5a5bf36
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Jun 13 15:14:56 2016 -0700

    doc: remove obsolete MS-DOS mention
    
    * doc/grep.in.1: Remove obsolete discussion of MS-DOS heuristics.
    Problem reported by Björn Voigt in: http://bugs.gnu.org/23763

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 1a3b7d2..8525ca4 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -502,8 +502,9 @@ This can cause a performance penalty.
 Treat the file(s) as binary.
 By default, under \s-1MS-DOS\s0 and \s-1MS\s0-Windows,
 .BR grep
-guesses the file type by looking at the contents of the first 32KB
-read from the file.
+guesses whether a file is text or binary as described for the
+.B \-\^\-binary\-files
+option.
 If
 .BR grep
 decides the file is a text file, it strips the CR characters from the

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.in.1 |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Wed Jun 15 01:26:14 2016
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1bD3LC-0006nZ-2O
	for mharc-grep-commit@gnu.org; Wed, 15 Jun 2016 01:26:14 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58846)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bD3L8-0006lG-PI
	for grep-commit@gnu.org; Wed, 15 Jun 2016 01:26:12 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bD3L5-0008Ka-Rz
	for grep-commit@gnu.org; Wed, 15 Jun 2016 01:26:09 -0400
Received: from vcs.savannah.gnu.org ([208.118.235.72]:42678)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1bD3L5-0008KV-PC
	for grep-commit@gnu.org; Wed, 15 Jun 2016 01:26:07 -0400
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 85784220116; Wed, 15 Jun 2016 05:26:07 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.25-25-g440b0b8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 258a78f03685ee99fe36b2ccddb7e491c5a5bf36
X-Git-Newrev: 440b0b85d13dab62a562762db51c6de2255fc9f1
Message-Id: <20160615052607.85784220116@vcs.savannah.gnu.org>
Date: Wed, 15 Jun 2016 05:26:07 +0000 (UTC)
From: eggert@cs.ucla.edu (Paul Eggert)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x
X-Received-From: 208.118.235.72
X-BeenThere: grep-commit@gnu.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: CVS commit notices for GNU grep <grep-commit.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/grep-commit/>
List-Post: <mailto:grep-commit@gnu.org>
List-Help: <mailto:grep-commit-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/grep-commit>,
	<mailto:grep-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Jun 2016 05:26:12 -0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  440b0b85d13dab62a562762db51c6de2255fc9f1 (commit)
      from  258a78f03685ee99fe36b2ccddb7e491c5a5bf36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=440b0b85d13dab62a562762db51c6de2255fc9f1


commit 440b0b85d13dab62a562762db51c6de2255fc9f1
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jun 14 22:25:35 2016 -0700

    doc: propagate more changes from grep.texi
    
    Problem reported by Björn Voigt in: http://bugs.gnu.org/23763#27
    * doc/grep.in.1: Fix more inconsistencies with grep.texi.

diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 8525ca4..05f3382 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -140,6 +140,9 @@ character.
 Similarly, it must be either at the end of the line
 or followed by a non-word constituent character.
 Word-constituent characters are letters, digits, and the underscore.
+This option has no effect if
+.B \-x
+is also specified.
 .TP
 .BR \-x ", " \-\^\-line\-regexp
 Select only those matches that exactly match the whole line.
@@ -365,26 +368,36 @@ Process a binary file as if it were text; this is equivalent to the
 option.
 .TP
 .BI \-\^\-binary\-files= TYPE
-If the first few bytes of a file indicate that the file contains binary
-data, assume that the file is of type
+If a file's data or metadata
+indicate that the file contains binary data,
+assume that the file is of type
 .IR TYPE .
+Non-text bytes indicate binary data; these are either output bytes that are
+improperly encoded for the current locale, or null input bytes when the
+.B \-z
+option is not given.
+.IP
 By default,
 .I TYPE
 is
 .BR binary ,
-and
+and when
 .B grep
-normally outputs either
-a one-line message saying that a binary file matches, or no message if
-there is no match.
+discovers that a file is binary it suppresses any further output, and
+instead outputs either a one-line message saying that a binary file
+matches, or no message if there is no match.
+.IP
 If
 .I TYPE
 is
 .BR without-match ,
+when
 .B grep
-assumes that a binary file does not match; this is equivalent to the
+discovers that a file is binary it assumes that the rest of the file
+does not match; this is equivalent to the
 .B \-I
 option.
+.IP
 If
 .I TYPE
 is
@@ -393,17 +406,53 @@ is
 processes a binary file as if it were text; this is equivalent to the
 .B \-a
 option.
-When processing binary data,
+.IP
+When
+.I type
+is
+.BR binary ,
 .B grep
-may treat non-text bytes as line terminators; for example, the pattern
-.RB ' . '\&
-(period) might not match a null byte, as the null byte might be
-treated as a line terminator.
+may treat non-text bytes as line terminators even without the
+.B \-z
+option.  This means choosing
+.B binary
+versus
+.B text
+can affect whether a pattern matches a file.  For
+example, when
+.I type
+is
+.B binary
+the pattern
+.B q$ might
+match
+.B q
+immediately followed by a null byte, even though this
+is not matched when
+.I type
+is
+.BR text .
+Conversely, when
+.I type
+is
+.B binary
+the pattern
+.B .\&
+(period) might not match a null byte.
+.IP
 .I Warning:
-.B "grep \-\^\-binary\-files=text"
-might output binary garbage,
+The
+.B \-a
+option might output binary garbage,
 which can have nasty side effects if the output is a terminal and if the
 terminal driver interprets some of it as commands.
+On the other hand, when reading files whose text encodings are
+unknown, it can be helpful to use
+.B \-a
+or to set
+.B LC_ALL='C'
+in the environment, in order to find more matches even if the matches
+are unsafe for direct display.
 .TP
 .BI \-D " ACTION" "\fR,\fP \-\^\-devices=" ACTION
 If an input file is a device, FIFO or socket, use
@@ -445,10 +494,17 @@ This is equivalent to the
 option.
 .TP
 .BI \-\^\-exclude= GLOB
-Skip files whose base name matches
-.I GLOB
-(using wildcard matching).
-A file-name glob can use
+Skip any command-line file with a name suffix that matches the pattern
+.IR GLOB ,
+using wildcard matching; a name suffix is either the whole
+name, or any suffix starting after a
+.B /
+and before a +non-\fB/\fP.
+When searching recursively, skip any subfile whose base name matches
+.IR GLOB ;
+the base name is the part after the last
+.BR / .
+A pattern can use
 .BR * ,
 .BR ? ,
 and
@@ -463,10 +519,15 @@ Skip files whose base name matches any of the file-name globs read from
 (using wildcard matching as described under
 .BR \-\^\-exclude ).
 .TP
-.BI \-\^\-exclude-dir= DIR
-Exclude directories matching the pattern
-.I DIR
-from recursive searches.
+.BI \-\^\-exclude-dir= GLOB
+Skip any command-line directory with a name suffix that matches the
+pattern
+.IR GLOB .
+When searching recursively, skip any subdirectory
+whose base name matches
+.IR GLOB .
+Ignore any redundant trailing slashes in
+.IR GLOB .
 .TP
 .BR \-I
 Process a binary file as if it did not contain matching data; this is
@@ -523,12 +584,10 @@ This option has no effect on platforms
 other than \s-1MS-DOS\s0 and \s-1MS\s0-Windows.
 .TP
 .BR \-z ", " \-\^\-null\-data
-Treat the input as a set of lines,
-each terminated by a zero byte (the \s-1ASCII\s0
-.B NUL
-character) instead of a newline.
+Treat input and output data as sequences of lines, each terminated by
+a zero byte (the ASCII NUL character) instead of a newline.
 Like the
-.B -Z
+.B \-Z
 or
 .B \-\^\-null
 option, this option can be used with commands like
@@ -772,6 +831,9 @@ The C locale is used if none of these environment variables are set,
 if the locale catalog is not installed, or if
 .B grep
 was not compiled with national language support (\s-1NLS\s0).
+The shell command
+.B "locale \-a"
+lists locales that are currently available.
 .TP
 .B GREP_OPTIONS
 This variable specifies default options
@@ -1019,6 +1081,10 @@ These variables specify the locale for the
 category,
 which determines the type of characters,
 e.g., which characters are whitespace.
+This category also determines the character encoding, that is, whether
+text is encoded in UTF-8, ASCII, or some other encoding.  In the C or
+POSIX locale, all characters are encoded as a single byte and every
+byte is a valid character.
 .TP
 \fBLC_ALL\fP, \fBLC_MESSAGES\fP, \fBLANG\fP
 These variables specify the locale for the

-----------------------------------------------------------------------

Summary of changes:
 doc/grep.in.1 |  120 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 93 insertions(+), 27 deletions(-)


hooks/post-receive
-- 
grep


