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, 2 insertions, 0 deletions

diff --git a/lib/libarchive/archive_write_disk.c b/lib/libarchive/archive_write_disk.c
index 1bed323..ba0f49b 100644
--- a/lib/libarchive/archive_write_disk.c
+++ b/lib/libarchive/archive_write_disk.c
@@ -543,6 +543,8 @@ _archive_write_data_block(struct archive *_a,
 		buff = (const char *)buff + bytes_written;
 		size -= bytes_written;
 		offset += bytes_written;
+		a->archive.file_position += bytes_written;
+		a->archive.raw_position += bytes_written;
 		a->last_offset = a->offset = offset;
 	}
 	a->offset = offset;