IFC

SVN-Revision: 194

diff --git a/cpio/cpio.c b/cpio/cpio.c
index 06bd91b16e372012f441680771c7aa08f570f9ec..de86ab9b8e7a5f20e9ee415a58dfd4db3dacd34b 100644 (file)
--- 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 0f6326cf535751fc18fc1a063a391bf6cca2a77c..5ed4a5038f180f2cba1373714e5e6fd32887ebdf 100644 (file)
--- 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