Update the total archive byte counters when writing entries to disk using

archive_write_disk.
Update cpio to use this to emit block counts in -p mode.
Update cpio tests to verify these block counts.

1 files changed, 1 insertions, 4 deletions

diff --git a/usr.bin/cpio/test/test_basic.c b/usr.bin/cpio/test/test_basic.c
index 67381ce..c707ad0 100644
--- a/usr.bin/cpio/test/test_basic.c
+++ b/usr.bin/cpio/test/test_basic.c
@@ -151,10 +151,7 @@ passthrough(const char *target)
 	/* Verify stderr. */
 	failure("Error invoking %s -p in dir %s",
 	    testprog, target);
-	/* gcpio 2.9 writes "1 block" to stderr */
-	/* assertFileContents("1 block\n", 8, "stderr"); */
-	/* bsdcpio writes nothing to stderr for passthrough mode */
-	assertFileContents("", 0, "stderr");
+	assertFileContents("1 block\n", 8, "stderr");
 
 	verify_files(target);
 	chdir("..");