The filenames in pax should be written in UTF-8 without hdrcharset=UTF-8 option.

SVN-Revision: 3175

diff --git a/libarchive/test/test_pax_filename_encoding.c b/libarchive/test/test_pax_filename_encoding.c
index 03d649aa8e15fc3c2180f55862d1e0934bf68c43..44fdbb82031f15a045c99f64f9091b2fe5273b15 100644 (file)
--- a/libarchive/test/test_pax_filename_encoding.c
+++ b/libarchive/test/test_pax_filename_encoding.c
@@ -343,6 +343,7 @@ test_pax_filename_encoding_ru_RU()
                return;
        }
 
+       /* Check if the paltform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {
@@ -351,6 +352,12 @@ test_pax_filename_encoding_ru_RU()
                archive_write_free(a);
                return;
        }
+       archive_write_free(a);
+
+       /* Re-create a write archive object since filenames should be written
+        * in UTF-8 by default. */
+       a = archive_write_new();
+       assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        assertEqualInt(ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used));
 
        entry = archive_entry_new2(a);
@@ -382,6 +389,7 @@ test_pax_filename_encoding_ja_JP()
                return;
        }
 
+       /* Check if the paltform completely supports the string conversion. */
        a = archive_write_new();
        assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        if (archive_write_set_options(a, "hdrcharset=UTF-8") != ARCHIVE_OK) {
@@ -390,6 +398,12 @@ test_pax_filename_encoding_ja_JP()
                archive_write_free(a);
                return;
        }
+       archive_write_free(a);
+
+       /* Re-create a write archive object since filenames should be written
+        * in UTF-8 by default. */
+       a = archive_write_new();
+       assertEqualInt(ARCHIVE_OK, archive_write_set_format_pax(a));
        assertEqualInt(ARCHIVE_OK, archive_write_open_memory(a, buff, sizeof(buff), &used));
 
        entry = archive_entry_new2(a);