From owner-svn-src-head@FreeBSD.ORG  Sun Apr 12 04:45:40 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B17F9106566B;
	Sun, 12 Apr 2009 04:45:40 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A01A98FC12;
	Sun, 12 Apr 2009 04:45:40 +0000 (UTC)
	(envelope-from kientzle@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3C4jeBF010899;
	Sun, 12 Apr 2009 04:45:40 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3C4jevv010898;
	Sun, 12 Apr 2009 04:45:40 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200904120445.n3C4jevv010898@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Sun, 12 Apr 2009 04:45:40 +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: r190955 - head/lib/libarchive
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 12 Apr 2009 04:45:41 -0000

Author: kientzle
Date: Sun Apr 12 04:45:40 2009
New Revision: 190955
URL: http://svn.freebsd.org/changeset/base/190955

Log:
  Merge r881 from libarchive.googlecode.com:  The "empty" format
  should not be recognized if there is a read error.

Modified:
  head/lib/libarchive/archive_read_support_format_empty.c

Modified: head/lib/libarchive/archive_read_support_format_empty.c
==============================================================================
--- head/lib/libarchive/archive_read_support_format_empty.c	Sun Apr 12 03:45:03 2009	(r190954)
+++ head/lib/libarchive/archive_read_support_format_empty.c	Sun Apr 12 04:45:40 2009	(r190955)
@@ -60,9 +60,10 @@ static int
 archive_read_format_empty_bid(struct archive_read *a)
 {
 	const void *h;
+	ssize_t avail;
 
-	h = __archive_read_ahead(a, 1, NULL);
-	if (h != NULL)
+	h = __archive_read_ahead(a, 1, &avail);
+	if (avail != 0)
 		return (-1);
 	return (1);
 }