libarchive 2.2.3

  * "compression_program" support uses an external program
  * Portability: no longer uses "struct stat" as a primary
    data interchange structure internally
  * Part of the above: refactor archive_entry to separate
    out copy_stat() and stat() functions
  * More complete tests for archive_entry
  * Finish archive_entry_clone()
  * Isolate major()/minor()/makedev() in archive_entry; remove
    these from everywhere else.
  * Bug fix: properly handle decompression look-ahead at end-of-data
  * Bug fixes to 'ar' support
  * Fix memory leak in ZIP reader
  * Portability: better timegm() emulation in iso9660 reader
  * New write_disk flags to suppress auto dir creation and not
    overwrite newer files (for future cpio front-end)
  * Simplify trailing-'/' fixup when writing tar and pax
  * Test enhancements:  fix various compiler warnings, improve
    portability, add lots of new tests.
  * Documentation: document new functions, first draft of
    libarchive_internals.3

MFC after: 14 days
Thanks to: Joerg Sonnenberger (compression_program)
Thanks to: Kai Wang (ar)
Thanks to: Colin Percival (many small fixes)
Thanks to: Many others who sent me various patches and problem reports.

1 files changed, 10 insertions, 9 deletions

diff --git a/lib/libarchive/test/test_write_disk.c b/lib/libarchive/test/test_write_disk.c
index 4ff70c3..a2d95bb 100644
--- a/lib/libarchive/test/test_write_disk.c
+++ b/lib/libarchive/test/test_write_disk.c
@@ -27,17 +27,18 @@ __FBSDID("$FreeBSD$");
 
 #define UMASK 022
 
-static void create(struct archive_entry *ae)
+static void create(struct archive_entry *ae, const char *msg)
 {
 	struct archive *ad;
 	struct stat st;
 
 	/* Write the entry to disk. */
 	assert((ad = archive_write_disk_new()) != NULL);
-	assert(0 == archive_write_header(ad, ae));
-	assert(0 == archive_write_finish_entry(ad));
+	failure("%s", msg);
+	assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+	assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
 #if ARCHIVE_API_VERSION > 1
-	assert(0 == archive_write_finish(ad));
+	assertEqualInt(0, archive_write_finish(ad));
 #else
 	archive_write_finish(ad);
 #endif
@@ -59,34 +60,34 @@ DEFINE_TEST(test_write_disk)
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "file");
 	archive_entry_set_mode(ae, S_IFREG | 0755);
-	create(ae);
+	create(ae, "Test creating a regular file");
 	archive_entry_free(ae);
 
 	/* A regular file over an existing file */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "file");
 	archive_entry_set_mode(ae, S_IFREG | 0724);
-	create(ae);
+	create(ae, "Test creating a file over an existing file.");
 	archive_entry_free(ae);
 
 	/* A directory. */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "dir");
 	archive_entry_set_mode(ae, S_IFDIR | 0555);
-	create(ae);
+	create(ae, "Test creating a regular dir.");
 	archive_entry_free(ae);
 
 	/* A directory over an existing file. */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "file");
 	archive_entry_set_mode(ae, S_IFDIR | 0742);
-	create(ae);
+	create(ae, "Test creating a dir over an existing file.");
 	archive_entry_free(ae);
 
 	/* A file over an existing dir. */
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "file");
 	archive_entry_set_mode(ae, S_IFREG | 0744);
-	create(ae);
+	create(ae, "Test creating a file over an existing dir.");
 	archive_entry_free(ae);
 }