grep ./ChangeLog tests/foad1.sh src/grep.c

[Charles Levert]

CVSROOT:        /cvsroot/grep
Module name:    grep
Branch:         
Changes by:     Charles Levert <address@hidden> 05/06/21 06:19:44

Modified files:
        .              : ChangeLog 
        tests          : foad1.sh 
        src            : grep.c 

Log message:
        * tests/foad1.sh: Add tests combining -o, -n/-b/-H, and -i,
        since there are separate code paths for -i.  Add tests combining
        -o, -n/-b/-H, and -3, since any context line specification
        should be ignored when combined with -o.
        * src/grep.c (print_line_head): New function, culled off the
        top content of prline().  Adds a guard against "lastnl" having
        already reached "lim", which can happen when if the function
        is called more than once per line.
        * src/grep.c (prline): Now calls print_line_head(), not only at
        the beginning to replace the moved code when -o is not
        specified, but also for each match when -o is specified (two
        code paths with this).  Patch #3770, more or less.  This makes
        all tests combining -o and -n/-b/-H pass, which they didn't
        before.  Fixes bug #12727.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/ChangeLog.diff?tr1=1.252&tr2=1.253&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/tests/foad1.sh.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/grep/grep/src/grep.c.diff?tr1=1.103&tr2=1.104&r1=text&r2=text