ffi-libarchive 0.4.6 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c72d2c946ebbe1abc58adcc317403ec80da09dc6f1279da0a6ac4ba9b97f69b0
-  data.tar.gz: 28b4880ea52ac6818b2c8278aece3cbb1733c6df31a7832bf0d7b079f6bb2e8b
+  metadata.gz: 27c509a1d26618d51623cca95acc84cfeb8c804bdf818b999c8d10ac173a99ae
+  data.tar.gz: 7d2a2184aa944ff1e91917be83e58be06d1df592154ce1a1bc33c8c1a6e1dd5e
 SHA512:
-  metadata.gz: bc3da073141178fb7c7a92d86a345cfb1767218a1b30251b7ad610e8f3e21372e1937e63a4f5bc2375ebd032d3cb8401ac834c80bac35fb1821d081b779b850a
-  data.tar.gz: fa05aa479a2909b02e5e74f8ec361e9cae5a6092cbe42a3db1b6443c02eee740d0eee9fb91ec2a485904641eb8de98e6675f386e17b22217c086cf56de0f717c
+  metadata.gz: e6ba3e6ccb7c1ce9656a6bf399e4d6050bf9b8bc813d4eb6f9435c0be177dda9c861d9387913e8220eb7e27067ce93cbd891f221efcdc62c11e61f0b9284b055
+  data.tar.gz: 84bec17cb6e83978bd5241c116668ade6e4b2cf25595bdd44f10267c8274f42eaec00ec9719ecec2020cc1d927c13d55c437de89f4b5a8c387ed1ee1083b3797

data/lib/ffi-libarchive.rb

@@ -1,7 +1,7 @@
 module Archive
   # :stopdoc:
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  LIBPATH ||= __dir__ + ::File::SEPARATOR
+  PATH ||= ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
 
   # Returns the library path for the module. If any arguments are given,
@@ -46,7 +46,8 @@ module Archive
   def self.require_all_libs_relative_to(fname, dir = nil)
     dir ||= ::File.basename(fname, ".*")
     search_me = ::File.expand_path(
-      ::File.join(::File.dirname(fname), dir, "**", "*.rb"))
+      ::File.join(::File.dirname(fname), dir, "**", "*.rb")
+    )
 
     Dir.glob(search_me).sort.each { |rb| require rb }
   end

data/lib/ffi-libarchive/archive.rb

@@ -1,4 +1,4 @@
-require "ffi"
+require "ffi" unless defined?(FFI)
 
 module Archive
   module C
@@ -16,15 +16,24 @@ module Archive
     attach_function :archive_errno, [:pointer], :int
 
     attach_function :archive_read_new, [], :pointer
-    attach_function :archive_read_open_filename, [:pointer, :string, :size_t], :int
-    attach_function :archive_read_open_memory, [:pointer, :pointer, :size_t], :int
-    attach_function :archive_read_support_compression_program, [:pointer, :string], :int
+    attach_function :archive_read_open_filename, %i{pointer string size_t}, :int
+    attach_function :archive_read_open_memory, %i{pointer pointer size_t}, :int
+    attach_function :archive_read_open1, [:pointer], :int
+    attach_function :archive_read_support_compression_program, %i{pointer string}, :int
     attach_function :archive_read_support_compression_all, [:pointer], :int
 
-    attach_function_maybe :archive_read_set_format, [:pointer, :int], :int
-    attach_function_maybe :archive_read_append_filter, [:pointer, :int], :int
-    attach_function_maybe :archive_read_append_filter_program, [:pointer, :pointer], :int
-    attach_function_maybe :archive_read_append_filter_program_signature, [:pointer, :string, :pointer, :size_t], :int
+    callback :archive_read_callback, %i{pointer pointer pointer}, :int
+    callback :archive_skip_callback, %i{pointer pointer int64}, :int
+    callback :archive_seek_callback, %i{pointer pointer int64 int}, :int
+    attach_function :archive_read_set_read_callback, %i{pointer archive_read_callback}, :int
+    attach_function :archive_read_set_callback_data, %i{pointer pointer}, :int
+    attach_function :archive_read_set_skip_callback, %i{pointer archive_skip_callback}, :int
+    attach_function :archive_read_set_seek_callback, %i{pointer archive_seek_callback}, :int
+
+    attach_function_maybe :archive_read_set_format, %i{pointer int}, :int
+    attach_function_maybe :archive_read_append_filter, %i{pointer int}, :int
+    attach_function_maybe :archive_read_append_filter_program, %i{pointer pointer}, :int
+    attach_function_maybe :archive_read_append_filter_program_signature, %i{pointer string pointer size_t}, :int
 
     attach_function_maybe :archive_read_support_filter_all, [:pointer], :int
     attach_function_maybe :archive_read_support_filter_bzip2, [:pointer], :int
