From 5ea3fdc7759782f8ea07545796ca11bfb0b0348a Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Fri, 20 Apr 2018 03:11:51 +0000
Subject: [PATCH] bsdgrep: Clean up procmatches a little bit

---
 usr.bin/grep/util.c | 65 +++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 0bb6d1c71588..a581173d775c 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -218,32 +218,41 @@ procmatches(struct mprintc *mc, struct parsec *pc, bool matched)
 {
 
 	/* 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;
-	}
-
-	/* 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;
+	if (matched) {
+		if (mc->doctx) {
+			if (!first_match &&
+			    (!mc->same_file || mc->last_outed > 0))
+				printf("--\n");
+			if (Bflag > 0)
+				printqueue();
+			mc->tail = Aflag;
 		}
-		first_match = false;
-		mc->same_file = true;
-		mc->last_outed = 0;
-	}
 
-	if (!matched && mc->doctx) {
-		/* Deal with any -A context */
+		/* 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 */
+			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--;
@@ -262,14 +271,6 @@ procmatches(struct mprintc *mc, struct parsec *pc, bool matched)
 		}
 	}
 
-	/* 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);
 }