From: Tim Kientzle <kientzle@gmail.com>
Date: Thu, 4 Sep 2008 23:17:01 +0000 (-0400)
Subject: IFC
X-Git-Tag: v2.6.0~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a95be458379f952b0a5f88d16907391357b6943;p=thirdparty%2Flibarchive.git

IFC

SVN-Revision: 194
---

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 06bd91b16..de86ab9b8 100644
--- a/cpio/cpio.c
+++ b/cpio/cpio.c
@@ -26,7 +26,7 @@
 
 
 #include "cpio_platform.h"
-__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.12 2008/08/24 06:21:00 kientzle Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.13 2008/09/04 05:20:46 kientzle Exp $");
 
 #include <sys/types.h>
 #include <archive.h>
@@ -863,7 +863,6 @@ mode_pass(struct cpio *cpio, const char *destdir)
 	r = archive_write_close(cpio->archive);
 	if (r != ARCHIVE_OK)
 		cpio_errc(1, 0, archive_error_string(cpio->archive));
-	archive_write_finish(cpio->archive);
 
 	if (!cpio->quiet) {
 		blocks = (archive_position_uncompressed(cpio->archive) + 511)
@@ -872,6 +871,7 @@ mode_pass(struct cpio *cpio, const char *destdir)
 		    blocks == 1 ? "block" : "blocks");
 	}
 
+	archive_write_finish(cpio->archive);
 }
 
 /*
diff --git a/libarchive/archive_write_disk.3 b/libarchive/archive_write_disk.3
index 0f6326cf5..5ed4a5038 100644
--- a/libarchive/archive_write_disk.3
+++ b/libarchive/archive_write_disk.3
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.3 2008/05/26 17:00:23 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_write_disk.3,v 1.4 2008/09/04 05:22:00 kientzle Exp $
 .\"
 .Dd August 5, 2008
 .Dt archive_write_disk 3