Date: Fri, 19 Aug 2011 00:44:37 +0000 (UTC) From: Gabor Kovesdan <gabor@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224990 - user/gabor/tre-integration/usr.bin/grep Message-ID: <201108190044.p7J0ib7x080177@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gabor Date: Fri Aug 19 00:44:37 2011 New Revision: 224990 URL: http://svn.freebsd.org/changeset/base/224990 Log: - Also fix here the REG_NOSUB regression Modified: user/gabor/tre-integration/usr.bin/grep/grep.c Modified: user/gabor/tre-integration/usr.bin/grep/grep.c ============================================================================== --- user/gabor/tre-integration/usr.bin/grep/grep.c Thu Aug 18 23:15:04 2011 (r224989) +++ user/gabor/tre-integration/usr.bin/grep/grep.c Fri Aug 19 00:44:37 2011 (r224990) @@ -518,6 +518,7 @@ main(int argc, char *argv[]) break; case 'o': oflag = true; + cflags &= ~REG_NOSUB; break; case 'p': linkbehave = LINK_SKIP; @@ -551,9 +552,11 @@ main(int argc, char *argv[]) break; case 'w': cflags |= REG_WORD; + cflags &= ~REG_NOSUB; break; case 'x': xflag = true; + cflags &= ~REG_NOSUB; break; case 'Z': filebehave = FILE_GZIP; @@ -587,6 +590,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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108190044.p7J0ib7x080177>