Changeset 28994

Timestamp:

01/25/09 12:02:21 (4 years ago)

Author:

winebarrel

Message:

外部プログラムでの圧縮を一応サポート。
Windowsは未対応。。。

Location:

lang/ruby/libarchive/trunk/ext

Files:

• libarchive_reader.c (modified) (6 diffs)
• libarchive_writer.c (modified) (5 diffs)

lang/ruby/libarchive/trunk/ext/libarchive_reader.c

@@ -21 +21 @@
 }
 
-static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_reader_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE reader;
   struct rb_libarchive_archive_container *p;
@@ -32 +32 @@
   }
 
-  if (compression != -1) {
+  if (cmd != NULL) {
+    r = archive_read_support_compression_program(p->ar, cmd);
+  } else if (compression != -1) {
     r = archive_read_support_compression(p->ar, compression);
   } else {
@@ -101 +103 @@
   const char *filename = NULL;
   int compression = -1, format = -1;
+  const char *cmd;
   rb_scan_args(argc, argv, "12", &v_filename, &v_compression, &v_format);
   Check_Type(v_filename, T_STRING);
   filename = RSTRING_PTR(v_filename);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
@@ -113 +119 @@
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
@@ -125 +131 @@
   VALUE v_memory, v_compression, v_format;
   int compression = -1, format = -1;
+  const char *cmd;
   rb_scan_args(argc, argv, "12", &v_memory, &v_compression, &v_format);
   Check_Type(v_memory, T_STRING);
 
-  if (!NIL_P(v_compression)) {
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else if (!NIL_P(v_compression)) {
     compression = NUM2INT(v_compression);
   }
@@ -136 +146 @@
   }
 
-  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_reader_s_open0(rb_libarchive_reader_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }
 

lang/ruby/libarchive/trunk/ext/libarchive_writer.c

@@ -21 +21 @@
 }
 
-static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format) {
+static VALUE rb_libarchive_writer_s_open0(int (*archive_open)(struct rb_libarchive_archive_container *, void *), void *arg, int compression, int format, const char *cmd) {
   VALUE writer;
   struct rb_libarchive_archive_container *p;
+  int r;
   writer = rb_funcall(rb_cArchiveWriter, rb_intern("new"), 0);
   Data_Get_Struct(writer, struct rb_libarchive_archive_container, p);
@@ -31 +32 @@
   }
 
-  if (archive_write_set_compression(p->ar, compression) != ARCHIVE_OK) {
+  if (cmd != NULL) {
+    r = archive_write_set_compression_program(p->ar,  cmd);
+  } else {
+    r = archive_write_set_compression(p->ar, compression);
+  }
+
+  if (r != ARCHIVE_OK) {
     char error_string[BUFSIZ];
     archive_copy_error_string(p->ar, error_string, BUFSIZ);
@@ -77 +84 @@
   const char *filename = NULL;
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_filename, T_STRING);
 
@@ -84 +92 @@
 
   filename = RSTRING_PTR(v_filename);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_filename0, (void *) filename, compression, format, cmd);
 }
 
@@ -98 +114 @@
 static VALUE rb_libarchive_writer_s_open_memory(VALUE self, VALUE v_memory, VALUE v_compression, VALUE v_format) {
   int compression, format;
+  const char *cmd = NULL;
   Check_Type(v_memory, T_STRING);
-  compression = NUM2INT(v_compression);
+
+  if (T_STRING == TYPE(v_compression)) {
+    compression = -1;
+    cmd = RSTRING_PTR(v_compression);
+  } else {
+    compression = NUM2INT(v_compression);
+  }
+
   format = NUM2INT(v_format);
-  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format);
+  return rb_libarchive_writer_s_open0(rb_libarchive_writer_s_open_memory0, (void *) v_memory, compression, format, cmd);
 }