libextractor

commit af2a8908e00c15fb55795159a2d0e68d254c9b28
parent fe4adabac1e180abb7e1ed4424545a8b7ea9631d
Author: LRN <lrn1986@gmail.com>
Date:   Tue, 21 Apr 2015 15:52:12 +0000

Only use deprecated libarchive functions with old libarchive

Diffstat:
M
src/plugins/archive_extractor.c
 | 
8
++++++++

1 file changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/plugins/archive_extractor.c b/src/plugins/archive_extractor.c
@@ -99,7 +99,11 @@ EXTRACTOR_archive_extract_method (struct EXTRACTOR_ExtractContext *ec)
 
   format = NULL;
   a = archive_read_new ();
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+  archive_read_support_filter_all (a);
+#else
   archive_read_support_compression_all (a);
+#endif
   archive_read_support_format_all (a);
   if(archive_read_open2 (a, ec, NULL, &read_cb, &skip_cb, NULL)!= ARCHIVE_OK)
 	return;
@@ -118,7 +122,11 @@ EXTRACTOR_archive_extract_method (struct EXTRACTOR_ExtractContext *ec)
 			 s, strlen (s) + 1))
 	break;
     }
+#if ARCHIVE_VERSION_NUMBER >= 3000000
+  archive_read_free (a);
+#else
   archive_read_finish (a);
+#endif
   if (NULL != format)
     {
       if (0 != ec->proc (ec->cls,