libarchive-ruby-swig 0.5.4 → 0.5.6

data/ext/libarchive-ruby-swig/entry.cpp

@@ -22,9 +22,8 @@
 #include "error.h"
 
 Entry::Entry(struct archive_entry *entry)
-{
-    _entry = entry;
-}
+    : _entry(entry)
+{}
 
 Entry::~Entry()
 {
@@ -36,7 +35,12 @@ Entry::~Entry()
 
 bool Entry::is_file()
 {
-    return S_ISREG(archive_entry_filetype(_entry));
+    if(S_ISREG(archive_entry_filetype(_entry)) &&
+        !this->is_hardlink()) {
+        return true;
+    }
+
+    return false;
 }
 
 bool Entry::is_directory()
@@ -69,6 +73,14 @@ bool Entry::is_socket()
     return S_ISSOCK(archive_entry_filetype(_entry));
 }
 
+bool Entry::is_hardlink()
+{
+    if(archive_entry_hardlink(_entry) != 0)
+        return true;
+
+    return false;
+}
+
 unsigned int Entry::filetype()
 {
     return archive_entry_filetype(_entry);

data/ext/libarchive-ruby-swig/entry.h

@@ -30,6 +30,7 @@ class Entry
         bool is_character_special();
         bool is_fifo();
         bool is_socket();
+        bool is_hardlink();
 
         unsigned int filetype();
         void set_filetype(unsigned int filetype);

data/ext/libarchive-ruby-swig/writer.cpp

@@ -122,6 +122,16 @@ Entry *Writer::new_entry_helper()
 
 void Writer::write_header(Entry *entry)
 {
+    if(entry->nlink() > 1) {
+        std::string path = _hardlinks[entry->dev()][entry->ino()];
+        if(path.empty()) {
+            _hardlinks[entry->dev()][entry->ino()] =
+                std::string(entry->pathname());
+        } else {
+            entry->set_hardlink(path.c_str());
+        }
+    }
+
     if(archive_write_header(_ar, entry->_entry) != ARCHIVE_OK) {
         std::string error_msg = archive_error_string(_ar);
         throw Error(error_msg);

data/ext/libarchive-ruby-swig/writer.h

@@ -16,6 +16,8 @@ class Entry;
 
 #ifndef SWIG
 #include <ruby.h>
+#include <string>
+#include <map>
 #endif
 
 namespace Archive
@@ -101,6 +103,7 @@ class Writer
         char *_buf;
         int _buf_size;
 
+        std::map<unsigned long, std::map<unsigned long, std::string> > _hardlinks;
 };
 
 #endif

data/lib/libarchive_doc.rb

@@ -83,6 +83,13 @@ module Archive
     def is_socket
     end
 
+    ##
+    #
+    # Is Entry a hardlink?
+    #
+    def is_hardlink
+    end
+
     ##
     #
     # Returns the filetype bits for entry.

data/lib/libarchive_rs.rb

@@ -28,6 +28,7 @@ module Archive
     alias :character_special? :is_character_special
     alias :fifo? :is_fifo
     alias :socket? :is_socket
+    alias :hardlink? :is_hardlink
 
     alias :filetype= :set_filetype
     alias :devmajor= :set_devmajor

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libarchive-ruby-swig
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Tobias Koch
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-27 00:00:00 +02:00
+date: 2011-04-16 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
-description: libarchive-ruby-swig provides Ruby bindings to libarchive using SWIG. The gem allows you to read and write compressed archives in a variety of formats.
+description: Ruby bindings to libarchive allowing reading and creation of compressed archives in a variety of formats.
 email: tobias.koch@gmail.com
 executables: []