[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
grep branch, master, updated. v2.21-20-g5f8579d
From: |
Paul Eggert |
Subject: |
grep branch, master, updated. v2.21-20-g5f8579d |
Date: |
Wed, 11 Mar 2015 18:00:42 +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 5f8579d37290a67359f54f020092635f33228e5f (commit)
from 1938fb7827db3874a3325fafa76b684a7718060a (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=5f8579d37290a67359f54f020092635f33228e5f
commit 5f8579d37290a67359f54f020092635f33228e5f
Author: Paul Eggert <address@hidden>
Date: Wed Mar 11 10:59:27 2015 -0700
doc: clarify how -a matches
* doc/grep.in.1, doc/grep.texi (File and Directory Selection):
Give an example of how non-text bytes affect pattern matching in
binary files.
Fixes: bug#20080
diff --git a/doc/grep.in.1 b/doc/grep.in.1
index dfd8288..2b513a8 100644
--- a/doc/grep.in.1
+++ b/doc/grep.in.1
@@ -383,6 +383,12 @@ is
processes a binary file as if it were text; this is equivalent to the
.B \-a
option.
+When processing binary data,
+.B grep
+may treat non-text bytes as line terminators; for example, the pattern
+.RB ' . '\&
+(period) might not match a null byte, as the null byte might be
+treated as a line terminator.
.I Warning:
.B "grep \-\^\-binary\-files=text"
might output binary garbage,
diff --git a/doc/grep.texi b/doc/grep.texi
index 7738677..18a1102 100644
--- a/doc/grep.texi
+++ b/doc/grep.texi
@@ -605,8 +605,10 @@ By default, @var{type} is @samp{binary},
and @command{grep} normally outputs either
a one-line message saying that a binary file matches,
or no message if there is no match.
-When matching binary data, @command{grep} may treat non-text
-bytes as line terminators.
+When processing binary data, @command{grep} may treat non-text bytes
+as line terminators; for example, the pattern @samp{.} (period) might
+not match a null byte, as the null byte might be treated as a line
+terminator even without the @option{-z} (@option{--null-data}) option.
If @var{type} is @samp{without-match},
@command{grep} assumes that a binary file does not match;
-----------------------------------------------------------------------
Summary of changes:
doc/grep.in.1 | 6 ++++++
doc/grep.texi | 6 ++++--
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
grep
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- grep branch, master, updated. v2.21-20-g5f8579d,
Paul Eggert <=