From owner-svn-src-stable-10@FreeBSD.ORG  Tue Mar 24 01:31:03 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D0BE4D6B;
 Tue, 24 Mar 2015 01:31:03 +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 BA8B8DA3;
 Tue, 24 Mar 2015 01:31:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2O1V31W028012;
 Tue, 24 Mar 2015 01:31:03 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2O1V3ne028011;
 Tue, 24 Mar 2015 01:31:03 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201503240131.t2O1V3ne028011@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Tue, 24 Mar 2015 01:31:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280408 - stable/10/usr.bin/grep
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2015 01:31:03 -0000

Author: pfg
Date: Tue Mar 24 01:31:02 2015
New Revision: 280408
URL: https://svnweb.freebsd.org/changeset/base/280408

Log:
  MFC	r280307:
  bsdgrep: fix regression in the -f option since r268799
  
  Caused by an incomplete merge from NetBSD.
  
  PR:		198725

Modified:
  stable/10/usr.bin/grep/grep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/grep/grep.c
==============================================================================
--- stable/10/usr.bin/grep/grep.c	Tue Mar 24 00:10:11 2015	(r280407)
+++ stable/10/usr.bin/grep/grep.c	Tue Mar 24 01:31:02 2015	(r280408)
@@ -316,7 +316,7 @@ read_patterns(const char *fn)
 	len = 0;
 	line = NULL;
 	while ((rlen = getline(&line, &len, f)) != -1)
-		add_pattern(line, line[0] == '\n' ? 0 : len);
+		add_pattern(line, line[0] == '\n' ? 0 : (size_t)rlen);
 	free(line);
 	if (ferror(f))
 		err(2, "%s", fn);