From owner-svn-src-all@FreeBSD.ORG  Wed Aug 26 03:30:06 2009
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 DA987106568C;
	Wed, 26 Aug 2009 03:30:06 +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 CA71F8FC18;
	Wed, 26 Aug 2009 03:30:06 +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 n7Q3U61d047847;
	Wed, 26 Aug 2009 03:30:06 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7Q3U61l047845;
	Wed, 26 Aug 2009 03:30:06 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200908260330.n7Q3U61l047845@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Wed, 26 Aug 2009 03:30:06 +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: r196558 - head/usr.bin/look
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, 26 Aug 2009 03:30:06 -0000

Author: cperciva
Date: Wed Aug 26 03:30:06 2009
New Revision: 196558
URL: http://svn.freebsd.org/changeset/base/196558

Log:
  Don't try to mmap the contents of empty files.  This behaviour was harmless
  prior to r195693, since historical behaviour of mmap(2) was to silently
  ignore length-zero mmap requests; but mmap now returns EINVAL, which caused
  look(1) to emit an error message and fail.
  
  Among other things, this makes `freebsd-update fetch` on a newly installed
  8.0-BETA3 system print bogus warning messages.
  
  MFC after:	3 days

Modified:
  head/usr.bin/look/look.c

Modified: head/usr.bin/look/look.c
==============================================================================
--- head/usr.bin/look/look.c	Tue Aug 25 21:51:47 2009	(r196557)
+++ head/usr.bin/look/look.c	Wed Aug 26 03:30:06 2009	(r196558)
@@ -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;