From MAILER-DAEMON Sun Jan 01 06:35:02 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cNePm-0007hD-IJ
	for mharc-grep-commit@gnu.org; Sun, 01 Jan 2017 06:35:02 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37099)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cNePf-0007gf-Aq
	for grep-commit@gnu.org; Sun, 01 Jan 2017 06:35:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cNePZ-0000IV-A5
	for grep-commit@gnu.org; Sun, 01 Jan 2017 06:34:55 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:44253)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cNePZ-0000IR-4a
	for grep-commit@gnu.org; Sun, 01 Jan 2017 06:34:49 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id E46EE220152; Sun,  1 Jan 2017 11:34:48 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-36-g3cd2e86
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 296f3b994d59006a64fcd1a2398a6b3e13e84e3c
X-Git-Newrev: 3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea
Message-Id: <20170101113448.E46EE220152@vcs.savannah.gnu.org>
Date: Sun,  1 Jan 2017 11:34:48 +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: Sun, 01 Jan 2017 11:35:01 -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  3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea (commit)
      from  296f3b994d59006a64fcd1a2398a6b3e13e84e3c (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=3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea


commit 3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 1 03:22:16 2017 -0800

    maint: update gnulib and copyright dates for 2017
    
    * gnulib: Update to latest.
    * all files: Run "make update-copyright".

diff --git a/AUTHORS b/AUTHORS
index cafd903..8417b63 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-  Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+  Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/ChangeLog-2009 b/ChangeLog-2009
index 055b720..e86c46c 100644
--- a/ChangeLog-2009
+++ b/ChangeLog-2009
@@ -3648,6 +3648,6 @@
 
         * Version 2.0 released.
 
-Copyright (C) 1998-2016 Free Software Foundation, Inc.
+Copyright (C) 1998-2017 Free Software Foundation, Inc.
 Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/HACKING b/HACKING
index 4791639..dbbe7b0 100644
--- a/HACKING
+++ b/HACKING
@@ -598,7 +598,7 @@ Then just open the index.html file (in the generated lcov-html directory)
 in your favorite web browser.
 
 ========================================================================
-Copyright (C) 2009-2016 Free Software Foundation, Inc.
+Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
diff --git a/Makefile.am b/Makefile.am
index 3a52e8f..24b28c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake to create Makefile.in
 #
-# Copyright 1997-1998, 2005-2016 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/NEWS b/NEWS
index bfafe3c..7530584 100644
--- a/NEWS
+++ b/NEWS
@@ -1066,7 +1066,7 @@ necessary to track the evolution of the regex package, and since
 I was changing it anyway I decided to do a general cleanup.
 
 ========================================================================
-Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/README b/README
index 0ce7f1e..7aadf0b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-  Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+  Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/README-alpha b/README-alpha
index d179192..3d650d3 100644
--- a/README-alpha
+++ b/README-alpha
@@ -1,4 +1,4 @@
-  Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+  Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/README-hacking b/README-hacking
index 76996e3..bcee236 100644
--- a/README-hacking
+++ b/README-hacking
@@ -67,7 +67,7 @@ reporting address of this package, and not to that of gnulib, even
 if the problem seems to originate in a gnulib-provided file.
 -----
 
-Copyright (C) 2002-2016 Free Software Foundation, Inc.
+Copyright (C) 2002-2017 Free Software Foundation, Inc.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/TODO b/TODO
index cb48cc2..55a8262 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-  Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+  Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/bootstrap b/bootstrap
index 294c0bc..715c7ad 100755
--- a/bootstrap
+++ b/bootstrap
@@ -4,7 +4,7 @@ scriptversion=2014-12-08.12; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003-2016 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/bootstrap.conf b/bootstrap.conf
index 5ee69cd..cd2d756 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,6 +1,6 @@
 # Bootstrap configuration.
 
-# Copyright (C) 2006-2016 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/cfg.mk b/cfg.mk
index 43205a6..f4eead7 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -1,5 +1,5 @@
 # Customize maint.mk                           -*- makefile -*-
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/configure.ac b/configure.ac
index 8a20317..032c91b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl autoconf input file for GNU grep
 dnl
-dnl Copyright (C) 1997-2006, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2006, 2009-2017 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU grep.
 dnl
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 048c691..a4aae4a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 # Process this file with automake to create Makefile.in
 # Makefile.am for grep/doc.
 #
-# Copyright 2008-2016 Free Software Foundation, Inc.
+# Copyright 2008-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/doc/grep.in.1 b/doc/grep.in.1
index 05f3382..e3472f7 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -1145,7 +1145,7 @@ is used and a line is selected, the exit status is 0 even if an error
 occurred.
 .
 .SH COPYRIGHT
-Copyright 1998-2000, 2002, 2005-2016 Free Software Foundation, Inc.
+Copyright 1998-2000, 2002, 2005-2017 Free Software Foundation, Inc.
 .PP
 This is free software;
 see the source for copying conditions.
diff --git a/doc/grep.texi b/doc/grep.texi
index a579e8e..2d3ee78 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -18,7 +18,7 @@
 @copying
 This manual is for @command{grep}, a pattern matching engine.
 
-Copyright @copyright{} 1999-2002, 2005, 2008-2016 Free Software Foundation,
+Copyright @copyright{} 1999-2002, 2005, 2008-2017 Free Software Foundation,
 Inc.
 
 @quotation
diff --git a/gnulib b/gnulib
index 5996001..a3fd683 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 5996001fc550d7e12292f22f312176014f787243
+Subproject commit a3fd683de3decbb58ab5fb5d32ad2e62f74fbf12
diff --git a/lib/Makefile.am b/lib/Makefile.am
index a14c8b7..6661d79 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 1997-1998, 2005-2016 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/lib/colorize-posix.c b/lib/colorize-posix.c
index eb66c1b..1941a4a 100644
--- a/lib/colorize-posix.c
+++ b/lib/colorize-posix.c
@@ -1,5 +1,5 @@
 /* Output colorization.
-   Copyright 2011-2016 Free Software Foundation, Inc.
+   Copyright 2011-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/colorize-w32.c b/lib/colorize-w32.c
index 2f3d3d3..1073018 100644
--- a/lib/colorize-w32.c
+++ b/lib/colorize-w32.c
@@ -1,5 +1,5 @@
 /* Output colorization on MS-Windows.
-   Copyright 2011-2016 Free Software Foundation, Inc.
+   Copyright 2011-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib/colorize.h b/lib/colorize.h
index 7abc295..4930464 100644
--- a/lib/colorize.h
+++ b/lib/colorize.h
@@ -1,6 +1,6 @@
 /* Output colorization.
 
-   Copyright 2011-2016 Free Software Foundation, Inc.
+   Copyright 2011-2017 Free Software Foundation, Inc.
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3, or (at your option)
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 3bffcf5..3c372e2 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -1,6 +1,6 @@
 # pcre.m4 - check for libpcre support
 
-# Copyright (C) 2010-2016 Free Software Foundation, Inc.
+# Copyright (C) 2010-2017 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6608652..de72b6c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of files which containing translatable strings.
 #
-# Copyright 1997-1998, 2005-2016 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/Makefile.am b/src/Makefile.am
index 423ded8..b7b02af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to create Makefile.in
-# Copyright 1997-1998, 2005-2016 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/src/dfasearch.c b/src/dfasearch.c
index c201a51..44bfaa3 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -1,5 +1,5 @@
 /* dfasearch.c - searching subroutines using dfa and regex for grep.
-   Copyright 1992, 1998, 2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 1992, 1998, 2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/die.h b/src/die.h
index c0bd024..2208d0f 100644
--- a/src/die.h
+++ b/src/die.h
@@ -1,5 +1,5 @@
 /* Report an error and exit.
-   Copyright 2016 Free Software Foundation, Inc.
+   Copyright 2016-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/dosbuf.c b/src/dosbuf.c
index accc3ff..9892755 100644
--- a/src/dosbuf.c
+++ b/src/dosbuf.c
@@ -1,5 +1,5 @@
 /* dosbuf.c
-   Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/grep.c b/src/grep.c
index e64c430..0a674ec 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -1,5 +1,5 @@
 /* grep.c - main driver file for grep.
-   Copyright (C) 1992, 1997-2002, 2004-2016 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1997-2002, 2004-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/grep.h b/src/grep.h
index d10145e..325b278 100644
--- a/src/grep.h
+++ b/src/grep.h
@@ -1,5 +1,5 @@
 /* grep.h - interface to grep driver for searching subroutines.
-   Copyright (C) 1992, 1998, 2001, 2007, 2009-2016 Free Software Foundation,
+   Copyright (C) 1992, 1998, 2001, 2007, 2009-2017 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/src/kwsearch.c b/src/kwsearch.c
index a36381f..e07eb63 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -1,5 +1,5 @@
 /* kwsearch.c - searching subroutines using kwset for grep.
-   Copyright 1992, 1998, 2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 1992, 1998, 2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/kwset.c b/src/kwset.c
index 30c0f04..20a1284 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -1,5 +1,5 @@
 /* kwset.c - search for any of a set of keywords.
-   Copyright (C) 1989, 1998, 2000, 2005, 2007, 2009-2016 Free Software
+   Copyright (C) 1989, 1998, 2000, 2005, 2007, 2009-2017 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/src/kwset.h b/src/kwset.h
index d2700e9..b03b71a 100644
--- a/src/kwset.h
+++ b/src/kwset.h
@@ -1,5 +1,5 @@
 /* kwset.h - header declaring the keyword set library.
-   Copyright (C) 1989, 1998, 2005, 2007, 2009-2016 Free Software Foundation,
+   Copyright (C) 1989, 1998, 2005, 2007, 2009-2017 Free Software Foundation,
    Inc.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/src/pcresearch.c b/src/pcresearch.c
index 5bc9328..28144b4 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -1,5 +1,5 @@
 /* pcresearch.c - searching subroutines using PCRE for grep.
-   Copyright 2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/search.h b/src/search.h
index 1aa2f94..c8bd5f2 100644
--- a/src/search.h
+++ b/src/search.h
@@ -1,5 +1,5 @@
 /* search.c - searching subroutines using dfa, kwset and regex for grep.
-   Copyright 1992, 1998, 2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 1992, 1998, 2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/searchutils.c b/src/searchutils.c
index a007955..51a3097 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -1,5 +1,5 @@
 /* searchutils.c - helper subroutines for grep's matchers.
-   Copyright 1992, 1998, 2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 1992, 1998, 2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/system.h b/src/system.h
index c875275..05d8f1a 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,5 +1,5 @@
 /* Portability cruft.  Include after config.h and sys/types.h.
-   Copyright 1996, 1998-2000, 2007, 2009-2016 Free Software Foundation, Inc.
+   Copyright 1996, 1998-2000, 2007, 2009-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
index bd2088f..d7b644e 100644
--- a/tests/Coreutils.pm
+++ b/tests/Coreutils.pm
@@ -1,7 +1,7 @@
 package Coreutils;
 # This is a testing framework.
 
-# Copyright (C) 1998-2015 Free Software Foundation, Inc.
+# Copyright (C) 1998-2015, 2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/CuSkip.pm b/tests/CuSkip.pm
index a25688a..f2e306b 100644
--- a/tests/CuSkip.pm
+++ b/tests/CuSkip.pm
@@ -1,7 +1,7 @@
 package CuSkip;
 # Skip a test: emit diag to log and to stderr, and exit 77
 
-# Copyright (C) 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2011-2015, 2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/CuTmpdir.pm b/tests/CuTmpdir.pm
index fd65556..a9e2a4e 100644
--- a/tests/CuTmpdir.pm
+++ b/tests/CuTmpdir.pm
@@ -1,7 +1,7 @@
 package CuTmpdir;
 # create, then chdir into a temporary sub-directory
 
-# Copyright (C) 2007-2015 Free Software Foundation, Inc.
+# Copyright (C) 2007-2015, 2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 52e2b9e..2f640d7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to create Makefile.in
-# Copyright 1997-1998, 2005-2016 Free Software Foundation, Inc.
+# Copyright 1997-1998, 2005-2017 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/backref b/tests/backref
index 1d15434..57c3c62 100755
--- a/tests/backref
+++ b/tests/backref
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test for backreferences and other things.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/backref-alt b/tests/backref-alt
index 654b345..d5bae5c 100755
--- a/tests/backref-alt
+++ b/tests/backref-alt
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test for a bug in glibc's regex code as of 2015-09-19.
 #
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/backslash-s-and-repetition-operators b/tests/backslash-s-and-repetition-operators
index 45a4b55..bc9cf24 100755
--- a/tests/backslash-s-and-repetition-operators
+++ b/tests/backslash-s-and-repetition-operators
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that \s and \S work with repetition operators.
 #
-# Copyright (C) 2013-2016 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/backslash-s-vs-invalid-multitype b/tests/backslash-s-vs-invalid-multitype
index a77b6a5..6c2c8e8 100755
--- a/tests/backslash-s-vs-invalid-multitype
+++ b/tests/backslash-s-vs-invalid-multitype
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that neither \s nor \S matches an invalid multibyte character.
 #
-# Copyright (C) 2013-2016 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/bre b/tests/bre
index 324d198..7f1abbe 100755
--- a/tests/bre
+++ b/tests/bre
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Regression test for GNU grep.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/bre.awk b/tests/bre.awk
index 4f3e006..69ffbde 100644
--- a/tests/bre.awk
+++ b/tests/bre.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/c-locale b/tests/c-locale
index 1fe5c70..d665e0d 100755
--- a/tests/c-locale
+++ b/tests/c-locale
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Regression test for GNU grep.
 #
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/case-fold-titlecase b/tests/case-fold-titlecase
index 57a4613..fb2702c 100755
--- a/tests/case-fold-titlecase
+++ b/tests/case-fold-titlecase
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check that case folding works even with titlecase and similarly odd chars.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/count-newline b/tests/count-newline
index b37b8ec..aa3547d 100755
--- a/tests/count-newline
+++ b/tests/count-newline
@@ -2,7 +2,7 @@
 # Test that newline is counted correctly even when the transition
 # table is rebuilt.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/dfa-coverage b/tests/dfa-coverage
index ca8654f..e2e636b 100755
--- a/tests/dfa-coverage
+++ b/tests/dfa-coverage
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise the final reachable code in dfa.c's match_mb_charset.
 
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/dfa-heap-overrun b/tests/dfa-heap-overrun
index c8bb185..9131a0b 100755
--- a/tests/dfa-heap-overrun
+++ b/tests/dfa-heap-overrun
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Trigger a heap overrun in grep-2.6..grep-2.8.
 
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/empty b/tests/empty
index 2b5ecf2..a44f48b 100755
--- a/tests/empty
+++ b/tests/empty
@@ -2,7 +2,7 @@
 # test that the empty file means no pattern
 # and an empty pattern means match all.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/empty-line-mb b/tests/empty-line-mb
index 605ecf9..af1aa3f 100755
--- a/tests/empty-line-mb
+++ b/tests/empty-line-mb
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Exercise bugs in grep-2.13 with -i, -n and an RE of ^$ in a multi-byte locale.
 #
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/encoding-error b/tests/encoding-error
index 5f5a09d..36b0199 100755
--- a/tests/encoding-error
+++ b/tests/encoding-error
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test grep's behavior on encoding errors.
 #
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/envvar-check b/tests/envvar-check
index 16d7069..8138e54 100644
--- a/tests/envvar-check
+++ b/tests/envvar-check
@@ -1,7 +1,7 @@
 # -*- sh -*-
 # Check environment variables for sane values while testing.
 
-# Copyright (C) 2000-2016 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/ere b/tests/ere
index 68d1533..6b956bb 100755
--- a/tests/ere
+++ b/tests/ere
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Regression test for GNU grep.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/ere.awk b/tests/ere.awk
index 9ffc9f6..84013a0 100644
--- a/tests/ere.awk
+++ b/tests/ere.awk
@@ -1,4 +1,4 @@
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/false-match-mb-non-utf8 b/tests/false-match-mb-non-utf8
index c772793..c89f780 100755
--- a/tests/false-match-mb-non-utf8
+++ b/tests/false-match-mb-non-utf8
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test for false matches in grep 2.19..2.26 in multibyte, non-UTF8 locales
 #
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/file b/tests/file
index 11de7e4..3fff27e 100755
--- a/tests/file
+++ b/tests/file
@@ -4,7 +4,7 @@
 # grep -F -f pattern_file file
 # grep -G -f pattern_file file
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/filename-lineno.pl b/tests/filename-lineno.pl
index 3827f4d..8eead57 100755
--- a/tests/filename-lineno.pl
+++ b/tests/filename-lineno.pl
@@ -4,7 +4,7 @@
 # file or line number from which the offending regular expression came.
 # With 2.26, now, each such diagnostic has a "FILENAME:LINENO: " prefix.
 
-# Copyright (C) 2016 Free Software Foundation, Inc.
+# Copyright (C) 2016-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/fmbtest b/tests/fmbtest
index 14fb9d3..38ce352 100755
--- a/tests/fmbtest
+++ b/tests/fmbtest
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/foad1 b/tests/foad1
index 9417381..286c449 100755
--- a/tests/foad1
+++ b/tests/foad1
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test various combinations of command-line options.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/get-mb-cur-max.c b/tests/get-mb-cur-max.c
index 6e92796..e89c2fa 100644
--- a/tests/get-mb-cur-max.c
+++ b/tests/get-mb-cur-max.c
@@ -1,5 +1,5 @@
 /* Auxiliary program to detect support for a locale.
-   Copyright 2010-2016 Free Software Foundation, Inc.
+   Copyright 2010-2017 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/tests/help-version b/tests/help-version
index 9d9b147..e27c576 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -2,7 +2,7 @@
 # Make sure all of these programs work properly
 # when invoked with --help or --version.
 
-# Copyright (C) 2000-2016 Free Software Foundation, Inc.
+# Copyright (C) 2000-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/high-bit-range b/tests/high-bit-range
index e414c93..a432f9d 100755
--- a/tests/high-bit-range
+++ b/tests/high-bit-range
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise high-bit-set unibyte-in-[...]-range bug.
 
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/init.sh b/tests/init.sh
index ee08022..6fc4a4d 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -1,6 +1,6 @@
 # source this file; set up for tests
 
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/initial-tab b/tests/initial-tab
index 8b3cb8c..00a2608 100755
--- a/tests/initial-tab
+++ b/tests/initial-tab
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise -T.
 
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/khadafy b/tests/khadafy
index 73ee1c7..f21a3a9 100755
--- a/tests/khadafy
+++ b/tests/khadafy
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Regression test for GNU grep.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/kwset-abuse b/tests/kwset-abuse
index a8680f8..9d023f4 100755
--- a/tests/kwset-abuse
+++ b/tests/kwset-abuse
@@ -2,7 +2,7 @@
 # Evoke a segfault in a hard-to-reach code path of kwset.c.
 # This bug affected grep versions 2.19 through 2.21.
 #
-# Copyright (C) 2015-2016 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/long-pattern-perf b/tests/long-pattern-perf
index 0a02e6f..7236fca 100755
--- a/tests/long-pattern-perf
+++ b/tests/long-pattern-perf
@@ -1,7 +1,7 @@
 #!/bin/sh
 # grep-2.21 would incur a 100x penalty for 10x increase in regexp length
 
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/match-lines b/tests/match-lines
index 7e1f291..c8f2cc2 100755
--- a/tests/match-lines
+++ b/tests/match-lines
@@ -3,7 +3,7 @@
 # grep -F -x -o PAT print an extra newline for each match.
 # This would fail for grep-2.19 and grep-2.20.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/mb-dot-newline b/tests/mb-dot-newline
index 9e3db15..9cbbcf1 100755
--- a/tests/mb-dot-newline
+++ b/tests/mb-dot-newline
@@ -2,7 +2,7 @@
 # Trigger a bug in the DFA matcher.
 # This would fail for grep-2.20.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/mb-non-UTF8-overrun b/tests/mb-non-UTF8-overrun
index 7743029..834ef47 100755
--- a/tests/mb-non-UTF8-overrun
+++ b/tests/mb-non-UTF8-overrun
@@ -2,7 +2,7 @@
 # grep would sometimes read beyond end of input, when using a non-UTF8
 # multibyte locale.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/mb-non-UTF8-performance b/tests/mb-non-UTF8-performance
index 11d0cf7..507a3d3 100755
--- a/tests/mb-non-UTF8-performance
+++ b/tests/mb-non-UTF8-performance
@@ -3,7 +3,7 @@
 # The 200x is on an Intel i7-based system.
 # On an AMD FX-4100, it would take up to 2500x longer.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/multibyte-white-space b/tests/multibyte-white-space
index 7c0d0b7..9b694c2 100755
--- a/tests/multibyte-white-space
+++ b/tests/multibyte-white-space
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test whether \s matches SP and UTF-8 multi-byte white space characters.
 #
-# Copyright (C) 2013-2016 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/multiple-begin-or-end-line b/tests/multiple-begin-or-end-line
index ec6da30..d0d0a4f 100755
--- a/tests/multiple-begin-or-end-line
+++ b/tests/multiple-begin-or-end-line
@@ -2,7 +2,7 @@
 # Test a pattern of multiple begin or end line constraints.
 # This would mistakenly print a line when using grep-2.19.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/null-byte b/tests/null-byte
index f9bb00e..149957a 100755
--- a/tests/null-byte
+++ b/tests/null-byte
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test NUL bytes in patterns and data.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/options b/tests/options
index 97d2a03..17259cd 100755
--- a/tests/options
+++ b/tests/options
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test for POSIX options for grep
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre b/tests/pcre
index a290099..4c50fc7 100755
--- a/tests/pcre
+++ b/tests/pcre
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Simple PCRE tests.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-abort b/tests/pcre-abort
index 83c90e4..581df32 100755
--- a/tests/pcre-abort
+++ b/tests/pcre-abort
@@ -2,7 +2,7 @@
 # Show that grep handles PCRE's PCRE_ERROR_MATCHLIMIT.
 # In grep-2.8, it would abort.
 #
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-count b/tests/pcre-count
index e638635..c14426c 100755
--- a/tests/pcre-count
+++ b/tests/pcre-count
@@ -2,7 +2,7 @@
 # grep -P / grep -Pc are inconsistent results
 # This bug affected grep versions 2.21 through 2.22.
 #
-# Copyright (C) 2015-2016 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-infloop b/tests/pcre-infloop
index fe97353..ba09217 100755
--- a/tests/pcre-infloop
+++ b/tests/pcre-infloop
@@ -2,7 +2,7 @@
 # With some versions of libpcre, apparently including 8.35,
 # the following would trigger an infinite loop in its match function.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/pcre-invalid-utf8-infloop b/tests/pcre-invalid-utf8-infloop
index e0503bc..47520d1 100755
--- a/tests/pcre-invalid-utf8-infloop
+++ b/tests/pcre-invalid-utf8-infloop
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that grep -oaP doesn't infloop for invalid multi-byte input
 #
-# Copyright (C) 2015-2016 Free Software Foundation, Inc.
+# Copyright (C) 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-invalid-utf8-input b/tests/pcre-invalid-utf8-input
index 17c1d4e..edad02e 100755
--- a/tests/pcre-invalid-utf8-input
+++ b/tests/pcre-invalid-utf8-input
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that grep -P doesn't abort or infloop for invalid multi-byte input
 #
-# Copyright (C) 2013-2016 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-jitstack b/tests/pcre-jitstack
index 5bdb5a8..bbd531f 100755
--- a/tests/pcre-jitstack
+++ b/tests/pcre-jitstack
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Grep 2.21 would report "grep: internal PCRE error: -27"
 #
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-o b/tests/pcre-o
index 7c46f27..83440a4 100755
--- a/tests/pcre-o
+++ b/tests/pcre-o
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that grep -oP doesn't cause internal error at match.
 #
-# Copyright (C) 2014-2016 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-utf8 b/tests/pcre-utf8
index a29b412..490c94a 100755
--- a/tests/pcre-utf8
+++ b/tests/pcre-utf8
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Ensure that, with -P, Unicode \p{} symbols are correctly matched.
 #
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-w b/tests/pcre-w
index 2c91e90..1993409 100755
--- a/tests/pcre-w
+++ b/tests/pcre-w
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Before grep-2.19, grep -Pw %% would match %% enclosed in word boundaries
 #
-# Copyright (C) 2014-2016 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/pcre-wx-backref b/tests/pcre-wx-backref
index 907c858..88f7807 100755
--- a/tests/pcre-wx-backref
+++ b/tests/pcre-wx-backref
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Before grep-2.19, grep -P and -w/-x would not with a backreference.
 #
-# Copyright (C) 2014-2016 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/posix-bracket b/tests/posix-bracket
index bca4303..b9b2c11 100755
--- a/tests/posix-bracket
+++ b/tests/posix-bracket
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check various bracket expressions in the POSIX locale.
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/proc b/tests/proc
index aeb4a50..406cefc 100755
--- a/tests/proc
+++ b/tests/proc
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test the /proc file system if available.
 
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/spencer1 b/tests/spencer1
index 65503d3..acb4547 100755
--- a/tests/spencer1
+++ b/tests/spencer1
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Regression test for GNU grep.
 # Copyright (C) 1988 Henry Spencer.
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/spencer1-locale b/tests/spencer1-locale
index 3f202d8..4a6ce6c 100755
--- a/tests/spencer1-locale
+++ b/tests/spencer1-locale
@@ -2,7 +2,7 @@
 # Regression test for GNU grep.
 #
 # Copyright (C) 1988 Henry Spencer.
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/spencer1-locale.awk b/tests/spencer1-locale.awk
index bc92ecf..eb229ed 100644
--- a/tests/spencer1-locale.awk
+++ b/tests/spencer1-locale.awk
@@ -1,5 +1,5 @@
 # Copyright (C) 1988 Henry Spencer.
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/spencer1.awk b/tests/spencer1.awk
index aff38f9..ad15c06 100644
--- a/tests/spencer1.awk
+++ b/tests/spencer1.awk
@@ -1,5 +1,5 @@
 # Copyright (C) 1988 Henry Spencer.
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/spencer2 b/tests/spencer2
index c31a393..1950297 100644
--- a/tests/spencer2
+++ b/tests/spencer2
@@ -2,7 +2,7 @@
 # Regression test for GNU grep.
 #
 # Copyright (C) 1988 Henry Spencer.
-# Copyright (C) 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/status b/tests/status
index 37703be..e939b1f 100755
--- a/tests/status
+++ b/tests/status
@@ -5,7 +5,7 @@
 #  1 no match
 #  2 file not found
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/surrogate-pair b/tests/surrogate-pair
index 38a2a55..e58b353 100755
--- a/tests/surrogate-pair
+++ b/tests/surrogate-pair
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Trigger a segfault-inducing bug with -i in grep-2.14 on Cygwin.
 
-# Copyright (C) 2013-2016 Free Software Foundation, Inc.
+# Copyright (C) 2013-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/symlink b/tests/symlink
index a915bbe..ff95fe3 100755
--- a/tests/symlink
+++ b/tests/symlink
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check that "grep -r" does the right thing with symbolic links.
 
-# Copyright (C) 2012-2016 Free Software Foundation, Inc.
+# Copyright (C) 2012-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/tests b/tests/tests
index d59b974..44b8462 100644
--- a/tests/tests
+++ b/tests/tests
@@ -1,6 +1,6 @@
 # regular expression test set
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/triple-backref b/tests/triple-backref
index 3d36c05..56a0eb9 100755
--- a/tests/triple-backref
+++ b/tests/triple-backref
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test for a bug in glibc's regex code as of September 7, 2014.
 #
-# Copyright (C) 2014-2016 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/turkish-I b/tests/turkish-I
index 43becea..47ebf83 100755
--- a/tests/turkish-I
+++ b/tests/turkish-I
@@ -1,7 +1,7 @@
 #!/bin/sh
 # grep -i in UTF-8: missing NL in output on line containing I WITH DOT (U+0130)
 
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/turkish-I-without-dot b/tests/turkish-I-without-dot
index 69215de..3096f0b 100755
--- a/tests/turkish-I-without-dot
+++ b/tests/turkish-I-without-dot
@@ -3,7 +3,7 @@
 # (like "I" in the tr_TR.utf8 locale) whose lower-case representation
 # occupies more bytes (two in this case, for 0xc4b1, aka U+0131).
 
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/turkish-eyes b/tests/turkish-eyes
index b57df8e..0db7556 100755
--- a/tests/turkish-eyes
+++ b/tests/turkish-eyes
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that case-insensitive matching works with all Turkish i's
 
-# Copyright (C) 2014-2016 Free Software Foundation, Inc.
+# Copyright (C) 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/two-chars b/tests/two-chars
index 7ce7216..f65cb26 100755
--- a/tests/two-chars
+++ b/tests/two-chars
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Check for grep -F with two patterns consisting of the same char.
 #
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/two-files b/tests/two-files
index 1b52e3f..fa6603a 100755
--- a/tests/two-files
+++ b/tests/two-files
@@ -2,7 +2,7 @@
 # Read two files, of increasing size.
 # With ASAN, this would have triggered a false-positive read of poisoned memory.
 #
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/unibyte-binary b/tests/unibyte-binary
index 11325ee..a48c323 100755
--- a/tests/unibyte-binary
+++ b/tests/unibyte-binary
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test binary files in unibyte locales with encoding errors
 
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/unibyte-bracket-expr b/tests/unibyte-bracket-expr
index 68c475c..1b0c99c 100755
--- a/tests/unibyte-bracket-expr
+++ b/tests/unibyte-bracket-expr
@@ -5,7 +5,7 @@
 # ru_RU.KOI8-R for any C whose wide-char representation differed from
 # its single-byte equivalent.
 
-# Copyright (C) 2011-2016 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/unibyte-negated-circumflex b/tests/unibyte-negated-circumflex
index 03e448a..64b5f60 100755
--- a/tests/unibyte-negated-circumflex
+++ b/tests/unibyte-negated-circumflex
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise a bug where [^^-^] was treated as if it were [^-^].
 
-# Copyright 2014-2016 Free Software Foundation, Inc.
+# Copyright 2014-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/utf8-bracket b/tests/utf8-bracket
index e85877c..ba9cd77 100755
--- a/tests/utf8-bracket
+++ b/tests/utf8-bracket
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Check bracket expressions in a UTF-8 locale.
 
-# Copyright 2015-2016 Free Software Foundation, Inc.
+# Copyright 2015-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/write-error-msg b/tests/write-error-msg
index 130648b..f2ab6da 100755
--- a/tests/write-error-msg
+++ b/tests/write-error-msg
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Ensure that output errors are reported with errno information.
 
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/tests/yesno b/tests/yesno
index fd8d4ec..e379c19 100755
--- a/tests/yesno
+++ b/tests/yesno
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Test feature interaction of -C, -v, -o, and -m.
 #
-# Copyright (C) 2001, 2006, 2009-2016 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2006, 2009-2017 Free Software Foundation, Inc.
 #
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
diff --git a/tests/z-anchor-newline b/tests/z-anchor-newline
index c12dd1e..678dcca 100755
--- a/tests/z-anchor-newline
+++ b/tests/z-anchor-newline
@@ -2,7 +2,7 @@
 # grep -z with an anchor in the regex could mistakenly match text
 # including a newline.
 
-# Copyright 2016 Free Software Foundation, Inc.
+# Copyright 2016-2017 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

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

Summary of changes:
 AUTHORS                                    |    2 +-
 ChangeLog-2009                             |    2 +-
 HACKING                                    |    2 +-
 Makefile.am                                |    2 +-
 NEWS                                       |    2 +-
 README                                     |    2 +-
 README-alpha                               |    2 +-
 README-hacking                             |    2 +-
 TODO                                       |    2 +-
 bootstrap                                  |    2 +-
 bootstrap.conf                             |    2 +-
 cfg.mk                                     |    2 +-
 configure.ac                               |    2 +-
 doc/Makefile.am                            |    2 +-
 doc/grep.in.1                              |    2 +-
 doc/grep.texi                              |    2 +-
 gnulib                                     |    2 +-
 lib/Makefile.am                            |    2 +-
 lib/colorize-posix.c                       |    2 +-
 lib/colorize-w32.c                         |    2 +-
 lib/colorize.h                             |    2 +-
 m4/pcre.m4                                 |    2 +-
 po/POTFILES.in                             |    2 +-
 src/Makefile.am                            |    2 +-
 src/dfasearch.c                            |    2 +-
 src/die.h                                  |    2 +-
 src/dosbuf.c                               |    2 +-
 src/grep.c                                 |    2 +-
 src/grep.h                                 |    2 +-
 src/kwsearch.c                             |    2 +-
 src/kwset.c                                |    2 +-
 src/kwset.h                                |    2 +-
 src/pcresearch.c                           |    2 +-
 src/search.h                               |    2 +-
 src/searchutils.c                          |    2 +-
 src/system.h                               |    2 +-
 tests/Coreutils.pm                         |    2 +-
 tests/CuSkip.pm                            |    2 +-
 tests/CuTmpdir.pm                          |    2 +-
 tests/Makefile.am                          |    2 +-
 tests/backref                              |    2 +-
 tests/backref-alt                          |    2 +-
 tests/backslash-s-and-repetition-operators |    2 +-
 tests/backslash-s-vs-invalid-multitype     |    2 +-
 tests/bre                                  |    2 +-
 tests/bre.awk                              |    2 +-
 tests/c-locale                             |    2 +-
 tests/case-fold-titlecase                  |    2 +-
 tests/count-newline                        |    2 +-
 tests/dfa-coverage                         |    2 +-
 tests/dfa-heap-overrun                     |    2 +-
 tests/empty                                |    2 +-
 tests/empty-line-mb                        |    2 +-
 tests/encoding-error                       |    2 +-
 tests/envvar-check                         |    2 +-
 tests/ere                                  |    2 +-
 tests/ere.awk                              |    2 +-
 tests/false-match-mb-non-utf8              |    2 +-
 tests/file                                 |    2 +-
 tests/filename-lineno.pl                   |    2 +-
 tests/fmbtest                              |    2 +-
 tests/foad1                                |    2 +-
 tests/get-mb-cur-max.c                     |    2 +-
 tests/help-version                         |    2 +-
 tests/high-bit-range                       |    2 +-
 tests/init.sh                              |    2 +-
 tests/initial-tab                          |    2 +-
 tests/khadafy                              |    2 +-
 tests/kwset-abuse                          |    2 +-
 tests/long-pattern-perf                    |    2 +-
 tests/match-lines                          |    2 +-
 tests/mb-dot-newline                       |    2 +-
 tests/mb-non-UTF8-overrun                  |    2 +-
 tests/mb-non-UTF8-performance              |    2 +-
 tests/multibyte-white-space                |    2 +-
 tests/multiple-begin-or-end-line           |    2 +-
 tests/null-byte                            |    2 +-
 tests/options                              |    2 +-
 tests/pcre                                 |    2 +-
 tests/pcre-abort                           |    2 +-
 tests/pcre-count                           |    2 +-
 tests/pcre-infloop                         |    2 +-
 tests/pcre-invalid-utf8-infloop            |    2 +-
 tests/pcre-invalid-utf8-input              |    2 +-
 tests/pcre-jitstack                        |    2 +-
 tests/pcre-o                               |    2 +-
 tests/pcre-utf8                            |    2 +-
 tests/pcre-w                               |    2 +-
 tests/pcre-wx-backref                      |    2 +-
 tests/posix-bracket                        |    2 +-
 tests/proc                                 |    2 +-
 tests/spencer1                             |    2 +-
 tests/spencer1-locale                      |    2 +-
 tests/spencer1-locale.awk                  |    2 +-
 tests/spencer1.awk                         |    2 +-
 tests/spencer2                             |    2 +-
 tests/status                               |    2 +-
 tests/surrogate-pair                       |    2 +-
 tests/symlink                              |    2 +-
 tests/tests                                |    2 +-
 tests/triple-backref                       |    2 +-
 tests/turkish-I                            |    2 +-
 tests/turkish-I-without-dot                |    2 +-
 tests/turkish-eyes                         |    2 +-
 tests/two-chars                            |    2 +-
 tests/two-files                            |    2 +-
 tests/unibyte-binary                       |    2 +-
 tests/unibyte-bracket-expr                 |    2 +-
 tests/unibyte-negated-circumflex           |    2 +-
 tests/utf8-bracket                         |    2 +-
 tests/write-error-msg                      |    2 +-
 tests/yesno                                |    2 +-
 tests/z-anchor-newline                     |    2 +-
 113 files changed, 113 insertions(+), 113 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Thu Jan 12 01:29:38 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cRYtF-0005eu-Uv
	for mharc-grep-commit@gnu.org; Thu, 12 Jan 2017 01:29:37 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58098)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cRYtB-0005em-RP
	for grep-commit@gnu.org; Thu, 12 Jan 2017 01:29:36 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cRYt9-0004zy-35
	for grep-commit@gnu.org; Thu, 12 Jan 2017 01:29:33 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33689)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cRYt8-0004zu-V7
	for grep-commit@gnu.org; Thu, 12 Jan 2017 01:29:31 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id D183022015D; Thu, 12 Jan 2017 06:29:30 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-37-g3438c3a
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea
X-Git-Newrev: 3438c3a65c655baed1bb764e41d7ddcced5f1e7c
Message-Id: <20170112062930.D183022015D@vcs.savannah.gnu.org>
Date: Thu, 12 Jan 2017 06:29:30 +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, 12 Jan 2017 06:29:36 -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  3438c3a65c655baed1bb764e41d7ddcced5f1e7c (commit)
      from  3cd2e8625ae7c0608b91af5d2fff9c1c41eedbea (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=3438c3a65c655baed1bb764e41d7ddcced5f1e7c


commit 3438c3a65c655baed1bb764e41d7ddcced5f1e7c
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Jan 11 22:28:24 2017 -0800

    grep: improve comments, mostly in kwset
    
    Remove kwset.h comments that are obsolete and seemingly not
    maintained anyway; people can look in kwset.c instead.
    Update comments to reflect current behavior better.
    Cite Faro & Lecroq 2013.  Use GNU style for end-of-sentence.

diff --git a/src/kwset.c b/src/kwset.c
index 20a1284..0c22041 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -17,19 +17,29 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-/* Written August 1989 by Mike Haertel.
-   The author may be reached (Email) at the address mike@ai.mit.edu,
-   or (US mail) as Mike Haertel c/o Free Software Foundation. */
+/* Written August 1989 by Mike Haertel.  */
 
-/* The algorithm implemented by these routines bears a startling resemblance
-   to one discovered by Beate Commentz-Walter, although it is not identical.
+/* The algorithm called "Commentz_Walter" below bears a startling resemblance
+   to that of Beate Commentz-Walter, although it is not identical.
    See: Commentz-Walter B. A string matching algorithm fast on the average.
    Lecture Notes in Computer Science 71 (1979), 118-32
    <http://dx.doi.org/10.1007/3-540-09510-1_10>.
-   See also: Aho AV, Corasick MJ. Efficient string matching: an aid to
+
+   For the Aho-Corasick algorithm, see:
+   Aho AV, Corasick MJ. Efficient string matching: an aid to
    bibliographic search. CACM 18, 6 (1975), 333-40
    <http://dx.doi.org/10.1145/360825.360855>, which describes the
-   failure function used below. */
+   failure function used below.
+
+   For the Boyer-Moore algorithm, see: Boyer RS, Moore JS.
+   A fast string searching algorithm. CACM 20, 10 (1977), 762-72
+   <http://dx.doi.org/10.1145/359842.359859>.
+
+   For a survey of more-recent string matching algorithms that might
+   help improve performance, see: Faro S, Lecroq T. The exact online
+   string matching problem: a review of the most recent results.
+   ACM Computing Surveys 45, 2 (2013), 13
+   <http://dx.doi.org/10.1145/2431211.2431212>.  */
 
 #include <config.h>
 
@@ -52,42 +62,47 @@ U (char ch)
   return to_uchar (ch);
 }
 