@@ -64,18 +73,18 @@ module Archive
     attach_function_maybe :archive_read_support_format_zip_seekable, [:pointer], :int
 
     attach_function :archive_read_finish, [:pointer], :int
-    attach_function :archive_read_extract, [:pointer, :pointer, :int], :int
+    attach_function :archive_read_extract, %i{pointer pointer int}, :int
     attach_function :archive_read_header_position, [:pointer], :int
-    attach_function :archive_read_next_header, [:pointer, :pointer], :int
-    attach_function :archive_read_data, [:pointer, :pointer, :size_t], :size_t
-    attach_function :archive_read_data_into_fd, [:pointer, :int], :int
+    attach_function :archive_read_next_header, %i{pointer pointer}, :int
+    attach_function :archive_read_data, %i{pointer pointer size_t}, :size_t
+    attach_function :archive_read_data_into_fd, %i{pointer int}, :int
 
     attach_function :archive_write_new, [], :pointer
-    attach_function :archive_write_open_filename, [:pointer, :string], :int
-    callback :archive_open_callback, [:pointer, :pointer], :int
-    callback :archive_write_callback, [:pointer, :pointer, :pointer, :size_t], :int
-    callback :archive_close_callback, [:pointer, :pointer], :int
-    attach_function :archive_write_open, [:pointer, :pointer, :pointer, :archive_write_callback, :pointer], :int
+    attach_function :archive_write_open_filename, %i{pointer string}, :int
+    callback :archive_open_callback, %i{pointer pointer}, :int
+    callback :archive_write_callback, %i{pointer pointer pointer size_t}, :int
+    callback :archive_close_callback, %i{pointer pointer}, :int
+    attach_function :archive_write_open, %i{pointer pointer pointer archive_write_callback pointer}, :int
     attach_function :archive_write_set_compression_none, [:pointer], :int
     attach_function_maybe :archive_write_set_compression_gzip, [:pointer], :int
     attach_function_maybe :archive_write_set_compression_bzip2, [:pointer], :int
@@ -83,7 +92,7 @@ module Archive
     attach_function_maybe :archive_write_set_compression_compress, [:pointer], :int
     attach_function_maybe :archive_write_set_compression_lzma, [:pointer], :int
     attach_function_maybe :archive_write_set_compression_xz, [:pointer], :int
-    attach_function :archive_write_set_compression_program, [:pointer, :string], :int
+    attach_function :archive_write_set_compression_program, %i{pointer string}, :int
 
     def self.archive_write_set_compression(archive, compression)
       case compression
@@ -106,94 +115,95 @@ module Archive
       end
     end
 
-    attach_function :archive_write_set_format, [:pointer, :int], :int
-    attach_function :archive_write_data, [:pointer, :pointer, :size_t], :ssize_t
-    attach_function :archive_write_header, [:pointer, :pointer], :int
+    attach_function :archive_write_set_format, %i{pointer int}, :int
+    attach_function :archive_write_data, %i{pointer pointer size_t}, :ssize_t
+    attach_function :archive_write_header, %i{pointer pointer}, :int
     attach_function :archive_write_finish, [:pointer], :void
     attach_function :archive_write_get_bytes_in_last_block, [:pointer], :int
-    attach_function :archive_write_set_bytes_in_last_block, [:pointer, :int], :int
+    attach_function :archive_write_set_bytes_in_last_block, %i{pointer int}, :int
 
     attach_function :archive_entry_new, [], :pointer
+    attach_function :archive_entry_clone, [:pointer], :pointer
     attach_function :archive_entry_free, [:pointer], :void
     attach_function :archive_entry_atime, [:pointer], :time_t
