From owner-svn-src-all@freebsd.org Fri Apr 20 03:11:52 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2A51DF9870B; Fri, 20 Apr 2018 03:11:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CCE728629F; Fri, 20 Apr 2018 03:11:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C7D2C12CB3; Fri, 20 Apr 2018 03:11:51 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3K3Bpe3019299; Fri, 20 Apr 2018 03:11:51 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3K3BpXm019298; Fri, 20 Apr 2018 03:11:51 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804200311.w3K3BpXm019298@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Fri, 20 Apr 2018 03:11:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332806 - head/usr.bin/grep X-SVN-Group: head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: head/usr.bin/grep X-SVN-Commit-Revision: 332806 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 03:11:52 -0000 Author: kevans Date: Fri Apr 20 03:11:51 2018 New Revision: 332806 URL: https://svnweb.freebsd.org/changeset/base/332806 Log: bsdgrep: Clean up procmatches a little bit Modified: head/usr.bin/grep/util.c Modified: head/usr.bin/grep/util.c ============================================================================== --- head/usr.bin/grep/util.c Fri Apr 20 03:08:46 2018 (r332805) +++ head/usr.bin/grep/util.c Fri Apr 20 03:11:51 2018 (r332806) @@ -218,32 +218,41 @@ procmatches(struct mprintc *mc, struct parsec *pc, boo { /* Deal with any -B context or context separators */ - if (matched && mc->doctx) { - if (!first_match && (!mc->same_file || mc->last_outed > 0)) - printf("--\n"); - if (Bflag > 0) - printqueue(); - mc->tail = Aflag; - } + if (matched) { + if (mc->doctx) { + if (!first_match && + (!mc->same_file || mc->last_outed > 0)) + printf("--\n"); + if (Bflag > 0) + printqueue(); + mc->tail = Aflag; + } - /* Print the matching line, but only if not quiet/binary */ - if (matched && mc->printmatch) { - printline(pc, ':'); - while (pc->matchidx >= MAX_MATCHES) { - /* Reset matchidx and try again */ - pc->matchidx = 0; - if (procline(pc) == 0) - printline(pc, ':'); - else - break; + /* Print the matching line, but only if not quiet/binary */ + if (mc->printmatch) { + printline(pc, ':'); + while (pc->matchidx >= MAX_MATCHES) { + /* Reset matchidx and try again */ + pc->matchidx = 0; + if (procline(pc) == 0) + printline(pc, ':'); + else + break; + } + first_match = false; + mc->same_file = true; + mc->last_outed = 0; } - first_match = false; - mc->same_file = true; - mc->last_outed = 0; - } - if (!matched && mc->doctx) { - /* Deal with any -A context */ + /* Count the matches if we have a match limit */ + if (mflag) { + /* XXX TODO: Decrement by number of matched lines */ + mcount -= 1; + if (mflag && mcount <= 0) + return (false); + } + } else if (mc->doctx) { + /* Not matching, deal with any -A context as needed */ if (mc->tail > 0) { grep_printline(&pc->ln, '-'); mc->tail--; @@ -260,14 +269,6 @@ procmatches(struct mprintc *mc, struct parsec *pc, boo if (Bflag == 0 || (Bflag > 0 && enqueue(&pc->ln))) ++mc->last_outed; } - } - - /* Count the matches if we have a match limit */ - if (matched && mflag) { - /* XXX TODO: Decrement by number of matched lines */ - mcount -= 1; - if (mflag && mcount <= 0) - return (false); } return (true);