From owner-freebsd-current@FreeBSD.ORG  Thu Sep  4 05:06:49 2008
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EFFBF106564A;
	Thu,  4 Sep 2008 05:06:49 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: from kientzle.com (kientzle.com [66.166.149.50])
	by mx1.freebsd.org (Postfix) with ESMTP id C8D398FC24;
	Thu,  4 Sep 2008 05:06:49 +0000 (UTC)
	(envelope-from kientzle@freebsd.org)
Received: from [10.0.0.128] (p54.kientzle.com [66.166.149.54])
	by kientzle.com (8.12.9/8.12.9) with ESMTP id m8456etv085513;
	Wed, 3 Sep 2008 22:06:46 -0700 (PDT)
	(envelope-from kientzle@freebsd.org)
Message-ID: <48BF6D2C.4030001@freebsd.org>
Date: Wed, 03 Sep 2008 22:07:56 -0700
From: Tim Kientzle <kientzle@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20060422
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Giorgos Keramidas <keramida@freebsd.org>
References: <87hc8x74nd.fsf@kobe.laptop> <48BEB5E1.8080906@freebsd.org>
	<87ej41rkpk.fsf@kobe.laptop>
In-Reply-To: <87ej41rkpk.fsf@kobe.laptop>
Content-Type: multipart/mixed; boundary="------------010309030202020008070802"
Cc: freebsd-current@freebsd.org
Subject: Re: cpio reporting too many 'blocks'
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Sep 2008 05:06:50 -0000

This is a multi-part message in MIME format.
--------------010309030202020008070802
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Giorgos Keramidas wrote:
> 
> ACK.  If you want me to run any tests or test patches, please feel free
> to send them this way :-)

I think I found it.  <sigh>  Try this and let me know.

Tim

--------------010309030202020008070802
Content-Type: text/x-patch;
 name="cpio_blockcount.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpio_blockcount.patch"

Index: cpio.c
===================================================================
--- cpio.c	(revision 182102)
+++ cpio.c	(working copy)
@@ -863,7 +863,6 @@
 	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 @@
 		    blocks == 1 ? "block" : "blocks");
 	}
 
+	archive_write_finish(cpio->archive);
 }
 
 /*

--------------010309030202020008070802--