Compare commits
4 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
abfeb11c5f | ||
|
|
06192f4293 | ||
|
|
4c87a4d510 | ||
|
|
c7e5c9ff07 |
4 changed files with 808 additions and 1 deletions
81
grep-2.21-Pc-consistent-results.patch
Normal file
81
grep-2.21-Pc-consistent-results.patch
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
diff --git a/src/grep.c b/src/grep.c
|
||||
index 6f18c1b..859ec27 100644
|
||||
--- a/src/grep.c
|
||||
+++ b/src/grep.c
|
||||
@@ -1339,7 +1339,8 @@ grep (int fd, struct stat const *st)
|
||||
has_nulls = true;
|
||||
if (binary_files == WITHOUT_MATCH_BINARY_FILES)
|
||||
return 0;
|
||||
- done_on_match = out_quiet = true;
|
||||
+ if (!count_matches)
|
||||
+ done_on_match = out_quiet = true;
|
||||
nul_zapper = eol;
|
||||
skip_nuls = skip_empty_lines;
|
||||
}
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 47b9883..1b2281d 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -91,6 +91,7 @@ TESTS = \
|
||||
options \
|
||||
pcre \
|
||||
pcre-abort \
|
||||
+ pcre-count \
|
||||
pcre-infloop \
|
||||
pcre-invalid-utf8-input \
|
||||
pcre-o \
|
||||
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||||
index 4aaebdf..0f40547 100644
|
||||
--- a/tests/Makefile.in
|
||||
+++ b/tests/Makefile.in
|
||||
@@ -1395,6 +1395,7 @@ TESTS = \
|
||||
options \
|
||||
pcre \
|
||||
pcre-abort \
|
||||
+ pcre-count \
|
||||
pcre-infloop \
|
||||
pcre-invalid-utf8-input \
|
||||
pcre-o \
|
||||
@@ -2166,6 +2167,13 @@ pcre-abort.log: pcre-abort
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
+pcre-count.log: pcre-count
|
||||
+ @p='pcre-count'; \
|
||||
+ b='pcre-count'; \
|
||||
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
+ --log-file $$b.log --trs-file $$b.trs \
|
||||
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
pcre-infloop.log: pcre-infloop
|
||||
@p='pcre-infloop'; \
|
||||
b='pcre-infloop'; \
|
||||
diff --git a/tests/pcre-count b/tests/pcre-count
|
||||
new file mode 100755
|
||||
index 0000000..78e1c7c
|
||||
--- /dev/null
|
||||
+++ b/tests/pcre-count
|
||||
@@ -0,0 +1,23 @@
|
||||
+#! /bin/sh
|
||||
+# grep -P / grep -Pc are inconsistent results
|
||||
+# This bug affected grep versions 2.21 through 2.22.
|
||||
+#
|
||||
+# Copyright (C) 2015 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
|
||||
+require_pcre_
|
||||
+
|
||||
+fail=0
|
||||
+
|
||||
+printf 'a\n%032768d\nb\x0\n%032768d\na\n' 0 0 > in
|
||||
+
|
||||
+LC_ALL=C grep -P 'a' in | wc -l > exp
|
||||
+
|
||||
+LC_ALL=C grep -Pc 'a' in > out || fail=1
|
||||
+compare exp out || fail=1
|
||||
+
|
||||
+Exit $fail
|
||||
671
grep-2.21-better-encoding-errors-handling.patch
Normal file
671
grep-2.21-better-encoding-errors-handling.patch
Normal file
|
|
@ -0,0 +1,671 @@
|
|||
diff --git a/src/grep.c b/src/grep.c
|
||||
index 50a9868..6f18c1b 100644
|
||||
--- a/src/grep.c
|
||||
+++ b/src/grep.c
|
||||
@@ -351,7 +351,6 @@ bool match_icase;
|
||||
bool match_words;
|
||||
bool match_lines;
|
||||
char eolbyte;
|
||||
-enum textbin input_textbin;
|
||||
|
||||
static char const *matcher;
|
||||
|
||||
@@ -362,6 +361,10 @@ static size_t filename_prefix_len;
|
||||
static bool errseen;
|
||||
static bool write_error_seen;
|
||||
|
||||
+/* True if output from the current input file has been suppressed
|
||||
+ because an output line had an encoding error. */
|
||||
+static bool encoding_error_output;
|
||||
+
|
||||
enum directories_type
|
||||
{
|
||||
READ_DIRECTORIES = 2,
|
||||
@@ -447,12 +450,6 @@ clean_up_stdout (void)
|
||||
close_stdout ();
|
||||
}
|
||||
|
||||
-static bool
|
||||
-textbin_is_binary (enum textbin textbin)
|
||||
-{
|
||||
- return textbin < TEXTBIN_UNKNOWN;
|
||||
-}
|
||||
-
|
||||
/* The high-order bit of a byte. */
|
||||
enum { HIBYTE = 0x80 };
|
||||
|
||||
@@ -517,58 +514,60 @@ skip_easy_bytes (char const *buf)
|
||||
return p;
|
||||
}
|
||||
|
||||
-/* Return the text type of data in BUF, of size SIZE.
|
||||
+/* Return true if BUF, of size SIZE, has an encoding error.
|
||||
BUF must be followed by at least sizeof (uword) bytes,
|
||||
- which may be arbitrarily written to or read from. */
|
||||
-static enum textbin
|
||||
-buffer_textbin (char *buf, size_t size)
|
||||
+ the first of which may be modified. */
|
||||
+static bool
|
||||
+buf_has_encoding_errors (char *buf, size_t size)
|
||||
{
|
||||
- if (eolbyte && memchr (buf, '\0', size))
|
||||
- return TEXTBIN_BINARY;
|
||||
+ if (MB_CUR_MAX <= 1)
|
||||
+ return false;
|
||||
|
||||
- if (1 < MB_CUR_MAX)
|
||||
- {
|
||||
- mbstate_t mbs = { 0 };
|
||||
- size_t clen;
|
||||
- char const *p;
|
||||
+ mbstate_t mbs = { 0 };
|
||||
+ size_t clen;
|
||||
|
||||
- buf[size] = -1;
|
||||
- for (p = buf; (p = skip_easy_bytes (p)) < buf + size; p += clen)
|
||||
- {
|
||||
- clen = mbrlen (p, buf + size - p, &mbs);
|
||||
- if ((size_t) -2 <= clen)
|
||||
- return clen == (size_t) -2 ? TEXTBIN_UNKNOWN : TEXTBIN_BINARY;
|
||||
- }
|
||||
+ buf[size] = -1;
|
||||
+ for (char const *p = buf; (p = skip_easy_bytes (p)) < buf + size; p += clen)
|
||||
+ {
|
||||
+ clen = mbrlen (p, buf + size - p, &mbs);
|
||||
+ if ((size_t) -2 <= clen)
|
||||
+ return true;
|
||||
}
|
||||
|
||||
- return TEXTBIN_TEXT;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
-/* Return the text type of a file. BUF, of size SIZE, is the initial
|
||||
- buffer read from the file with descriptor FD and status ST.
|
||||
- BUF must be followed by at least sizeof (uword) bytes,
|
||||
+
|
||||
+/* Return true if BUF, of size SIZE, has a null byte.
|
||||
+ BUF must be followed by at least one byte,
|
||||
which may be arbitrarily written to or read from. */
|
||||
-static enum textbin
|
||||
-file_textbin (char *buf, size_t size, int fd, struct stat const *st)
|
||||
+static bool
|
||||
+buf_has_nulls (char *buf, size_t size)
|
||||
{
|
||||
- enum textbin textbin = buffer_textbin (buf, size);
|
||||
- if (textbin_is_binary (textbin))
|
||||
- return textbin;
|
||||
+ buf[size] = 0;
|
||||
+ return strlen (buf) != size;
|
||||
+}
|
||||
|
||||
+/* Return true if a file is known to contain null bytes.
|
||||
+ SIZE bytes have already been read from the file
|
||||
+ with descriptor FD and status ST. */
|
||||
+static bool
|
||||
+file_must_have_nulls (size_t size, int fd, struct stat const *st)
|
||||
+{
|
||||
if (usable_st_size (st))
|
||||
{
|
||||
if (st->st_size <= size)
|
||||
- return textbin == TEXTBIN_UNKNOWN ? TEXTBIN_BINARY : textbin;
|
||||
+ return false;
|
||||
|
||||
/* If the file has holes, it must contain a null byte somewhere. */
|
||||
- if (SEEK_HOLE != SEEK_SET && eolbyte)
|
||||
+ if (SEEK_HOLE != SEEK_SET)
|
||||
{
|
||||
off_t cur = size;
|
||||
if (O_BINARY || fd == STDIN_FILENO)
|
||||
{
|
||||
cur = lseek (fd, 0, SEEK_CUR);
|
||||
if (cur < 0)
|
||||
- return TEXTBIN_UNKNOWN;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/* Look for a hole after the current location. */
|
||||
@@ -578,12 +577,12 @@ file_textbin (char *buf, size_t size, int fd, struct stat const *st)
|
||||
if (lseek (fd, cur, SEEK_SET) < 0)
|
||||
suppressible_error (filename, errno);
|
||||
if (hole_start < st->st_size)
|
||||
- return TEXTBIN_BINARY;
|
||||
+ return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
- return TEXTBIN_UNKNOWN;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
/* Convert STR to a nonnegative integer, storing the result in *OUT.
|
||||
@@ -841,7 +840,7 @@ static char *label = NULL; /* Fake filename for stdin */
|
||||
/* Internal variables to keep track of byte count, context, etc. */
|
||||
static uintmax_t totalcc; /* Total character count before bufbeg. */
|
||||
static char const *lastnl; /* Pointer after last newline counted. */
|
||||
-static char const *lastout; /* Pointer after last character output;
|
||||
+static char *lastout; /* Pointer after last character output;
|
||||
NULL if no character has been output
|
||||
or if it's conceptually before bufbeg. */
|
||||
static intmax_t outleft; /* Maximum number of lines to be output. */
|
||||
@@ -913,10 +912,31 @@ print_offset (uintmax_t pos, int min_width, const char *color)
|
||||
pr_sgr_end_if (color);
|
||||
}
|
||||
|
||||
-/* Print a whole line head (filename, line, byte). */
|
||||
-static void
|
||||
-print_line_head (char const *beg, char const *lim, char sep)
|
||||
+/* Print a whole line head (filename, line, byte). The output data
|
||||
+ starts at BEG and contains LEN bytes; it is followed by at least
|
||||
+ sizeof (uword) bytes, the first of which may be temporarily modified.
|
||||
+ The output data comes from what is perhaps a larger input line that
|
||||
+ goes until LIM, where LIM[-1] is an end-of-line byte. Use SEP as
|
||||
+ the separator on output.
|
||||
+
|
||||
+ Return true unless the line was suppressed due to an encoding error. */
|
||||
+
|
||||
+static bool
|
||||
+print_line_head (char *beg, size_t len, char const *lim, char sep)
|
||||
{
|
||||
+ bool encoding_errors = false;
|
||||
+ if (binary_files != TEXT_BINARY_FILES)
|
||||
+ {
|
||||
+ char ch = beg[len];
|
||||
+ encoding_errors = buf_has_encoding_errors (beg, len);
|
||||
+ beg[len] = ch;
|
||||
+ }
|
||||
+ if (encoding_errors)
|
||||
+ {
|
||||
+ encoding_error_output = done_on_match = out_quiet = true;
|
||||
+ return false;
|
||||
+ }
|
||||
+
|
||||
bool pending_sep = false;
|
||||
|
||||
if (out_file)
|
||||
@@ -963,22 +983,27 @@ print_line_head (char const *beg, char const *lim, char sep)
|
||||
|
||||
print_sep (sep);
|
||||
}
|
||||
+
|
||||
+ return true;
|
||||
}
|
||||
|
||||
-static const char *
|
||||
-print_line_middle (const char *beg, const char *lim,
|
||||
+static char *
|
||||
+print_line_middle (char *beg, char *lim,
|
||||
const char *line_color, const char *match_color)
|
||||
{
|
||||
size_t match_size;
|
||||
size_t match_offset;
|
||||
- const char *cur = beg;
|
||||
- const char *mid = NULL;
|
||||
-
|
||||
- while (cur < lim
|
||||
- && ((match_offset = execute (beg, lim - beg, &match_size,
|
||||
- beg + (cur - beg))) != (size_t) -1))
|
||||
+ char *cur = beg;
|
||||
+ char *mid = NULL;
|
||||
+ char *b;
|
||||
+
|
||||
+ for (cur = beg;
|
||||
+ (cur < lim
|
||||
+ && ((match_offset = execute (beg, lim - beg, &match_size, cur))
|
||||
+ != (size_t) -1));
|
||||
+ cur = b + match_size)
|
||||
{
|
||||
- char const *b = beg + match_offset;
|
||||
+ b = beg + match_offset;
|
||||
|
||||
/* Avoid matching the empty line at the end of the buffer. */
|
||||
if (b == lim)
|
||||
@@ -998,8 +1023,11 @@ print_line_middle (const char *beg, const char *lim,
|
||||
/* This function is called on a matching line only,
|
||||
but is it selected or rejected/context? */
|
||||
if (only_matching)
|
||||
- print_line_head (b, lim, (out_invert ? SEP_CHAR_REJECTED
|
||||
- : SEP_CHAR_SELECTED));
|
||||
+ {
|
||||
+ char sep = out_invert ? SEP_CHAR_REJECTED : SEP_CHAR_SELECTED;
|
||||
+ if (! print_line_head (b, match_size, lim, sep))
|
||||
+ return NULL;
|
||||
+ }
|
||||
else
|
||||
{
|
||||
pr_sgr_start (line_color);
|
||||
@@ -1017,7 +1045,6 @@ print_line_middle (const char *beg, const char *lim,
|
||||
if (only_matching)
|
||||
fputs ("\n", stdout);
|
||||
}
|
||||
- cur = b + match_size;
|
||||
}
|
||||
|
||||
if (only_matching)
|
||||
@@ -1028,8 +1055,8 @@ print_line_middle (const char *beg, const char *lim,
|
||||
return cur;
|
||||
}
|
||||
|
||||
-static const char *
|
||||
-print_line_tail (const char *beg, const char *lim, const char *line_color)
|
||||
+static char *
|
||||
+print_line_tail (char *beg, const char *lim, const char *line_color)
|
||||
{
|
||||
size_t eol_size;
|
||||
size_t tail_size;
|
||||
@@ -1050,14 +1077,15 @@ print_line_tail (const char *beg, const char *lim, const char *line_color)
|
||||
}
|
||||
|
||||
static void
|
||||
-prline (char const *beg, char const *lim, char sep)
|
||||
+prline (char *beg, char *lim, char sep)
|
||||
{
|
||||
bool matching;
|
||||
const char *line_color;
|
||||
const char *match_color;
|
||||
|
||||
if (!only_matching)
|
||||
- print_line_head (beg, lim, sep);
|
||||
+ if (! print_line_head (beg, lim - beg - 1, lim, sep))
|
||||
+ return;
|
||||
|
||||
matching = (sep == SEP_CHAR_SELECTED) ^ out_invert;
|
||||
|
||||
@@ -1077,7 +1105,11 @@ prline (char const *beg, char const *lim, char sep)
|
||||
{
|
||||
/* We already know that non-matching lines have no match (to colorize). */
|
||||
if (matching && (only_matching || *match_color))
|
||||
- beg = print_line_middle (beg, lim, line_color, match_color);
|
||||
+ {
|
||||
+ beg = print_line_middle (beg, lim, line_color, match_color);
|
||||
+ if (! beg)
|
||||
+ return;
|
||||
+ }
|
||||
|
||||
if (!only_matching && *line_color)
|
||||
{
|
||||
@@ -1111,7 +1143,7 @@ prpending (char const *lim)
|
||||
lastout = bufbeg;
|
||||
while (pending > 0 && lastout < lim)
|
||||
{
|
||||
- char const *nl = memchr (lastout, eolbyte, lim - lastout);
|
||||
+ char *nl = memchr (lastout, eolbyte, lim - lastout);
|
||||
size_t match_size;
|
||||
--pending;
|
||||
if (outleft
|
||||
@@ -1126,7 +1158,7 @@ prpending (char const *lim)
|
||||
|
||||
/* Output the lines between BEG and LIM. Deal with context. */
|
||||
static void
|
||||
-prtext (char const *beg, char const *lim)
|
||||
+prtext (char *beg, char *lim)
|
||||
{
|
||||
static bool used; /* Avoid printing SEP_STR_GROUP before any output. */
|
||||
char eol = eolbyte;
|
||||
@@ -1134,7 +1166,7 @@ prtext (char const *beg, char const *lim)
|
||||
if (!out_quiet && pending > 0)
|
||||
prpending (beg);
|
||||
|
||||
- char const *p = beg;
|
||||
+ char *p = beg;
|
||||
|
||||
if (!out_quiet)
|
||||
{
|
||||
@@ -1160,7 +1192,7 @@ prtext (char const *beg, char const *lim)
|
||||
|
||||
while (p < beg)
|
||||
{
|
||||
- char const *nl = memchr (p, eol, beg - p);
|
||||
+ char *nl = memchr (p, eol, beg - p);
|
||||
nl++;
|
||||
prline (p, nl, SEP_CHAR_REJECTED);
|
||||
p = nl;
|
||||
@@ -1173,7 +1205,7 @@ prtext (char const *beg, char const *lim)
|
||||
/* One or more lines are output. */
|
||||
for (n = 0; p < lim && n < outleft; n++)
|
||||
{
|
||||
- char const *nl = memchr (p, eol, lim - p);
|
||||
+ char *nl = memchr (p, eol, lim - p);
|
||||
nl++;
|
||||
if (!out_quiet)
|
||||
prline (p, nl, SEP_CHAR_SELECTED);
|
||||
@@ -1220,13 +1252,12 @@ zap_nuls (char *p, char *lim, char eol)
|
||||
between matching lines if OUT_INVERT is true). Return a count of
|
||||
lines printed. Replace all NUL bytes with NUL_ZAPPER as we go. */
|
||||
static intmax_t
|
||||
-grepbuf (char const *beg, char const *lim)
|
||||
+grepbuf (char *beg, char const *lim)
|
||||
{
|
||||
intmax_t outleft0 = outleft;
|
||||
- char const *p;
|
||||
- char const *endp;
|
||||
+ char *endp;
|
||||
|
||||
- for (p = beg; p < lim; p = endp)
|
||||
+ for (char *p = beg; p < lim; p = endp)
|
||||
{
|
||||
size_t match_size;
|
||||
size_t match_offset = execute (p, lim - p, &match_size, NULL);
|
||||
@@ -1237,15 +1268,15 @@ grepbuf (char const *beg, char const *lim)
|
||||
match_offset = lim - p;
|
||||
match_size = 0;
|
||||
}
|
||||
- char const *b = p + match_offset;
|
||||
+ char *b = p + match_offset;
|
||||
endp = b + match_size;
|
||||
/* Avoid matching the empty line at the end of the buffer. */
|
||||
if (!out_invert && b == lim)
|
||||
break;
|
||||
if (!out_invert || p < b)
|
||||
{
|
||||
- char const *prbeg = out_invert ? p : b;
|
||||
- char const *prend = out_invert ? b : endp;
|
||||
+ char *prbeg = out_invert ? p : b;
|
||||
+ char *prend = out_invert ? b : endp;
|
||||
prtext (prbeg, prend);
|
||||
if (!outleft || done_on_match)
|
||||
{
|
||||
@@ -1266,7 +1297,6 @@ static intmax_t
|
||||
grep (int fd, struct stat const *st)
|
||||
{
|
||||
intmax_t nlines, i;
|
||||
- enum textbin textbin;
|
||||
size_t residue, save;
|
||||
char oldc;
|
||||
char *beg;
|
||||
@@ -1275,6 +1305,7 @@ grep (int fd, struct stat const *st)
|
||||
char nul_zapper = '\0';
|
||||
bool done_on_match_0 = done_on_match;
|
||||
bool out_quiet_0 = out_quiet;
|
||||
+ bool has_nulls = false;
|
||||
|
||||
if (! reset (fd, st))
|
||||
return 0;
|
||||
@@ -1286,6 +1317,7 @@ grep (int fd, struct stat const *st)
|
||||
after_last_match = 0;
|
||||
pending = 0;
|
||||
skip_nuls = skip_empty_lines && !eol;
|
||||
+ encoding_error_output = false;
|
||||
seek_data_failed = false;
|
||||
|
||||
nlines = 0;
|
||||
@@ -1298,26 +1330,20 @@ grep (int fd, struct stat const *st)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (binary_files == TEXT_BINARY_FILES)
|
||||
- textbin = TEXTBIN_TEXT;
|
||||
- else
|
||||
+ for (bool firsttime = true; ; firsttime = false)
|
||||
{
|
||||
- textbin = file_textbin (bufbeg, buflim - bufbeg, fd, st);
|
||||
- if (textbin_is_binary (textbin))
|
||||
+ if (!has_nulls && eol && binary_files != TEXT_BINARY_FILES
|
||||
+ && (buf_has_nulls (bufbeg, buflim - bufbeg)
|
||||
+ || (firsttime && file_must_have_nulls (buflim - bufbeg, fd, st))))
|
||||
{
|
||||
+ has_nulls = true;
|
||||
if (binary_files == WITHOUT_MATCH_BINARY_FILES)
|
||||
return 0;
|
||||
done_on_match = out_quiet = true;
|
||||
nul_zapper = eol;
|
||||
skip_nuls = skip_empty_lines;
|
||||
}
|
||||
- else if (execute != Pexecute)
|
||||
- textbin = TEXTBIN_TEXT;
|
||||
- }
|
||||
|
||||
- for (;;)
|
||||
- {
|
||||
- input_textbin = textbin;
|
||||
lastnl = bufbeg;
|
||||
if (lastout)
|
||||
lastout = bufbeg;
|
||||
@@ -1368,13 +1394,8 @@ grep (int fd, struct stat const *st)
|
||||
}
|
||||
|
||||
/* Detect whether leading context is adjacent to previous output. */
|
||||
- if (lastout)
|
||||
- {
|
||||
- if (textbin == TEXTBIN_UNKNOWN)
|
||||
- textbin = TEXTBIN_TEXT;
|
||||
- if (beg != lastout)
|
||||
- lastout = 0;
|
||||
- }
|
||||
+ if (beg != lastout)
|
||||
+ lastout = 0;
|
||||
|
||||
/* Handle some details and read more data to scan. */
|
||||
save = residue + lim - beg;
|
||||
@@ -1387,22 +1408,6 @@ grep (int fd, struct stat const *st)
|
||||
suppressible_error (filename, errno);
|
||||
goto finish_grep;
|
||||
}
|
||||
-
|
||||
- /* If the file's textbin has not been determined yet, assume
|
||||
- it's binary if the next input buffer suggests so. */
|
||||
- if (textbin == TEXTBIN_UNKNOWN)
|
||||
- {
|
||||
- enum textbin tb = buffer_textbin (bufbeg, buflim - bufbeg);
|
||||
- if (textbin_is_binary (tb))
|
||||
- {
|
||||
- if (binary_files == WITHOUT_MATCH_BINARY_FILES)
|
||||
- return 0;
|
||||
- textbin = tb;
|
||||
- done_on_match = out_quiet = true;
|
||||
- nul_zapper = eol;
|
||||
- skip_nuls = skip_empty_lines;
|
||||
- }
|
||||
- }
|
||||
}
|
||||
if (residue)
|
||||
{
|
||||
@@ -1416,7 +1421,7 @@ grep (int fd, struct stat const *st)
|
||||
finish_grep:
|
||||
done_on_match = done_on_match_0;
|
||||
out_quiet = out_quiet_0;
|
||||
- if (textbin_is_binary (textbin) && !out_quiet && nlines != 0)
|
||||
+ if ((has_nulls || encoding_error_output) && !out_quiet && nlines != 0)
|
||||
printf (_("Binary file %s matches\n"), filename);
|
||||
return nlines;
|
||||
}
|
||||
diff --git a/src/grep.h b/src/grep.h
|
||||
index 02052b4..e70e28f 100644
|
||||
--- a/src/grep.h
|
||||
+++ b/src/grep.h
|
||||
@@ -29,22 +29,4 @@ extern bool match_words; /* -w */
|
||||
extern bool match_lines; /* -x */
|
||||
extern char eolbyte; /* -z */
|
||||
|
||||
-/* An enum textbin describes the file's type, inferred from data read
|
||||
- before the first line is selected for output. */
|
||||
-enum textbin
|
||||
- {
|
||||
- /* Binary, as it contains null bytes and the -z option is not in effect,
|
||||
- or it contains encoding errors. */
|
||||
- TEXTBIN_BINARY = -1,
|
||||
-
|
||||
- /* Not known yet. Only text has been seen so far. */
|
||||
- TEXTBIN_UNKNOWN = 0,
|
||||
-
|
||||
- /* Text. */
|
||||
- TEXTBIN_TEXT = 1
|
||||
- };
|
||||
-
|
||||
-/* Input file type. */
|
||||
-extern enum textbin input_textbin;
|
||||
-
|
||||
#endif
|
||||
diff --git a/src/pcresearch.c b/src/pcresearch.c
|
||||
index 5451029..ef2f241 100644
|
||||
--- a/src/pcresearch.c
|
||||
+++ b/src/pcresearch.c
|
||||
@@ -157,32 +157,13 @@ Pexecute (char const *buf, size_t size, size_t *match_size,
|
||||
int e = PCRE_ERROR_NOMATCH;
|
||||
char const *line_end;
|
||||
|
||||
- /* If the input type is unknown, the caller is still testing the
|
||||
- input, which means the current buffer cannot contain encoding
|
||||
- errors and a multiline search is typically more efficient.
|
||||
- Otherwise, a single-line search is typically faster, so that
|
||||
- pcre_exec doesn't waste time validating the entire input
|
||||
- buffer. */
|
||||
- bool multiline = input_textbin == TEXTBIN_UNKNOWN;
|
||||
-
|
||||
for (; p < buf + size; p = line_start = line_end + 1)
|
||||
{
|
||||
- bool too_big;
|
||||
-
|
||||
- if (multiline)
|
||||
- {
|
||||
- size_t pcre_size_max = MIN (INT_MAX, SIZE_MAX - 1);
|
||||
- size_t scan_size = MIN (pcre_size_max + 1, buf + size - p);
|
||||
- line_end = memrchr (p, eolbyte, scan_size);
|
||||
- too_big = ! line_end;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- line_end = memchr (p, eolbyte, buf + size - p);
|
||||
- too_big = INT_MAX < line_end - p;
|
||||
- }
|
||||
-
|
||||
- if (too_big)
|
||||
+ /* A single-line search is typically faster, so that
|
||||
+ pcre_exec doesn't waste time validating the entire input
|
||||
+ buffer. */
|
||||
+ line_end = memchr (p, eolbyte, buf + size - p);
|
||||
+ if (INT_MAX < line_end - p)
|
||||
error (EXIT_TROUBLE, 0, _("exceeded PCRE's line length limit"));
|
||||
|
||||
for (;;)
|
||||
@@ -209,27 +190,11 @@ Pexecute (char const *buf, size_t size, size_t *match_size,
|
||||
int options = 0;
|
||||
if (!bol)
|
||||
options |= PCRE_NOTBOL;
|
||||
- if (multiline)
|
||||
- options |= PCRE_NO_UTF8_CHECK;
|
||||
|
||||
e = pcre_exec (cre, extra, p, search_bytes, 0,
|
||||
options, sub, NSUB);
|
||||
if (e != PCRE_ERROR_BADUTF8)
|
||||
- {
|
||||
- if (0 < e && multiline && sub[1] - sub[0] != 0)
|
||||
- {
|
||||
- char const *nl = memchr (p + sub[0], eolbyte,
|
||||
- sub[1] - sub[0]);
|
||||
- if (nl)
|
||||
- {
|
||||
- /* This match crosses a line boundary; reject it. */
|
||||
- p += sub[0];
|
||||
- line_end = nl;
|
||||
- continue;
|
||||
- }
|
||||
- }
|
||||
- break;
|
||||
- }
|
||||
+ break;
|
||||
int valid_bytes = sub[0];
|
||||
|
||||
/* Try to match the string before the encoding error.
|
||||
@@ -291,15 +256,6 @@ Pexecute (char const *buf, size_t size, size_t *match_size,
|
||||
beg = matchbeg;
|
||||
end = matchend;
|
||||
}
|
||||
- else if (multiline)
|
||||
- {
|
||||
- char const *prev_nl = memrchr (line_start - 1, eolbyte,
|
||||
- matchbeg - (line_start - 1));
|
||||
- char const *next_nl = memchr (matchend, eolbyte,
|
||||
- line_end + 1 - matchend);
|
||||
- beg = prev_nl + 1;
|
||||
- end = next_nl + 1;
|
||||
- }
|
||||
else
|
||||
{
|
||||
beg = line_start;
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index 2f69835..47b9883 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -55,6 +55,7 @@ TESTS = \
|
||||
dfaexec-multibyte \
|
||||
empty \
|
||||
empty-line \
|
||||
+ encoding-error \
|
||||
epipe \
|
||||
equiv-classes \
|
||||
ere \
|
||||
diff --git a/tests/Makefile.in b/tests/Makefile.in
|
||||
index 4e843bf..4aaebdf 100644
|
||||
--- a/tests/Makefile.in
|
||||
+++ b/tests/Makefile.in
|
||||
@@ -1359,6 +1359,7 @@ TESTS = \
|
||||
dfaexec-multibyte \
|
||||
empty \
|
||||
empty-line \
|
||||
+ encoding-error \
|
||||
epipe \
|
||||
equiv-classes \
|
||||
ere \
|
||||
@@ -1913,6 +1914,13 @@ empty-line.log: empty-line
|
||||
--log-file $$b.log --trs-file $$b.trs \
|
||||
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
"$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
+encoding-error.log: encoding-error
|
||||
+ @p='encoding-error'; \
|
||||
+ b='encoding-error'; \
|
||||
+ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
|
||||
+ --log-file $$b.log --trs-file $$b.trs \
|
||||
+ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
|
||||
+ "$$tst" $(AM_TESTS_FD_REDIRECT)
|
||||
epipe.log: epipe
|
||||
@p='epipe'; \
|
||||
b='epipe'; \
|
||||
diff --git a/tests/encoding-error b/tests/encoding-error
|
||||
new file mode 100755
|
||||
index 0000000..fe52de2
|
||||
--- a/dev/null
|
||||
+++ b/tests/encoding-error
|
||||
@@ -0,0 +1,41 @@
|
||||
+#! /bin/sh
|
||||
+# Test grep's behavior on encoding errors.
|
||||
+#
|
||||
+# Copyright 2015 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
|
||||
+
|
||||
+require_en_utf8_locale_
|
||||
+
|
||||
+LC_ALL=en_US.UTF-8
|
||||
+export LC_ALL
|
||||
+
|
||||
+printf 'Alfred Jones\n' > a || framework_failure_
|
||||
+printf 'John Smith\n' >j || framework_failure_
|
||||
+printf 'Pedro P\xe9rez\n' >p || framework_failure_
|
||||
+cat a p j >in || framework_failure_
|
||||
+
|
||||
+fail=0
|
||||
+
|
||||
+grep '^A' in >out || fail=1
|
||||
+compare a out || fail=1
|
||||
+
|
||||
+grep '^P' in >out || fail=1
|
||||
+printf 'Binary file in matches\n' >exp || framework_failure_
|
||||
+compare exp out || fail=1
|
||||
+
|
||||
+grep '^J' in >out || fail=1
|
||||
+compare j out || fail=1
|
||||
+
|
||||
+grep '^X' in >out
|
||||
+test $? = 1 || fail=1
|
||||
+compare /dev/null out || fail=1
|
||||
+
|
||||
+grep -a . in >out || fail=1
|
||||
+compare in out
|
||||
+
|
||||
+Exit $fail
|
||||
26
grep-2.21-test-pcre-count-fix.patch
Normal file
26
grep-2.21-test-pcre-count-fix.patch
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/tests/pcre-count b/tests/pcre-count
|
||||
--- a/tests/pcre-count
|
||||
+++ b/tests/pcre-count
|
||||
@@ -13,11 +13,17 @@ require_pcre_
|
||||
|
||||
fail=0
|
||||
|
||||
-printf 'a\n%032768d\nb\x0\n%032768d\na\n' 0 0 > in
|
||||
+printf 'a\n%032768d\nb\0\n%032768d\na\n' 0 0 > in || framework_failure_
|
||||
|
||||
-LC_ALL=C grep -P 'a' in | wc -l > exp
|
||||
+# grep will discover that the input is a binary file sooner if the
|
||||
+# page size is larger, so allow for either possible output.
|
||||
+printf 'a\nBinary file in matches\n' >exp1a || framework_failure_
|
||||
+printf 'Binary file in matches\n' >exp1b || framework_failure_
|
||||
+LC_ALL=C grep -P 'a' in >out || fail=1
|
||||
+compare exp1a out || compare exp1b out || fail=1
|
||||
|
||||
-LC_ALL=C grep -Pc 'a' in > out || fail=1
|
||||
-compare exp out || fail=1
|
||||
+printf '2\n' >exp2 || framework_failure_
|
||||
+LC_ALL=C grep -Pc 'a' in >out || fail=1
|
||||
+compare exp2 out || fail=1
|
||||
|
||||
Exit $fail
|
||||
|
||||
31
grep.spec
31
grep.spec
|
|
@ -3,7 +3,7 @@
|
|||
Summary: Pattern matching utilities
|
||||
Name: grep
|
||||
Version: 2.21
|
||||
Release: 5%{?dist}
|
||||
Release: 9%{?dist}
|
||||
License: GPLv3+
|
||||
Group: Applications/Text
|
||||
Source: ftp://ftp.gnu.org/pub/gnu/grep/grep-%{version}.tar.xz
|
||||
|
|
@ -20,6 +20,12 @@ Patch2: grep-2.21-buf-overrun-fix.patch
|
|||
# backported from upstream
|
||||
# http://git.savannah.gnu.org/cgit/grep.git/commit/?id=c8b9364d5900a40809827aee6cc53705073278f6
|
||||
Patch3: grep-2.21-recurse-behaviour-change-doc.patch
|
||||
# backported from upstream
|
||||
Patch4: grep-2.21-better-encoding-errors-handling.patch
|
||||
# backported from upstream, upstream bug#22028
|
||||
Patch5: grep-2.21-Pc-consistent-results.patch
|
||||
# backported from upstream, upstream bug#22350
|
||||
Patch6: grep-2.21-test-pcre-count-fix.patch
|
||||
URL: http://www.gnu.org/software/grep/
|
||||
Requires(post): /sbin/install-info
|
||||
Requires(preun): /sbin/install-info
|
||||
|
|
@ -42,8 +48,13 @@ GNU grep is needed by many scripts, so it shall be installed on every system.
|
|||
%patch1 -p1 -b .help-align
|
||||
%patch2 -p1 -b .buf-overrun-fix
|
||||
%patch3 -p1 -b .recurse-behaviour-change-doc
|
||||
%patch4 -p1 -b .better-encoding-errors-handling
|
||||
%patch5 -p1 -b .Pc-consistent-results
|
||||
%patch6 -p1 -b .test-pcre-count-fix
|
||||
|
||||
chmod 755 tests/kwset-abuse
|
||||
chmod 755 tests/encoding-error
|
||||
chmod 755 tests/pcre-count
|
||||
|
||||
%build
|
||||
%global BUILD_FLAGS $RPM_OPT_FLAGS
|
||||
|
|
@ -99,6 +110,24 @@ fi
|
|||
%{_libexecdir}/grepconf.sh
|
||||
|
||||
%changelog
|
||||
* Tue Jan 12 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21-9
|
||||
- Fixed pcre-count test on secondary architectures
|
||||
(byt test-pcre-count-fix patch)
|
||||
Resolves: rhbz#1296842
|
||||
|
||||
* Wed Jan 6 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21-8
|
||||
- Used latest upstream patch for bug 1269014 to fix regression,
|
||||
fixed order of patches
|
||||
Resolves: rhbz#1269014
|
||||
|
||||
* Tue Jan 5 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21-7
|
||||
- Improved encoding errors handling (by better-encoding-errors-handling patch)
|
||||
Resolves: rhbz#1219141
|
||||
|
||||
* Wed Dec 2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21-6
|
||||
- Fixed grep to be consistent in 'grep -Pc' and 'grep -P | wc -l'
|
||||
Resolves: rhbz#1269014
|
||||
|
||||
* Tue Apr 7 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.21-5
|
||||
- Documented change in behaviour of recurse option
|
||||
Resolves: rhbz#1178305
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue