From owner-svn-src-all@FreeBSD.ORG Mon Aug 18 12:29:28 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB0462D8; Mon, 18 Aug 2014 12:29:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C656E328B; Mon, 18 Aug 2014 12:29:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7ICTSbw049536; Mon, 18 Aug 2014 12:29:28 GMT (envelope-from gabor@FreeBSD.org) Received: (from gabor@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7ICTS9M049535; Mon, 18 Aug 2014 12:29:28 GMT (envelope-from gabor@FreeBSD.org) Message-Id: <201408181229.s7ICTS9M049535@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gabor set sender to gabor@FreeBSD.org using -f From: Gabor Kovesdan Date: Mon, 18 Aug 2014 12:29:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r270132 - head/usr.bin/grep X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Aug 2014 12:29:29 -0000 Author: gabor Date: Mon Aug 18 12:29:28 2014 New Revision: 270132 URL: http://svnweb.freebsd.org/changeset/base/270132 Log: - Do not look for more matching lines if -L is specified Submitted by: eadler (based on) MFC after: 2 weeks Modified: head/usr.bin/grep/util.c Modified: head/usr.bin/grep/util.c ============================================================================== --- head/usr.bin/grep/util.c Mon Aug 18 09:40:19 2014 (r270131) +++ head/usr.bin/grep/util.c Mon Aug 18 12:29:28 2014 (r270132) @@ -336,7 +336,7 @@ procline(struct str *l, int nottext) } /* One pass if we are not recording matches */ - if (!wflag && ((color == NULL && !oflag) || qflag || lflag)) + if (!wflag && ((color == NULL && !oflag) || qflag || lflag || Lflag)) break; if (st == (size_t)pmatch.rm_so)