aboutsummaryrefslogtreecommitdiffstats
path: root/libarchive
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2017-07-13 00:16:51 +0000
committerMartin Matuska <mm@FreeBSD.org>2017-07-13 00:16:51 +0000
commitf8c95ef815a3fb49a75051140944d2ff63d58831 (patch)
tree9ec2da591935ef08800090ca49e29f86d5b765f9 /libarchive
parent218287e0e4dcfa649d1e19ecb952154da6efcd67 (diff)
downloadsrc-f8c95ef815a3fb49a75051140944d2ff63d58831.tar.gz
src-f8c95ef815a3fb49a75051140944d2ff63d58831.zip
Update vendor/libarchive to git 98a695399e8e7420635a5448aecde8b0a82fb83avendor/libarchive/3.3.2
Release 3.3.2 Vendor changes: PR #901: don't depend on stdin in a testcase
Notes
Notes: svn path=/vendor/libarchive/dist/; revision=320924 svn path=/vendor/libarchive/3.3.2/; revision=320926; tag=vendor/libarchive/3.3.2
Diffstat (limited to 'libarchive')
-rw-r--r--libarchive/archive.h2
-rw-r--r--libarchive/test/test_archive_read_close_twice_open_filename.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/libarchive/archive.h b/libarchive/archive.h
index d6913f35fc0c..316a68a63368 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -155,7 +155,7 @@ __LA_DECL int archive_version_number(void);
/*
* Textual name/version of the library, useful for version displays.
*/
-#define ARCHIVE_VERSION_ONLY_STRING "3.3.2dev"
+#define ARCHIVE_VERSION_ONLY_STRING "3.3.2"
#define ARCHIVE_VERSION_STRING "libarchive " ARCHIVE_VERSION_ONLY_STRING
__LA_DECL const char * archive_version_string(void);
diff --git a/libarchive/test/test_archive_read_close_twice_open_filename.c b/libarchive/test/test_archive_read_close_twice_open_filename.c
index f82539117bcb..9a194fdc4a8b 100644
--- a/libarchive/test/test_archive_read_close_twice_open_filename.c
+++ b/libarchive/test/test_archive_read_close_twice_open_filename.c
@@ -28,10 +28,12 @@ __FBSDID("$FreeBSD$");
DEFINE_TEST(test_archive_read_close_twice_open_filename)
{
+ const char *filename = "empty.file";
struct archive* a = archive_read_new();
+ assertMakeFile(filename, 0644, "");
assertEqualInt(ARCHIVE_OK, archive_read_support_format_empty(a));
- assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, 0, 0));
+ assertEqualInt(ARCHIVE_OK, archive_read_open_filename(a, filename, 0));
assertEqualInt(0, archive_errno(a));
assertEqualString(NULL, archive_error_string(a));