From 33140186cb7b918f2b84df68c2a2fdbbf8d4881a Mon Sep 17 00:00:00 2001
From: Tim Kientzle <kientzle@acm.org>
Date: Sun, 31 Dec 2023 19:25:01 -0800
Subject: [PATCH] Gardening: Fix the `begin` lines in many of the uuencoded
 test data (#2043)

The libarchive test harness always extracts these to the truncated
source filename, ignoring the name in the `begin` line. However, for
ease of experimentation, people will want to manually extract these with
`uudecode`, so the `begin` lines should have the correct filename.
---
 libarchive/test/test_compat_gtar_2.tar.uu     |  2 +-
 libarchive/test/test_compat_xz_1.txz.uu       |  2 +-
 libarchive/test/test_compat_zip_8.zip.uu      | 12 +++---
 ...t_rar_multivolume_single_file.part1.rar.uu |  2 +-
 ...t_rar_multivolume_single_file.part2.rar.uu |  2 +-
 ...t_rar_multivolume_single_file.part3.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part01.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part02.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part03.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part04.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part05.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part06.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part07.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part08.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part09.rar.uu |  2 +-
 ...ltivolume_uncompressed_files.part10.rar.uu |  2 +-
 .../test/test_read_filter_lrzip.tar.lrz.uu    |  2 +-
 .../test/test_read_format_7zip_copy.7z.uu     |  2 +-
 .../test_read_format_7zip_deflate_arm64.7z.uu |  2 +-
 .../test_read_format_7zip_lzma2_arm64.7z.uu   |  2 +-
 ...test_read_format_cab_filename_cp932.cab.uu |  2 +-
 ...st_read_format_cpio_filename_cp866.cpio.uu |  2 +-
 ...st_read_format_cpio_filename_eucjp.cpio.uu |  2 +-
 ...st_read_format_cpio_filename_koi8r.cpio.uu |  2 +-
 ..._read_format_cpio_filename_utf8_jp.cpio.uu |  2 +-
 ..._read_format_cpio_filename_utf8_ru.cpio.uu |  2 +-
 ...t_read_format_gtar_filename_cp866.tar.Z.uu |  2 +-
 ...t_read_format_gtar_filename_eucjp.tar.Z.uu |  2 +-
 ...t_read_format_gtar_filename_koi8r.tar.Z.uu |  2 +-
 ...ead_format_gtar_sparse_skip_entry.tar.Z.uu |  2 +-
 ...test_read_format_lha_filename_cp932.lzh.uu |  2 +-
 ...test_read_format_lha_filename_utf16.lzh.uu | 38 +++++++++----------
 libarchive/test/test_read_format_rar.rar.uu   |  2 +-
 ...t_rar5_bad_window_sz_in_mltarc_file.rar.uu |  2 +-
 .../test_read_format_rar5_compressed.rar.uu   |  2 +-
 ...mat_rar5_different_winsize_on_merge.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part01.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part02.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part03.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part04.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part05.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part06.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part07.rar.uu |  2 +-
 ...ead_format_rar5_multiarchive.part08.rar.uu |  2 +-
 ...est_read_format_rar5_multiple_files.rar.uu |  2 +-
 ...ad_format_rar5_multiple_files_solid.rar.uu |  2 +-
 .../test/test_read_format_rar5_sfx.exe.uu     |  2 +-
 .../test/test_read_format_rar5_stored.rar.uu  |  2 +-
 .../test_read_format_rar_binary_data.rar.uu   |  2 +-
 .../test_read_format_rar_compress_best.rar.uu |  2 +-
 ...est_read_format_rar_compress_normal.rar.uu |  2 +-
 ...t_read_format_rar_multi_lzss_blocks.rar.uu |  2 +-
 ...ead_format_rar_multivolume.part0001.rar.uu |  2 +-
 ...ead_format_rar_multivolume.part0002.rar.uu |  2 +-
 ...ead_format_rar_multivolume.part0003.rar.uu |  2 +-
 ...ead_format_rar_multivolume.part0004.rar.uu |  2 +-
 .../test/test_read_format_rar_noeof.rar.uu    |  2 +-
 ...ead_format_rar_ppmd_lzss_conversion.rar.uu |  2 +-
 .../test/test_read_format_rar_sfx.exe.uu      |  2 +-
 .../test/test_read_format_rar_subblock.rar.uu |  2 +-
 .../test/test_read_format_rar_windows.rar.uu  |  2 +-
 libarchive/test/test_read_format_raw.bufr.uu  |  2 +-
 ...test_read_format_tar_empty_filename.tar.uu |  2 +-
 .../test_read_format_tar_empty_pax.tar.Z.uu   |  2 +-
 ...st_read_format_tar_invalid_pax_size.tar.uu |  2 +-
 .../test/test_read_format_zip_bzip2.zipx.uu   |  2 +-
 ...test_read_format_zip_filename_cp866.zip.uu |  2 +-
 ...test_read_format_zip_filename_cp932.zip.uu |  2 +-
 ...test_read_format_zip_filename_koi8r.zip.uu |  2 +-
 ...st_read_format_zip_filename_utf8_jp.zip.uu |  2 +-
 ...st_read_format_zip_filename_utf8_ru.zip.uu |  2 +-
 ...t_read_format_zip_filename_utf8_ru2.zip.uu |  2 +-
 .../test/test_read_format_zip_lzma.zipx.uu    |  2 +-
 .../test/test_read_format_zip_ppmd8.zipx.uu   |  2 +-
 .../test_read_format_zip_winzip_aes128.zip.uu |  2 +-
 .../test_read_format_zip_winzip_aes256.zip.uu |  2 +-
 ...ead_format_zip_winzip_aes256_stored.zip.uu |  2 +-
 ...t_zip_with_invalid_traditional_eocd.zip.uu |  2 +-
 .../test/test_read_large_splitted_rar_aa.uu   |  2 +-
 .../test/test_read_large_splitted_rar_ab.uu   |  2 +-
 .../test/test_read_large_splitted_rar_ac.uu   |  2 +-
 .../test/test_read_large_splitted_rar_ad.uu   |  2 +-
 .../test/test_read_large_splitted_rar_ae.uu   |  2 +-
 .../test/test_read_pax_xattr_schily.tar.uu    |  2 +-
 libarchive/test/test_read_splitted_rar_aa.uu  |  2 +-
 libarchive/test/test_read_splitted_rar_ab.uu  |  2 +-
 libarchive/test/test_read_splitted_rar_ac.uu  |  2 +-
 libarchive/test/test_read_splitted_rar_ad.uu  |  2 +-
 .../test/test_splitted_rar_seek_support_aa.uu |  2 +-
 .../test/test_splitted_rar_seek_support_ab.uu |  2 +-
 .../test/test_splitted_rar_seek_support_ac.uu |  2 +-
 91 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/libarchive/test/test_compat_gtar_2.tar.uu b/libarchive/test/test_compat_gtar_2.tar.uu
index 7843a2cba..63303056f 100644
--- a/libarchive/test/test_compat_gtar_2.tar.uu
+++ b/libarchive/test/test_compat_gtar_2.tar.uu
@@ -1,4 +1,4 @@
-begin 660 test_compat_gtar_2.tar.uu
+begin 660 test_compat_gtar_2.tar
 M9FEL95]W:71H7V)I9U]U:61?9VED````````````````````````````````
 M````````````````````````````````````````````````````````````
 M`````````````#`P,#`V-C8`@``````@```Q,#`P,#`P,#`P,#`P,#`P,38W
