From owner-p4-projects@FreeBSD.ORG  Thu Jun 17 09:52:03 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C14C31065678; Thu, 17 Jun 2010 09:52:02 +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 857BA1065672
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 09:52:02 +0000 (UTC)
	(envelope-from gcooper@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7359C8FC1C
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 09:52:02 +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 o5H9q2Us079760
	for <perforce@FreeBSD.org>; Thu, 17 Jun 2010 09:52:02 GMT
	(envelope-from gcooper@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o5H9q2d0079758
	for perforce@freebsd.org; Thu, 17 Jun 2010 09:52:02 GMT
	(envelope-from gcooper@FreeBSD.org)
Date: Thu, 17 Jun 2010 09:52:02 GMT
Message-Id: <201006170952.o5H9q2d0079758@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gcooper@FreeBSD.org using -f
From: Garrett Cooper <gcooper@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 179699 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: Thu, 17 Jun 2010 09:52:03 -0000

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

Change 179699 by gcooper@gcooper-bayonetta on 2010/06/17 09:51:24

	Integrate fix for bug with read_plist_from_buffer where the return code
	was being incorrectly checked for ARCHIVE_OK, not the number of bytes
	returned.
	
	style(9) fix it a bit though.
	
	Committed-by: jlaffaye@.

Affected files ...

.. //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#22 integrate

Differences ...

==== //depot/projects/soc2007/gcooper-pkg_install-enhancements-simplified/lib/libpkg/file.c#22 (text+ko) ====

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