From owner-svn-src-user@FreeBSD.ORG  Thu Aug 18 17:54:33 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8502C1065674;
	Thu, 18 Aug 2011 17:54:33 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 758B98FC08;
	Thu, 18 Aug 2011 17:54:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7IHsXwY067707;
	Thu, 18 Aug 2011 17:54:33 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7IHsXlQ067705;
	Thu, 18 Aug 2011 17:54:33 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201108181754.p7IHsXlQ067705@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Thu, 18 Aug 2011 17:54:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r224983 - user/gabor/grep/trunk
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Aug 2011 17:54:33 -0000

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;