[Bug 253350] Grep regression with --after-context (-A) and --max-count (-m) switches

[bugzilla-noreply at freebsd.org]

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=253350

--- Comment #4 from commit-hook at FreeBSD.org ---
A commit in branch releng/13.0 references this bug:

URL:
https://cgit.FreeBSD.org/src/commit/?id=dc57f212526d25e8ef036e768b816a7fdae5707b

commit dc57f212526d25e8ef036e768b816a7fdae5707b
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-02-11 15:11:24 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-02-11 15:12:17 +0000

    grep: fix -A handling in conjunction with -m match limitation

    The basic issue here is that grep, when given -m 1, would stop all
    line processing once it hit the match count and exit immediately.  The
    problem with exiting immediately is that -A processing only happens when
    subsequent lines are processed and do not match.

    The fix here is relatively easy; when bsdgrep matches a line, it resets
    the 'tail' of the matching context to the value supplied to -A and
    dumps anything that's been queued up for -B. After the current line has
    been printed and tail is reset, we check our mcount and do what's
    needed. Therefore, at the time that we decide we're doing nothing, we
    know that 'tail' of the context is correct and we can simply continue
    on if there's still more to pick up.

    With this change, we still bail out immediately if there's been no -A
    flag. If -A was supplied, we signal that we should continue on. However,
    subsequent lines will not even bothere to try and process the line.  We
    have reached the match count, so even if the next line would match then
    we must process it if it hadn't. Thus, the loop in procfile() can
    short-circuit and just process the line as a non-match until
    procmatches() indicates that it's safe to stop.

    A test has been added to reflect both that we should be picking up the
    next line and that the next line should be considered a non-match even
    if it should have been.

    PR:             253350
    Approved by:    re (gjb)

    (cherry picked from commit 3e2d96ac974db823255a6f40b90eeffa6e38d022)
    (cherry picked from commit 08f25b50dbd332e5c5c9380fd90c516e9af1ab36)

 contrib/netbsd-tests/usr.bin/grep/t_grep.sh | 17 +++++++++++++++++
 usr.bin/grep/util.c                         | 21 ++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

-- 
You are receiving this mail because:
You are on the CC list for the bug.