From owner-svn-src-all@FreeBSD.ORG  Tue Mar  3 03:33:26 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 0DAE5106564A;
	Tue,  3 Mar 2009 03:33:26 +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 EF8EC8FC08;
	Tue,  3 Mar 2009 03:33:25 +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 n233XPd9094111;
	Tue, 3 Mar 2009 03:33:25 GMT (envelope-from kientzle@svn.freebsd.org)
Received: (from kientzle@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n233XPBi094109;
	Tue, 3 Mar 2009 03:33:25 GMT (envelope-from kientzle@svn.freebsd.org)
Message-Id: <200903030333.n233XPBi094109@svn.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Tue, 3 Mar 2009 03:33:25 +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: r189294 - head/lib/libarchive
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: Tue, 03 Mar 2009 03:33:26 -0000

Author: kientzle
Date: Tue Mar  3 03:33:25 2009
New Revision: 189294
URL: http://svn.freebsd.org/changeset/base/189294

Log:
  Merge r282 from libarchive.googlecode.com: Close multiple filters
  by walking the filter list in archive_read_close().

Modified:
  head/lib/libarchive/archive_read.c
  head/lib/libarchive/archive_read_support_compression_compress.c

Modified: head/lib/libarchive/archive_read.c
==============================================================================
--- head/lib/libarchive/archive_read.c	Tue Mar  3 03:28:09 2009	(r189293)
+++ head/lib/libarchive/archive_read.c	Tue Mar  3 03:33:25 2009	(r189294)
@@ -595,11 +595,12 @@ archive_read_close(struct archive *_a)
 	/* TODO: Clean up the formatters. */
 
 	/* Clean up the stream pipeline. */
-	if (a->source != NULL) {
+	while (a->source != NULL) {
+		struct archive_read_source *t = a->source->upstream;
 		r1 = (a->source->close)(a->source);
 		if (r1 < r)
 			r = r1;
-		a->source = NULL;
+		a->source = t;
 	}
 
 	/* Release the reader objects. */

Modified: head/lib/libarchive/archive_read_support_compression_compress.c
==============================================================================
--- head/lib/libarchive/archive_read_support_compression_compress.c	Tue Mar  3 03:28:09 2009	(r189293)
+++ head/lib/libarchive/archive_read_support_compression_compress.c	Tue Mar  3 03:33:25 2009	(r189294)
@@ -339,7 +339,6 @@ compress_source_close(struct archive_rea
 {
 	struct private_data *state = (struct private_data *)self->data;
 
-	self->upstream->close(self->upstream);
 	free(state->out_block);
 	free(state);
 	free(self);