-/* Balanced tree of edges and labels leaving a given trie node. */
+/* Balanced tree of edges and labels leaving a given trie node.  */
 struct tree
 {
-  struct tree *llink;		/* Left link; MUST be first field. */
-  struct tree *rlink;		/* Right link (to larger labels). */
-  struct trie *trie;		/* Trie node pointed to by this edge. */
-  unsigned char label;		/* Label on this edge. */
-  char balance;			/* Difference in depths of subtrees. */
+  struct tree *llink;		/* Left link; MUST be first field.  */
+  struct tree *rlink;		/* Right link (to larger labels).  */
+  struct trie *trie;		/* Trie node pointed to by this edge.  */
+  unsigned char label;		/* Label on this edge.  */
+  char balance;			/* Difference in depths of subtrees.  */
 };
 
-/* Node of a trie representing a set of keywords. */
+/* Node of a trie representing a set of keywords.  */
 struct trie
 {
-  size_t accepting;		/* Word index of accepted word, or zero. */
-  struct tree *links;		/* Tree of edges leaving this node. */
-  struct trie *parent;		/* Parent of this node. */
-  struct trie *next;		/* List of all trie nodes in level order. */
-  struct trie *fail;		/* Aho-Corasick failure function. */
-  ptrdiff_t depth;		/* Depth of this node from the root. */
-  ptrdiff_t shift;		/* Shift function for search failures. */
-  ptrdiff_t maxshift;		/* Max shift of self and descendants. */
+  /* If an accepting node, this is either 2*W + 1 where W is the word
+     index, or is SIZE_MAX if Commentz-Walter is in use and FAIL
+     specifies where to look for more info.  If not an accepting node,
+     this is zero.  */
+  size_t accepting;
+
+  struct tree *links;		/* Tree of edges leaving this node.  */
+  struct trie *parent;		/* Parent of this node.  */
+  struct trie *next;		/* List of all trie nodes in level order.  */
+  struct trie *fail;		/* Aho-Corasick failure function.  */
+  ptrdiff_t depth;		/* Depth of this node from the root.  */
+  ptrdiff_t shift;		/* Shift function for search failures.  */
+  ptrdiff_t maxshift;		/* Max shift of self and descendants.  */
 };
 