-    attach_function :archive_entry_atime_nsec, [:pointer, :time_t, :long], :void
+    attach_function :archive_entry_atime_nsec, %i{pointer time_t long}, :void
     attach_function_maybe :archive_entry_atime_is_set, [:pointer], :int
-    attach_function :archive_entry_set_atime, [:pointer, :time_t, :long], :int
+    attach_function :archive_entry_set_atime, %i{pointer time_t long}, :int
     attach_function_maybe :archive_entry_unset_atime, [:pointer], :int
     attach_function_maybe :archive_entry_birthtime, [:pointer], :time_t
-    attach_function_maybe :archive_entry_birthtime_nsec, [:pointer, :time_t, :long], :void
+    attach_function_maybe :archive_entry_birthtime_nsec, %i{pointer time_t long}, :void
     attach_function_maybe :archive_entry_birthtime_is_set, [:pointer], :int
-    attach_function_maybe :archive_entry_set_birthtime, [:pointer, :time_t, :long], :int
+    attach_function_maybe :archive_entry_set_birthtime, %i{pointer time_t long}, :int
     attach_function_maybe :archive_entry_unset_birthtime, [:pointer], :int
     attach_function :archive_entry_ctime, [:pointer], :time_t
-    attach_function :archive_entry_ctime_nsec, [:pointer, :time_t, :long], :void
+    attach_function :archive_entry_ctime_nsec, %i{pointer time_t long}, :void
     attach_function_maybe :archive_entry_ctime_is_set, [:pointer], :int
-    attach_function :archive_entry_set_ctime, [:pointer, :time_t, :long], :int
+    attach_function :archive_entry_set_ctime, %i{pointer time_t long}, :int
     attach_function_maybe :archive_entry_unset_ctime, [:pointer], :int
     attach_function :archive_entry_mtime, [:pointer], :time_t
-    attach_function :archive_entry_mtime_nsec, [:pointer, :time_t, :long], :void
+    attach_function :archive_entry_mtime_nsec, %i{pointer time_t long}, :void
     attach_function_maybe :archive_entry_mtime_is_set, [:pointer], :int
-    attach_function :archive_entry_set_mtime, [:pointer, :time_t, :long], :int
+    attach_function :archive_entry_set_mtime, %i{pointer time_t long}, :int
     attach_function_maybe :archive_entry_unset_mtime, [:pointer], :int
     attach_function :archive_entry_dev, [:pointer], :dev_t
-    attach_function :archive_entry_set_dev, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_dev, %i{pointer dev_t}, :void
     attach_function :archive_entry_devmajor, [:pointer], :dev_t
-    attach_function :archive_entry_set_devmajor, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_devmajor, %i{pointer dev_t}, :void
     attach_function :archive_entry_devminor, [:pointer], :dev_t
-    attach_function :archive_entry_set_devminor, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_devminor, %i{pointer dev_t}, :void
     attach_function :archive_entry_filetype, [:pointer], :mode_t
-    attach_function :archive_entry_set_filetype, [:pointer, :mode_t], :void
-    attach_function :archive_entry_fflags, [:pointer, :pointer, :pointer], :void
-    attach_function :archive_entry_set_fflags, [:pointer, :ulong, :ulong], :void
+    attach_function :archive_entry_set_filetype, %i{pointer mode_t}, :void
+    attach_function :archive_entry_fflags, %i{pointer pointer pointer}, :void
+    attach_function :archive_entry_set_fflags, %i{pointer ulong ulong}, :void
     attach_function :archive_entry_fflags_text, [:pointer], :string
-    attach_function :archive_entry_gid, [:pointer], :gid_t
-    attach_function :archive_entry_set_gid, [:pointer, :gid_t], :void
+    attach_function :archive_entry_gid, [:pointer], :uint
+    attach_function :archive_entry_set_gid, %i{pointer uint}, :void
     attach_function :archive_entry_gname, [:pointer], :string
-    attach_function :archive_entry_set_gname, [:pointer, :string], :void
+    attach_function :archive_entry_set_gname, %i{pointer string}, :void
     attach_function :archive_entry_hardlink, [:pointer], :string
-    attach_function :archive_entry_set_hardlink, [:pointer, :string], :void
-    attach_function :archive_entry_set_link, [:pointer, :string], :void
+    attach_function :archive_entry_set_hardlink, %i{pointer string}, :void
+    attach_function :archive_entry_set_link, %i{pointer string}, :void
     attach_function :archive_entry_ino, [:pointer], :ino_t
