From 69a6d1985d135502e9a5565626191a0298b59a25 Mon Sep 17 00:00:00 2001
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Sun, 12 Jun 2011 12:51:58 +0000
Subject: [PATCH] - Use REG_NOSUB to bypass submatch counting when not
 necessary. This may   yield in somewhat better performance in a few cases.

Approved by:	delphij (mentor)
---
 usr.bin/grep/grep.c | 6 +++++-
 usr.bin/grep/util.c | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c
index 0047650b14cb..d03c13c7713f 100644
--- a/usr.bin/grep/grep.c
+++ b/usr.bin/grep/grep.c
@@ -73,7 +73,7 @@ const char	*errstr[] = {
 };
 
 /* Flags passed to regcomp() and regexec() */
-int		 cflags = 0;
+int		 cflags = REG_NOSUB;
 int		 eflags = REG_STARTEND;
 
 /* Shortcut for matching all cases like empty regex */
@@ -519,6 +519,7 @@ main(int argc, char *argv[])
 			break;
 		case 'o':
 			oflag = true;
+			cflags &= ~REG_NOSUB;
 			break;
 		case 'p':
 			linkbehave = LINK_SKIP;
@@ -552,9 +553,11 @@ main(int argc, char *argv[])
 			break;
 		case 'w':
 			wflag = true;
+			cflags &= ~REG_NOSUB;
 			break;
 		case 'x':
 			xflag = true;
+			cflags &= ~REG_NOSUB;
 			break;
 		case 'Z':
 			filebehave = FILE_GZIP;
@@ -588,6 +591,7 @@ main(int argc, char *argv[])
 			    strcasecmp("none", optarg) != 0 &&
 			    strcasecmp("no", optarg) != 0)
 				errx(2, getstr(3), "--color");
+			cflags &= ~REG_NOSUB;
 			break;
 		case LABEL_OPT:
 			label = optarg;
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 758270de8205..683a537dfdaf 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -309,7 +309,9 @@ procline(struct str *l, int nottext)
 					r = regexec(&r_pattern[i], l->dat, 1,
 					    &pmatch, eflags);
 				r = (r == 0) ? 0 : REG_NOMATCH;
-				st = pmatch.rm_eo;
+				st = (cflags & REG_NOSUB)
+					? (size_t)l->len
+					: (size_t)pmatch.rm_eo;
 				if (r == REG_NOMATCH)
 					continue;
 				/* Check for full match */