diff options
Diffstat (limited to 'archivers/libarchive/files/libarchive/test/test_tar_filenames.c')
| -rw-r--r-- | archivers/libarchive/files/libarchive/test/test_tar_filenames.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/archivers/libarchive/files/libarchive/test/test_tar_filenames.c b/archivers/libarchive/files/libarchive/test/test_tar_filenames.c index 27c8db4e33d..b75ac7f0cae 100644 --- a/archivers/libarchive/files/libarchive/test/test_tar_filenames.c +++ b/archivers/libarchive/files/libarchive/test/test_tar_filenames.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "test.h" -__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.6 2007/07/06 15:43:11 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/test/test_tar_filenames.c,v 1.7 2007/07/14 17:52:01 kientzle Exp $"); /* * Exercise various lengths of filenames in tar archives, @@ -42,9 +42,6 @@ test_filename(const char *prefix, int dlen, int flen) size_t used; size_t prefix_length = 0; int i = 0; -#if ARCHIVE_VERSION_STAMP < 1009000 - static int bug_reported_1 = 0, bug_reported_2 = 0, bug_reported_3 = 0; -#endif if (prefix) { strcpy(filename, prefix); @@ -118,10 +115,7 @@ test_filename(const char *prefix, int dlen, int flen) /* Read the file and check the filename. */ assertA(0 == archive_read_next_header(a, &ae)); #if ARCHIVE_VERSION_STAMP < 1009000 - if (!bug_reported_3) { - skipping("Leading '/' preserved on long filenames"); - ++bug_reported_3; - } + skipping("Leading '/' preserved on long filenames"); #else assertEqualString(filename, archive_entry_pathname(ae)); #endif @@ -137,10 +131,7 @@ test_filename(const char *prefix, int dlen, int flen) */ assertA(0 == archive_read_next_header(a, &ae)); #if ARCHIVE_VERSION_STAMP < 1009000 - if (!bug_reported_2) { - skipping("Trailing '/' preserved on dirnames"); - ++bug_reported_2; - } + skipping("Trailing '/' preserved on dirnames"); #else assertEqualString(dirname, archive_entry_pathname(ae)); #endif @@ -148,10 +139,7 @@ test_filename(const char *prefix, int dlen, int flen) assertA(0 == archive_read_next_header(a, &ae)); #if ARCHIVE_VERSION_STAMP < 1009000 - if (!bug_reported_1) { - skipping("Trailing '/' added to dir names"); - ++bug_reported_1; - } + skipping("Trailing '/' added to dir names"); #else assertEqualString(dirname, archive_entry_pathname(ae)); #endif |