diff --git a/libarchive/test/test_compat_xz_1.txz.uu b/libarchive/test/test_compat_xz_1.txz.uu
index ea5d1e54d..af47f4eee 100644
--- a/libarchive/test/test_compat_xz_1.txz.uu
+++ b/libarchive/test/test_compat_xz_1.txz.uu
@@ -1,4 +1,4 @@
-begin 644 test_compat_gzip_1.txz
+begin 644 test_compat_xz_1.txz
 M_3=Z6%H```3FUK1&`@`A`18```!T+^6CX`^?`(-=`#,,/!NGC#0&C6L"2_R2
 M/O9*^(7KX=WM^(=KA(RH"\09$$)!Q_+JUHQ*`]R;ITL_F3/I6:^Q0550A&)B
 MHS@=K]7@K1-9FOIP#PU!I<PUHW+W#<F(6FSL/<?5:4*>?E5&IHH&Q=N>_C&G
diff --git a/libarchive/test/test_compat_zip_8.zip.uu b/libarchive/test/test_compat_zip_8.zip.uu
index 316b6f62d..2ab6cf70c 100644
--- a/libarchive/test/test_compat_zip_8.zip.uu
+++ b/libarchive/test/test_compat_zip_8.zip.uu
@@ -1,6 +1,6 @@
-begin 666 test_compat_zip_8.zip
-M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
-MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
-H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
-`
-end
+begin 666 test_compat_zip_8.zip
+M4$L#!!0````(`%A\;TOY6""D$`````X````(````87)C7'1E<W3[_Z^$(96A
+MF*&$@9>!BP$`4$L!`A0`%`````@`6'QO2_E8(*00````#@````@`````````
+H`````````````&%R8UQT97-T4$L%!@`````!``$`-@```#8`````````
+`
+end
diff --git a/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu b/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
index 22b5c8dfa..b2afdf152 100644
--- a/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
+++ b/libarchive/test/test_rar_multivolume_single_file.part1.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part1.rar
 M4F%R(1H'`%IN<Q$!#0````````"(KG0BD$,`[1H``(].```#D,J\!?-C(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`/"%$
 M3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,(#0N,"!4<F%N
diff --git a/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu b/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
index e00e06cb2..615698bde 100644
--- a/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
+++ b/libarchive/test/test_rar_multivolume_single_file.part2.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part2.rar
 M4F%R(1H'`!EZ<Q$`#0````````#7@W0CD$,`[1H``(].```#.)1.%?-C(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`*0IG
 M96YE<F%T92!D971A:6QE9"!L;V<@;65S<V%G97,@;VX@9F%I;'5R92X@26X@
diff --git a/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu b/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
index 06e72a790..63c984782 100644
--- a/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
+++ b/libarchive/test/test_rar_multivolume_single_file.part3.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_single_file.part3.rar
 M4F%R(1H'`!EZ<Q$`#0`````````?;70AD$,`M1@``(].```#8Z8%7O-C(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S/-C(4#T8R%`=7-U
 M86QL>2!R=6X*"6%L;"!O9B!T:&4@=&5S=',N(`H)/"]0/@H)/$Q)/CQ0(%-4
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
index 876b7e9ac..b583f86f8 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part01.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part01.rar
 M4F%R(1H'`%IN<Q$!#0````````"G@W0BD$P`C#,``(].```#]EC4PKM,-4$4
 M,"(`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0R+FAT;6R`S#)?
 M.T)17SM"/"%$3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
index 97e826ee7..fdf944443 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part02.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part02.rar
 M4F%R(1H'`!EZ<Q$`#0````````#G!'0AD$P``QL``(].```#8Z8%7KM,-4$4
 M,"(`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0R+FAT;6R`S#)?
 M.T)17SM"(&%S<V5R=$5Q=6%L365M('1O('1E<W0@97%U86QI='D@:6YS=&5A
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
index 027f05088..caf9e7569 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part03.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part03.rar
 M4F%R(1H'`!EZ<Q$`#0````````"P,W0CD%<`@3,``(].```#*23KD;M,-4$4
 M,"T`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
 M=#(N:'1M;,#,,U\[0F-?.T)I;VYS+B!)9B!T:&4@87-S97)T:6]N(&9A:6QS
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
index be9a921bc..1e645fe35 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part04.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part04.rar
 M4F%R(1H'`!EZ<Q$`#0````````!K>G0AD%<`W`(``(].```#8Z8%7KM,-4$4
 M,"T`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
 M=#(N:'1M;,#,,U\[0F-?.T)B>0IT:&4@87)C:&EV92!W<FET97(@:7,@=&AE
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
index 0891b2285..eb271f063 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part05.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part05.rar
 M4F%R(1H'`!EZ<Q$`#0````````!U''0AD$0`+AX``(].```#8Z8%7KM,-4$4
 M,!H`I($``$QI8F%R8VAI=F5!9&1I;F=497-T,BYH=&ULP,P)7SM",E\[0F9E
 M<F5N8V5?9FEL92@F<75O=#MT97-T7V9O;RYT87(F<75O=#LI.SPO4%)%/CQ0
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
index 6511cb68c..c63065865 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part06.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part06.rar
 M4F%R(1H'`!EZ<Q$`#0`````````*JW0CD$L`C3,``(].```#8\SY_?-C(4`4
 M,"$`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0N:'1M;(#,,E\[
 M0DU?.T(N+B!S971U<"!O;6ET=&5D("XN+B`J+PHF;F)S<#L@)FYB<W`[(&%S
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
index fa3206266..c7dab1b88 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part07.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part07.rar
 M4F%R(1H'`!EZ<Q$`#0````````!*\70AD$L`YP4``(].```#8Z8%7O-C(4`4
 M,"$`I($``'1E<W1D:7)<3&EB87)C:&EV94%D9&EN9U1E<W0N:'1M;(#,,E\[
 M0DU?.T)I=&@@82!D;WIE;B!E;G1R:65S(&1O=VX@=&\*:G5S="!A(&9E=R!K
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
index e8e0ffe8c..9e53660ed 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part08.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part08.rar
 M4F%R(1H'`!EZ<Q$`#0````````#I1G0AD%8`/R$``(].```#8Z8%7O-C(4`4
 M,"P`I($``'1E<W1D:7)<=&5S='-U8F1I<EQ,:6)A<F-H:79E061D:6YG5&5S
 M="YH=&ULP,PS7SM"6U\[0D-O;G1E;G1S/"]45#XL"@D\5%0@0TQ!4U,](G=E
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
index bdcdc999c..c2d890401 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part09.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part09.rar
 M4F%R(1H'`!EZ<Q$`#0````````"N!'0CD$,`E3,``(].```#97_()_-C(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S`E?.T(R7SM"4STB
 M=V5S=&5R;B(^/$$@3D%-13TB0F%S:6-?=&5S=%]T97)M:6YO;&]G>2(^/"]!
diff --git a/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu b/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
index aef15d214..66c22262e 100644
--- a/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
+++ b/libarchive/test/test_rar_multivolume_uncompressed_files.part10.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_rar_multivolume_uncompressed_files.part10.rar
 M4F%R(1H'`!EZ<Q$`#0`````````5)G0AD$,`^@@``(].```#8Z8%7O-C(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S`E?.T(R7SM"97AE
 M<F-I<V4@8F]U;F1A<GD@8V%S97,@=VET:"!V97)Y"FQA<F=E(&5N=')I97,L
diff --git a/libarchive/test/test_read_filter_lrzip.tar.lrz.uu b/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
index d9bbd6116..2272c2778 100644
--- a/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
+++ b/libarchive/test/test_read_filter_lrzip.tar.lrz.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_filter_lrzip.tar.lrz.uu
+begin 644 test_read_filter_lrzip.tar.lrz
 M3%):20`&`"@``````````%T````!`0```@$`*`,`````#@`#`````&4`!E``
 MAP``````*(%=%O"2=0L1MCAA@GB4H1+_)V=!8=DS/0JC4Z+Q&5I0A'\SJ-#.
 M$U<4K-:^%:G^C3$B/80>END]NJE=5AP+]64N7$3):G02EKP>+AD`!IH`HQ(`
diff --git a/libarchive/test/test_read_format_7zip_copy.7z.uu b/libarchive/test/test_read_format_7zip_copy.7z.uu
index 2429834c2..92e7c5867 100644
--- a/libarchive/test/test_read_format_7zip_copy.7z.uu
+++ b/libarchive/test/test_read_format_7zip_copy.7z.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_7zip_none.7z
+begin 644 test_read_format_7zip_copy.7z
 M-WJ\KR<<``-!QGV(/`````````!"`````````(/;BV,@("`@("`@("`@("`@
 M("`@("`@("`@("`@(&9I;&4@,2!C;VYT96YT<PIH96QL;PIH96QL;PIH96QL
 M;PH!!`8``0D\``<+`0`!`0`,/``("@&J'=X/```%`1$-`&8`:0!L`&4`,0``
diff --git a/libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu b/libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu
index e516ca5b4..2199d921b 100644
--- a/libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu
+++ b/libarchive/test/test_read_format_7zip_deflate_arm64.7z.uu
@@ -1,4 +1,4 @@
-begin 664 libarchive/test/test_read_format_7zip_deflate_arm64.7z
+begin 664 test_read_format_7zip_deflate_arm64.7z
 M-WJ\KR<<``2V^52G)0H```````!:`````````.HY+B_LU5^(3%$<P/%SYPY+
 M_N1?*/]F5R'Y3_['&'^&0FB]T9BU@ZFQH]F1#65X4C:9"`](HI`'#PHO_N5!
 M>2.2T-J0XF&*!R-C_.Z=<^_<NSLKWK^?]MS?GM\]OW//W'ONS*&5:U<%#$,Y
diff --git a/libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu b/libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu
index 3792a187f..34025b843 100644
--- a/libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu
+++ b/libarchive/test/test_read_format_7zip_lzma2_arm64.7z.uu
@@ -1,4 +1,4 @@
-begin 664 libarchive/test/test_read_format_7zip_lzma2_arm64.7z
+begin 664 test_read_format_7zip_lzma2_arm64.7z
 M-WJ\KR<<``0W'TW><P@```````!:`````````&'_J;[A$M\(:UT`/Y%%A&@]
 MB:;:BN&&(J+"URDYX#ZEJ=1:R[LP;*R_8L2:_5F_1<^DV<8-2,=3[&X?U.=W
 M*%Q!?DN>B^),$C`%""HM.8#>=`<R:?!<.$B$K6X!RY4*=X/2*.1;F86;KQ[4
diff --git a/libarchive/test/test_read_format_cab_filename_cp932.cab.uu b/libarchive/test/test_read_format_cab_filename_cp932.cab.uu
index 0d51f10c4..9d59000c7 100644
--- a/libarchive/test/test_read_format_cab_filename_cp932.cab.uu
+++ b/libarchive/test/test_read_format_cab_filename_cp932.cab.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cab_cp932.cab
+begin 644 test_read_format_cab_filename_cp932.cab
 M35-#1@````"4`````````"P``````````P$!``(````(_@``;@````$``Q(%
 M````````````=#ZO5"``E5R"OH+F7(J_CIHN='AT``4````%``````!T/KM4
 M(`"57(*^@N9<B.J7EY5<+G1X=``I]2&+'@`*`%N`@(T`,*```0````$````!
diff --git a/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu b/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu
index 5f0658504..b1ac82f54 100644
--- a/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu
+++ b/libarchive/test/test_read_format_cpio_filename_cp866.cpio.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_cp866.cpio
+begin 644 test_read_format_cpio_filename_cp866.cpio
 M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
 M,#`P,3$U-#<S,C$U,#$P,#`P,#<P,#`P,#`P,#`P-H^0B(*%D@#P\NGWY?0P
 M-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P,#$P,#`P
diff --git a/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu b/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu
index 9aa7666bc..b900adb05 100644
--- a/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu
+++ b/libarchive/test/test_read_format_cpio_filename_eucjp.cpio.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_eucjp.cpio
+begin 644 test_read_format_cpio_filename_eucjp.cpio
 M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
 M,#`P,3$U-3$U,C(U,C`P,#`P,3$P,#`P,#`P,#`Q,+3!N_HN='AT`(J_CIJ"
 MJ8+(,#<P-S`W,#`P,3,W,#`P,#`R,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q
diff --git a/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu b/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu
index dcdfd0ed6..76f58acac 100644
--- a/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu
+++ b/libarchive/test/test_read_format_cpio_filename_koi8r.cpio.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_koi8r.cpio
+begin 644 test_read_format_cpio_filename_koi8r.cpio
 M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
 M,#`P,3$U-#<S,C`P,S8P,#`P,#<P,#`P,#`P,#`P-O#RZ??E]`#P\NGWY?0P
 M-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P,#$P,#`P
diff --git a/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu b/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu
index 8f9a6f652..45c3c4791 100644
--- a/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu
+++ b/libarchive/test/test_read_format_cpio_filename_utf8_jp.cpio.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_utf8_jp.cpio
+begin 644 test_read_format_cpio_filename_utf8_jp.cpio
 M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-C0T,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
 M,#`P,3$U-3$U,C(S-C8P,#`P,3,P,#`P,#`P,#`Q,.:\HN6MERYT>'0`BK^.
 MFH*I@L@P-S`W,#<P,#`Q,S<P,#`P,#(Q,#`V-#0P,#$W-3$P,#$W-3$P,#`P
diff --git a/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu b/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu
index 9ed52f87c..849b9fe33 100644
--- a/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu
+++ b/libarchive/test/test_read_format_cpio_filename_utf8_ru.cpio.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_cpio_utf8_ru.cpio
+begin 644 test_read_format_cpio_filename_utf8_ru.cpio
 M,#<P-S`W,#`P,3,W,#`P,#`Q,3`P-S4U,#`Q-S4Q,#`Q-S4Q,#`P,#`Q,#`P
 M,#`P,3$U,C$U,38U,38P,#`P,34P,#`P,#`P,#`P-M"?T*#0F-"2T)70H@#P
 M\NGWY?0P-S`W,#<P,#`Q,S<P,#`P,#(Q,#`W-34P,#$W-3$P,#$W-3$P,#`P
diff --git a/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu b/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu
index a6fd80c24..b06fb11d5 100644
--- a/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu
+++ b/libarchive/test/test_read_format_gtar_filename_cp866.tar.Z.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_cp866.tar.Z
+begin 644 test_read_format_gtar_filename_cp866.tar.Z
 M'YV0CR`A$E1($H"#"!,J7,BPH<.'$"-*1`BC(HP;-6H`L!@#8XR-%3O6^&BQ
 MI$4;`&+$J$'CQ@P9*V&0C`'#Q@T9`$#`F,BSI\^?0`'4F4,GC!P0(`",J5,F
 MJ,.E39U*G4JUJM6K6'G"DY?N7CEZ6<.*'4NVK-FS:-.J7<NVK<-7X%")*B7.
diff --git a/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu b/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu
index 87fa582f6..97d87728f 100644
--- a/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu
+++ b/libarchive/test/test_read_format_gtar_filename_eucjp.tar.Z.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_eucjp.tar.Z
+begin 644 test_read_format_gtar_filename_eucjp.tar.Z
 M'YV0M(+MTN>"#AXZ`!(J7,BPH<.'$"-*G$@1`(R+,&S0H&'Q8HP;-6)TA/$Q
 MY$B,&&/``!`C1HV0-63(B+F29`P:)D&LK,BSI\^?0.O,H1-&#@@0`,;4*0,T
 MHE*F3:-*G4JUJM6K4Q7]<J1)4"I!R+"*'4NVK-FS:-.J7<NVK=NHR7H5//BV
diff --git a/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu b/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu
index bf4ce0170..a198830ae 100644
--- a/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu
+++ b/libarchive/test/test_read_format_gtar_filename_koi8r.tar.Z.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_gtar_koi8r.tar.Z
+begin 644 test_read_format_gtar_filename_koi8r.tar.Z
 M'YV0T*0ENU:,&H"#"!,J7,BPH<.'$"-*1`BC(HP;-6H`L!@#8XR-%3O6^&BQ
 MI$4;`&+$J$'CQ@P9%6>@A*&RAHP;`$#`F,BSI\^?0`'4F4,GC!P0(`",J5,F
 MJ,.E39U*G4JUJM6K6'G"DY?N7CEZ6<.*'4NVK-FS:-.J7<NVK<.M7;^ZG<NP
diff --git a/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu b/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
index dc0daae9e..634ac0673 100644
--- a/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
+++ b/libarchive/test/test_read_format_gtar_sparse_skip_entry.tar.Z.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_gtar_sparse_skip_entry.tar.Z
 M'YV04,+@05(F#)DR<EZ$`<"PH<.'$"-*G$BQHL6*,#+:L$$#!(",,6[4@.$1
 MI$B2'S.JS#A#A@P0,63,L`$C!HP9-VB\K"FCAHT8`$#@N4BTJ-&C2"/6F4,G
 MC)R48^J424HQZE2J$E=F+*G5(]:O8,.*'3M6!LDY:?24Z6'S!DX:,7#(H$%#
diff --git a/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu b/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu
index 151701460..a579fb1aa 100644
--- a/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu
+++ b/libarchive/test/test_read_format_lha_filename_cp932.lzh.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_lha_cp932.lzh
+begin 644 test_read_format_lha_filename_cp932.lzh
 M30`M;&@P+0@````(````*:2#32`"&4A-!P!&I`,```L``8J_CIHN='AT&P!!
 M-'"`))KERP%TJNDQFN7+`72JZ3&:Y<L!!@``T2,'``"*OXZ:@JF"R$L`+6QH
 M,"T$````!````#RD@TT@`NA;30<`1J0#```)``&57"YT>'0;`$&:91,VFN7+
diff --git a/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu b/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu
index ca5da7a64..0eeea817b 100644
--- a/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu
+++ b/libarchive/test/test_read_format_lha_filename_utf16.lzh.uu
@@ -1,19 +1,19 @@
-begin 644 test_read_format_lha_filename_utf16.lzh
-M@0`M;&@P+0P````,````L/5872`"IW%-!P!&I`,```T``5]?7U]?7RYT>'0*
-M``)?7U]?7U__%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``1`$7<`-8`Q`#\`/8`
-MY`#__QL`078S<F.15=4!]0V8@I%5U0'U#9B"D575`08```\:!P``PZ3#ML.\
-MPX3#EL.<90`M;&AD+0``````````PX"D72`"``!-!P!&I`,```,``0H``E]?
-M7U]?7_\%`$`0`!$`1=P`U@#$`/P`]@#D`/__&P!!FDHB>9B"U0$H^DQ_F(+5
-M`2CZ3'^8@M4!!@``GW<'``!J`"UL:#`M&0```!D```!V)L1=(`*CNTT'`$:D
-M`P``#0`!@V6#6(-G+G1X=`H``E]?7U]?7_\1`$7<`-8`Q`#\`/8`Y`#__QL`
-M00IF#4J@E-4!L"5C?'65U0&P)6-\=975`08``$%^!P``5&5S="!I;B!*87!A
-M;F5S92!+871A:V%N87L`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-
-M``%?7U]?7U\N='AT"@`"@V6#6(-G_Q<`1.0`]@#\`,0`U@#<`"X`=`!X`'0`
-M"P!%QC"Y,,@P__\;`$'D5O!-H)35`?4-F(*15=4!Y%;P3:"4U0$&``"A+0<`
-M`,.DP[;#O,.$PY;#G%0`+6QH9"T``````````-3`PET@`@``30<`1J0#```#
-M``$*``*#98-8@V?_!0!`$``;`$%%!\Y.H)35`3/_]%&@E-4!,__T4:"4U0$&
-M``!>;@<``&8`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-``%?7U]?
-M7U\N='AT%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``;`$'D5O!-H)35`?4-F(*1
-@5=4!Y%;P3:"4U0$&``"M>`<``,.DP[;#O,.$PY;#G`#D
-`
-end
+begin 644 test_read_format_lha_filename_utf16.lzh
+M@0`M;&@P+0P````,````L/5872`"IW%-!P!&I`,```T``5]?7U]?7RYT>'0*
+M``)?7U]?7U__%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``1`$7<`-8`Q`#\`/8`
+MY`#__QL`078S<F.15=4!]0V8@I%5U0'U#9B"D575`08```\:!P``PZ3#ML.\
+MPX3#EL.<90`M;&AD+0``````````PX"D72`"``!-!P!&I`,```,``0H``E]?
+M7U]?7_\%`$`0`!$`1=P`U@#$`/P`]@#D`/__&P!!FDHB>9B"U0$H^DQ_F(+5
+M`2CZ3'^8@M4!!@``GW<'``!J`"UL:#`M&0```!D```!V)L1=(`*CNTT'`$:D
+M`P``#0`!@V6#6(-G+G1X=`H``E]?7U]?7_\1`$7<`-8`Q`#\`/8`Y`#__QL`
+M00IF#4J@E-4!L"5C?'65U0&P)6-\=975`08``$%^!P``5&5S="!I;B!*87!A
+M;F5S92!+871A:V%N87L`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-
+M``%?7U]?7U\N='AT"@`"@V6#6(-G_Q<`1.0`]@#\`,0`U@#<`"X`=`!X`'0`
+M"P!%QC"Y,,@P__\;`$'D5O!-H)35`?4-F(*15=4!Y%;P3:"4U0$&``"A+0<`
+M`,.DP[;#O,.$PY;#G%0`+6QH9"T``````````-3`PET@`@``30<`1J0#```#
+M``$*``*#98-8@V?_!0!`$``;`$%%!\Y.H)35`3/_]%&@E-4!,__T4:"4U0$&
+M``!>;@<``&8`+6QH,"T,````#````+#U6%T@`J=Q30<`1J0#```-``%?7U]?
+M7U\N='AT%P!$Y`#V`/P`Q`#6`-P`+@!T`'@`=``;`$'D5O!-H)35`?4-F(*1
+@5=4!Y%;P3:"4U0$&``"M>`<``,.DP[;#O,.$PY;#G`#D
+`
+end
diff --git a/libarchive/test/test_read_format_rar.rar.uu b/libarchive/test/test_read_format_rar.rar.uu
index 75f93b4c2..f197a2983 100644
--- a/libarchive/test/test_read_format_rar.rar.uu
+++ b/libarchive/test/test_read_format_rar.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar.rar
 M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
 M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
 MG2]T()`R``@````(`````WM$R;;13-@^%#`(`/^A``!T97-T;&EN:\`(T4S8
diff --git a/libarchive/test/test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu b/libarchive/test/test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu
index 7684bc199..4decccb38 100644
--- a/libarchive/test/test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu
+++ b/libarchive/test/test_read_format_rar5_bad_window_sz_in_mltarc_file.rar.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_rar5_bad_window_size_in_multiarchive_file.rar
+begin 644 test_read_format_rar5_bad_window_sz_in_mltarc_file.rar
 M4F%R(1H'`0`]/-[E`@$`_R`@1#[Z5P("`PL`("`@@"(`"?\@("#___\@("`@
 M("`@("`@("`@4X`J]`,"YR(#$($@("`@``$@("`@@<L0("`@("`@("`@("`@
 M("`@(""LCTJA`P$%`B`@`2!3@"KT`P+G(@,@("`@_P,!!B`@(/___R`@(('+
diff --git a/libarchive/test/test_read_format_rar5_compressed.rar.uu b/libarchive/test/test_read_format_rar5_compressed.rar.uu
index f9f811c6d..dbd42f09c 100644
--- a/libarchive/test/test_read_format_rar5_compressed.rar.uu
+++ b/libarchive/test/test_read_format_rar5_compressed.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_compressed.rar
+begin 644 test_read_format_rar5_compressed.rar
 M4F%R(1H'`0#SX8+K"P$%!P`&`0&`@(``B<9?VB8"`POI`@2P":2#`LUPRGR`
 M!0$(=&5S="YB:6X*`Q.+5ZQ;^!BM'LKT90$G96!4'U5V7;^4DG')SV6660QP
 MV663&,62$X9"223AD)"2220DXY))(0A))"$)))"22$(2$LVU;WM],PZ`?1T#
diff --git a/libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu b/libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu
index 85391fa4e..9a3423e37 100644
--- a/libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu
+++ b/libarchive/test/test_read_format_rar5_different_winsize_on_merge.rar.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_rar5_different_winsize_on_merge.rar.uu
+begin 644 test_read_format_rar5_different_winsize_on_merge.rar
 M4F%R(1H'`0"-[P+2``+''QP,!`H``"0`N)$#`0(H$"<"``X`/3Q/`0"V````
 MQ@$````V`/^%02`H^B7&,NX``"F&AK%M-50O<WY2!P$`C>\"T@`"_[6U,1"U
 MM;6UM[BU45)A<K6UM;6UM+6U```\______?______________P`&80"-[P+2
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part01.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part01.rar.uu
index a83c78ca2..9006181ef 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part01.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part01.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part01.rar
+begin 644 test_read_format_rar5_multiarchive.part01.rar
 M4F%R(1H'`0!5`$'/#`$%"`$'`0'O]H"``.>[Y2I7`A,+@O8`!.#I".V#`FI)
 M!96`%0$W:&]M92]A;G1E:R]T96UP+V)U:6QD+W5N<F%R-2]L:6)A<F-H:79E
 M+V)I;B]B<V1C871?=&5S=`H#$Z@$JUL/WSH`BQ&75V"(540R)79@1V>KN2Y+
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part02.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part02.rar.uu
index fce298246..d766ccee9 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part02.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part02.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part02.rar
+begin 644 test_read_format_rar5_multiarchive.part02.rar
 M4F%R(1H'`0"ZHBK1#0$%"`,!!P$![_:`@`!@&RUZ5P(;"X'V``3@Z0CM@P)=
 M-\$R@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D8V%T7W1E<W0*`Q.H!*M;#]\Z`,C&\^P15*#4'A\D!$R&)9;I
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part03.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part03.rar.uu
index c600f0253..b2bd1a72b 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part03.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part03.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part03.rar
+begin 644 test_read_format_rar5_multiarchive.part03.rar
 M4F%R(1H'`0`S!&6T#0$%"`,"!P$!@_:`@`#;[#5T5P(+"_W#``3@Z0CM@P)S
 M="<U@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D8V%T7W1E<W0*`Q.H!*M;#]\Z`+YO1=#5A^0(J_-LW+!*WYK9
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part04.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part04.rar.uu
index 3b47dd07c..afd18ab0a 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part04.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part04.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part04.rar
+begin 644 test_read_format_rar5_multiarchive.part04.rar
 M4F%R(1H'`0`\BMS_#0$%"`,#!P$![_:`@``H3"7!5P(;"X'V``3HJ!;M@P)=
 M?Y*E@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D=&%R7W1E<W0*`Q.J!*M;T74"-U,K[HY2T0OI6D^@"4>G(I3D
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part05.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part05.rar.uu
index 4dc97d65e..a9f1981e4 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part05.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part05.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part05.rar
+begin 644 test_read_format_rar5_multiarchive.part05.rar
 M4F%R(1H'`0#UY[V;#0$%"`,$!P$![_:`@`"(]4(L5P(;"X'V``3HJ!;M@P+]
 MF?Z`@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D=&%R7W1E<W0*`Q.J!*M;T74"-[]V(;"@ZL+ZZ0DS>@98+@$>
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part06.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part06.rar.uu
index 1e2ad0cf9..1ba155dbf 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part06.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part06.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part06.rar
+begin 644 test_read_format_rar5_multiarchive.part06.rar
 M4F%R(1H'`0"V\\:,#0$%"`,%!P$![_:`@``2\>%K5P(;"X'V``3HJ!;M@P(]
 M(D2J@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D=&%R7W1E<W0*`Q.J!*M;T74"-\2/YDWQ,%)DI56J+M4UB8>R
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part07.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part07.rar.uu
index de1044e30..23ba290ad 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part07.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part07.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part07.rar
+begin 644 test_read_format_rar5_multiarchive.part07.rar
 M4F%R(1H'`0!SSTNU#0$%"`,&!P$![_:`@`#=K"Q/5P(;"X'V``3HJ!;M@P*V
 M0J=E@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D=&%R7W1E<W0*`Q.J!*M;T74"-YY^$-E'40]L2'?%!?HA6*"R
diff --git a/libarchive/test/test_read_format_rar5_multiarchive.part08.rar.uu b/libarchive/test/test_read_format_rar5_multiarchive.part08.rar.uu
index eae45fc7a..459beb48d 100644
--- a/libarchive/test/test_read_format_rar5_multiarchive.part08.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiarchive.part08.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiarchive.part08.rar
+begin 644 test_read_format_rar5_multiarchive.part08.rar
 M4F%R(1H'`0#"(ZNP#0$%"`,'!P$!\,:`@`#/Q#!K5P(+"X+&``3HJ!;M@P+X
 M99;E@!4!-VAO;64O86YT96LO=&5M<"]B=6EL9"]U;G)A<C4O;&EB87)C:&EV
 M92]B:6XO8G-D=&%R7W1E<W0*`Q.J!*M;T74"-P'V.L#Y#UMO#KJ6K6EJUOF6
diff --git a/libarchive/test/test_read_format_rar5_multiple_files.rar.uu b/libarchive/test/test_read_format_rar5_multiple_files.rar.uu
index 3fa8930c9..26ededc9b 100644
--- a/libarchive/test/test_read_format_rar5_multiple_files.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiple_files.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiple_files.rar
+begin 644 test_read_format_rar5_multiple_files.rar
 M4F%R(1H'`0#SX8+K"P$%!P`&`0&`@(```Q:>PB<"`POD`@2`(*2#`L:R$WZ`
 M!0$)=&5S=#$N8FEN"@,39U^L6QI:GA#*\6`!$&149R]7!6]2222222222222
 M2222222222222222222222222222222222222222222222223]_>QS,[=]KH
diff --git a/libarchive/test/test_read_format_rar5_multiple_files_solid.rar.uu b/libarchive/test/test_read_format_rar5_multiple_files_solid.rar.uu
index 4a8acb08c..8ba78774d 100644
--- a/libarchive/test/test_read_format_rar5_multiple_files_solid.rar.uu
+++ b/libarchive/test/test_read_format_rar5_multiple_files_solid.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_multiple_files_solid.rar
+begin 644 test_read_format_rar5_multiple_files_solid.rar
 M4F%R(1H'`0`)[\AO"P$%!P0&`0&`@(``&8R4_R<"`POY`@2`(*2#`L:R$WZ`
 M'0$)=&5S=#$N8FEN"@,39U^L6QI:GA#)YW4!&&5492;T@%?U\^?/DDDDDDDD
 MDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDO\\YG#6M
diff --git a/libarchive/test/test_read_format_rar5_sfx.exe.uu b/libarchive/test/test_read_format_rar5_sfx.exe.uu
index fdf83af1a..7df65a110 100644
--- a/libarchive/test/test_read_format_rar5_sfx.exe.uu
+++ b/libarchive/test/test_read_format_rar5_sfx.exe.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar5_sfx.exe
 M35J0``,````$````__\``+@`````````0```````````````````````````
 M````````````````````$`$```X?N@X`M`G-(;@!3,TA5&AI<R!P<F]G<F%M
 M(&-A;FYO="!B92!R=6X@:6X@1$]3(&UO9&4N#0T*)`````````!B8/>3)@&9
diff --git a/libarchive/test/test_read_format_rar5_stored.rar.uu b/libarchive/test/test_read_format_rar5_stored.rar.uu
index 405b8795a..afd565ff9 100644
--- a/libarchive/test/test_read_format_rar5_stored.rar.uu
+++ b/libarchive/test/test_read_format_rar5_stored.rar.uu
@@ -1,4 +1,4 @@
-begin 644 rar5_stored.rar
+begin 644 test_read_format_rar5_stored.rar
 M4F%R(1H'`0`SDK7E"@$%!@`%`0&`@``X,`9C+`(#"YT`!)T`I(,"M$.@E8``
 M`0YH96QL;W=O<FQD+G1X=`H#$WX.JUM6Z0X::&5L;&\@;&EB87)C:&EV92!T
 397-T('-U:71E(0H==U91`P4$````
diff --git a/libarchive/test/test_read_format_rar_binary_data.rar.uu b/libarchive/test/test_read_format_rar_binary_data.rar.uu
index 4d1cbd36d..712dd0e67 100644
--- a/libarchive/test/test_read_format_rar_binary_data.rar.uu
+++ b/libarchive/test/test_read_format_rar_binary_data.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_binary_data.rar
 M4F%R(1H'`,^0<P``#0````````!W#G2@D#D`E`H0````$``#OES$M0V6!S\=
 M-0\`I($``')A;F1O;5]D871A+F)I;H#,#98'/Q*6!S\1#\T0T54`#0Z16Z5B
 MZ6W>FQ_"3YH!RD,Z.<P&4ZSGQ+1(6^9/\HXB^LD*'EY-":6Y)MO'@@4>_X"C
diff --git a/libarchive/test/test_read_format_rar_compress_best.rar.uu b/libarchive/test/test_read_format_rar_compress_best.rar.uu
index 22fde0f8b..d31adcc92 100644
--- a/libarchive/test/test_read_format_rar_compress_best.rar.uu
+++ b/libarchive/test/test_read_format_rar_compress_best.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_compress_best.rar
 M4F%R(1H'`,^0<P``#0````````"/6W0@D$,`\A8``(].```#8Z8%7C:SVCX=
 M-1D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6R`S#:SVC[E:?8^IQ@[
 MY,&O-%WTZIVL0'K=[L^M$"SZ*I?&B@$S2EO?UM\%P_[#*[0L[1)9)\]U]*;T
diff --git a/libarchive/test/test_read_format_rar_compress_normal.rar.uu b/libarchive/test/test_read_format_rar_compress_normal.rar.uu
index afc6cc08d..2cce0e14c 100644
--- a/libarchive/test/test_read_format_rar_compress_normal.rar.uu
+++ b/libarchive/test/test_read_format_rar_compress_normal.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_compress_normal.rar
 M4F%R(1H'`,^0<P``#0````````!.!G0@D$,`LQL``(].```#8Z8%7C:SVCX=
 M,QD`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6R`S#:SVCZ4:NT^#!U1
 M#,S1%\6=F]T/PH[-`V-[U)/P29F;F3P#KD;FQC9X>MJ;G<[Z6"DBFSK*16$E
diff --git a/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu b/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu
index dd6ab50f9..e717b00fd 100644
--- a/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu
+++ b/libarchive/test/test_read_format_rar_multi_lzss_blocks.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multi_lzss_blocks.rar
 M4F%R(1H'`,^0<P``#0````````"5L73`D$0`(TT``"<M,P$#<!6B:RZ@[CX=
 M,QH`I($``&UU;'1I7VQZ<W-?8FQO8VMS7W1E<W0N='ATP,PNH.X^+:#N/@W!
 ME1$,S1$`%=F]SKX56/`,:6:25T-W=Y;Z1J;2>M#'TZD7E[>^E"B3)2K$2:-U
diff --git a/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu b/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
index 7378a9b55..bbe4be4c9 100644
--- a/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
+++ b/libarchive/test/test_read_format_rar_multivolume.part0001.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0001.rar
 M4F%R(1H'`%IN<Q$!#0`````````SE'3"D$<`\>D``&I!9PX#@*>#,/AM$C\=
 M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
 M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
diff --git a/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu b/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
index 696ff565b..a61a2fbc7 100644
--- a/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
+++ b/libarchive/test/test_read_format_rar_multivolume.part0002.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0002.rar
 M4F%R(1H'`!EZ<Q$`#0````````#NWW3#D$<`\>D``&I!9PX#%Y:4IOAM$C\=
 M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
 M/___________________________________________________________
diff --git a/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu b/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
index 91b7f28c5..ef70b9eba 100644
--- a/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
+++ b/libarchive/test/test_read_format_rar_multivolume.part0003.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0003.rar
 M4F%R(1H'`!EZ<Q$`#0````````#U+'3!D$<`^-T``&I!9PX#=T0K]_AM$C\=
 M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,SX;1(_P&X2
 M/QOK1E#^H^/%2CSU*]SFZB-O0P7.9&(^"2;U+Z.1_C%^3WOV,>5:-FN$2BNW
diff --git a/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu b/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
index 0bfad779e..20931f62c 100644
--- a/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
+++ b/libarchive/test/test_read_format_rar_multivolume.part0004.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_multivolume.part0004.rar
 M4F%R(1H'`!EZ<Q$`#0````````!AIG3!D$,`/`L``(].```#8Z8%7L"!$C\=
 M-1D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S,"!$C_!@1(_'H$B
 MVRP\K;>5J2C]?9NI\:;KW2+#TR@_Y5=4S)O&)O_B>J0/A0T-,@"ER';1YX:$
diff --git a/libarchive/test/test_read_format_rar_noeof.rar.uu b/libarchive/test/test_read_format_rar_noeof.rar.uu
index 7cf88e7c6..fd2d0d3a1 100644
--- a/libarchive/test/test_read_format_rar_noeof.rar.uu
+++ b/libarchive/test/test_read_format_rar_noeof.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_noeof.rar
 M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
 M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
 `
diff --git a/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu b/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu
index a41b007a0..472654259 100644
--- a/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu
+++ b/libarchive/test/test_read_format_rar_ppmd_lzss_conversion.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_ppmd_lzss_conversion.rar
 M4F%R(1H'`,^0<P``#0````````!R,W3`D$<`VK$"`&I!9PX#=T0K]VL`!S\=
 M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,B$``<_&[\&
 M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
diff --git a/libarchive/test/test_read_format_rar_sfx.exe.uu b/libarchive/test/test_read_format_rar_sfx.exe.uu
index ea084ecac..275d07496 100644
--- a/libarchive/test/test_read_format_rar_sfx.exe.uu
+++ b/libarchive/test/test_read_format_rar_sfx.exe.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_sfx.exe
 M35J0``,````$````__\``+@`````````0```````````````````````````
 M````````````````````Z`````X?N@X`M`G-(;@!3,TA5&AI<R!P<F]G<F%M
 M(&-A;FYO="!B92!R=6X@:6X@1$]3(&UO9&4N#0T*)`````````#3[14&EXQ[
diff --git a/libarchive/test/test_read_format_rar_subblock.rar.uu b/libarchive/test/test_read_format_rar_subblock.rar.uu
index 5c55ca11d..8bd8e6038 100644
--- a/libarchive/test/test_read_format_rar_subblock.rar.uu
+++ b/libarchive/test/test_read_format_rar_subblock.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_subblock.rar
 M4F%R(1H'`,^0<P``#0`````````##'H`@",`(@```!T````#&WQ`G@`````=
 M,P,``````$--5`@!"+Z0\5[-83@7PT#<+OM\M_$>H5JAD)Q_9XLAN3)VO("$
 M4G0@D#(`%````!0````#0J+(OK=VVCX4,`@`I($``'1E<W0N='AT@`BW=MH^
diff --git a/libarchive/test/test_read_format_rar_windows.rar.uu b/libarchive/test/test_read_format_rar_windows.rar.uu
index 05fa8db85..daaa32b25 100644
--- a/libarchive/test/test_read_format_rar_windows.rar.uu
+++ b/libarchive/test/test_read_format_rar_windows.rar.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_format_rar_windows.rar
 M4F%R(1H'`,^0<P``#0````````"6GW0@D$,`$````!`````"\1+6EVQA$C\4
 M,!``(````'1E<W1D:7)<=&5S="YT>'3POU/A"W5A$C_#FG]U81(_PYI_=&5S
 M="!T97AT(&9I;&4-"D."=""0.P`0````$`````+Q$M:7;&$2/Q0P"``@````
diff --git a/libarchive/test/test_read_format_raw.bufr.uu b/libarchive/test/test_read_format_raw.bufr.uu
index 2f4cef746..896e09c8f 100644
--- a/libarchive/test/test_read_format_raw.bufr.uu
+++ b/libarchive/test/test_read_format_raw.bufr.uu
@@ -1,4 +1,4 @@
-begin 660 test_read_format_raw.bufr.uu
+begin 660 test_read_format_raw.bufr
 M,#`P-S0T.3@P,`$-#0HP,#`-#0I)15%8,#$@155-4"`P-S`U,#`-#0I"5492
 M`2+?!```%@``_@`````#_]T0``?@"P<$.P````D``'C`Z`@!(K0``,``_@!N
 M@#T!^`"P!P"!`````"JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ@#=]]]]]
diff --git a/libarchive/test/test_read_format_tar_empty_filename.tar.uu b/libarchive/test/test_read_format_tar_empty_filename.tar.uu
index 7a34c82ca..6cd962927 100644
--- a/libarchive/test/test_read_format_tar_empty_filename.tar.uu
+++ b/libarchive/test/test_read_format_tar_empty_filename.tar.uu
@@ -1,4 +1,4 @@
-begin 644 test_compat_tar_1.tar
+begin 644 test_read_format_tar_empty_filename.tar
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M`````````````#`P,#<W-2``,#`Q-S4P(``P,#`P,#`@`#`P,#`P,#`P,#`P
diff --git a/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu b/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
index 2557b3f9f..0b2d53b69 100644
--- a/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
+++ b/libarchive/test/test_read_format_tar_empty_pax.tar.Z.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_tar_empty.tar.Z
+begin 644 test_read_format_tar_empty_pax.tar.Z
 M'YV0<,+@^7*&S1LQ8=A\05,F#)DR<@!(G$BQHL6+&#-JW,BQ(HR/,&R(!`"R
 M),F2'T^B_&B#!H`8,F+,B$%C1@V9,D[2K`&C!H`S'8,*'4JTZ,4Z<^B$B?A1
 MSILW=(QF=`I5*L:5,%2:M,JUJ]>O8,'6D`%BS)LV;<JXH=.#3)BW-W#D,!-F
diff --git a/libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu b/libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu
index 71309eab2..3fa9a2e0e 100644
--- a/libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu
+++ b/libarchive/test/test_read_format_tar_invalid_pax_size.tar.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_tar_invalid_pax_size.tar.uu
+begin 644 test_read_format_tar_invalid_pax_size.tar
 M+B]087A(96%D97)S+C$T-#8S+V%A80``````````````````````````````
 M````````````````````````````````````````````````````````````
 M`````````````#`P,#`V-#0`,#`P,#`P,``P,#`P,#`P`#`P,#`P,#`P,S$R
diff --git a/libarchive/test/test_read_format_zip_bzip2.zipx.uu b/libarchive/test/test_read_format_zip_bzip2.zipx.uu
index 6d9884aed..4c9aeb77a 100644
--- a/libarchive/test/test_read_format_zip_bzip2.zipx.uu
+++ b/libarchive/test/test_read_format_zip_bzip2.zipx.uu
@@ -1,4 +1,4 @@
-begin 644 bzip2.zipx
+begin 644 test_read_format_zip_bzip2.zipx
 M4$L#!"X#```,`#TQD4VJ.XZZ-`(``)`#```%````=FEM<F-"6F@Y,4%9)E-9
 MYPC!D@``3%^``!!TY^!2(B.7`+__W^%``C$[0!AJ>E,ID:&U-'E`T&C1IIIZ
 M@8&J>$9":`IZ@``'J:/2&#```````!@`2FB$T:31D9"F@8FC0`\H^:+Y;81F
diff --git a/libarchive/test/test_read_format_zip_filename_cp866.zip.uu b/libarchive/test/test_read_format_zip_filename_cp866.zip.uu
index 52c677060..7ef721490 100644
--- a/libarchive/test/test_read_format_zip_filename_cp866.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_cp866.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_cp866.zip
+begin 644 test_read_format_zip_filename_cp866.zip
 M4$L#!`H``````%VEAS[,X8$4!@````8````&`!P`CY"(@H62550)``-!HYU-
 M0:.=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*``````!=I8<^S.&!%`8`
 M```&````!@`<`*_@J**EXE54"0`#0:.=34&CG4UU>`L``03I`P``!.D#``#P
diff --git a/libarchive/test/test_read_format_zip_filename_cp932.zip.uu b/libarchive/test/test_read_format_zip_filename_cp932.zip.uu
index 90c22f2d5..ec0f9c091 100644
--- a/libarchive/test/test_read_format_zip_filename_cp932.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_cp932.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_cp932.zip
+begin 644 test_read_format_zip_filename_cp932.zip
 M4$L#!`H``````/94=#Z"B='W!0````4````1````E5R"OH+F+XCJEY>57"YT
 M>'1(96QL;U!+`P0*``````"W5'0^W)UO0@4````%````#P```)5<@KZ"YB^*
 MOXZ:+G1X=&MA;FII4$L!`A0+"@``````]E1T/H*)T?<%````!0```!$`````
diff --git a/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu b/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu
index 05c669560..242c902f0 100644
--- a/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_koi8r.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_koi8r.zip
+begin 644 test_read_format_zip_filename_koi8r.zip
 M4$L#!`H``````+&CAS[,X8$4!@````8````&`!P`T-+)U\74550)``,>H)U-
 M'J"=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*``````"QHX<^S.&!%`8`
 M```&````!@`<`/#RZ??E]%54"0`#'J"=31Z@G4UU>`L``03I`P``!.D#``#P
diff --git a/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu b/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu
index 00c2af337..3c9f4b9ea 100644
--- a/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_utf8_jp.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8.zip
+begin 644 test_read_format_zip_filename_utf8_jp.zip
 M4$L#!`H```@``,E4=#X````````````````*`!P`Z*&HXX&@XX*(+U54"0`#
 MBEJ%3;[UBDUU>`L``03M`P``!`$"``!02P,$"@``"```]51T/H*)T?<%````
 M!0```!<`'`#HH:CC@:#C@H@OY+B`Z*:GZ*&H+G1X=%54"0`#WEJ%31KLBDUU
diff --git a/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu b/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu
index 9241776d7..bd71cc2a4 100644
--- a/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_utf8_ru.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8_ru.zip
+begin 644 test_read_format_zip_filename_utf8_ru.zip
 M4$L#!`H```@``,NC/S[,X8$4!@````8````,`!P`T)_0H-"8T)+0E="B550)
 M``-.G49-'J"=375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*```(``!KI3\^
 MS.&!%`8````&````#``<`-"_T8#0N-"RT+71@E54"0`#6J!&31Z@G4UU>`L`
diff --git a/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu b/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu
index 651f8b1f8..65a34ed59 100644
--- a/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu
+++ b/libarchive/test/test_read_format_zip_filename_utf8_ru2.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_utf8_ru2.zip
+begin 644 test_read_format_zip_filename_utf8_ru2.zip
 M4$L#!`H``````.:PCC[,X8$4!@````8````&`!P`\/+I]^7T550)``.`\:9-
 MI6>G375X"P`!!.D#```$Z0,``/#RZ??E]%!+`P0*```(``!KI3\^S.&!%`8`
 M```&````#``<`-"_T8#0N-"RT+71@E54"0`#6J!&357SIDUU>`L``03I`P``
diff --git a/libarchive/test/test_read_format_zip_lzma.zipx.uu b/libarchive/test/test_read_format_zip_lzma.zipx.uu
index 24fdc8e7c..d0aad44a1 100644
--- a/libarchive/test/test_read_format_zip_lzma.zipx.uu
+++ b/libarchive/test/test_read_format_zip_lzma.zipx.uu
@@ -1,4 +1,4 @@
-begin 644 lzma.zipx
+begin 644 test_read_format_zip_lzma.zipx
 M4$L#!#\#```.`#TQD4VJ.XZZ.0(``)`#```%````=FEM<F,0`@4`70`0````
 M$0@$J,)\D;(#4L%<^$P5TO^CM0KI0HWG08B&_].4<,CJ")TW/L>)82Q1PWAL
 M+U`,N0L_$]^&650C/X$D6#4QFD$\A/"_![4!O/5O/!KH`WCQ*4?T2*]4P#/D
diff --git a/libarchive/test/test_read_format_zip_ppmd8.zipx.uu b/libarchive/test/test_read_format_zip_ppmd8.zipx.uu
index 4440e95b3..cdbf0f448 100644
--- a/libarchive/test/test_read_format_zip_ppmd8.zipx.uu
+++ b/libarchive/test/test_read_format_zip_ppmd8.zipx.uu
@@ -1,4 +1,4 @@
-begin 644 ppmd8.zipx
+begin 644 test_read_format_zip_ppmd8.zipx
 M4$L#!#\#``!B`#TQD4VJ.XZZV`$``)`#```%````=FEM<F,'`"']JO"&\1[R
 M;;G)@`(8>EJ>3<8@F_*<(\B>K]4_(WC8#)`_QSG+`7`B&_11VIJ)@#(<W.9L
 M>K)_I8R^=`VUO2_S,1C=1CAU>-*`]CC+&6Q;EE'#CG-W=^[,F,+UR-TE(9,G
diff --git a/libarchive/test/test_read_format_zip_winzip_aes128.zip.uu b/libarchive/test/test_read_format_zip_winzip_aes128.zip.uu
index d0f03a311..d3a69d8d4 100644
--- a/libarchive/test/test_read_format_zip_winzip_aes128.zip.uu
+++ b/libarchive/test/test_read_format_zip_winzip_aes128.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_winzip_aes128_encryption_data.zip
+begin 644 test_read_format_zip_winzip_aes128.zip
 M4$L#!#,#`0!C`(RP#D4`````@0H``*(:```&``L`4D5!1$U%`9D'``(`044!
 M"``>H87EHY!N6J#=V\<,#M>^H2IQID3@A--GSL+F%'R^%OKB.K(74CJ!,(%"
 ML\O.^D'TO'!T<+"]"28FXP@QKAY]R+02!E!XE_6A-W&<$&SJ5W]K'SJ4>'C<
diff --git a/libarchive/test/test_read_format_zip_winzip_aes256.zip.uu b/libarchive/test/test_read_format_zip_winzip_aes256.zip.uu
index a45c8fbe6..ae51e6653 100644
--- a/libarchive/test/test_read_format_zip_winzip_aes256.zip.uu
+++ b/libarchive/test/test_read_format_zip_winzip_aes256.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_winzip_aes256_encryption_data.zip
+begin 644 test_read_format_zip_winzip_aes256.zip
 M4$L#!#,#`0!C`(RP#D4`````B0H``*(:```&``L`4D5!1$U%`9D'``(`044#
 M"`#8+Z><':+DENQS9*!7Y*&!7BQK,UN]RF*'<':@;]N)O5>]A5>0<AYWX=%S
 MGUTK5M-^&`+%Q<#PC+45O;+Q/4[_J7)A7*2<^!W;)^E_W%,]]7-&6R8]ZL.F
diff --git a/libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu b/libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu
index c49673aab..e8300fa90 100644
--- a/libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu
+++ b/libarchive/test/test_read_format_zip_winzip_aes256_stored.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_winzip_aes256_encryption_stored_data.zip
+begin 644 test_read_format_zip_winzip_aes256_stored.zip
 M4$L#!#,#`0!C`(RP#D4`````OAH``*(:```&``L`4D5!1$U%`9D'``(`044#
 M``#5>!R(9&J6OW+%/X2D%.HLH/4@[H=,;4@&P$:E>NK#GQM>2SUV&GDS9/G@
 M#J5^X(O<TC2DQW<QV`U6]!AA].1DL/:C!^1V=PJ`#_Z7`]_@C+O\SN38$]ZL
diff --git a/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu b/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu
index 63744f145..7301c155e 100644
--- a/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu
+++ b/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.zip.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_format_zip_without_eocd.zip
+begin 644 test_read_format_zip_with_invalid_traditional_eocd.zip
 M4$L#!"T`"````-IT@DH`````__________\)`"``=&5S=#$N='AT`0`<````
 M````````````````````````````````````````````````````````````
 M`%!+`P0M``@```#:=()*`````/__________"0`@`'1E<W0R+G1X=`$`'```
diff --git a/libarchive/test/test_read_large_splitted_rar_aa.uu b/libarchive/test/test_read_large_splitted_rar_aa.uu
index a6c3b3cff..299b00b68 100644
--- a/libarchive/test/test_read_large_splitted_rar_aa.uu
+++ b/libarchive/test/test_read_large_splitted_rar_aa.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_aa
 M4F%R(1H'`,^0<P``#0````````!R,W3`D$<`VK$"`&I!9PX#=T0K]VL`!S\=
 M-1T`I($``'!P;61?;'IS<U]C;VYV97)S:6]N7W1E<W0N='ATP,B$``<_&[\&
 M/Z<8.^3!KS1=].J=K$!ZW>[/K1`L^BJ7QHH!,TI;W];?!</^PRNT+.T262?/
diff --git a/libarchive/test/test_read_large_splitted_rar_ab.uu b/libarchive/test/test_read_large_splitted_rar_ab.uu
index 43869789a..39ce2315c 100644
--- a/libarchive/test/test_read_large_splitted_rar_ab.uu
+++ b/libarchive/test/test_read_large_splitted_rar_ab.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ab
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
 M````````````````````````````````````````````````````````````
diff --git a/libarchive/test/test_read_large_splitted_rar_ac.uu b/libarchive/test/test_read_large_splitted_rar_ac.uu
index 0ceeae1b7..7941aaaca 100644
--- a/libarchive/test/test_read_large_splitted_rar_ac.uu
+++ b/libarchive/test/test_read_large_splitted_rar_ac.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ac
 M____________________________________________________________
 M____________________________________________________________
 M____________________________________________________________
diff --git a/libarchive/test/test_read_large_splitted_rar_ad.uu b/libarchive/test/test_read_large_splitted_rar_ad.uu
index f736f13c7..9b633d19a 100644
--- a/libarchive/test/test_read_large_splitted_rar_ad.uu
+++ b/libarchive/test/test_read_large_splitted_rar_ad.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ad
 M>WI\4,Y&PE_B_KBY3_KR8A*=V5Y9^":+9OY.2W-%I:#J"YC[#9]&6)@HH1ZH
 MV*<8TFQK2]$<A645.":BA=R^<=NOJ(%,H)2+!9H%.!"J[E>+2^(@3/9+1"6W
 M2O)L"JZC)MCDJG+%_;+=UEV.2(I,V[T@E<XQKA"\G.*'GD,QF_.C^"NU*.#4
diff --git a/libarchive/test/test_read_large_splitted_rar_ae.uu b/libarchive/test/test_read_large_splitted_rar_ae.uu
index 9f463a4ae..fada05733 100644
--- a/libarchive/test/test_read_large_splitted_rar_ae.uu
+++ b/libarchive/test/test_read_large_splitted_rar_ae.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_large_splitted_rar_ae
 M____________________________________________________________
 M____________________________________________________________
 M____________________________________________________________
diff --git a/libarchive/test/test_read_pax_xattr_schily.tar.uu b/libarchive/test/test_read_pax_xattr_schily.tar.uu
index 33a3ed4ea..83a3cdbc5 100644
--- a/libarchive/test/test_read_pax_xattr_schily.tar.uu
+++ b/libarchive/test/test_read_pax_xattr_schily.tar.uu
@@ -1,4 +1,4 @@
-begin 644 test_read_pax_xattr_schily.tar.uu
+begin 644 test_read_pax_xattr_schily.tar
 M+B]087A(96%D97)S+C$U,C4O8V]N9F9I;&5S````````````````````````
 M````````````````````````````````````````````````````````````
 M`````````````#`P,#`V-#0`,#`P,#`P,``P,#`P,#`P`#`P,#`P,#`P-C0W
diff --git a/libarchive/test/test_read_splitted_rar_aa.uu b/libarchive/test/test_read_splitted_rar_aa.uu
index 9a510cb4c..a15d31454 100644
--- a/libarchive/test/test_read_splitted_rar_aa.uu
+++ b/libarchive/test/test_read_splitted_rar_aa.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_aa
 M4F%R(1H'`,^0<P``#0````````"$4G0@D#(`%````!0````#0J+(OK=VVCX4
 M,`@`I($``'1E<W0N='AT@`BW=MH^MW;:/G1E<W0@=&5X="!D;V-U;65N=`T*
 *G2]T()`R``@`````
diff --git a/libarchive/test/test_read_splitted_rar_ab.uu b/libarchive/test/test_read_splitted_rar_ab.uu
index f34f25cc0..0855fc3e7 100644
--- a/libarchive/test/test_read_splitted_rar_ab.uu
+++ b/libarchive/test/test_read_splitted_rar_ab.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ab
 M``@````#>T3)MM%,V#X4,`@`_Z$``'1E<W1L:6YKP`C13-@^4%_:/G1E<W0N
 M='ATS>!T()`Z`!0````4`````T*BR+YC=]H^%#`0`*2!``!T97-T9&ER7'1E
 *<W0N='ATP,QC=P``
diff --git a/libarchive/test/test_read_splitted_rar_ac.uu b/libarchive/test/test_read_splitted_rar_ac.uu
index e131343bb..5ec194b0a 100644
--- a/libarchive/test/test_read_splitted_rar_ac.uu
+++ b/libarchive/test/test_read_splitted_rar_ac.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ac
 MVCYC=]H^=&5S="!T97AT(&1O8W5M96YT#0JAR'3@D#$````````````#````
 M`&-WVCX4,`<`[4$``'1E<W1D:7+`S&-WVCYD=]H^YN=TX)`V````````````
 *`P````"=J]4^%```
diff --git a/libarchive/test/test_read_splitted_rar_ad.uu b/libarchive/test/test_read_splitted_rar_ad.uu
index f4d36093e..7d29b7d63 100644
--- a/libarchive/test/test_read_splitted_rar_ad.uu
+++ b/libarchive/test/test_read_splitted_rar_ad.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_read_splitted_rar_ad
 D,`P`[4$``'1E<W1E;7!T>61I<H#,G:O5/L5=VC[$/7L`0`<`
 `
 end
diff --git a/libarchive/test/test_splitted_rar_seek_support_aa.uu b/libarchive/test/test_splitted_rar_seek_support_aa.uu
index 0344d2ce3..af2fcae34 100644
--- a/libarchive/test/test_splitted_rar_seek_support_aa.uu
+++ b/libarchive/test/test_splitted_rar_seek_support_aa.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_aa
 M4F%R(1H'`,^0<P``#0````````"X!'0@D$,`CTX``(].```#8Z8%7F!.(4`4
 M,!D`I($``$QI8F%R8VAI=F5!9&1I;F=497-T+FAT;6S`S&!.(4!B3B%`/"%$
 M3T-465!%($A434P@4%5"3$E#("(M+R]7,T,O+T141"!(5$U,(#0N,"!4<F%N
diff --git a/libarchive/test/test_splitted_rar_seek_support_ab.uu b/libarchive/test/test_splitted_rar_seek_support_ab.uu
index 5f41f5fda..5652c6ac5 100644
--- a/libarchive/test/test_splitted_rar_seek_support_ab.uu
+++ b/libarchive/test/test_splitted_rar_seek_support_ab.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_ab
 M;&]G(&UE<W-A9V5S(&]N(&9A:6QU<F4N($EN('!A<G1I8W5L87(L('1H97D@
 M<')I;G0*=&AE('9A;'5E(&]F(&)O=&@@87)G=6UE;G1S.R!T:&ES(&=R96%T
 M;'D@<VEM<&QI9FEE<R!D:6%G;F]S:6YG"F9A:6QU<F5S+B`*/"]0/@H\2#$@
diff --git a/libarchive/test/test_splitted_rar_seek_support_ac.uu b/libarchive/test/test_splitted_rar_seek_support_ac.uu
index ee9f78c48..3b45bdb4f 100644
--- a/libarchive/test/test_splitted_rar_seek_support_ac.uu
+++ b/libarchive/test/test_splitted_rar_seek_support_ac.uu
@@ -1,4 +1,4 @@
-begin 644 -
+begin 644 test_splitted_rar_seek_support_ac
 M<F]M(&-O;F9I9RYH+B`H268@=&AE('1E<W1S('5S92!T:&4@<V%M92`\5%0@
 M0TQ!4U,](G=E<W1E<FXB/DA!5D5?/"]45#X*"6UA8W)O<R!A<R!T:&4@8V]D
 M92!B96EN9R!T97-T960@=&AE;B!C;VYF:6=U<F%T:6]N('!R;V)L96US('=I
-- 
2.47.2