From owner-svn-src-head@freebsd.org Fri Apr 20 18:06:04 2018 Return-Path: Delivered-To: svn-src-head@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 5298EF8AEBA; Fri, 20 Apr 2018 18:06:04 +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 018C574A00; Fri, 20 Apr 2018 18:06:04 +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 EB9CA1BAF1; Fri, 20 Apr 2018 18:06:03 +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 w3KI630g066819; Fri, 20 Apr 2018 18:06:03 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3KI63Cv066818; Fri, 20 Apr 2018 18:06:03 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201804201806.w3KI63Cv066818@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 18:06:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r332832 - 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: 332832 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Apr 2018 18:06:04 -0000 Author: kevans Date: Fri Apr 20 18:06:03 2018 New Revision: 332832 URL: https://svnweb.freebsd.org/changeset/base/332832 Log: bsdgrep: Break procmatches down a little bit more Split the matching and non-matching cases out into their own functions to reduce future complexity. As the name implies, procmatches will eventually process more than one match itself in the future. Modified: head/usr.bin/grep/util.c Modified: head/usr.bin/grep/util.c ============================================================================== --- head/usr.bin/grep/util.c Fri Apr 20 15:55:09 2018 (r332831) +++ head/usr.bin/grep/util.c Fri Apr 20 18:06:03 2018 (r332832) @@ -84,6 +84,8 @@ struct mprintc { bool same_file; /* Same file as previously printed? */ }; +static void procmatch_match(struct mprintc *mc, struct parsec *pc); +static void procmatch_nomatch(struct mprintc *mc, struct parsec *pc); static bool procmatches(struct mprintc *mc, struct parsec *pc, bool matched); #ifdef WITH_INTERNAL_NOSPEC static int litexec(const struct pat *pat, const char *string, @@ -209,6 +211,55 @@ grep_tree(char **argv) return (c); } +static void +procmatch_match(struct mprintc *mc, struct parsec *pc) +{ + + 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 (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; + } +} + +static void +procmatch_nomatch(struct mprintc *mc, struct parsec *pc) +{ + + /* Deal with any -A context as needed */ + if (mc->tail > 0) { + grep_printline(&pc->ln, '-'); + mc->tail--; + if (Bflag > 0) + clearqueue(); + } else if (Bflag == 0 || (Bflag > 0 && enqueue(&pc->ln))) + /* + * Enqueue non-matching lines for -B context. If we're not + * actually doing -B context or if the enqueue resulted in a + * line being rotated out, then go ahead and increment + * last_outed to signify a gap between context/match. + */ + ++mc->last_outed; +} + /* * Process any matches in the current parsing context, return a boolean * indicating whether we should halt any further processing or not. 'true' to @@ -224,31 +275,8 @@ procmatches(struct mprintc *mc, struct parsec *pc, boo */ /* Deal with any -B context or context separators */ if (matched) { - if (mc->doctx) { - if (!first_match && - (!mc->same_file || mc->last_outed > 0)) - printf("--\n"); - if (Bflag > 0) - printqueue(); - mc->tail = Aflag; - } + procmatch_match(mc, pc); - /* 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; - } - /* Count the matches if we have a match limit */ if (mflag) { /* XXX TODO: Decrement by number of matched lines */ @@ -256,25 +284,8 @@ procmatches(struct mprintc *mc, struct parsec *pc, boo 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--; - if (Bflag > 0) - clearqueue(); - } else { - /* - * Enqueue non-matching lines for -B context. - * If we're not actually doing -B context or if - * the enqueue resulted in a line being rotated - * out, then go ahead and increment last_outed - * to signify a gap between context/match. - */ - if (Bflag == 0 || (Bflag > 0 && enqueue(&pc->ln))) - ++mc->last_outed; - } - } + } else if (mc->doctx) + procmatch_nomatch(mc, pc); return (true); }