libarchive-static 1.0.5 → 1.1.0

data/ext/libarchive-0.1.1/ext/libarchive_archive.c

@@ -25,7 +25,7 @@ static VALUE rb_libarchive_archive_position_compressed(VALUE self) {
   struct rb_libarchive_archive_container *p;
   Data_Get_Struct(self, struct rb_libarchive_archive_container, p);
   Check_Archive(p);
-  return LL2NUM(archive_position_compressed(p->ar));
+  return LL2NUM(archive_filter_bytes(p->ar, -1));
 }
 
 /* */
@@ -33,15 +33,15 @@ static VALUE rb_libarchive_archive_position_uncompressed(VALUE self) {
   struct rb_libarchive_archive_container *p;
   Data_Get_Struct(self, struct rb_libarchive_archive_container, p);
   Check_Archive(p);
-  return LL2NUM(archive_position_uncompressed(p->ar));
+  return LL2NUM(archive_filter_bytes(p->ar, 0));
 }
 
 /* */
-static VALUE rb_libarchive_archive_compression_name(VALUE self) {
+static VALUE rb_libarchive_archive_filter_name(VALUE self) {
   struct rb_libarchive_archive_container *p;
   Data_Get_Struct(self, struct rb_libarchive_archive_container, p);
   Check_Archive(p);
-  return rb_str_new2(archive_compression_name(p->ar));
+  return rb_str_new2(archive_filter_name(p->ar, 0));
 }
 
 /* */
@@ -49,7 +49,7 @@ static VALUE rb_libarchive_archive_compression(VALUE self) {
   struct rb_libarchive_archive_container *p;
   Data_Get_Struct(self, struct rb_libarchive_archive_container, p);
   Check_Archive(p);
-  return INT2NUM(archive_compression(p->ar));
+  return INT2NUM(archive_filter_code(p->ar, 0));
 }
 
 /* */
@@ -73,8 +73,8 @@ void Init_libarchive_archive() {
   rb_define_method(rb_cArchiveWriter, "position_compressed", rb_libarchive_archive_position_compressed, 0);
   rb_define_method(rb_cArchiveReader, "position_uncompressed", rb_libarchive_archive_position_uncompressed, 0);
   rb_define_method(rb_cArchiveWriter, "position_uncompressed", rb_libarchive_archive_position_uncompressed, 0);
-  rb_define_method(rb_cArchiveReader, "compression_name", rb_libarchive_archive_compression_name, 0);
-  rb_define_method(rb_cArchiveWriter, "compression_name", rb_libarchive_archive_compression_name, 0);
+  rb_define_method(rb_cArchiveReader, "compression_name", rb_libarchive_archive_filter_name, 0);
+  rb_define_method(rb_cArchiveWriter, "compression_name", rb_libarchive_archive_filter_name, 0);
   rb_define_method(rb_cArchiveReader, "compression", rb_libarchive_archive_compression, 0);
   rb_define_method(rb_cArchiveWriter, "compression", rb_libarchive_archive_compression, 0);
   rb_define_method(rb_cArchiveReader, "format_name", rb_libarchive_archive_format_name, 0);

data/ext/libarchive-0.1.1/ext/libarchive_entry.c

@@ -829,7 +829,10 @@ static VALUE rb_libarchive_entry_copy_stat(VALUE self, VALUE v_filename) {
   filename = RSTRING_PTR(v_filename);
 
   if (stat(filename, &s) != 0) {
+    #pragma GCC diagnostic ignored "-Wformat="
+    #pragma GCC diagnostic ignored "-Wformat-extra-args"
     rb_raise(rb_eArchiveError, "Copy stat failed: %", strerror(errno));
+    #pragma GCC diagnostic pop
   }
 
   archive_entry_copy_stat(p->ae, &s);
@@ -847,7 +850,10 @@ static VALUE rb_libarchive_entry_copy_lstat(VALUE self, VALUE v_filename) {
   filename = RSTRING_PTR(v_filename);
 
   if (lstat(filename, &s) != 0) {
+    #pragma GCC diagnostic ignored "-Wformat="
+    #pragma GCC diagnostic ignored "-Wformat-extra-args"
     rb_raise(rb_eArchiveError, "Copy stat failed: %", strerror(errno));
+    #pragma GCC diagnostic pop
   }
 
   archive_entry_copy_stat(p->ae, &s);

data/ext/libarchive-0.1.1/ext/libarchive_internal.h

@@ -28,7 +28,6 @@
 #include <archive_entry.h>
 
 #include <ruby.h>
-#include <rubysig.h>
 
 #ifdef _WIN32
 #include "libarchive_win32.h"

data/ext/libarchive-0.1.1/ext/libarchive_reader.c

@@ -7,7 +7,7 @@ extern VALUE rb_cArchiveEntry;
 
 static void rb_libarchive_reader_close0(struct rb_libarchive_archive_container *p) {
   archive_read_close(p->ar);
-  archive_read_finish(p->ar);
+  archive_read_free(p->ar);
   p->ar = NULL;
 }
 
@@ -32,11 +32,11 @@ static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchi
   }
 
   if (cmd != NULL) {
-    r = archive_read_support_compression_program(p->ar, cmd);
+    r = archive_read_support_filter_program(p->ar, cmd);
   } else if (compression != -1) {
     r = archive_read_support_compression(p->ar, compression);
   } else {
-    r = archive_read_support_compression_all(p->ar);
+    r = archive_read_support_filter_all(p->ar);
   }
 
   if (r != ARCHIVE_OK) {
@@ -89,7 +89,9 @@ static int rb_libarchive_reader_s_open_filename0(struct rb_libarchive_archive_co
     struct stat s;
 
     if (stat(filename, &s) != 0) {
+      #pragma GCC diagnostic ignored "-Wformat-security"
       archive_set_error(p->ar, -1, strerror(errno));
+      #pragma GCC diagnostic pop
       return (ARCHIVE_FATAL);
     }
   }
@@ -272,7 +274,7 @@ static VALUE rb_libarchive_reader_save_data(int argc, VALUE *argv, VALUE self) {
   }
 
   r = archive_read_data_into_fd(p->ar, fd);
-  _close(fd);
+  close(fd);
 
   if (r != ARCHIVE_OK) {
     rb_raise(rb_eArchiveError, "Save data failed: %s", archive_error_string(p->ar));

data/ext/libarchive-0.1.1/ext/libarchive_win32.h

@@ -3,7 +3,7 @@
 
 #ifdef _WIN32
 
-typedef long ssize_t;
+typedef _SSIZE_T_ ssize_t;
 
 #ifdef open
 #undef open

data/ext/libarchive-0.1.1/ext/libarchive_writer.c

@@ -7,7 +7,7 @@ extern VALUE rb_cArchiveEntry;
 
 static void rb_libarchive_writer_close0(struct rb_libarchive_archive_container *p) {
   archive_write_close(p->ar);
-  archive_write_finish(p->ar);
+  archive_write_free(p->ar);
   p->ar = NULL;
 }
 
@@ -32,7 +32,7 @@ static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchi
   }
 
   if (cmd != NULL) {
-    r = archive_write_set_compression_program(p->ar,  cmd);
+    r = archive_write_add_filter_program(p->ar,  cmd);
   } else {
     r = archive_write_set_compression(p->ar, compression);
   }