svn commit: r224983 - user/gabor/grep/trunk

[Gabor Kovesdan]

Author: gabor
Date: Thu Aug 18 17:54:33 2011
New Revision: 224983
URL: http://svn.freebsd.org/changeset/base/224983

Log:
  - Revert r224981; it was incorrect

Modified:
  user/gabor/grep/trunk/grep.c

Modified: user/gabor/grep/trunk/grep.c
==============================================================================
--- user/gabor/grep/trunk/grep.c	Thu Aug 18 17:53:19 2011	(r224982)
+++ user/gabor/grep/trunk/grep.c	Thu Aug 18 17:54:33 2011	(r224983)
@@ -522,6 +522,7 @@ main(int argc, char *argv[])
 			break;
 		case 'o':
 			oflag = true;
+			cflags &= ~REG_NOSUB;
 			break;
 		case 'p':
 			linkbehave = LINK_SKIP;
@@ -555,9 +556,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;
@@ -591,6 +594,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;