-    attach_function :archive_entry_set_ino, [:pointer, :ino_t], :void
+    attach_function :archive_entry_set_ino, %i{pointer ino_t}, :void
     attach_function :archive_entry_mode, [:pointer], :mode_t
-    attach_function :archive_entry_set_mode, [:pointer, :mode_t], :void
-    attach_function :archive_entry_set_perm, [:pointer, :mode_t], :void
+    attach_function :archive_entry_set_mode, %i{pointer mode_t}, :void
+    attach_function :archive_entry_set_perm, %i{pointer mode_t}, :void
     attach_function :archive_entry_nlink, [:pointer], :uint
-    attach_function :archive_entry_set_nlink, [:pointer, :uint], :void
+    attach_function :archive_entry_set_nlink, %i{pointer uint}, :void
     attach_function :archive_entry_pathname, [:pointer], :string
-    attach_function :archive_entry_set_pathname, [:pointer, :string], :void
+    attach_function :archive_entry_set_pathname, %i{pointer string}, :void
     attach_function :archive_entry_rdev, [:pointer], :dev_t
-    attach_function :archive_entry_set_rdev, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_rdev, %i{pointer dev_t}, :void
     attach_function :archive_entry_rdevmajor, [:pointer], :dev_t
-    attach_function :archive_entry_set_rdevmajor, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_rdevmajor, %i{pointer dev_t}, :void
     attach_function :archive_entry_rdevminor, [:pointer], :dev_t
-    attach_function :archive_entry_set_rdevminor, [:pointer, :dev_t], :void
+    attach_function :archive_entry_set_rdevminor, %i{pointer dev_t}, :void
     attach_function :archive_entry_size, [:pointer], :int64_t
-    attach_function :archive_entry_set_size, [:pointer, :int64_t], :void
+    attach_function :archive_entry_set_size, %i{pointer int64_t}, :void
     attach_function_maybe :archive_entry_unset_size, [:pointer], :void
     attach_function_maybe :archive_entry_size_is_set, [:pointer], :int
     attach_function :archive_entry_sourcepath, [:pointer], :string
     attach_function :archive_entry_strmode, [:pointer], :string
     attach_function :archive_entry_symlink, [:pointer], :string
-    attach_function :archive_entry_set_symlink, [:pointer, :string], :void
-    attach_function :archive_entry_uid, [:pointer], :uid_t
-    attach_function :archive_entry_set_uid, [:pointer, :uid_t], :void
+    attach_function :archive_entry_set_symlink, %i{pointer string}, :void
+    attach_function :archive_entry_uid, [:pointer], :uint
+    attach_function :archive_entry_set_uid, %i{pointer uint}, :void
     attach_function :archive_entry_uname, [:pointer], :string
-    attach_function :archive_entry_set_uname, [:pointer, :string], :void
-    attach_function :archive_entry_copy_stat, [:pointer, :pointer], :void
-    attach_function :archive_entry_copy_fflags_text, [:pointer, :string], :string
-    attach_function :archive_entry_copy_gname, [:pointer, :string], :string
-    attach_function :archive_entry_copy_uname, [:pointer, :string], :string
-    attach_function :archive_entry_copy_hardlink, [:pointer, :string], :string
-    attach_function :archive_entry_copy_link, [:pointer, :string], :string
-    attach_function :archive_entry_copy_symlink, [:pointer, :string], :string
-    attach_function :archive_entry_copy_sourcepath, [:pointer, :string], :string
-    attach_function :archive_entry_copy_pathname, [:pointer, :string], :string
+    attach_function :archive_entry_set_uname, %i{pointer string}, :void
+    attach_function :archive_entry_copy_stat, %i{pointer pointer}, :void
+    attach_function :archive_entry_copy_fflags_text, %i{pointer string}, :string
+    attach_function :archive_entry_copy_gname, %i{pointer string}, :string
+    attach_function :archive_entry_copy_uname, %i{pointer string}, :string
+    attach_function :archive_entry_copy_hardlink, %i{pointer string}, :string
+    attach_function :archive_entry_copy_link, %i{pointer string}, :string
+    attach_function :archive_entry_copy_symlink, %i{pointer string}, :string
+    attach_function :archive_entry_copy_sourcepath, %i{pointer string}, :string
+    attach_function :archive_entry_copy_pathname, %i{pointer string}, :string
     attach_function :archive_entry_xattr_clear, [:pointer], :void
-    attach_function :archive_entry_xattr_add_entry, [:pointer, :string, :pointer, :size_t], :void
+    attach_function :archive_entry_xattr_add_entry, %i{pointer string pointer size_t}, :void
     attach_function :archive_entry_xattr_count, [:pointer], :int
     attach_function :archive_entry_xattr_reset, [:pointer], :int
-    attach_function :archive_entry_xattr_next, [:pointer, :pointer, :pointer, :pointer], :int
+    attach_function :archive_entry_xattr_next, %i{pointer pointer pointer pointer}, :int
 
     EOF    = 1
     OK     = 0
@@ -278,6 +288,10 @@ module Archive
     Reader.open_memory string, command, &block
   end
 
+  def self.read_open_stream(reader, &block)
+    Reader.open_stream reader, &block
+  end
+
   def self.write_open_filename(file_name, compression, format, &block)
     Writer.open_filename file_name, compression, format, &block
   end
@@ -336,6 +350,7 @@ module Archive
 
     def archive
       raise Error, "No archive open" unless @archive
+
       @archive
     end
     protected :archive

data/lib/ffi-libarchive/entry.rb

@@ -17,14 +17,14 @@ module Archive
     CHARACTER_SPECIAL = 0020000 #  character device
     FIFO              = 0010000 #  FIFO
 
-    def self.from_pointer(entry)
-      new entry
+    def self.from_pointer(entry, clone: false)
+      new entry, clone: clone
     end
 
-    def initialize(entry = nil)
+    def initialize(entry = nil, clone: false)
       @entry_free = [true]
       if entry
-        @entry = entry
+        @entry = clone ? C.archive_entry_clone(entry) : entry
         yield self if block_given?
       else
         @entry = C.archive_entry_new
@@ -34,7 +34,7 @@ module Archive
           result = yield self
           C.archive_entry_free(@entry)
           @entry = nil
-          return result
+          result
         else
           @entry_free[0] = false
           ObjectSpace.define_finalizer(self, Entry.finalizer(@entry, @entry_free))
@@ -60,6 +60,7 @@ module Archive
 
     def entry
       raise "No entry object" unless @entry
+
       @entry
     end
 
@@ -182,6 +183,7 @@ module Archive
 
       stat = Archive::Stat.ffi_libarchive_create_lstat(filename)
       raise Error, "Copy stat failed: #{Archive::Stat.ffi_error}" if stat.null?
+
       C.archive_entry_copy_stat(entry, stat)
     ensure
       Archive::Stat.ffi_libarchive_free_stat(stat)
@@ -207,6 +209,7 @@ module Archive
 
       stat = Archive::Stat.ffi_libarchive_create_stat(filename)
       raise Error, "Copy stat failed: #{Archive::Stat.ffi_error}" if stat.null?
+
       C.archive_entry_copy_stat(entry, stat)
     ensure
       Archive::Stat.ffi_libarchive_free_stat(stat)
@@ -459,10 +462,10 @@ module Archive
       value = FFI::MemoryPointer.new :pointer
       size = FFI::MemoryPointer.new :size_t
       if C.archive_entry_xattr_next(entry, name, value, size) != C::OK
-        return nil
+        nil
       else
         # TODO: someday size.read_size_t could work
