ffi-libarchive 1.0.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9b6e6ed6fbbaf0e493767d47541307f64cfcffd32e23d33f0f47ab3efd6a35a
-  data.tar.gz: c85cb44e37fdbe3bec65f7408fc7e0eb821393bec658c929f6252d2ca01c6ecf
+  metadata.gz: 7a37a59bb2528341adba957354cc76a776d726a715390e6fa2261b9effcca7ca
+  data.tar.gz: 3e94f65843192c53a13352c0790833aad2e2deea833b6d97e68e068ffc5c2bef
 SHA512:
-  metadata.gz: f3bf10cbcfa75efc763348bce05f35f4891717a5c8aed5ab38e5ab2cd6c0d162b179fb2c3defb9af7c6e039e12f385590e66c8534b0eafd394706afc20b7ea55
-  data.tar.gz: 07cba89aa39ec4be250d187cb75113ae1b1f2c21b20b3854926fed0bc2f7ff413ba24c526fa5a2d2c7a3e27b2a8bc6ec2b27dfab54a6b7370c3ce8aea3c4dfc9
+  metadata.gz: dddc27a6897a12278ef644b124c9f3e718cb837fba7e2b164cc4766041b8063139be1836525bbcfa7a13cd1be8637155c6a96a470cc4ada3448482cb2db9c14b
+  data.tar.gz: b2d00c86cd4563a8bc86b6bad28f7d07a6e4c90281f074866fe30a330a2b4697c5321e9708777ad429f4e779a467cc45c47f2ff3d0f0b9952cd1d7279296a4b8

data/lib/ffi-libarchive/archive.rb

@@ -123,6 +123,7 @@ module Archive
     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, %i{pointer time_t long}, :void
@@ -155,8 +156,8 @@ module Archive
     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, %i{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, %i{pointer string}, :void
     attach_function :archive_entry_hardlink, [:pointer], :string
@@ -185,8 +186,8 @@ module Archive
     attach_function :archive_entry_strmode, [:pointer], :string
     attach_function :archive_entry_symlink, [:pointer], :string
     attach_function :archive_entry_set_symlink, %i{pointer string}, :void
-    attach_function :archive_entry_uid, [:pointer], :uid_t
-    attach_function :archive_entry_set_uid, %i{pointer uid_t}, :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, %i{pointer string}, :void
     attach_function :archive_entry_copy_stat, %i{pointer pointer}, :void

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))
@@ -462,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

@@ -109,11 +109,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 = "1.0.0".freeze
+  VERSION = "1.0.3".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.3
 platform: ruby
 authors:
 - John Bellone
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-28 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi