aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libarchive/libarchive/test/test_write_disk_secure.c
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2012-02-25 10:58:02 +0000
committerMartin Matuska <mm@FreeBSD.org>2012-02-25 10:58:02 +0000
commit6c95142e7977d720e7f1c70672b358aa09fa6bfa (patch)
tree117e869a99c6fa7f789c6d9a87cf7eac26ae69e3 /contrib/libarchive/libarchive/test/test_write_disk_secure.c
parent662c901c5429a3d06e28f5ce05df481159fb74c0 (diff)
parent17993d47e9beebea021707962fcdf2387b27cae9 (diff)
downloadsrc-6c95142e7977d720e7f1c70672b358aa09fa6bfa.tar.gz
src-6c95142e7977d720e7f1c70672b358aa09fa6bfa.zip
Update libarchive to 3.0.3
Some of new features: - New readers: RAR, LHA/LZH, CAB reader, 7-Zip - New writers: ISO9660, XAR - Improvements to many formats, especially including ISO9660 and Zip - Stackable write filters to write, e.g., tar.gz.uu in a single pass - Exploit seekable input; new "seekable" Zip reader can exploit the Zip Central Directory when it's available; the old "streamable" Zip reader is still fully supported for cases where seeking is not possible. Full release notes available at: https://github.com/libarchive/libarchive/wiki/ReleaseNotes
Notes
Notes: svn path=/head/; revision=232153
Diffstat (limited to 'contrib/libarchive/libarchive/test/test_write_disk_secure.c')
-rw-r--r--contrib/libarchive/libarchive/test/test_write_disk_secure.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/libarchive/libarchive/test/test_write_disk_secure.c b/contrib/libarchive/libarchive/test/test_write_disk_secure.c
index 74506f1bccb0..2345bfe0d485 100644
--- a/contrib/libarchive/libarchive/test/test_write_disk_secure.c
+++ b/contrib/libarchive/libarchive/test/test_write_disk_secure.c
@@ -34,9 +34,9 @@ __FBSDID("$FreeBSD$");
DEFINE_TEST(test_write_disk_secure)
{
-#if ARCHIVE_VERSION_NUMBER < 1009000
- skipping("archive_write_disk interface");
-#elif !defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__)
+ skipping("archive_write_disk security checks not supported on Windows");
+#else
struct archive *a;
struct archive_entry *ae;
struct stat st;
@@ -178,7 +178,7 @@ DEFINE_TEST(test_write_disk_secure)
assert(S_ISDIR(st.st_mode));
archive_entry_free(ae);
- assert(0 == archive_write_finish(a));
+ assertEqualInt(ARCHIVE_OK, archive_write_free(a));
/* Test the entries on disk. */
assert(0 == lstat("dir", &st));