zipruby 0.3.0 → 0.3.1

data/ext/zipruby_stat.c

@@ -1,3 +1,5 @@
+#include <string.h>
+
 #include "zip.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
@@ -7,14 +9,6 @@
 static VALUE zipruby_stat_alloc(VALUE klass);
 static void zipruby_stat_free(struct zipruby_stat *p);
 static VALUE zipruby_stat_initialize(int argc, VALUE *argv, VALUE self);
-static VALUE zipruby_stat_name(VALUE self);
-static VALUE zipruby_stat_index(VALUE self);
-static VALUE zipruby_stat_crc(VALUE self);
-static VALUE zipruby_stat_size(VALUE self);
-static VALUE zipruby_stat_mtime(VALUE self);
-static VALUE zipruby_stat_comp_size(VALUE self);
-static VALUE zipruby_stat_comp_method(VALUE self);
-static VALUE zipruby_stat_encryption_method(VALUE self);
 
 extern VALUE Zip;
 extern VALUE Archive;
@@ -33,6 +27,7 @@ void Init_zipruby_stat() {
   rb_define_method(Stat, "comp_size", zipruby_stat_comp_size, 0);
   rb_define_method(Stat, "comp_method", zipruby_stat_comp_method, 0);
   rb_define_method(Stat, "encryption_method", zipruby_stat_encryption_method, 0);
+  rb_define_method(Stat, "directory?", zipruby_stat_is_directory, 0);
 }
 
 static VALUE zipruby_stat_alloc(VALUE klass) {
@@ -92,7 +87,7 @@ static VALUE zipruby_stat_initialize(int argc, VALUE *argv, VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_name(VALUE self) {
+VALUE zipruby_stat_name(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -101,7 +96,7 @@ static VALUE zipruby_stat_name(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_index(VALUE self) {
+VALUE zipruby_stat_index(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -110,7 +105,7 @@ static VALUE zipruby_stat_index(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_crc(VALUE self) {
+VALUE zipruby_stat_crc(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -119,7 +114,7 @@ static VALUE zipruby_stat_crc(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_size(VALUE self) {
+VALUE zipruby_stat_size(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -128,7 +123,7 @@ static VALUE zipruby_stat_size(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_mtime(VALUE self) {
+VALUE zipruby_stat_mtime(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -137,7 +132,7 @@ static VALUE zipruby_stat_mtime(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_comp_size(VALUE self) {
+VALUE zipruby_stat_comp_size(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -146,7 +141,7 @@ static VALUE zipruby_stat_comp_size(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_comp_method(VALUE self) {
+VALUE zipruby_stat_comp_method(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
@@ -155,10 +150,34 @@ static VALUE zipruby_stat_comp_method(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_stat_encryption_method(VALUE self) {
+VALUE zipruby_stat_encryption_method(VALUE self) {
   struct zipruby_stat *p_stat;
 
   Data_Get_Struct(self, struct zipruby_stat, p_stat);
 
   return INT2NUM(p_stat->sb->encryption_method);
 }
+
+/* */
+VALUE zipruby_stat_is_directory(VALUE self) {
+  struct zipruby_stat *p_stat;
+  const char *name;
+  size_t name_len;
+  off_t size;
+
+  Data_Get_Struct(self, struct zipruby_stat, p_stat);
+  name = p_stat->sb->name;
+  size = p_stat->sb->size;
+
+  if (!name || size != 0) {
+    return Qfalse;
+  }
+
+  name_len = strlen(name);
+
+  if (name_len > 0 && name[name_len - 1] == '/') {
+    return Qtrue;
+  } else {
+    return Qfalse;
+  }
+}

data/ext/zipruby_stat.h

@@ -2,6 +2,7 @@
 #define __ZIPRUBY_STAT_H__
 
 #include "zip.h"
+#include "ruby.h"
 
 struct zipruby_stat {
   struct zip_stat *sb;
@@ -9,4 +10,14 @@ struct zipruby_stat {
 
 void Init_zipruby_stat();
 
+VALUE zipruby_stat_name(VALUE self);
+VALUE zipruby_stat_index(VALUE self);
+VALUE zipruby_stat_crc(VALUE self);
+VALUE zipruby_stat_size(VALUE self);
+VALUE zipruby_stat_mtime(VALUE self);
+VALUE zipruby_stat_comp_size(VALUE self);
+VALUE zipruby_stat_comp_method(VALUE self);
+VALUE zipruby_stat_encryption_method(VALUE self);
+VALUE zipruby_stat_is_directory(VALUE self);
+
 #endif

data/ext/zipruby_zip_source_io.c

@@ -0,0 +1,85 @@
+#include <string.h>
+
+#include "zip.h"
+#include "zipint.h"
+#include "zipruby_zip_source_io.h"
+#include "ruby.h"
+
+#define IO_READ_BUFSIZE 8192
+
+static VALUE io_read(VALUE io) {
+  return rb_funcall(io, rb_intern("read"), 1, INT2FIX(IO_READ_BUFSIZE));
+}
+
+static ssize_t read_io(void *state, void *data, size_t len, enum zip_source_cmd cmd) {
+  struct read_io *z;
+  VALUE src;
+  char *buf;
+  size_t n;
+  int status = 0;
+
+  z = (struct read_io *) state;
+  buf = (char *) data;
+
+  switch (cmd) {
+  case ZIP_SOURCE_OPEN:
+    return 0;
+
+  case ZIP_SOURCE_READ:
+    src = rb_protect(io_read, z->io, NULL);
+
+    if (status != 0) {
+      VALUE message, clazz;
+
+#if defined(RUBY_VM)
+      message = rb_funcall(rb_errinfo(), rb_intern("message"), 0);
+      clazz = CLASS_OF(rb_errinfo());
+#else
+      message = rb_funcall(ruby_errinfo, rb_intern("message"), 0);
+      clazz = CLASS_OF(ruby_errinfo);
+#endif
+
+      rb_warn("Error in IO: %s (%s)", RSTRING_PTR(message), rb_class2name(clazz));
+      return -1;
+    }
+
+    if (TYPE(src) != T_STRING) {
+      return 0;
+    }
+
+    n = RSTRING_LEN(src);
+
+    if (n > 0) {
+      n = (n > len) ? len : n;
+      memcpy(buf, RSTRING_PTR(src), n);
+    }
+
+    return n;
+
+  case ZIP_SOURCE_CLOSE:
+    return 0;
+
+  case ZIP_SOURCE_STAT:
+    {
+      struct zip_stat *st = (struct zip_stat *)data;
+      zip_stat_init(st);
+      st->mtime = z->mtime;
+      return sizeof(*st);
+    }
+
+  case ZIP_SOURCE_ERROR:
+    return 0;
+
+  case ZIP_SOURCE_FREE:
+    free(z);
+    return 0;
+  }
+
+  return -1;
+}
+
+struct zip_source *zip_source_io(struct zip *za, struct read_io *z) {
+  struct zip_source *zs;
+  zs = zip_source_function(za, read_io, z);
+  return zs;
+}

data/ext/zipruby_zip_source_io.h

@@ -0,0 +1,14 @@
+#ifndef __ZIPRUBY_ZIP_SOURCE_IO_H__
+#define __ZIPRUBY_ZIP_SOURCE_IO_H__
+
+#include "zip.h"
+#include "ruby.h"
+
+struct read_io {
+  VALUE io;
+  long mtime;
+};
+
+struct zip_source *zip_source_io(struct zip *za, struct read_io *z);
+
+#endif

data/ext/zipruby_zip_source_proc.c

@@ -14,6 +14,7 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
   VALUE src;
   char *buf;
   size_t n;
+  int status = 0;
 
   z = (struct read_proc *) state;
   buf = (char *) data;
@@ -23,7 +24,22 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
     return 0;
 
   case ZIP_SOURCE_READ:
-    src = rb_protect(proc_call, z->proc, NULL);
+    src = rb_protect(proc_call, z->proc, &status);
+
+    if (status != 0) {
+      VALUE message, clazz;
+
+#if defined(RUBY_VM)
+      message = rb_funcall(rb_errinfo(), rb_intern("message"), 0);
+      clazz = CLASS_OF(rb_errinfo());
+#else
+      message = rb_funcall(ruby_errinfo, rb_intern("message"), 0);
+      clazz = CLASS_OF(ruby_errinfo);
+#endif
+
+      rb_warn("Error in Proc: %s (%s)", RSTRING_PTR(message), rb_class2name(clazz));
+      return -1;
+    }
 
     if (TYPE(src) != T_STRING) {
       return 0;
@@ -45,7 +61,7 @@ static ssize_t read_proc(void *state, void *data, size_t len, enum zip_source_cm
     {
       struct zip_stat *st = (struct zip_stat *)data;
       zip_stat_init(st);
-      st->mtime = NUM2LONG(rb_funcall(z->mtime, rb_intern("tv_sec"), 0));
+      st->mtime = z->mtime;
       return sizeof(*st);
     }
 

data/ext/zipruby_zip_source_proc.h

@@ -6,7 +6,7 @@
 
 struct read_proc {
   VALUE proc;
-  VALUE mtime;
+  long mtime;
 };
 
 struct zip_source *zip_source_proc(struct zip *za, struct read_proc *z);