From owner-svn-src-all@FreeBSD.ORG  Wed Oct 12 01:09:57 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B2F951065744;
	Wed, 12 Oct 2011 01:09:57 +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 A30358FC19;
	Wed, 12 Oct 2011 01:09:57 +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 p9C19vXb040101;
	Wed, 12 Oct 2011 01:09:57 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9C19v6H040099;
	Wed, 12 Oct 2011 01:09:57 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201110120109.p9C19v6H040099@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Wed, 12 Oct 2011 01:09:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226273 - head/usr.bin/grep
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 01:09:57 -0000

Author: gabor
Date: Wed Oct 12 01:09:57 2011
New Revision: 226273
URL: http://svn.freebsd.org/changeset/base/226273

Log:
  - Fix counting of match limit (-m)
  
  Reported by:	Nali Toja <nalitoja@gmail.com>
  Approved by:	delphij (mentor)

Modified:
  head/usr.bin/grep/util.c

Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c	Wed Oct 12 00:17:43 2011	(r226272)
+++ head/usr.bin/grep/util.c	Wed Oct 12 01:09:57 2011	(r226273)
@@ -233,7 +233,7 @@ procfile(const char *fn)
 			linesqueued++;
 		}
 		c += t;
-		if (mflag && mcount < 0)
+		if (mflag && mcount <= 0)
 			break;
 	}
 	if (Bflag > 0)