-/* Structure returned opaquely to the caller, containing everything. */
+/* Structure returned opaquely to the caller, containing everything.  */
 struct kwset
 {
-  struct obstack obstack;	/* Obstack for node allocation. */
-  ptrdiff_t words;		/* Number of words in the trie. */
-  struct trie *trie;		/* The trie itself. */
-  ptrdiff_t mind;		/* Minimum depth of an accepting node. */
-  ptrdiff_t maxd;		/* Maximum depth of any node. */
-  unsigned char delta[NCHAR];	/* Delta table for rapid search. */
-  struct trie *next[NCHAR];	/* Table of children of the root. */
-  char *target;			/* Target string if there's only one. */
-  ptrdiff_t *shift;		/* Used in Boyer-Moore search for one string. */
-  char const *trans;		/* Character translation table. */
+  struct obstack obstack;	/* Obstack for node allocation.  */
+  ptrdiff_t words;		/* Number of words in the trie.  */
+  struct trie *trie;		/* The trie itself.  */
+  ptrdiff_t mind;		/* Minimum depth of an accepting node.  */
+  ptrdiff_t maxd;		/* Maximum depth of any node.  */
+  unsigned char delta[NCHAR];	/* Delta table for rapid search.  */
+  struct trie *next[NCHAR];	/* Table of children of the root.  */
+  char *target;			/* Target string if there's only one.  */
+  ptrdiff_t *shift;		/* Used in Boyer-Moore search for one string.  */
+  char const *trans;		/* Character translation table.  */
 
   /* If there's only one string, this is the string's last byte,
      translated via TRANS if TRANS is nonnull.  */
@@ -107,8 +122,8 @@ struct kwset
      all match when case-folding.  */
   int gc1help;
 
-  /* If true, prefer Aho-Corasick algorithm to Beate Commentz-Walter
-     algorithm in multiple words.  */
+  /* If true, prefer Aho-Corasick to Commentz-Walter when searching
+     for multiple words.  */
   bool reverse;
 
   /* kwsexec implementation.  */
@@ -126,8 +141,10 @@ static size_t acexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
 static size_t cwexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
 static size_t bmexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
 
-/* Allocate and initialize a keyword set object, returning an opaque
-   pointer to it.  */
+/* Return a newly allocated keyword set.  A nonnull TRANS specifies a
+   table of character translations to be applied to all pattern and
+   search text.  If REVERSE, prefer the Aho-Corasick algorithm to the
+   Commentz-Walter algorithm.  */
 kwset_t
 kwsalloc (char const *trans, bool reverse)
 {
@@ -154,7 +171,7 @@ kwsalloc (char const *trans, bool reverse)
 }
 
 /* This upper bound is valid for CHAR_BIT >= 4 and
-   exact for CHAR_BIT in { 4..11, 13, 15, 17, 19 }. */
+   exact for CHAR_BIT in { 4..11, 13, 15, 17, 19 }.  */
 enum { DEPTH_SIZE = CHAR_BIT + CHAR_BIT / 2 };
 
 /* Add the given string to the contents of the keyword set.  */
@@ -168,7 +185,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
     text += len;
 
   /* Descend the trie (built of keywords) character-by-character,
-     installing new nodes when necessary. */
+     installing new nodes when necessary.  */
   while (len--)
     {
       unsigned char uc = kwset->reverse ? *--text : *text++;
@@ -176,7 +193,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
 
       /* Descend the tree of outgoing links for this trie node,
          looking for the current character and keeping track
-         of the path followed. */
+         of the path followed.  */
       struct tree *cur = trie->links;
       struct tree *links[DEPTH_SIZE];
       enum { L, R } dirs[DEPTH_SIZE];
@@ -195,7 +212,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
 
       /* The current character doesn't have an outgoing link at
          this trie node, so build a new trie node and install
-         a link in the current trie node's tree. */
+         a link in the current trie node's tree.  */
       if (!cur)
         {
           cur = obstack_alloc (&kwset->obstack, sizeof *cur);
@@ -212,13 +229,13 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
           cur->label = label;
           cur->balance = 0;
 
-          /* Install the new tree node in its parent. */
+          /* Install the new tree node in its parent.  */
           if (dirs[--depth] == L)
             links[depth]->llink = cur;
           else
             links[depth]->rlink = cur;
 
-          /* Back up the tree fixing the balance flags. */
+          /* Back up the tree fixing the balance flags.  */
           while (depth && !links[depth]->balance)
             {
               if (dirs[depth] == L)
@@ -228,7 +245,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
               --depth;
             }
 
-          /* Rebalance the tree by pointer rotations if necessary. */
+          /* Rebalance the tree by pointer rotations if necessary.  */
           if (depth && ((dirs[depth] == L && --links[depth]->balance)
                         || (dirs[depth] == R && ++links[depth]->balance)))
             {
@@ -290,13 +307,13 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
       trie = cur->trie;
     }
 
-  /* Mark the node we finally reached as accepting, encoding the
-     index number of this word in the keyword set so far. */
+  /* Mark the node finally reached as accepting, encoding the
+     index number of this word in the keyword set so far.  */
   if (!trie->accepting)
     trie->accepting = 1 + 2 * kwset->words;
   ++kwset->words;
 
-  /* Keep track of the longest and shortest string of the keyword set. */
+  /* Keep track of the longest and shortest string of the keyword set.  */
   if (trie->depth < kwset->mind)
     kwset->mind = trie->depth;
   if (trie->depth > kwset->maxd)
@@ -304,7 +321,7 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
 }
 
 /* Enqueue the trie nodes referenced from the given tree in the
-   given queue. */
+   given queue.  */
 static void
 enqueue (struct tree *tree, struct trie **last)
 {
@@ -317,7 +334,7 @@ enqueue (struct tree *tree, struct trie **last)
 
 /* Compute the Aho-Corasick failure function for the trie nodes referenced
    from the given tree, given the failure function for their parent as
-   well as a last resort failure node. */
+   well as a last resort failure node.  */
 static void
 treefails (struct tree const *tree, struct trie const *fail,
            struct trie *recourse, bool reverse)
@@ -331,7 +348,7 @@ treefails (struct tree const *tree, struct trie const *fail,
   treefails (tree->rlink, fail, recourse, reverse);
 
   /* Find, in the chain of fails going back to the root, the first
-     node that has a descendant on the current label. */
+     node that has a descendant on the current label.  */
   while (fail)
     {
       cur = fail->links;
@@ -354,7 +371,7 @@ treefails (struct tree const *tree, struct trie const *fail,
 }
 
 /* Set delta entries for the links of the given tree such that
-   the preexisting delta value is larger than the current depth. */
+   the preexisting delta value is larger than the current depth.  */
 static void
 treedelta (struct tree const *tree, ptrdiff_t depth, unsigned char delta[])
 {
@@ -366,7 +383,7 @@ treedelta (struct tree const *tree, ptrdiff_t depth, unsigned char delta[])
     delta[tree->label] = depth;
 }
 
-/* Return true if A has every label in B. */
+/* Return true if A has every label in B.  */
 static bool _GL_ATTRIBUTE_PURE
 hasevery (struct tree const *a, struct tree const *b)
 {
@@ -385,7 +402,7 @@ hasevery (struct tree const *a, struct tree const *b)
 }
 
 /* Compute a vector, indexed by character code, of the trie nodes
-   referenced from the given tree. */
+   referenced from the given tree.  */
 static void
 treenext (struct tree const *tree, struct trie *next[])
 {
@@ -396,8 +413,7 @@ treenext (struct tree const *tree, struct trie *next[])
   next[tree->label] = tree->trie;
 }
 
-/* Compute the shift for each trie node, as well as the delta
-   table and next cache for the given keyword set. */
+/* Prepare a built keyword set for use.  */
 void
 kwsprep (kwset_t kwset)
 {
@@ -436,7 +452,7 @@ kwsprep (kwset_t kwset)
 
   /* 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. */
+     node at which an outgoing edge is labeled by that character.  */
   memset (delta, MIN (kwset->mind, UCHAR_MAX), sizeof deltabuf);
 
   /* Traverse the nodes of the trie in level order, simultaneously
@@ -501,11 +517,11 @@ kwsprep (kwset_t kwset)
     for (i = 0; i < NCHAR; ++i)
       kwset->next[i] = next[U(trans[i])];
 
-  /* Check if we can use the simple boyer-moore algorithm, instead
-     of the hairy commentz-walter algorithm. */
+  /* Decide whether to use the simple Boyer-Moore algorithm, instead
+     of the hairy Commentz-Walter algorithm.  */
   if (kwset->words == 1)
     {
-      /* Looking for just one string.  Extract it from the trie. */
+      /* 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)
         {
@@ -513,7 +529,7 @@ kwsprep (kwset_t kwset)
           curr = curr->next;
         }
 
-      /* Looking for the delta2 shift that we might make after a
+      /* Looking for the delta2 shift that might be made after a
          backwards match has failed.  Extract it from the trie.  */
       if (kwset->mind > 1)
         {
@@ -549,7 +565,7 @@ kwsprep (kwset_t kwset)
         kwset->gc2 = tr (trans, kwset->target[kwset->mind - 2]);
     }
 
-  /* Fix things up for any translation table. */
+  /* Fix things up for any translation table.  */
   if (trans)
     for (i = 0; i < NCHAR; ++i)
       kwset->delta[i] = delta[U(trans[i])];
@@ -682,10 +698,10 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
   char gc1 = kwset->gc1;
   char gc2 = kwset->gc2;
 
-  /* Significance of 12: 1 (initial offset) + 10 (skip loop) + 1 (md2). */
+  /* Significance of 12: 1 (initial offset) + 10 (skip loop) + 1 (md2).  */
   ptrdiff_t len12;
   if (!INT_MULTIPLY_WRAPV (len, 12, &len12) && len12 < size)
-    /* 11 is not a bug, the initial offset happens only once. */
+    /* 11 is not a bug, the initial offset happens only once.  */
     for (ep = text + size - 11 * len; tp <= ep; )
       {
         char const *tp0 = tp;
@@ -725,8 +741,8 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
           return tp - text;
       }
 
-  /* Now we have only a few characters left to search.  We
-     carefully avoid ever producing an out-of-bounds pointer. */
+  /* Now only a few characters are left to search.  Carefully avoid
+     ever producing an out-of-bounds pointer.  */
   ep = text + size;
   d = d1[U(tp[-1])];
   while (d <= ep - tp)
@@ -746,8 +762,8 @@ static size_t
 bmexec (kwset_t kwset, char const *text, size_t size,
         struct kwsmatch *kwsmatch, bool longest)
 {
-  /* Help the compiler inline bmexec_trans in two ways, depending on
-     whether kwset->trans is null.  */
+  /* Help the compiler inline in two ways, depending on whether
+     kwset->trans is null.  */
   size_t ret = (kwset->trans
                 ? bmexec_trans (kwset, text, size)
                 : bmexec_trans (kwset, text, size));
@@ -762,7 +778,7 @@ bmexec (kwset_t kwset, char const *text, size_t size,
   return ret;
 }
 
-/* Hairy multiple string search with Commentz-Walter algorithm.  */
+/* Hairy multiple string search with the Commentz-Walter algorithm.  */
 static size_t
 cwexec (kwset_t kwset, char const *text, size_t len,
         struct kwsmatch *kwsmatch, bool longest)
@@ -857,7 +873,7 @@ cwexec (kwset_t kwset, char const *text, size_t len,
  match:
   /* Given a known match, find the longest possible match anchored
      at or before its starting point.  This is nearly a verbatim
-     copy of the preceding main search loops. */
+     copy of the preceding main search loops.  */
   if (longest)
     {
       if (lim - mch > kwset->maxd)
@@ -920,7 +936,7 @@ cwexec (kwset_t kwset, char const *text, size_t len,
   return mch - text;
 }
 
-/* Hairy multiple string search with Aho-Corasick algorithm.
+/* Hairy multiple string search with the Aho-Corasick algorithm.
    (inlinable version)  */
 static inline size_t
 acexec_trans (kwset_t kwset, char const *text, size_t len,
@@ -1034,18 +1050,19 @@ static size_t
 acexec (kwset_t kwset, char const *text, size_t size,
         struct kwsmatch *kwsmatch, bool longest)
 {
-  /* Help the compiler inline bmexec_trans in two ways, depending on
-     whether kwset->trans is null.  */
+  /* Help the compiler inline in two ways, depending on whether
+     kwset->trans is null.  */
   return (kwset->trans
           ? acexec_trans (kwset, text, size, kwsmatch, longest)
           : acexec_trans (kwset, text, size, kwsmatch, longest));
 }
 
-/* Search TEXT for a match of any member of KWSET.
+/* Find the first instance of a KWSET member in TEXT, which has SIZE bytes.
    Return the offset (into TEXT) of the first byte of the matching substring,
    or SIZE_MAX if no match is found.  Upon a match, store details in
    *KWSMATCH: index of matched keyword, start offset (same as the return
-   value), and length.  */
+   value), and length.  If LONGEST, find the longest match; otherwise
+   any match will do.  */
 size_t
 kwsexec (kwset_t kwset, char const *text, size_t size,
          struct kwsmatch *kwsmatch, bool longest)
@@ -1053,7 +1070,7 @@ kwsexec (kwset_t kwset, char const *text, size_t size,
   return kwset->kwsexec (kwset, text, size, kwsmatch, longest);
 }
 
-/* Free the components of the given keyword set. */
+/* Free the components of the given keyword set.  */
 void
 kwsfree (kwset_t kwset)
 {
diff --git a/src/kwset.h b/src/kwset.h
index b03b71a..e9fa3dc 100644
--- a/src/kwset.h
+++ b/src/kwset.h
@@ -17,18 +17,16 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    02110-1301, USA.  */
 
-/* Written August 1989 by Mike Haertel.
-   The author may be reached (Email) at the address mike@ai.mit.edu,
-   or (US mail) as Mike Haertel c/o Free Software Foundation. */
+/* Written August 1989 by Mike Haertel.  */
 
 #include <stddef.h>
 #include <stdbool.h>
 
 struct kwsmatch
 {
-  size_t index;			/* Index number of matching keyword. */
-  size_t offset[1];		/* Offset of each submatch. */
-  size_t size[1];		/* Length of each submatch. */
+  size_t index;			/* Index number of matching keyword.  */
+  size_t offset[1];		/* Offset of match.  */
+  size_t size[1];		/* Length of match.  */
 };
 
 #include "arg-nonnull.h"
@@ -36,26 +34,9 @@ struct kwsmatch
 struct kwset;
 typedef struct kwset *kwset_t;
 
-/* Return an opaque pointer to a newly allocated keyword set.  A nonnull arg
-   specifies a table of character translations to be applied to all
-   pattern and search text.  */
 extern kwset_t kwsalloc (char const *, bool);
-
-/* Incrementally extend the keyword set to include the given string.
-   Remember an index number for each keyword included in the set.  */
 extern void kwsincr (kwset_t, char const *, size_t);
-
-/* When the keyword set has been completely built, prepare it for use.  */
 extern void kwsprep (kwset_t);
-
-/* Search through the given buffer for a member of the keyword set.
-   Return a pointer to the leftmost longest match found, or NULL if
-   no match is found.  If foundlen is non-NULL, store the length of
-   the matching substring in the integer it points to.  Similarly,
-   if foundindex is non-NULL, store the index of the particular
-   keyword found therein. */
 extern size_t kwsexec (kwset_t, char const *, size_t, struct kwsmatch *, bool)
   _GL_ARG_NONNULL ((4));
-
-/* Deallocate the given keyword set and all its associated storage. */
 extern void kwsfree (kwset_t);
diff --git a/src/searchutils.c b/src/searchutils.c
index 51a3097..e0a94e2 100644
--- a/src/searchutils.c
+++ b/src/searchutils.c
@@ -133,7 +133,7 @@ mb_goback (char const **mb_start, char const *cur, char const *end)
   return p == cur ? 0 : cur - p0;
 }
 
-/* Examine the start of BUF (of size SIZE) for word constituents.
+/* Examine the start of BUF (which goes to END) for word constituents.
    If COUNTALL, examine as many as possible; otherwise, examine at most one.
    Return the total number of bytes in the examined characters.  */
 static size_t

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

Summary of changes:
 src/kwset.c       |  167 +++++++++++++++++++++++++++++------------------------
 src/kwset.h       |   27 ++-------
 src/searchutils.c |    2 +-
 3 files changed, 97 insertions(+), 99 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sun Jan 15 22:46:07 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cSyFC-0007Ql-Tk
	for mharc-grep-commit@gnu.org; Sun, 15 Jan 2017 22:46:06 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55019)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cSyF9-0007Qc-0V
	for grep-commit@gnu.org; Sun, 15 Jan 2017 22:46:05 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cSyF6-0007ID-Ov
	for grep-commit@gnu.org; Sun, 15 Jan 2017 22:46:03 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:49186)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cSyF6-0007I7-Kz
	for grep-commit@gnu.org; Sun, 15 Jan 2017 22:46:00 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 5B1E5220134; Mon, 16 Jan 2017 03:46:00 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-38-ga037bbf
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3438c3a65c655baed1bb764e41d7ddcced5f1e7c
X-Git-Newrev: a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6
Message-Id: <20170116034600.5B1E5220134@vcs.savannah.gnu.org>
Date: Mon, 16 Jan 2017 03:46:00 +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, 16 Jan 2017 03:46:05 -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  a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6 (commit)
      from  3438c3a65c655baed1bb764e41d7ddcced5f1e7c (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=a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6


commit a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sun Jan 15 19:39:38 2017 -0800

    dfa: prefer ptrdiff_t to size_t
    
    The code already cannot handle objects with size greater than
    SIZE_MAX / 2, so be more honest about it and use ptrdiff_t instead
    of size_t.  ptrdiff_t arithmetic is signed, which allows for more
    checking via -fsanitize=undefined.  It also makes the code a tad
    smaller on x86-64, since it can test for < 0 rather than for ==
    SIZE_MAX.
    * src/dfasearch.c (struct dfa_comp.kwset_exact_matches):
    (kwsmusts, EGexecute):
    * src/kwsearch.c (Fcompile, Fexecute):
    * src/kwset.c (struct kwset.kwsexec, kwsincr, memchr_kwset)
    (memoff2_kwset, bmexec_trans, bmexec, cwexec, acexec_trans)
    (acexec, kwsexec):
    * src/kwset.h (struct kwsmatch.index, .offset, .size):
    Prefer ptrdiff_t to size_t where either will do.

diff --git a/src/dfasearch.c b/src/dfasearch.c
index 44bfaa3..9b32d48 100644
--- a/src/dfasearch.c
+++ b/src/dfasearch.c
@@ -42,7 +42,7 @@ struct dfa_comp
   /* Number of compiled fixed strings known to exactly match the regexp.
      If kwsexec returns < kwset_exact_matches, then we don't need to
      call the regexp matcher at all. */
-  size_t kwset_exact_matches;
+  ptrdiff_t kwset_exact_matches;
 
   bool begline;
 };
@@ -80,8 +80,8 @@ kwsmusts (struct dfa_comp *dc)
          The kwset matcher will return the index of the matching
          string that it chooses. */
       ++dc->kwset_exact_matches;
-      size_t old_len = strlen (dm->must);
-      size_t new_len = old_len + dm->begline + dm->endline;
+      ptrdiff_t old_len = strlen (dm->must);
+      ptrdiff_t new_len = old_len + dm->begline + dm->endline;
       char *must = xmalloc (new_len);
       char *mp = must;
       *mp = eolbyte;
@@ -244,9 +244,10 @@ EGexecute (void *vdc, char const *buf, size_t size, size_t *match_size,
               char const *prev_beg;
 
               /* Find a possible match using the KWset matcher.  */
-              size_t offset = kwsexec (dc->kwset, beg - dc->begline,
-                                       buflim - beg + dc->begline, &kwsm, true);
-              if (offset == (size_t) -1)
+              ptrdiff_t offset = kwsexec (dc->kwset, beg - dc->begline,
+                                          buflim - beg + dc->begline,
+                                          &kwsm, true);
+              if (offset < 0)
                 goto failure;
               match = beg + offset;
               prev_beg = beg;
diff --git a/src/kwsearch.c b/src/kwsearch.c
index e07eb63..5e9df16 100644
--- a/src/kwsearch.c
+++ b/src/kwsearch.c
@@ -25,7 +25,7 @@ void *
 Fcompile (char const *pattern, size_t size, reg_syntax_t ignored)
 {
   kwset_t kwset;
-  size_t total = size;
+  ptrdiff_t total = size;
   char *buf = NULL;
   size_t bufalloc = 0;
 
@@ -34,7 +34,7 @@ Fcompile (char const *pattern, size_t size, reg_syntax_t ignored)
   char const *p = pattern;
   do
     {
-      size_t len;
+      ptrdiff_t len;
       char const *sep = memchr (p, '\n', total);
       if (sep)
         {
@@ -84,7 +84,7 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size,
           char const *start_ptr)
 {
   char const *beg, *end, *mb_start;
-  size_t len;
+  ptrdiff_t len;
   char eol = eolbyte;
   struct kwsmatch kwsmatch;
   size_t ret_val;
@@ -102,10 +102,10 @@ Fexecute (void *vcp, char const *buf, size_t size, size_t *match_size,
 
   for (mb_start = beg = start_ptr ? start_ptr : buf; beg <= buf + size; beg++)
     {
-      size_t offset = kwsexec (kwset, beg - match_lines,
-                               buf + size - beg + match_lines, &kwsmatch,
-                               longest);
-      if (offset == (size_t) -1)
+      ptrdiff_t offset = kwsexec (kwset, beg - match_lines,
+                                  buf + size - beg + match_lines, &kwsmatch,
+                                  longest);
+      if (offset < 0)
         break;
       len = kwsmatch.size[0] - 2 * match_lines;
       if (mb_check && mb_goback (&mb_start, beg + offset, buf + size) != 0)
diff --git a/src/kwset.c b/src/kwset.c
index 0c22041..0b6fab4 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -127,7 +127,8 @@ struct kwset
   bool reverse;
 
   /* kwsexec implementation.  */
-  size_t (*kwsexec) (kwset_t, char const *, size_t, struct kwsmatch *, bool);
+  ptrdiff_t (*kwsexec) (kwset_t, char const *, ptrdiff_t,
+                        struct kwsmatch *, bool);
 };
 
 /* Use TRANS to transliterate C.  A null TRANS does no transliteration.  */
@@ -137,9 +138,12 @@ tr (char const *trans, char c)
   return trans ? trans[U(c)] : c;
 }
 
-static size_t acexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
-static size_t cwexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
-static size_t bmexec (kwset_t, char const *, size_t, struct kwsmatch *, bool);
+static ptrdiff_t acexec (kwset_t, char const *, ptrdiff_t,
+                         struct kwsmatch *, bool);
+static ptrdiff_t cwexec (kwset_t, char const *, ptrdiff_t,
+                         struct kwsmatch *, bool);
+static ptrdiff_t bmexec (kwset_t, char const *, ptrdiff_t,
+                         struct kwsmatch *, bool);
 
 /* Return a newly allocated keyword set.  A nonnull TRANS specifies a
    table of character translations to be applied to all pattern and
@@ -176,8 +180,9 @@ enum { DEPTH_SIZE = CHAR_BIT + CHAR_BIT / 2 };
 
 /* Add the given string to the contents of the keyword set.  */
 void
-kwsincr (kwset_t kwset, char const *text, size_t len)
+kwsincr (kwset_t kwset, char const *text, ptrdiff_t len)
 {
+  assume (0 <= len);
   struct trie *trie = kwset->trie;
   char const *trans = kwset->trans;
 
@@ -310,7 +315,10 @@ kwsincr (kwset_t kwset, char const *text, size_t len)
   /* Mark the node finally reached as accepting, encoding the
      index number of this word in the keyword set so far.  */
   if (!trie->accepting)
-    trie->accepting = 1 + 2 * kwset->words;
+    {
+      size_t words = kwset->words;
+      trie->accepting = 2 * words + 1;
+    }
   ++kwset->words;
 
   /* Keep track of the longest and shortest string of the keyword set.  */
@@ -629,14 +637,14 @@ bm_delta2_search (char const **tpp, char const *ep, char const *sp,
    that matches the last byte specified by KWSET, a singleton.
    Return NULL if there is no match.  */
 static char const *
-memchr_kwset (char const *s, size_t n, kwset_t kwset)
+memchr_kwset (char const *s, ptrdiff_t n, kwset_t kwset)
 {
   if (kwset->gc1help < 0)
     return memchr (s, kwset->gc1, n);
   int small_heuristic = 2;
   int small = (- (uintptr_t) s % sizeof (long)
                + small_heuristic * sizeof (long));
-  size_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
+  ptrdiff_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
   char const *slim = s + ntrans;
   for (; s < slim; s++)
     if (kwset->trans[U(*s)] == kwset->gc1)
@@ -647,9 +655,9 @@ memchr_kwset (char const *s, size_t n, kwset_t kwset)
 
 /* Return the offset of the first byte in the buffer S (of size N)
    that matches the last byte specified by KWSET, a pair.
-   Return SIZE_MAX if there is no match.  */
-static size_t
-memoff2_kwset (char const *s, size_t n, kwset_t kwset,
+   Return -1 if there is no match.  */
+static ptrdiff_t
+memoff2_kwset (char const *s, ptrdiff_t n, kwset_t kwset,
                struct kwsmatch *kwsmatch)
 {
   struct tree const *cur = kwset->trie->links;
@@ -658,10 +666,10 @@ memoff2_kwset (char const *s, size_t n, kwset_t kwset,
                      ? memchr2 (s, cur->label, clink->label, n)
                      : memchr (s, cur->label, n));
   if (! mch)
-    return SIZE_MAX;
+    return -1;
   else
     {
-      size_t off = mch - s;
+      ptrdiff_t off = mch - s;
       if (*mch == cur->label)
         kwsmatch->index = cur->trie->accepting / 2;
       else
@@ -673,9 +681,10 @@ memoff2_kwset (char const *s, size_t n, kwset_t kwset,
 }
 
 /* Fast Boyer-Moore search (inlinable version).  */
-static inline size_t
-bmexec_trans (kwset_t kwset, char const *text, size_t size)
+static inline ptrdiff_t
+bmexec_trans (kwset_t kwset, char const *text, ptrdiff_t size)
 {
+  assume (0 <= size);
   unsigned char const *d1;
   char const *ep, *sp, *tp;
   int d;
@@ -685,11 +694,11 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
   if (len == 0)
     return 0;
   if (len > size)
-    return SIZE_MAX;
+    return -1;
   if (len == 1)
     {
       tp = memchr_kwset (text, size, kwset);
-      return tp ? tp - text : SIZE_MAX;
+      return tp ? tp - text : -1;
     }
 
   d1 = kwset->delta;
@@ -730,7 +739,7 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
                     tp--;
                     tp = memchr_kwset (tp, text + size - tp, kwset);
                     if (! tp)
-                      return SIZE_MAX;
+                      return -1;
                     tp++;
                     if (ep <= tp)
                       break;
@@ -754,21 +763,21 @@ bmexec_trans (kwset_t kwset, char const *text, size_t size)
         return tp - text;
     }
 
-  return SIZE_MAX;
+  return -1;
 }
 
 /* Fast Boyer-Moore search.  */
-static size_t
-bmexec (kwset_t kwset, char const *text, size_t size,
+static ptrdiff_t
+bmexec (kwset_t kwset, char const *text, ptrdiff_t size,
         struct kwsmatch *kwsmatch, bool longest)
 {
   /* Help the compiler inline in two ways, depending on whether
      kwset->trans is null.  */
-  size_t ret = (kwset->trans
-                ? bmexec_trans (kwset, text, size)
-                : bmexec_trans (kwset, text, size));
+  ptrdiff_t ret = (kwset->trans
+                   ? bmexec_trans (kwset, text, size)
+                   : bmexec_trans (kwset, text, size));
 
-  if (ret != SIZE_MAX)
+  if (0 <= ret)
     {
        kwsmatch->index = 0;
        kwsmatch->offset[0] = ret;
@@ -779,10 +788,11 @@ bmexec (kwset_t kwset, char const *text, size_t size,
 }
 
 /* Hairy multiple string search with the Commentz-Walter algorithm.  */
-static size_t
-cwexec (kwset_t kwset, char const *text, size_t len,
+static ptrdiff_t
+cwexec (kwset_t kwset, char const *text, ptrdiff_t len,
         struct kwsmatch *kwsmatch, bool longest)
 {
+  assume (0 <= len);
   struct trie * const *next;
   struct trie const *trie;
   struct trie const *accept;
@@ -796,7 +806,7 @@ cwexec (kwset_t kwset, char const *text, size_t len,
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
-    return SIZE_MAX;
+    return -1;
   if (!kwset->trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
   next = kwset->next;
@@ -868,7 +878,7 @@ cwexec (kwset_t kwset, char const *text, size_t len,
       if (mch)
         goto match;
     }
-  return SIZE_MAX;
+  return -1;
 
  match:
   /* Given a known match, find the longest possible match anchored
@@ -938,8 +948,8 @@ cwexec (kwset_t kwset, char const *text, size_t len,
 
 /* Hairy multiple string search with the Aho-Corasick algorithm.
    (inlinable version)  */
-static inline size_t
-acexec_trans (kwset_t kwset, char const *text, size_t len,
+static inline ptrdiff_t
+acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
               struct kwsmatch *kwsmatch, bool longest)
 {
   struct trie * const *next;
@@ -950,7 +960,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
 
   /* Initialize register copies and look for easy ways out.  */
   if (len < kwset->mind)
-    return SIZE_MAX;
+    return -1;
   trans = kwset->trans;
   if (!trans && kwset->maxd == 1 && kwset->words == 2)
     return memoff2_kwset (text, len, kwset, kwsmatch);
@@ -969,7 +979,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
           while (! (trie = next[c]))
             {
               if (tp >= lim)
-                return SIZE_MAX;
+                return -1;
               c = tr (trans, *tp++);
             }
 
@@ -978,7 +988,7 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
               if (trie->accepting)
                 goto match;
               if (tp >= lim)
-                return SIZE_MAX;
+                return -1;
               c = tr (trans, *tp++);
 
               for (tree = trie->links; c != tree->label; )
@@ -1046,10 +1056,11 @@ acexec_trans (kwset_t kwset, char const *text, size_t len,
 }
 
 /* Hairy multiple string search with Aho-Corasick algorithm.  */
-static size_t
-acexec (kwset_t kwset, char const *text, size_t size,
+static ptrdiff_t
+acexec (kwset_t kwset, char const *text, ptrdiff_t size,
         struct kwsmatch *kwsmatch, bool longest)
 {
+  assume (0 <= size);
   /* Help the compiler inline in two ways, depending on whether
      kwset->trans is null.  */
   return (kwset->trans
@@ -1059,12 +1070,12 @@ acexec (kwset_t kwset, char const *text, size_t size,
 
 /* Find the first instance of a KWSET member in TEXT, which has SIZE bytes.
    Return the offset (into TEXT) of the first byte of the matching substring,
-   or SIZE_MAX if no match is found.  Upon a match, store details in
+   or -1 if no match is found.  Upon a match, store details in
    *KWSMATCH: index of matched keyword, start offset (same as the return
    value), and length.  If LONGEST, find the longest match; otherwise
    any match will do.  */
-size_t
-kwsexec (kwset_t kwset, char const *text, size_t size,
+ptrdiff_t
+kwsexec (kwset_t kwset, char const *text, ptrdiff_t size,
          struct kwsmatch *kwsmatch, bool longest)
 {
   return kwset->kwsexec (kwset, text, size, kwsmatch, longest);
diff --git a/src/kwset.h b/src/kwset.h
index e9fa3dc..ef78db3 100644
--- a/src/kwset.h
+++ b/src/kwset.h
@@ -24,9 +24,9 @@
 
 struct kwsmatch
 {
-  size_t index;			/* Index number of matching keyword.  */
-  size_t offset[1];		/* Offset of match.  */
-  size_t size[1];		/* Length of match.  */
+  ptrdiff_t index;			/* Index number of matching keyword.  */
+  ptrdiff_t offset[1];		/* Offset of match.  */
+  ptrdiff_t size[1];		/* Length of match.  */
 };
 
 #include "arg-nonnull.h"
@@ -35,8 +35,9 @@ struct kwset;
 typedef struct kwset *kwset_t;
 
 extern kwset_t kwsalloc (char const *, bool);
-extern void kwsincr (kwset_t, char const *, size_t);
+extern void kwsincr (kwset_t, char const *, ptrdiff_t);
 extern void kwsprep (kwset_t);
-extern size_t kwsexec (kwset_t, char const *, size_t, struct kwsmatch *, bool)
+extern ptrdiff_t kwsexec (kwset_t, char const *, ptrdiff_t,
+                          struct kwsmatch *, bool)
   _GL_ARG_NONNULL ((4));
 extern void kwsfree (kwset_t);

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

Summary of changes:
 src/dfasearch.c |   13 ++++----
 src/kwsearch.c  |   14 ++++-----
 src/kwset.c     |   89 +++++++++++++++++++++++++++++++------------------------
 src/kwset.h     |   11 +++----
 4 files changed, 70 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Tue Jan 17 11:02:13 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cTWD7-0006iD-Qz
	for mharc-grep-commit@gnu.org; Tue, 17 Jan 2017 11:02:13 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45737)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cTWD5-0006gX-2f
	for grep-commit@gnu.org; Tue, 17 Jan 2017 11:02:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cTWD3-00027X-S6
	for grep-commit@gnu.org; Tue, 17 Jan 2017 11:02:11 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:55559)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cTWD3-00027T-NX
	for grep-commit@gnu.org; Tue, 17 Jan 2017 11:02:09 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 73B802201B9; Tue, 17 Jan 2017 16:02:09 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-42-gf20a648
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6
X-Git-Newrev: f20a648c6c24a4015cf801f5b11a78b2182ed171
Message-Id: <20170117160209.73B802201B9@vcs.savannah.gnu.org>
Date: Tue, 17 Jan 2017 16:02:09 +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: Tue, 17 Jan 2017 16:02: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  f20a648c6c24a4015cf801f5b11a78b2182ed171 (commit)
       via  cb63bc5d574a36bcfb593008f684d67c899e414f (commit)
       via  aa1f107a143900d2d9a9d8c3aa541671140315ba (commit)
       via  e0cb70cc85aac558106d0c66adff239c97aba563 (commit)
      from  a037bbf74a6a0cae9450ae7fa9a2f5630180a3d6 (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=f20a648c6c24a4015cf801f5b11a78b2182ed171


commit f20a648c6c24a4015cf801f5b11a78b2182ed171
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 17 08:00:11 2017 -0800

    * NEWS: Fix typo.

diff --git a/NEWS b/NEWS
index 7530584..3529f4e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,6 @@ GNU grep NEWS                                    -*- outline -*-
   standard input is a pipe and standard output is in append mode.
   [bugs introduced in grep-2.27]
 
-** Bug fixes
-
   Fix performance regression with multiple patterns, e.g., for -Fi in
   a multi-byte locale, or for -Fw in a single-byte locale.
   [bugs introduced in grep-2.19, grep-2.22 and grep-2.26]

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


commit f20a648c6c24a4015cf801f5b11a78b2182ed171
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 17 08:00:11 2017 -0800

    * NEWS: Fix typo.

diff --git a/NEWS b/NEWS
index 7530584..3529f4e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,6 @@ GNU grep NEWS                                    -*- outline -*-
   standard input is a pipe and standard output is in append mode.
   [bugs introduced in grep-2.27]
 
-** Bug fixes
-
   Fix performance regression with multiple patterns, e.g., for -Fi in
   a multi-byte locale, or for -Fw in a single-byte locale.
   [bugs introduced in grep-2.19, grep-2.22 and grep-2.26]

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


commit f20a648c6c24a4015cf801f5b11a78b2182ed171
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 17 08:00:11 2017 -0800

    * NEWS: Fix typo.

diff --git a/NEWS b/NEWS
index 7530584..3529f4e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,6 @@ GNU grep NEWS                                    -*- outline -*-
   standard input is a pipe and standard output is in append mode.
   [bugs introduced in grep-2.27]
 
-** Bug fixes
-
   Fix performance regression with multiple patterns, e.g., for -Fi in
   a multi-byte locale, or for -Fw in a single-byte locale.
   [bugs introduced in grep-2.19, grep-2.22 and grep-2.26]

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


commit f20a648c6c24a4015cf801f5b11a78b2182ed171
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jan 17 08:00:11 2017 -0800

    * NEWS: Fix typo.

diff --git a/NEWS b/NEWS
index 7530584..3529f4e 100644
--- a/NEWS
+++ b/NEWS
@@ -9,8 +9,6 @@ GNU grep NEWS                                    -*- outline -*-
   standard input is a pipe and standard output is in append mode.
   [bugs introduced in grep-2.27]
 
-** Bug fixes
-
   Fix performance regression with multiple patterns, e.g., for -Fi in
   a multi-byte locale, or for -Fw in a single-byte locale.
   [bugs introduced in grep-2.19, grep-2.22 and grep-2.26]

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

Summary of changes:
 NEWS             |    2 --
 gnulib           |    2 +-
 src/dfasearch.c  |    2 +-
 src/grep.c       |   93 ++++++++++++++++++++++++++++++------------------------
 src/kwsearch.c   |   92 +++++++++++++++++++++++++++++++++++++++++++++++++++--
 src/kwset.c      |    8 ++++-
 src/kwset.h      |    1 +
 src/pcresearch.c |    2 +-
 src/search.h     |    7 ++--
 9 files changed, 155 insertions(+), 54 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Tue Jan 17 12:10:54 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cTXHZ-0000mV-U7
	for mharc-grep-commit@gnu.org; Tue, 17 Jan 2017 12:10:53 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:35491)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cTXHW-0000mE-VI
	for grep-commit@gnu.org; Tue, 17 Jan 2017 12:10:52 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cTXHV-0007bE-Fg
	for grep-commit@gnu.org; Tue, 17 Jan 2017 12:10:50 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:55793)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cTXHV-0007b9-AI
	for grep-commit@gnu.org; Tue, 17 Jan 2017 12:10:49 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id 25B372201B9; Tue, 17 Jan 2017 17:10:49 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-43-g8486cc9
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f20a648c6c24a4015cf801f5b11a78b2182ed171
X-Git-Newrev: 8486cc9546c61eeb0decf65eca788e550254a93e
Message-Id: <20170117171049.25B372201B9@vcs.savannah.gnu.org>
Date: Tue, 17 Jan 2017 17:10:49 +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: Tue, 17 Jan 2017 17:10:52 -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  8486cc9546c61eeb0decf65eca788e550254a93e (commit)
      from  f20a648c6c24a4015cf801f5b11a78b2182ed171 (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=8486cc9546c61eeb0decf65eca788e550254a93e


commit 8486cc9546c61eeb0decf65eca788e550254a93e
Author: Jim Meyering <meyering@fb.com>
Date:   Tue Jan 17 09:07:15 2017 -0800

    maint: avoid new syntax-check failures
    
    * src/kwset.c (struct kwset): Split a line longer than 80.
    * bootstrap: Update from gnulib. This fixes a new syntax-check
    failure due to its use of "time stamp".

diff --git a/bootstrap b/bootstrap
index 715c7ad..932ff85 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2017-01-09.19; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -42,7 +42,7 @@ export LC_ALL
 
 local_gl_dir=gl
 
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
 PERL="${PERL-perl}"
 
 me=$0
@@ -418,28 +418,30 @@ sort_ver() { # sort -V is not generally available
   done
 }
 
-get_version() {
-  app=$1
+get_version_sed='
+# Move version to start of line.
+s/.*[v ]\([0-9]\)/\1/
 
-  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
+# Skip lines that do not start with version.
+/^[0-9]/!d
 
-  $app --version 2>&1 |
-  sed -n '# Move version to start of line.
-          s/.*[v ]\([0-9]\)/\1/
+# Remove characters after the version.
+s/[^.a-z0-9-].*//
 
-          # Skip lines that do not start with version.
-          /^[0-9]/!d
+# The first component must be digits only.
+s/^\([0-9]*\)[a-z-].*/\1/
 
-          # Remove characters after the version.
-          s/[^.a-z0-9-].*//
+#the following essentially does s/5.005/5.5/
+s/\.0*\([1-9]\)/.\1/g
+p
+q'
 
-          # The first component must be digits only.
-          s/^\([0-9]*\)[a-z-].*/\1/
+get_version() {
+  app=$1
+
+  $app --version >/dev/null 2>&1 || { $app --version; return 1; }
 
-          #the following essentially does s/5.005/5.5/
-          s/\.0*\([1-9]\)/.\1/g
-          p
-          q'
+  $app --version 2>&1 | sed -n "$get_version_sed"
 }
 
 check_versions() {
@@ -788,7 +790,7 @@ symlink_to_dir()
       # Leave any existing symlink alone, if it already points to the source,
       # so that broken build tools that care about symlink times
       # aren't confused into doing unnecessary builds.  Conversely, if the
-      # existing symlink's time stamp is older than the source, make it afresh,
+      # existing symlink's timestamp is older than the source, make it afresh,
       # so that broken tools aren't confused into skipping needed builds.  See
       # <http://lists.gnu.org/archive/html/bug-gnulib/2011-05/msg00326.html>.
       test -h "$dst" &&
@@ -1021,6 +1023,6 @@ echo "$0: done.  Now you can run './configure'."
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/src/kwset.c b/src/kwset.c
index bbb837c..0c0993d 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -101,7 +101,8 @@ struct kwset
   unsigned char delta[NCHAR];	/* Delta table for rapid search.  */
   struct trie *next[NCHAR];	/* Table of children of the root.  */
   char *target;			/* Target string if there's only one.  */
-  ptrdiff_t *shift;		/* Used in Boyer-Moore search for one string.  */
+  ptrdiff_t *shift;		/* Used in Boyer-Moore search for one
+                                   string.  */
   char const *trans;		/* Character translation table.  */
 
   /* If there's only one string, this is the string's last byte,

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

Summary of changes:
 bootstrap   |   42 ++++++++++++++++++++++--------------------
 src/kwset.c |    3 ++-
 2 files changed, 24 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Wed Jan 18 18:53:13 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cU02T-0001Sd-C8
	for mharc-grep-commit@gnu.org; Wed, 18 Jan 2017 18:53:13 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59876)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cU02P-0001SP-HN
	for grep-commit@gnu.org; Wed, 18 Jan 2017 18:53:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cU02N-0006f7-55
	for grep-commit@gnu.org; Wed, 18 Jan 2017 18:53:09 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:33957)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cU02M-0006ey-WE
	for grep-commit@gnu.org; Wed, 18 Jan 2017 18:53:07 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id B3406220125; Wed, 18 Jan 2017 23:53:06 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-45-gb408bce
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8486cc9546c61eeb0decf65eca788e550254a93e
X-Git-Newrev: b408bcee1e81a2c4cc187d520b1fd5ae0da68f13
Message-Id: <20170118235306.B3406220125@vcs.savannah.gnu.org>
Date: Wed, 18 Jan 2017 23:53:06 +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, 18 Jan 2017 23:53:11 -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  b408bcee1e81a2c4cc187d520b1fd5ae0da68f13 (commit)
       via  57d32889c95e04a0f0237ec09538b22aa39fe908 (commit)
      from  8486cc9546c61eeb0decf65eca788e550254a93e (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=b408bcee1e81a2c4cc187d520b1fd5ae0da68f13


commit b408bcee1e81a2c4cc187d520b1fd5ae0da68f13
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Jan 18 15:51:30 2017 -0800

    grep: speed up Aho-Corasick when at most 2 bytes
    
    When using Aho-Corasick and all matched strings either begin with
    the same byte, or begin with one of at most two bytes, use memchr2
    to search for these matching bytes and apply the Aho-Corasick
    algorithm only when a memchr2 match is found.  On my platform,
    this speeds up 'grep -F -e aa -e ba in' by a factor of 7, where
    the file 'in' was created by 'seq -f %040.0f 10000000 >in'.
    * src/kwset.c (struct kwset.gc1): Now int, not char.
    If negative, there is no single terminal byte.  All uses changed.
    (struct kwset.gc1help): Now int, not char.
    If negative, memchr2 cannot be used.
    (kwsprep): Set up gc1 and gc1help from kwset->next, with
    the new (slightly changed) interpretation.
    (memchr_kwset): Use memchr2 if possible.
    Adjust to match new meaning of gc1, gc1help.
    (memoff2_kwset): Remove; no longer needed.
    (acexec_trans): Use memchr_kwset when possible, for speed.
    It now supersedes memoff2_kwset.

diff --git a/src/kwset.c b/src/kwset.c
index ace720b..39a1e15 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -99,24 +99,26 @@ struct kwset
                                    string.  */
   char const *trans;		/* Character translation table.  */
 
-  /* If there's only one string, this is the string's last byte,
-     translated via TRANS if TRANS is nonnull.  */
-  char gc1;
+  /* This helps to match a terminal byte, which is the first byte
+     for Aho-Corasick, and the last byte for Boyer-More.  If all the
+     patterns have the same terminal byte (after translation via TRANS
+     if TRANS is nonnull), then this is that byte as an unsigned char.
+     Otherwise this is -1 if there is disagreement among the strings
+     about terminal bytes, and -2 if there are no terminal bytes and
+     no disagreement because all the patterns are empty.  */
+  int gc1;
+
+  /* This helps to match a terminal byte.  If 0 <= GC1HELP, B is
+     terminal when B == GC1 || B == GC1HELP (note that GC1 == GCHELP
+     is common here).  This is typically faster than evaluating
+     to_uchar (TRANS[B]) == GC1.  */
+  int gc1help;
 
-  /* Likewise for the string's penultimate byte, if it has two or more
-     bytes.  */
+  /* If the string has two or more bytes, this is the penultimate byte,
+     after translation via TRANS if TRANS is nonnull.  This variable
+     is used only by Boyer-Moore.  */
   char gc2;
 
-  /* If there's only one string, this helps to match the string's last byte.
-     If GC1HELP is negative, only GC1 matches the string's last byte;
-     otherwise at least two bytes match, and B matches if TRANS[B] == GC1.
-     If GC1HELP is in the range 0..(NCHAR - 1), there are exactly two
-     such matches, and GC1HELP is the other match after conversion to
-     unsigned char.  If GC1HELP is at least NCHAR, there are three or
-     more such matches; e.g., Greek has three sigma characters that
-     all match when case-folding.  */
-  int gc1help;
-
   /* kwsexec implementation.  */
   ptrdiff_t (*kwsexec) (kwset_t, char const *, ptrdiff_t,
                         struct kwsmatch *, bool);
@@ -510,14 +512,38 @@ kwsprep (kwset_t kwset)
     }
 
   /* Create a vector, indexed by character code, of the outgoing links
-     from the root node.  */
+     from the root node.  Accumulate GC1 and GC1HELP.  */
   struct trie *nextbuf[NCHAR];
   struct trie **next = trans ? nextbuf : kwset->next;
   memset (next, 0, sizeof nextbuf);
   treenext (kwset->trie->links, next);
-  if (trans)
-    for (i = 0; i < NCHAR; ++i)
-      kwset->next[i] = next[U(trans[i])];
+  int gc1 = -2;
+  int gc1help = -1;
+  for (i = 0; i < NCHAR; i++)
+    {
+      int ti = i;
+      if (trans)
+        {
+          ti = U(trans[i]);
+          kwset->next[i] = next[ti];
+        }
+      if (kwset->next[i])
+        {
+          if (gc1 < -1)
+            {
+              gc1 = ti;
+              gc1help = i;
+            }
+          else if (gc1 == ti)
+            gc1help = gc1help == ti ? i : -1;
+          else if (i == ti && gc1 == gc1help)
+            gc1help = i;
+          else
+            gc1 = -1;
+        }
+    }
+  kwset->gc1 = gc1;
+  kwset->gc1help = gc1help;
 
   if (reverse)
     {
@@ -529,10 +555,10 @@ kwsprep (kwset_t kwset)
           curr = curr->next;
         }
 
-      /* Looking for the delta2 shift that might be made after a
-         backwards match has failed.  Extract it from the trie.  */
       if (kwset->mind > 1)
         {
+          /* Looking for the delta2 shift that might be made after a
+             backwards match has failed.  Extract it from the trie.  */
           kwset->shift
             = obstack_alloc (&kwset->obstack,
                              sizeof *kwset->shift * (kwset->mind - 1));
@@ -541,28 +567,10 @@ kwsprep (kwset_t kwset)
               kwset->shift[i] = curr->shift;
               curr = curr->next;
             }
-        }
 
-      char gc1 = tr (trans, kwset->target[kwset->mind - 1]);
-
-      /* Set GC1HELP according to whether exactly one, exactly two, or
-         three-or-more characters match GC1.  */
-      int gc1help = -1;
-      if (trans)
-        {
-          char const *equiv1 = memchr (trans, gc1, NCHAR);
-          char const *equiv2 = memchr (equiv1 + 1, gc1,
-                                       trans + NCHAR - (equiv1 + 1));
-          if (equiv2)
-            gc1help = (memchr (equiv2 + 1, gc1, trans + NCHAR - (equiv2 + 1))
-                       ? NCHAR
-                       : U(gc1) ^ (equiv1 - trans) ^ (equiv2 - trans));
+          /* The penultimate byte.  */
+          kwset->gc2 = tr (trans, kwset->target[kwset->mind - 2]);
         }
-
-      kwset->gc1 = gc1;
-      kwset->gc1help = gc1help;
-      if (kwset->mind > 1)
-        kwset->gc2 = tr (trans, kwset->target[kwset->mind - 2]);
     }
 
   /* Fix things up for any translation table.  */
@@ -626,50 +634,18 @@ bm_delta2_search (char const **tpp, char const *ep, char const *sp,
 }
 
 /* Return the address of the first byte in the buffer S (of size N)
-   that matches the last byte specified by KWSET, a singleton.
-   Return NULL if there is no match.  */
+   that matches the terminal byte specified by KWSET, or NULL if there
+   is no match.  KWSET->gc1 should be nonnegative.  */
 static char const *
 memchr_kwset (char const *s, ptrdiff_t n, kwset_t kwset)
 {
-  if (kwset->gc1help < 0)
-    return memchr (s, kwset->gc1, n);
-  int small_heuristic = 2;
-  int small = (- (uintptr_t) s % sizeof (long)
-               + small_heuristic * sizeof (long));
-  ptrdiff_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
-  char const *slim = s + ntrans;
+  if (0 <= kwset->gc1help)
+    return memchr2 (s, kwset->gc1, kwset->gc1help, n);
+  char const *slim = s + n;
   for (; s < slim; s++)
-    if (kwset->trans[U(*s)] == kwset->gc1)
+    if (U(kwset->trans[U(*s)]) == kwset->gc1)
       return s;
-  n -= ntrans;
-  return n == 0 ? NULL : memchr2 (s, kwset->gc1, kwset->gc1help, n);
-}
-
-/* Return the offset of the first byte in the buffer S (of size N)
-   that matches the last byte specified by KWSET, a pair.
-   Return -1 if there is no match.  */
-static ptrdiff_t
-memoff2_kwset (char const *s, ptrdiff_t n, kwset_t kwset,
-               struct kwsmatch *kwsmatch)
-{
-  struct tree const *cur = kwset->trie->links;
-  struct tree const *clink = cur->llink ? cur->llink : cur->rlink;
-  char const *mch = (clink
-                     ? memchr2 (s, cur->label, clink->label, n)
-                     : memchr (s, cur->label, n));
-  if (! mch)
-    return -1;
-  else
-    {
-      ptrdiff_t off = mch - s;
-      if (*mch == cur->label)
-        kwsmatch->index = cur->trie->accepting / 2;
-      else
-        kwsmatch->index = clink->trie->accepting / 2;
-      kwsmatch->offset[0] = off;
-      kwsmatch->size[0] = 1;
-      return off;
-    }
+  return NULL;
 }
 
 /* Fast Boyer-Moore search (inlinable version).  */
@@ -785,7 +761,6 @@ static inline ptrdiff_t
 acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
               struct kwsmatch *kwsmatch, bool longest)
 {
-  struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
   struct tree const *tree;
@@ -795,25 +770,30 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
   if (len < kwset->mind)
     return -1;
   trans = kwset->trans;
-  if (!trans && kwset->maxd == 1 && kwset->words == 2)
-    return memoff2_kwset (text, len, kwset, kwsmatch);
-
-  next = kwset->next;
   trie = kwset->trie;
   lim = text + len;
   tp = text;
 
   if (!trie->accepting)
     {
-      unsigned char c = tr (trans, *tp++);
+      unsigned char c;
+      int gc1 = kwset->gc1;
 
       while (true)
         {
-          while (! (trie = next[c]))
+          if (gc1 < 0)
             {
-              if (tp >= lim)
+              while (! (trie = kwset->next[c = tr (trans, *tp++)]))
+                if (tp >= lim)
+                  return -1;
+            }
+          else
+            {
+              tp = memchr_kwset (tp, lim - tp, kwset);
+              if (!tp)
                 return -1;
               c = tr (trans, *tp++);
+              trie = kwset->next[c];
             }
 
           while (true)
@@ -831,7 +811,14 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
                     {
                       trie = trie->fail;
                       if (!trie)
-                        goto next_trie;
+                        {
+                          trie = kwset->next[c];
+                          if (trie)
+                            goto have_trie;
+                          if (tp >= lim)
+                            return -1;
+                          goto next_c;
+                        }
                       if (trie->accepting)
                         {
                           --tp;
@@ -841,8 +828,9 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
                     }
                 }
               trie = tree->trie;
+            have_trie:;
             }
-        next_trie:;
+        next_c:;
         }
     }
 

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


commit b408bcee1e81a2c4cc187d520b1fd5ae0da68f13
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Wed Jan 18 15:51:30 2017 -0800

    grep: speed up Aho-Corasick when at most 2 bytes
    
    When using Aho-Corasick and all matched strings either begin with
    the same byte, or begin with one of at most two bytes, use memchr2
    to search for these matching bytes and apply the Aho-Corasick
    algorithm only when a memchr2 match is found.  On my platform,
    this speeds up 'grep -F -e aa -e ba in' by a factor of 7, where
    the file 'in' was created by 'seq -f %040.0f 10000000 >in'.
    * src/kwset.c (struct kwset.gc1): Now int, not char.
    If negative, there is no single terminal byte.  All uses changed.
    (struct kwset.gc1help): Now int, not char.
    If negative, memchr2 cannot be used.
    (kwsprep): Set up gc1 and gc1help from kwset->next, with
    the new (slightly changed) interpretation.
    (memchr_kwset): Use memchr2 if possible.
    Adjust to match new meaning of gc1, gc1help.
    (memoff2_kwset): Remove; no longer needed.
    (acexec_trans): Use memchr_kwset when possible, for speed.
    It now supersedes memoff2_kwset.

diff --git a/src/kwset.c b/src/kwset.c
index ace720b..39a1e15 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -99,24 +99,26 @@ struct kwset
                                    string.  */
   char const *trans;		/* Character translation table.  */
 
-  /* If there's only one string, this is the string's last byte,
-     translated via TRANS if TRANS is nonnull.  */
-  char gc1;
+  /* This helps to match a terminal byte, which is the first byte
+     for Aho-Corasick, and the last byte for Boyer-More.  If all the
+     patterns have the same terminal byte (after translation via TRANS
+     if TRANS is nonnull), then this is that byte as an unsigned char.
+     Otherwise this is -1 if there is disagreement among the strings
+     about terminal bytes, and -2 if there are no terminal bytes and
+     no disagreement because all the patterns are empty.  */
+  int gc1;
+
+  /* This helps to match a terminal byte.  If 0 <= GC1HELP, B is
+     terminal when B == GC1 || B == GC1HELP (note that GC1 == GCHELP
+     is common here).  This is typically faster than evaluating
+     to_uchar (TRANS[B]) == GC1.  */
+  int gc1help;
 
-  /* Likewise for the string's penultimate byte, if it has two or more
-     bytes.  */
+  /* If the string has two or more bytes, this is the penultimate byte,
+     after translation via TRANS if TRANS is nonnull.  This variable
+     is used only by Boyer-Moore.  */
   char gc2;
 
-  /* If there's only one string, this helps to match the string's last byte.
-     If GC1HELP is negative, only GC1 matches the string's last byte;
-     otherwise at least two bytes match, and B matches if TRANS[B] == GC1.
-     If GC1HELP is in the range 0..(NCHAR - 1), there are exactly two
-     such matches, and GC1HELP is the other match after conversion to
-     unsigned char.  If GC1HELP is at least NCHAR, there are three or
-     more such matches; e.g., Greek has three sigma characters that
-     all match when case-folding.  */
-  int gc1help;
-
   /* kwsexec implementation.  */
   ptrdiff_t (*kwsexec) (kwset_t, char const *, ptrdiff_t,
                         struct kwsmatch *, bool);
@@ -510,14 +512,38 @@ kwsprep (kwset_t kwset)
     }
 
   /* Create a vector, indexed by character code, of the outgoing links
-     from the root node.  */
+     from the root node.  Accumulate GC1 and GC1HELP.  */
   struct trie *nextbuf[NCHAR];
   struct trie **next = trans ? nextbuf : kwset->next;
   memset (next, 0, sizeof nextbuf);
   treenext (kwset->trie->links, next);
-  if (trans)
-    for (i = 0; i < NCHAR; ++i)
-      kwset->next[i] = next[U(trans[i])];
+  int gc1 = -2;
+  int gc1help = -1;
+  for (i = 0; i < NCHAR; i++)
+    {
+      int ti = i;
+      if (trans)
+        {
+          ti = U(trans[i]);
+          kwset->next[i] = next[ti];
+        }
+      if (kwset->next[i])
+        {
+          if (gc1 < -1)
+            {
+              gc1 = ti;
+              gc1help = i;
+            }
+          else if (gc1 == ti)
+            gc1help = gc1help == ti ? i : -1;
+          else if (i == ti && gc1 == gc1help)
+            gc1help = i;
+          else
+            gc1 = -1;
+        }
+    }
+  kwset->gc1 = gc1;
+  kwset->gc1help = gc1help;
 
   if (reverse)
     {
@@ -529,10 +555,10 @@ kwsprep (kwset_t kwset)
           curr = curr->next;
         }
 
-      /* Looking for the delta2 shift that might be made after a
-         backwards match has failed.  Extract it from the trie.  */
       if (kwset->mind > 1)
         {
+          /* Looking for the delta2 shift that might be made after a
+             backwards match has failed.  Extract it from the trie.  */
           kwset->shift
             = obstack_alloc (&kwset->obstack,
                              sizeof *kwset->shift * (kwset->mind - 1));
@@ -541,28 +567,10 @@ kwsprep (kwset_t kwset)
               kwset->shift[i] = curr->shift;
               curr = curr->next;
             }
-        }
 
-      char gc1 = tr (trans, kwset->target[kwset->mind - 1]);
-
-      /* Set GC1HELP according to whether exactly one, exactly two, or
-         three-or-more characters match GC1.  */
-      int gc1help = -1;
-      if (trans)
-        {
-          char const *equiv1 = memchr (trans, gc1, NCHAR);
-          char const *equiv2 = memchr (equiv1 + 1, gc1,
-                                       trans + NCHAR - (equiv1 + 1));
-          if (equiv2)
-            gc1help = (memchr (equiv2 + 1, gc1, trans + NCHAR - (equiv2 + 1))
-                       ? NCHAR
-                       : U(gc1) ^ (equiv1 - trans) ^ (equiv2 - trans));
+          /* The penultimate byte.  */
+          kwset->gc2 = tr (trans, kwset->target[kwset->mind - 2]);
         }
-
-      kwset->gc1 = gc1;
-      kwset->gc1help = gc1help;
-      if (kwset->mind > 1)
-        kwset->gc2 = tr (trans, kwset->target[kwset->mind - 2]);
     }
 
   /* Fix things up for any translation table.  */
@@ -626,50 +634,18 @@ bm_delta2_search (char const **tpp, char const *ep, char const *sp,
 }
 
 /* Return the address of the first byte in the buffer S (of size N)
-   that matches the last byte specified by KWSET, a singleton.
-   Return NULL if there is no match.  */
+   that matches the terminal byte specified by KWSET, or NULL if there
+   is no match.  KWSET->gc1 should be nonnegative.  */
 static char const *
 memchr_kwset (char const *s, ptrdiff_t n, kwset_t kwset)
 {
-  if (kwset->gc1help < 0)
-    return memchr (s, kwset->gc1, n);
-  int small_heuristic = 2;
-  int small = (- (uintptr_t) s % sizeof (long)
-               + small_heuristic * sizeof (long));
-  ptrdiff_t ntrans = kwset->gc1help < NCHAR && small < n ? small : n;
-  char const *slim = s + ntrans;
+  if (0 <= kwset->gc1help)
+    return memchr2 (s, kwset->gc1, kwset->gc1help, n);
+  char const *slim = s + n;
   for (; s < slim; s++)
-    if (kwset->trans[U(*s)] == kwset->gc1)
+    if (U(kwset->trans[U(*s)]) == kwset->gc1)
       return s;
-  n -= ntrans;
-  return n == 0 ? NULL : memchr2 (s, kwset->gc1, kwset->gc1help, n);
-}
-
-/* Return the offset of the first byte in the buffer S (of size N)
-   that matches the last byte specified by KWSET, a pair.
-   Return -1 if there is no match.  */
-static ptrdiff_t
-memoff2_kwset (char const *s, ptrdiff_t n, kwset_t kwset,
-               struct kwsmatch *kwsmatch)
-{
-  struct tree const *cur = kwset->trie->links;
-  struct tree const *clink = cur->llink ? cur->llink : cur->rlink;
-  char const *mch = (clink
-                     ? memchr2 (s, cur->label, clink->label, n)
-                     : memchr (s, cur->label, n));
-  if (! mch)
-    return -1;
-  else
-    {
-      ptrdiff_t off = mch - s;
-      if (*mch == cur->label)
-        kwsmatch->index = cur->trie->accepting / 2;
-      else
-        kwsmatch->index = clink->trie->accepting / 2;
-      kwsmatch->offset[0] = off;
-      kwsmatch->size[0] = 1;
-      return off;
-    }
+  return NULL;
 }
 
 /* Fast Boyer-Moore search (inlinable version).  */
@@ -785,7 +761,6 @@ static inline ptrdiff_t
 acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
               struct kwsmatch *kwsmatch, bool longest)
 {
-  struct trie * const *next;
   struct trie const *trie, *accept;
   char const *tp, *left, *lim;
   struct tree const *tree;
@@ -795,25 +770,30 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
   if (len < kwset->mind)
     return -1;
   trans = kwset->trans;
-  if (!trans && kwset->maxd == 1 && kwset->words == 2)
-    return memoff2_kwset (text, len, kwset, kwsmatch);
-
-  next = kwset->next;
   trie = kwset->trie;
   lim = text + len;
   tp = text;
 
   if (!trie->accepting)
     {
-      unsigned char c = tr (trans, *tp++);
+      unsigned char c;
+      int gc1 = kwset->gc1;
 
       while (true)
         {
-          while (! (trie = next[c]))
+          if (gc1 < 0)
             {
-              if (tp >= lim)
+              while (! (trie = kwset->next[c = tr (trans, *tp++)]))
+                if (tp >= lim)
+                  return -1;
+            }
+          else
+            {
+              tp = memchr_kwset (tp, lim - tp, kwset);
+              if (!tp)
                 return -1;
               c = tr (trans, *tp++);
+              trie = kwset->next[c];
             }
 
           while (true)
@@ -831,7 +811,14 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
                     {
                       trie = trie->fail;
                       if (!trie)
-                        goto next_trie;
+                        {
+                          trie = kwset->next[c];
+                          if (trie)
+                            goto have_trie;
+                          if (tp >= lim)
+                            return -1;
+                          goto next_c;
+                        }
                       if (trie->accepting)
                         {
                           --tp;
@@ -841,8 +828,9 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
                     }
                 }
               trie = tree->trie;
+            have_trie:;
             }
-        next_trie:;
+        next_c:;
         }
     }
 

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

Summary of changes:
 src/kwset.c       |  408 +++++++++++++++--------------------------------------
 src/kwset.h       |    2 +-
 src/searchutils.c |    2 +-
 3 files changed, 113 insertions(+), 299 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sat Jan 21 19:31:55 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cV64Z-0004kk-LT
	for mharc-grep-commit@gnu.org; Sat, 21 Jan 2017 19:31:55 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33242)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cV64X-0004kY-KE
	for grep-commit@gnu.org; Sat, 21 Jan 2017 19:31:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cV64W-0000Gf-BX
	for grep-commit@gnu.org; Sat, 21 Jan 2017 19:31:53 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:51379)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cV64W-0000Gb-7g
	for grep-commit@gnu.org; Sat, 21 Jan 2017 19:31:52 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id 1DEB7220114; Sun, 22 Jan 2017 00:31:52 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-46-gb0cdf48
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b408bcee1e81a2c4cc187d520b1fd5ae0da68f13
X-Git-Newrev: b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa
Message-Id: <20170122003152.1DEB7220114@vcs.savannah.gnu.org>
Date: Sun, 22 Jan 2017 00:31:52 +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: Sun, 22 Jan 2017 00:31:54 -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  b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa (commit)
      from  b408bcee1e81a2c4cc187d520b1fd5ae0da68f13 (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=b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa


commit b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa
Author: Norihiro Tanaka <noritnk@kcn.ne.jp>
Date:   Sat Jan 21 18:01:53 2017 +0900

    grep -Fo could report a match that is not the longest
    
    * src/kwset.c (acexec): Fix it.
    * tests/fgrep-longest: New test.
    * tests/Makefile.am: Add the test.
    * NEWS: Mention it.

diff --git a/NEWS b/NEWS
index 3529f4e..773a8ed 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ GNU grep NEWS                                    -*- outline -*-
 
 ** Bug fixes
 
+  When grep -Fo finds matches of differing length, it could
+  mistakenly print a shorter one.  Now it prints a longest one.
+  [bug introduced in grep-2.26]
+
   When standard output is /dev/null, grep no longer fails when
   standard input is a file in the Linux /proc file system, or when
   standard input is a pipe and standard output is in append mode.
diff --git a/src/kwset.c b/src/kwset.c
index 39a1e15..258cff5 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -848,9 +848,20 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
           struct trie const *accept1;
           char const *left1;
           unsigned char c = tr (trans, *tp++);
-          tree = trie->links;
-          while (tree && c != tree->label)
-            tree = c < tree->label ? tree->llink : tree->rlink;
+          while (true)
+            {
+              tree = trie->links;
+              while (tree && c != tree->label)
+                tree = c < tree->label ? tree->llink : tree->rlink;
+              if (tree)
+                break;
+              trie = trie->fail;
+              if (!trie)
+                break;
+              left1 = tp - trie->depth;
+              if (left1 > left)
+                break;
+            }
           if (!tree)
             break;
           trie = tree->trie;
diff --git a/tests/fgrep-longest b/tests/fgrep-longest
new file mode 100755
index 0000000..5974d11
--- /dev/null
+++ b/tests/fgrep-longest
@@ -0,0 +1,23 @@
+#! /bin/sh
+# With multiple matches, grep -Fo could print a shorter one.
+# This bug affected grep versions 2.26 through 2.27.
+#
+# Copyright (C) 2017 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+
+fail=0
+
+# The erroneous versions would print "c", rather than the longer match, "bce".
+printf 'abce\n' > in || framework_failure_
+printf 'abcd\nc\nbce\n' > pat || framework_failure_
+printf 'bce\n' > exp || framework_failure_
+
+LC_ALL=C grep -Fof pat in > out || fail=1
+compare exp out || fail=1
+
+Exit $fail

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

Summary of changes:
 NEWS                |    4 ++++
 src/kwset.c         |   17 ++++++++++++++---
 tests/fgrep-longest |   23 +++++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100755 tests/fgrep-longest


hooks/post-receive
-- 
grep


From MAILER-DAEMON Mon Jan 23 14:41:46 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cVkUs-0000cz-Ii
	for mharc-grep-commit@gnu.org; Mon, 23 Jan 2017 14:41:46 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34830)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cVkUp-0000bF-BC
	for grep-commit@gnu.org; Mon, 23 Jan 2017 14:41:45 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cVkUm-0005Ai-LI
	for grep-commit@gnu.org; Mon, 23 Jan 2017 14:41:43 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:36969)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cVkUm-0005AU-IJ
	for grep-commit@gnu.org; Mon, 23 Jan 2017 14:41:40 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id 377EE22015F; Mon, 23 Jan 2017 19:41:40 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-47-gb2e0f3f
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa
X-Git-Newrev: b2e0f3f86c6ff948c9b37668af762ea90f06e401
Message-Id: <20170123194140.377EE22015F@vcs.savannah.gnu.org>
Date: Mon, 23 Jan 2017 19:41:40 +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: Mon, 23 Jan 2017 19:41:45 -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  b2e0f3f86c6ff948c9b37668af762ea90f06e401 (commit)
      from  b0cdf48d416b2cbb028a1b65c758035ba7c8a2aa (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=b2e0f3f86c6ff948c9b37668af762ea90f06e401


commit b2e0f3f86c6ff948c9b37668af762ea90f06e401
Author: Jim Meyering <meyering@fb.com>
Date:   Mon Jan 23 11:41:24 2017 -0800

    tests: really add the new test name
    
    * tests/Makefile.am (TESTS): Add fgrep-longest.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2f640d7..66fb461 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -98,6 +98,7 @@ TESTS =						\
   false-match-mb-non-utf8			\
   fedora					\
   fgrep-infloop					\
+  fgrep-longest					\
   file						\
   filename-lineno.pl				\
   fmbtest					\

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

Summary of changes:
 tests/Makefile.am |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Mon Jan 23 19:03:43 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cVoaN-0004pJ-7n
	for mharc-grep-commit@gnu.org; Mon, 23 Jan 2017 19:03:43 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46214)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cVoaK-0004ok-Mb
	for grep-commit@gnu.org; Mon, 23 Jan 2017 19:03:41 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cVoaJ-0006Hd-O4
	for grep-commit@gnu.org; Mon, 23 Jan 2017 19:03:40 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:37932)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <eggert@cs.ucla.edu>) id 1cVoaJ-0006HU-Kj
	for grep-commit@gnu.org; Mon, 23 Jan 2017 19:03:39 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69712)
	id 40CD522015F; Tue, 24 Jan 2017 00:03:39 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-48-g8f2d700
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b2e0f3f86c6ff948c9b37668af762ea90f06e401
X-Git-Newrev: 8f2d7009a1c982c6ed9c844529639f1794d029bb
Message-Id: <20170124000339.40CD522015F@vcs.savannah.gnu.org>
Date: Tue, 24 Jan 2017 00:03:39 +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: Tue, 24 Jan 2017 00:03:41 -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  8f2d7009a1c982c6ed9c844529639f1794d029bb (commit)
      from  b2e0f3f86c6ff948c9b37668af762ea90f06e401 (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=8f2d7009a1c982c6ed9c844529639f1794d029bb


commit 8f2d7009a1c982c6ed9c844529639f1794d029bb
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Mon Jan 23 16:03:12 2017 -0800

    grep: simplify recent kwset change
    
    * src/kwset.c (acexec_trans): Simplify.

diff --git a/src/kwset.c b/src/kwset.c
index 258cff5..3be5c42 100644
--- a/src/kwset.c
+++ b/src/kwset.c
@@ -848,20 +848,15 @@ acexec_trans (kwset_t kwset, char const *text, ptrdiff_t len,
           struct trie const *accept1;
           char const *left1;
           unsigned char c = tr (trans, *tp++);
-          while (true)
+
+          do
             {
               tree = trie->links;
               while (tree && c != tree->label)
                 tree = c < tree->label ? tree->llink : tree->rlink;
-              if (tree)
-                break;
-              trie = trie->fail;
-              if (!trie)
-                break;
-              left1 = tp - trie->depth;
-              if (left1 > left)
-                break;
             }
+          while (!tree && (trie = trie->fail) && accept->depth <= trie->depth);
+
           if (!tree)
             break;
           trie = tree->trie;

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

Summary of changes:
 src/kwset.c |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
grep


From MAILER-DAEMON Sun Jan 29 19:00:12 2017
Received: from list by lists.gnu.org with archive (Exim 4.71)
	id 1cXzOG-0000bc-7w
	for mharc-grep-commit@gnu.org; Sun, 29 Jan 2017 19:00:12 -0500
Received: from eggs.gnu.org ([2001:4830:134:3::10]:43620)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cXzOC-0000XJ-TD
	for grep-commit@gnu.org; Sun, 29 Jan 2017 19:00:11 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cXzO5-0004kv-Sc
	for grep-commit@gnu.org; Sun, 29 Jan 2017 19:00:08 -0500
Received: from vcs.savannah.gnu.org ([208.118.235.72]:35427)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <jim@meyering.net>) id 1cXzO5-0004kn-Qc
	for grep-commit@gnu.org; Sun, 29 Jan 2017 19:00:01 -0500
Received: by vcs.savannah.gnu.org (Postfix, from userid 69698)
	id 72AAB22012B; Mon, 30 Jan 2017 00:00:00 +0000 (UTC)
To: grep-commit@gnu.org
Subject: grep branch, master, updated. v2.27-49-g20ca636
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8f2d7009a1c982c6ed9c844529639f1794d029bb
X-Git-Newrev: 20ca6364bd25c89fcded930dc63b7b6a67825b65
Message-Id: <20170130000001.72AAB22012B@vcs.savannah.gnu.org>
Date: Mon, 30 Jan 2017 00:00:00 +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: Mon, 30 Jan 2017 00:00:11 -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  20ca6364bd25c89fcded930dc63b7b6a67825b65 (commit)
      from  8f2d7009a1c982c6ed9c844529639f1794d029bb (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=20ca6364bd25c89fcded930dc63b7b6a67825b65


commit 20ca6364bd25c89fcded930dc63b7b6a67825b65
Author: Jim Meyering <meyering@fb.com>
Date:   Sun Jan 29 15:19:48 2017 -0800

    gnulib: update to latest

diff --git a/gnulib b/gnulib
index fadd80a..4e6e16b 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit fadd80aef9f1ae32a16fe7380b1635fee18876ce
+Subproject commit 4e6e16b3f43ce96302b1e52e48730c1f15e18c14

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

Summary of changes:
 gnulib |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
grep


