aboutsummaryrefslogtreecommitdiffstats
path: root/libarchive/test/test_read_set_format.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2020-12-01 10:36:46 +0000
committerMartin Matuska <mm@FreeBSD.org>2020-12-01 10:36:46 +0000
commitd5f2a5ff11474589cccacfc8e153d437f48530e2 (patch)
treeaeb7e201bfb2d629755c396db8001e39d116e852 /libarchive/test/test_read_set_format.c
parent4dd2ae60c22045bc4e4f53a0cf45028322168ec0 (diff)
downloadsrc-d5f2a5ff11474589cccacfc8e153d437f48530e2.tar.gz
src-d5f2a5ff11474589cccacfc8e153d437f48530e2.zip
Update vendor/libarchive/dist to git 833821f55b1807cac22a63a58b759a7802df2fb7vendor/libarchive/3.5.0
Libarchive 3.5.0 Relevant vendor changes: Issue #1258: add archive_read_support_filter_by_code() PR #1347: mtree digest reader support Issue #1381: skip hardlinks pointing to itself on extraction PR #1387: fix writing of cpio archives with hardlinks without file type PR #1388: fix rdev field in cpio format for device nodes PR #1389: completed support for UTF-8 encoding conversion PR #1405: more formats in archive_read_support_format_by_code() PR #1408: fix uninitialized size in rar5_read_data PR #1409: system extended attribute support PR #1435: support for decompression of symbolic links in zipx archives Issue #1456: memory leak after unsuccessful archive_write_open_filename
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=368207 svn path=/vendor/libarchive/3.5.0/; revision=368208; tag=vendor/libarchive/3.5.0
Diffstat (limited to 'libarchive/test/test_read_set_format.c')
-rw-r--r--libarchive/test/test_read_set_format.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/libarchive/test/test_read_set_format.c b/libarchive/test/test_read_set_format.c
index b4f414fa2bb2..f357bada82c3 100644
--- a/libarchive/test/test_read_set_format.c
+++ b/libarchive/test/test_read_set_format.c
@@ -201,11 +201,6 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
{
struct archive_entry *ae;
struct archive *a;
-#if !defined(_WIN32) || defined(__CYGWIN__)
- FILE * fp;
- int fd;
- fpos_t pos;
-#endif
/*
* If we have "bunzip2 -q", try using that.
@@ -215,14 +210,6 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
return;
}
-#if !defined(_WIN32) || defined(__CYGWIN__)
- /* bunzip2 will write to stderr, redirect it to a file */
- fflush(stderr);
- fgetpos(stderr, &pos);
- assert((fd = dup(fileno(stderr))) != -1);
- fp = freopen("stderr1", "w", stderr);
-#endif
-
assert((a = archive_read_new()) != NULL);
assertA(0 == archive_read_set_format(a, ARCHIVE_FORMAT_TAR));
assertEqualIntA(a, ARCHIVE_OK,
@@ -232,16 +219,4 @@ DEFINE_TEST(test_read_append_filter_wrong_program)
assertA(archive_read_next_header(a, &ae) < (ARCHIVE_WARN));
assertEqualIntA(a, ARCHIVE_WARN, archive_read_close(a));
assertEqualInt(ARCHIVE_OK, archive_read_free(a));
-
-#if !defined(_WIN32) || defined(__CYGWIN__)
- /* restore stderr and verify results */
- if (fp != NULL) {
- fflush(stderr);
- dup2(fd, fileno(stderr));
- clearerr(stderr);
- (void)fsetpos(stderr, &pos);
- }
- close(fd);
- assertTextFileContents("bunzip2: (stdin) is not a bzip2 file.\n", "stderr1");
-#endif
}