Page MenuHomeFreeBSD
Files F131839400

D10104.id26569.diff
No OneTemporary
Actions

D10104.id26569.diff
View Options

Index: usr.bin/grep/util.c
===================================================================
--- usr.bin/grep/util.c
+++ usr.bin/grep/util.c
@@ -276,28 +276,29 @@
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;
+ int startm = 0;
/* Loop to process the whole line */
while (st <= l->len) {
- pmatch.rm_so = st;
- pmatch.rm_eo = l->len;
-
+ lastmatches = 0;
+ startm = m;
+ 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 +325,29 @@
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) {
+ /* Replace previous match if the new one is earlier and/or longer */
+ if (m > startm) {
+ if (pmatch.rm_so < matches[m-1].rm_so ||
+ (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 +364,19 @@
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 +475,10 @@
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);

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 12, 2:50 PM (17 h, 30 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23627324
Default Alt Text
D10104.id26569.diff (2 KB)

Event Timeline