From owner-p4-projects@FreeBSD.ORG  Sat Jun  5 18:17:23 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 91AC41065676; Sat,  5 Jun 2010 18:17:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 54AEF106564A
	for <perforce@FreeBSD.org>; Sat,  5 Jun 2010 18:17:23 +0000 (UTC)
	(envelope-from jlaffaye@FreeBSD.org)
Received: from repoman.freebsd.org (unknown [IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4296C8FC0A
	for <perforce@FreeBSD.org>; Sat,  5 Jun 2010 18:17:23 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o55IHMDn020074
	for <perforce@FreeBSD.org>; Sat, 5 Jun 2010 18:17:22 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o55IHMq5020072
	for perforce@freebsd.org; Sat, 5 Jun 2010 18:17:22 GMT
	(envelope-from jlaffaye@FreeBSD.org)
Date: Sat, 5 Jun 2010 18:17:22 GMT
Message-Id: <201006051817.o55IHMq5020072@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jlaffaye@FreeBSD.org using -f
From: Julien Laffaye <jlaffaye@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179228 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Jun 2010 18:17:23 -0000

http://p4web.freebsd.org/@@179228?ac=10

Change 179228 by jlaffaye@jlaffaye-chulak on 2010/06/05 18:17:16

	archive_read_data() returns the number of read bytes and not a status.
	Fixed a logic error;

Affected files ...

.. //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#5 edit

Differences ...

==== //depot/projects/soc2010/pkg_complete/lib/libpkg/file.c#5 (text+ko) ====

@@ -346,11 +346,11 @@
 	Boolean found_match = FALSE;
 
 	size_t buf_size = 0;
+	size_t r;
 
 	const char *entry_pathname = NULL;
 	const char *error = NULL;
 	int archive_fd = -1;
-	int r;
 
 	errno = 0;
 
@@ -411,7 +411,7 @@
 						r = archive_read_data(archive,
 						    *buf, buf_size);
 
-						if (r != ARCHIVE_OK) {
+						if (r != buf_size) {
 							error = archive_error_string(archive);
 							buf_size = 0;
 						}