From owner-svn-src-head@FreeBSD.ORG  Mon Dec 28 03:30:31 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 EB9AF106566B;
	Mon, 28 Dec 2009 03:30:31 +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 DAF548FC08;
	Mon, 28 Dec 2009 03:30:31 +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 nBS3UVqR078064;
	Mon, 28 Dec 2009 03:30:31 GMT
	(envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBS3UVe9078062;
	Mon, 28 Dec 2009 03:30:31 GMT
	(envelope-from kientzle@svn.freebsd.org)
Message-Id: <200912280330.nBS3UVe9078062@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Mon, 28 Dec 2009 03:30:31 +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: r201109 - 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: Mon, 28 Dec 2009 03:30:32 -0000

Author: kientzle
Date: Mon Dec 28 03:30:31 2009
New Revision: 201109
URL: http://svn.freebsd.org/changeset/base/201109

Log:
  Compatibility with old systems with non-POSIX getpwuid_r/getgrgid_r.

Modified:
  head/lib/libarchive/archive_read_disk_set_standard_lookup.c

Modified: head/lib/libarchive/archive_read_disk_set_standard_lookup.c
==============================================================================
--- head/lib/libarchive/archive_read_disk_set_standard_lookup.c	Mon Dec 28 03:28:21 2009	(r201108)
+++ head/lib/libarchive/archive_read_disk_set_standard_lookup.c	Mon Dec 28 03:30:31 2009	(r201109)
@@ -195,6 +195,7 @@ lookup_uname_helper(struct name_cache *c
 	if (cache->buff == NULL)
 		return (NULL);
 	for (;;) {
+		result = &pwent; /* Old getpwuid_r ignores last arg. */
 		r = getpwuid_r((uid_t)id, &pwent,
 			       cache->buff, cache->buff_size, &result);
 		if (r == 0)
@@ -243,6 +244,7 @@ lookup_gname_helper(struct name_cache *c
 	if (cache->buff == NULL)
 		return (NULL);
 	for (;;) {
+		result = &grent; /* Old getgrgid_r ignores last arg. */
 		r = getgrgid_r((gid_t)id, &grent,
 			       cache->buff, cache->buff_size, &result);
 		if (r == 0)