From owner-svn-src-stable-8@FreeBSD.ORG  Mon Aug 31 13:02:22 2009
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 09144106566C;
	Mon, 31 Aug 2009 13:02:22 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EB9528FC1E;
	Mon, 31 Aug 2009 13:02:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7VD2LYo028261;
	Mon, 31 Aug 2009 13:02:21 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7VD2Lg8028259;
	Mon, 31 Aug 2009 13:02:21 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200908311302.n7VD2Lg8028259@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Mon, 31 Aug 2009 13:02:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196695 - stable/8/usr.bin/look
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 31 Aug 2009 13:02:22 -0000

Author: cperciva
Date: Mon Aug 31 13:02:21 2009
New Revision: 196695
URL: http://svn.freebsd.org/changeset/base/196695

Log:
  MFC r196558: Don't try to mmap the contents of empty files.  This behaviour
  was harmless prior to r195693, when mmap(2) changed from silently ignoring
  requests for mapping zero bytes to returning EINVAL; this commit can be seen
  as adjusting for the change in mmap(2) in order to make look(1) act like it
  did previously.
  
  Reviewed by:	jhb
  Approved by:	re (kib)

Modified:
  stable/8/usr.bin/look/   (props changed)
  stable/8/usr.bin/look/look.c

Modified: stable/8/usr.bin/look/look.c
==============================================================================
--- stable/8/usr.bin/look/look.c	Mon Aug 31 12:25:04 2009	(r196694)
+++ stable/8/usr.bin/look/look.c	Mon Aug 31 13:02:21 2009	(r196695)
@@ -140,6 +140,10 @@ main(int argc, char *argv[])
 			err(2, "%s", file);
 		if (sb.st_size > SIZE_T_MAX)
 			errx(2, "%s: %s", file, strerror(EFBIG));
+		if (sb.st_size == 0) {
+			close(fd);
+			continue;
+		}
 		if ((front = mmap(NULL, (size_t)sb.st_size, PROT_READ, MAP_SHARED, fd, (off_t)0)) == MAP_FAILED)
 			err(2, "%s", file);
 		back = front + sb.st_size;