-        return [name.null? ? nil : name.read_string,
+        [name.null? ? nil : name.read_string,
                 value.null? ? nil : value.get_string(0, size.read_ulong)]
       end
     end

data/lib/ffi-libarchive/reader.rb

@@ -28,6 +28,19 @@ module Archive
       end
     end
 
+    def self.open_stream(reader)
+      if block_given?
+        reader = new reader: reader
+        begin
+          yield reader
+        ensure
+          reader.close
+        end
+      else
+        new reader: reader
+      end
+    end
+
     def initialize(params = {})
       super C.method(:archive_read_new), C.method(:archive_read_finish)
 
@@ -40,22 +53,60 @@ module Archive
 
       raise Error, @archive if C.archive_read_support_format_all(archive) != C::OK
 
-      if params[:file_name]
+      case
+      when params[:file_name]
         raise Error, @archive if C.archive_read_open_filename(archive, params[:file_name], 1024) != C::OK
-      elsif params[:memory]
+      when params[:memory]
         str = params[:memory]
         @data = FFI::MemoryPointer.new(str.bytesize + 1)
         @data.write_string str, str.bytesize
         raise Error, @archive if C.archive_read_open_memory(archive, @data, str.bytesize) != C::OK
+      when params[:reader]
+        @reader = params[:reader]
+        @buffer = nil
+
+        @read_callback = FFI::Function.new(:int, %i{pointer pointer pointer}) do |_, _, archive_data|
+          data = @reader.call || ""
+          @buffer = FFI::MemoryPointer.new(:char, data.size) if @buffer.nil? || @buffer.size < data.size
+          @buffer.write_bytes(data)
+          archive_data.write_pointer(@buffer)
+          data.size
+        end
+        C.archive_read_set_read_callback(archive, @read_callback)
+
+        if @reader.respond_to?(:skip)
+          @skip_callback = FFI::Function.new(:int, %i{pointer pointer int64}) do |_, _, offset|
+            @reader.skip(offset)
+          end
+          C.archive_read_set_skip_callback(archive, @skip_callback)
+        end
+
+        if @reader.respond_to?(:seek)
+          @seek_callback = FFI::Function.new(:int, %i{pointer pointer int64 int}) do |_, _, offset, whence|
+            @reader.seek(offset, whence)
+          end
+          C.archive_read_set_seek_callback(archive, @seek_callback)
+        end
+
+        # Required or open1 will segfault, even though the callback data is not used.
+        C.archive_read_set_callback_data(archive, nil)
+        raise Error, @archive if C.archive_read_open1(archive) != C::OK
       end
     rescue
       close
       raise
     end
 
-    def extract(entry, flags = 0)
+    def extract(entry, flags = 0, destination: nil)
       raise ArgumentError, "Expected Archive::Entry as first argument" unless entry.is_a? Entry
       raise ArgumentError, "Expected Integer as second argument" unless flags.is_a? Integer
+      raise ArgumentError, "Expected String as destination" if destination && !destination.is_a?(String)
+
+      if destination
+        # We update the pathname here so this will change for the caller as a side effect, but this seems convenient and accurate?
+        pathname = C.archive_entry_pathname(entry.entry)
+        C.archive_entry_set_pathname(entry.entry, "#{destination}/#{pathname}")
+      end
 
       flags |= EXTRACT_FFLAGS
       raise Error, @archive if C.archive_read_extract(archive, entry.entry, flags) != C::OK
@@ -65,11 +116,11 @@ module Archive
       raise Error, @archive if C.archive_read_header_position archive
     end
 
-    def next_header
+    def next_header(clone_entry: false)
       entry_ptr = FFI::MemoryPointer.new(:pointer)
       case C.archive_read_next_header(archive, entry_ptr)
       when C::OK
-        Entry.from_pointer entry_ptr.read_pointer
+        Entry.from_pointer entry_ptr.read_pointer, clone: clone_entry
       when C::EOF
         @eof = true
         nil

data/lib/ffi-libarchive/version.rb

@@ -1,3 +1,3 @@
 module Archive
-  VERSION = "0.4.6".freeze
+  VERSION = "1.0.17".freeze
 end

data/lib/ffi-libarchive/writer.rb

@@ -58,9 +58,9 @@ module Archive
         end
         @data = write_callback params[:memory]
         raise Error, @archive if C.archive_write_open(archive, nil,
-                                                       nil,
-                                                       @data,
-                                                       nil) != C::OK
+          nil,
+          @data,
+          nil) != C::OK
       end
     rescue
       close
@@ -117,10 +117,12 @@ module Archive
           if (n = C.archive_write_data(ar, str, str.bytesize)) < 1
             return len
           end
+
           len += n
         end
       else
         raise ArgumentError, "wrong number of argument (#{args.size}) for 1)" if args.size != 1
+
         str = args[0]
         C.archive_write_data(archive, str, str.bytesize)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 1.0.17
 platform: ruby
 authors:
 - John Bellone
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -76,8 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A Ruby FFI binding to libarchive.