bug#22911: Minor doc changes to clarify the use of multiple -e, -f
And now that I'm cleaning the patches applied to the debian package, here is another tiny patch. Cheers, Santiago >From 1c86cafdc67c157ce8744da0b32151d1e0f77545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Ruano=20Rinc=C3=B3n?=Date: Fri, 4 Mar 2016 20:01:48 +0100 Subject: [PATCH] doc: consistent PCRE doc between grep.1.in and grep.texi --- doc/grep.texi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/grep.texi b/doc/grep.texi index 8883b27..39d6276 100644 --- a/doc/grep.texi +++ b/doc/grep.texi @@ -1102,7 +1102,7 @@ expressions), separated by newlines, any of which is to be matched. @opindex -P @opindex --perl-regexp @cindex matching Perl regular expressions -Interpret the pattern as a Perl regular expression. +Interpret the pattern as a Perl regular expression (PCRE). This is highly experimental and @samp{grep@ -P} may warn of unimplemented features. @@ -1127,7 +1127,7 @@ Regular expressions are constructed analogously to arithmetic expressions, by using various operators to combine smaller expressions. @command{grep} understands three different versions of regular expression syntax: -``basic,'' (BRE) ``extended'' (ERE) and ``perl''. +``basic,'' (BRE) ``extended'' (ERE) and ``perl'' (PCRE). In GNU @command{grep}, there is no difference in available functionality between the basic and extended syntaxes. -- 2.4.6
bug#22911: Minor doc changes to clarify the use of multiple -e,-f
Hi, Please consider this patch to clarify the use of multiple -e and -f options in grep. I think the current documentation is inconsistent with grep behaviour and POSIX man page for grep. This patch is intended to close another long-standing bug reported in Debian: https://bugs.debian.org/356120 Cheers, Santiago >From 3e6c7dbb30aa51c08d5b5fd8143051055dc26a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santiago=20Ruano=20Rinc=C3=B3n?=Date: Fri, 4 Mar 2016 17:52:43 +0100 Subject: [PATCH] doc/ multiple -e,-f arguments --- doc/grep.in.1 | 16 ++-- doc/grep.texi | 6 -- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/grep.in.1 b/doc/grep.in.1 index ade11b4..4713228 100644 --- a/doc/grep.in.1 +++ b/doc/grep.in.1 @@ -35,10 +35,9 @@ grep, egrep, fgrep \- print lines matching a pattern .B grep .RI [ OPTIONS ] .RB [ \-e -.I PATTERN -| -.B \-f -.IR FILE ] +.IR PATTERN ].\|.\|. +.RB [ \-f +.IR FILE ].\|.\|. .RI [ FILE .\|.\|.] . .SH DESCRIPTION @@ -110,8 +109,10 @@ may warn of unimplemented features. Use .I PATTERN as the pattern. -This can be used to specify multiple search patterns, -or to protect a pattern beginning with a hyphen +Multiple +.BR \-e +can be used to specify different search patterns. +This option is also useful to protect a pattern beginning with a hyphen .RB ( \- ). .TP .BI \-f " FILE" "\fR,\fP \-\^\-file=" FILE @@ -119,6 +120,9 @@ Obtain patterns from .IR FILE , one per line. The empty file contains zero patterns, and therefore matches nothing. +Multiple +.BR \-f +can be used to specify different files. .TP .BR \-i ", " \-\^\-ignore\-case Ignore case distinctions in both the diff --git a/doc/grep.texi b/doc/grep.texi index 8883b27..1ad31c7 100644 --- a/doc/grep.texi +++ b/doc/grep.texi @@ -175,8 +175,9 @@ This version number should be included in all bug reports. @opindex --regexp=@var{pattern} @cindex pattern list Use @var{pattern} as the pattern. -This can be used to specify multiple search patterns, -or to protect a pattern beginning with a @samp{-}. +Multiple @option{-e} can be used to specify different search patterns. +This option is also useful to protect a pattern beginning with a +@samp{-}. (@option{-e} is specified by POSIX.) @item -f @var{file} @@ -186,6 +187,7 @@ or to protect a pattern beginning with a @samp{-}. @cindex pattern from file Obtain patterns from @var{file}, one per line. The empty file contains zero patterns, and therefore matches nothing. +Multiple @option{-f} can be used to specify different files. (@option{-f} is specified by POSIX.) @item -i -- 2.4.6
bug#22899: new snapshot available: grep-2.23.7-9e28
On Fri, Mar 4, 2016 at 7:20 AM, Assaf Gordonwrote: > Hello, > > On 03/03/2016 08:57 PM, Jim Meyering wrote: >> >> grep snapshot: >>http://meyering.net/grep/grep-2.23.7-9e28.tar.xz > > > No failures (with minimal build, no pcre) on: > CentOS 7 + 6.5, amd64 > Ubuntu 14.04, amd64 > Ubuntu 15.04 amd64 + i686 > openSUSE 42.1, 13.1, amd64 > Fedora 23, 22, 21, amd64 > Debian 8.1, 7.6, amd64 > Trisquel 7.0, 6.0.1, amd64 >Fedora-21, ppc64le > Fedora-20, ppc64 > Ubuntu-14, aarch64 > > OpenBSD 5.8, 5.7, 5.6, amd64 > FreeBSD 10.1, 9.3, amd64 > NetBSD 6.1.4, amd64 > NetBSD 7.0, amd64 (though one gnulib test fails to compile, similar to > this: > > http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00083.html ). > AIX-7.1,power7 > GNU Hurd 0.7, i686 > Debian-7/kFreeBSD-9, amd64 > OpenSolaris 5.10/5.11 on i86pc and suv4u/sub4v > > On Minix 3.3.0, one test fails ('symlink'), same as mentioned here (with > decision not to fix): > http://lists.gnu.org/archive/html/bug-grep/2016-01/msg00050.html Hi Assaf, Thank you for testing with that impressive menagerie.
bug#22899: new snapshot available: grep-2.23.7-9e28
Hello, On 03/03/2016 08:57 PM, Jim Meyering wrote: grep snapshot: http://meyering.net/grep/grep-2.23.7-9e28.tar.xz No failures (with minimal build, no pcre) on: CentOS 7 + 6.5, amd64 Ubuntu 14.04, amd64 Ubuntu 15.04 amd64 + i686 openSUSE 42.1, 13.1, amd64 Fedora 23, 22, 21, amd64 Debian 8.1, 7.6, amd64 Trisquel 7.0, 6.0.1, amd64 Fedora-21, ppc64le Fedora-20, ppc64 Ubuntu-14, aarch64 OpenBSD 5.8, 5.7, 5.6, amd64 FreeBSD 10.1, 9.3, amd64 NetBSD 6.1.4, amd64 NetBSD 7.0, amd64 (though one gnulib test fails to compile, similar to this: http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00083.html ). AIX-7.1,power7 GNU Hurd 0.7, i686 Debian-7/kFreeBSD-9, amd64 OpenSolaris 5.10/5.11 on i86pc and suv4u/sub4v On Minix 3.3.0, one test fails ('symlink'), same as mentioned here (with decision not to fix): http://lists.gnu.org/archive/html/bug-grep/2016-01/msg00050.html regards, - assaf
bug#22899: new snapshot available: grep-2.23.7-9e28
Hi Jim, On Thu, 3 Mar 2016 17:57:05 -0800 Jim Meyeringwrote: > I'm ready to make a new bug-fix release of grep, so > am making this test release. I plan to release grep-2.24 > within the next few days, so if you can build and test, > please let us know how that goes. > the test suite gives me: Testsuite summary for GNU grep 2.23.7-9e28 # TOTAL: 138 # PASS: 129 # SKIP: 9 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 on Mageia Linux x86-64 v6/Cauldron. Is there anything else that I can do for you? Regards, Shlomi Fish -- - Shlomi Fish http://www.shlomifish.org/ https://youtu.be/n6KAGqjdmsk - “Hurt Me Tomorrow” In Soviet Russia, XSLT codes you. Badly! — http://www.shlomifish.org/humour/bits/facts/XSLT/ Please reply to list if it's a mailing list post - http://shlom.in/reply .