Attachment 179175 Details for Bug 195763 – Proposed patch to address line matching issues

[patch] Proposed patch to address line matching issues

grep-zerolen.patch (text/plain), 3.67 KB, created by Kyle Evans on 2017-01-21 06:26:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Evans

Created: 2017-01-21 06:26:00 UTC

Size: 3.67 KB

patch

obsolete

>diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
>index 5583c803abc..c8bd48c03a9 100644
>--- a/usr.bin/grep/util.c
>+++ b/usr.bin/grep/util.c
>@@ -52,6 +52,10 @@ __FBSDID("$FreeBSD$");
> #include "fastmatch.h"
> #include "grep.h"
> 
>+#ifndef MAX
>+#define MAX(a,b)			((a > b) ? (a) : (b))
>+#endif
>+
> static int	 linesqueued;
> static int	 procline(struct str *l, int);
> 
>@@ -264,6 +283,12 @@ procfile(const char *fn)
> }
> 
> #define iswword(x)	(iswalnum((x)) || (x) == L'_')
>+#define overlaps(a,b) ( \
>+		((a.rm_so) >= (b.rm_so) && (a.rm_so) <= (b.rm_eo-1)) || \
>+		((a.rm_eo-1) >= (b.rm_so) && (a.rm_eo) <= (b.rm_eo)) || \
>+		((a.rm_so) < (b.rm_so) && (a.rm_eo-1) >= (b.rm_so)) || \
>+		((a.rm_so) < (b.rm_eo-1) && (a.rm_eo) >= (b.rm_eo)) \
>+		)
> 
> /*
>  * Processes a line comparing it with the specified patterns.  Each pattern
>@@ -276,28 +301,27 @@ static int
> procline(struct str *l, int nottext)
> {
> 	regmatch_t matches[MAX_LINE_MATCHES];
>-	regmatch_t pmatch;
>-	size_t st = 0;
>+	regmatch_t pmatch, lastmatch;
>+	size_t st = 0, nst = 0;
> 	unsigned int i;
>-	int c = 0, m = 0, r = 0;
>+	int c = 0, m = 0, r = 0, lastmatches = 0, leflags = eflags;
> 
> 	/* Loop to process the whole line */
> 	while (st <= l->len) {
>-		pmatch.rm_so = st;
>-		pmatch.rm_eo = l->len;
>-
>+		lastmatches = 0;
>+		if (st > 0)
>+			leflags |= REG_NOTBOL;
> 		/* Loop to compare with all the patterns */
> 		for (i = 0; i < patterns; i++) {
>+			pmatch.rm_so = st;
>+			pmatch.rm_eo = l->len;
> 			if (fg_pattern[i].pattern)
> 				r = fastexec(&fg_pattern[i],
>-				    l->dat, 1, &pmatch, eflags);
>+				    l->dat, 1, &pmatch, leflags);
> 			else
> 				r = regexec(&r_pattern[i], l->dat, 1,
>-				    &pmatch, eflags);
>+				    &pmatch, leflags);
> 			r = (r == 0) ? 0 : REG_NOMATCH;
>-			st = (cflags & REG_NOSUB)
>-				? (size_t)l->len
>-				: (size_t)pmatch.rm_eo;
> 			if (r == REG_NOMATCH)
> 				continue;
> 			/* Check for full match */
>@@ -324,10 +348,30 @@ procline(struct str *l, int nottext)
> 					r = REG_NOMATCH;
> 			}
> 			if (r == 0) {
>+				lastmatches ++;
>+				lastmatch = pmatch;
>+				/* Skip over zero-length matches */
>+				if (pmatch.rm_so == pmatch.rm_eo)
>+					continue;
> 				if (m == 0)
> 					c++;
>-				if (m < MAX_LINE_MATCHES)
>-					matches[m++] = pmatch;
>+
>+				if (m < MAX_LINE_MATCHES) {
>+						/* Conflicting matches? */
>+					if (m > 0 && overlaps(pmatch, matches[m-1])) {
>+						/* Replace previous match if the new one is earlier and/or longer */
>+						if (pmatch.rm_so < matches[m-1].rm_so ||
>+							(pmatch.rm_eo - pmatch.rm_so) >= (matches[m-1].rm_eo - matches[m-1].rm_so)) {
>+							matches[m-1] = pmatch;
>+							nst = pmatch.rm_eo;
>+						}
>+					} else {
>+						/* Advance as normal if not */
>+						matches[m++] = pmatch;
>+						nst = pmatch.rm_eo;
>+					}
>+				}
>+
> 				/* matches - skip further patterns */
> 				if ((color == NULL && !oflag) ||
> 				    qflag || lflag)
>@@ -344,8 +388,19 @@ procline(struct str *l, int nottext)
> 		if (!wflag && ((color == NULL && !oflag) || qflag || lflag || Lflag))
> 			break;
> 
>-		if (st == (size_t)pmatch.rm_so)
>-			break; 	/* No matches */
>+		/* If we didn't have any matches or REG_NOSUB set */
>+		if (lastmatches == 0 || (cflags & REG_NOSUB))
>+			nst = l->len;
>+
>+		if (lastmatches == 0)
>+			/* No matches */
>+			break;
>+		else if (st == nst && lastmatch.rm_so == lastmatch.rm_eo)
>+			/* Zero-length match -- advance one more so we don't get stuck */
>+			nst ++;
>+
>+		/* Advance st based on previous matches */
>+		st = nst;
> 	}
> 
> 
>@@ -444,6 +499,10 @@ printline(struct str *line, int sep, regmatch_t *matches, int m)
> 	size_t a = 0;
> 	int i, n = 0;
> 
>+	/* If matchall, everything matches but don't actually print for -o */
>+	if (oflag && matchall)
>+		return;
>+
> 	if (!hflag) {
> 		if (!nullflag) {
> 			fputs(line->file, stdout);

Actions: View | Diff

Attachments on bug 195763: 179126 | 179171 | 179173 | 179175 | 179227