From MAILER-DAEMON Fri Nov 03 04:43:57 2017 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eAXa1-0004FU-DL for mharc-grep-commit@gnu.org; Fri, 03 Nov 2017 04:43:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAXZz-0004Ed-MH for grep-commit@gnu.org; Fri, 03 Nov 2017 04:43:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAXZy-0004Ly-BW for grep-commit@gnu.org; Fri, 03 Nov 2017 04:43:55 -0400 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:43607) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAXZy-0004Lp-7c for grep-commit@gnu.org; Fri, 03 Nov 2017 04:43:54 -0400 Received: by vcs0.savannah.gnu.org (Postfix, from userid 69712) id CF737209AE; Fri, 3 Nov 2017 04:43:53 -0400 (EDT) To: grep-commit@gnu.org Subject: grep branch, master, updated. v3.1-13-g01fc34d X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 672aa245f0d76c6ef692752365d2771211535e71 X-Git-Newrev: 01fc34d2f121fb36bebe385ed9779e6b052f74b5 Message-Id: <20171103084353.CF737209AE@vcs0.savannah.gnu.org> Date: Fri, 3 Nov 2017 04:43:53 -0400 (EDT) From: eggert@cs.ucla.edu (Paul Eggert) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: grep-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: CVS commit notices for GNU grep List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Nov 2017 08:43:56 -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 01fc34d2f121fb36bebe385ed9779e6b052f74b5 (commit) from 672aa245f0d76c6ef692752365d2771211535e71 (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=01fc34d2f121fb36bebe385ed9779e6b052f74b5 commit 01fc34d2f121fb36bebe385ed9779e6b052f74b5 Author: Paul Eggert Date: Fri Nov 3 01:39:55 2017 -0700 grep: omit a dup 'const' * src/grep.c (matchers): Omit duplicate 'const'. diff --git a/src/grep.c b/src/grep.c index 2277a60..ad5cfa2 100644 --- a/src/grep.c +++ b/src/grep.c @@ -2005,7 +2005,7 @@ if any error occurs and -q is not given, the exit status is 2.\n")); static struct { - char const name[12]; + char name[12]; int syntax; /* used if compile == GEAcompile */ compile_fp_t compile; execute_fp_t execute; ----------------------------------------------------------------------- Summary of changes: src/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- grep From MAILER-DAEMON Sat Nov 25 23:10:15 2017 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eIoGl-0005ZH-9F for mharc-grep-commit@gnu.org; Sat, 25 Nov 2017 23:10:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51086) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eIoGi-0005YO-VG for grep-commit@gnu.org; Sat, 25 Nov 2017 23:10:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eIoGh-0005tl-Ny for grep-commit@gnu.org; Sat, 25 Nov 2017 23:10:12 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:44153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eIoGh-0005tb-KV for grep-commit@gnu.org; Sat, 25 Nov 2017 23:10:11 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 69712) id 61D812041C; Sat, 25 Nov 2017 23:10:11 -0500 (EST) To: grep-commit@gnu.org Subject: grep branch, master, updated. v3.1-14-gd069525 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 01fc34d2f121fb36bebe385ed9779e6b052f74b5 X-Git-Newrev: d069525b20e65ef86fb680ba830db634487f111e Message-Id: <20171126041011.61D812041C@vcs0.savannah.gnu.org> Date: Sat, 25 Nov 2017 23:10:11 -0500 (EST) From: eggert@cs.ucla.edu (Paul Eggert) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: grep-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: CVS commit notices for GNU grep List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Nov 2017 04:10:14 -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 d069525b20e65ef86fb680ba830db634487f111e (commit) from 01fc34d2f121fb36bebe385ed9779e6b052f74b5 (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=d069525b20e65ef86fb680ba830db634487f111e commit d069525b20e65ef86fb680ba830db634487f111e Author: Paul Eggert Date: Sat Nov 25 20:08:45 2017 -0800 grep: port better to Adélie GNU/Linux 64-bit ppc Problem reported by A. Wilcox (Bug#29446). * src/pcresearch.c (PCRE_EXTRA_MATCH_LIMIT_RECURSION) (PCRE_STUDY_EXTRA_NEEDED): Default to 0. (jit_exec): If we run up against the recursion limit, double it (if possible) and try again. (Pcompile): Also specify PCRE_STUDY_EXTRA_NEEDED so that pc->extra is not null. diff --git a/src/pcresearch.c b/src/pcresearch.c index 43f91d0..96b7fc6 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -29,9 +29,15 @@ in pcre_exec. */ enum { NSUB = 300 }; +# ifndef PCRE_EXTRA_MATCH_LIMIT_RECURSION +# define PCRE_EXTRA_MATCH_LIMIT_RECURSION 0 +# endif # ifndef PCRE_STUDY_JIT_COMPILE # define PCRE_STUDY_JIT_COMPILE 0 # endif +# ifndef PCRE_STUDY_EXTRA_NEEDED +# define PCRE_STUDY_EXTRA_NEEDED 0 +# endif struct pcre_comp { @@ -83,6 +89,21 @@ jit_exec (struct pcre_comp *pc, char const *subject, int search_bytes, } # endif +# if PCRE_EXTRA_MATCH_LIMIT_RECURSION + if (e == PCRE_ERROR_RECURSIONLIMIT + && (PCRE_STUDY_EXTRA_NEEDED || pc->extra) + && pc->extra->match_limit_recursion <= ULONG_MAX / 2) + { + pc->extra->match_limit_recursion *= 2; + if (pc->extra->match_limit_recursion == 0) + { + pc->extra->match_limit_recursion = (1 << 24) - 1; + pc->extra->flags |= PCRE_EXTRA_MATCH_LIMIT_RECURSION; + } + continue; + } +# endif + return e; } } @@ -158,7 +179,8 @@ Pcompile (char *pattern, size_t size, reg_syntax_t ignored) if (!pc->cre) die (EXIT_TROUBLE, 0, "%s", ep); - pc->extra = pcre_study (pc->cre, PCRE_STUDY_JIT_COMPILE, &ep); + int pcre_study_flags = PCRE_STUDY_EXTRA_NEEDED | PCRE_STUDY_JIT_COMPILE; + pc->extra = pcre_study (pc->cre, pcre_study_flags, &ep); if (ep) die (EXIT_TROUBLE, 0, "%s", ep); ----------------------------------------------------------------------- Summary of changes: src/pcresearch.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) hooks/post-receive -- grep From MAILER-DAEMON Sun Nov 26 21:55:39 2017 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1eJ9a7-0003lc-0y for mharc-grep-commit@gnu.org; Sun, 26 Nov 2017 21:55:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ9a1-0003jR-TN for grep-commit@gnu.org; Sun, 26 Nov 2017 21:55:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJ9a0-0000ci-NJ for grep-commit@gnu.org; Sun, 26 Nov 2017 21:55:33 -0500 Received: from vcs0.savannah.gnu.org ([208.118.235.201]:36932) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ9a0-0000cZ-C6 for grep-commit@gnu.org; Sun, 26 Nov 2017 21:55:32 -0500 Received: by vcs0.savannah.gnu.org (Postfix, from userid 69698) id E9CE820668; Sun, 26 Nov 2017 21:55:31 -0500 (EST) To: grep-commit@gnu.org Subject: grep branch, master, updated. v3.1-15-g6ada8b0 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d069525b20e65ef86fb680ba830db634487f111e X-Git-Newrev: 6ada8b0a1b3f408ebf76e0cf7f7bb61019a70fdc Message-Id: <20171127025531.E9CE820668@vcs0.savannah.gnu.org> Date: Sun, 26 Nov 2017 21:55:31 -0500 (EST) From: jim@meyering.net (Jim Meyering) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.201 X-BeenThere: grep-commit@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: CVS commit notices for GNU grep List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Nov 2017 02:55: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 6ada8b0a1b3f408ebf76e0cf7f7bb61019a70fdc (commit) from d069525b20e65ef86fb680ba830db634487f111e (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=6ada8b0a1b3f408ebf76e0cf7f7bb61019a70fdc commit 6ada8b0a1b3f408ebf76e0cf7f7bb61019a70fdc Author: Stephan T. Lavavej Date: Sun Nov 26 16:12:17 2017 -0800 grep: fix directory recursion on MS-Windows gnulib recently gained a module, windows-stat-inodes, that fixes directory recursion on MS-Windows. No changes to grep's C sources are required; grep simply needs to request the module during configuration. When grep requests this module, its configure script will gain the behavior that was implemented in windows-stat-inodes.m4. This detects mingw and sets WINDOWS_STAT_INODES=1. All other platforms are unaffected, setting WINDOWS_STAT_INODES=0 (which is what's happening in the absence of this patch). * bootstrap.conf (gnulib_modules): Add windows-stat-inodes. * NEWS (Bug fixes): Mention it. Thanks to Pär Björklund who diagnosed the problem as involving inodes, and thanks to Václav Haisman who provided the bootstrap.conf patch. diff --git a/NEWS b/NEWS index 9ed78fb..51a1529 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,12 @@ GNU grep NEWS -*- outline -*- when a file is listed, instead of when a line is selected. This resembles what git-grep does. +** Bug fixes + + The --recursive (-r) option no longer fails on MS-Windows. + [bug introduced in grep 2.11] + + * Noteworthy changes in release 3.1 (2017-07-02) [stable] ** Improvements diff --git a/bootstrap.conf b/bootstrap.conf index 1c50974..73f1573 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -93,6 +93,7 @@ wchar wcrtomb wctob wctype-h +windows-stat-inodes xalloc xbinary-io xstrtoimax ----------------------------------------------------------------------- Summary of changes: NEWS | 6 ++++++ bootstrap.conf | 1 + 2 files changed, 7 insertions(+) hooks/post-receive -- grep