zipruby 0.2.6 → 0.2.8

data/ext/foo.txt

@@ -1,315 +0,0 @@
---- zipruby_archive.c.r112	2008-07-13 16:12:21.234375000 +0900
-+++ zipruby_archive.c	2008-07-13 16:09:45.640625000 +0900
-@@ -21,15 +21,15 @@ static VALUE zipruby_archive_add_buffer(
- static VALUE zipruby_archive_add_file(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_add_filep(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_add_function(int argc, VALUE *argv, VALUE self);
--static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE source);
--static VALUE zipruby_archive_replace_file(VALUE self, VALUE index, VALUE fname);
-+static VALUE zipruby_archive_replace_buffer(int argc, VALUE *argv, VALUE self);
-+static VALUE zipruby_archive_replace_file(int argc, VALUE* argv, VALUE self);
- static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file);
- static VALUE zipruby_archive_replace_function(int argc, VALUE *argv, VALUE self);
--static VALUE zipruby_archive_add_or_replace_buffer(VALUE self, VALUE name, VALUE source);
-+static VALUE zipruby_archive_add_or_replace_buffer(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self);
--static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive);
-+static VALUE zipruby_archive_update(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_get_comment(int argc, VALUE *argv, VALUE self);
- static VALUE zipruby_archive_set_comment(VALUE self, VALUE comment);
- static VALUE zipruby_archive_locate_name(int argc, VALUE *argv, VALUE self);
-@@ -65,15 +65,15 @@ void Init_zipruby_archive() {
-   rb_define_method(Archive, "add_file", zipruby_archive_add_file, -1);
-   rb_define_method(Archive, "add_filep", zipruby_archive_add_filep, -1);
-   rb_define_method(Archive, "add", zipruby_archive_add_function, -1);
--  rb_define_method(Archive, "replace_buffer", zipruby_archive_replace_buffer, 2);
--  rb_define_method(Archive, "replace_file", zipruby_archive_replace_file, 2);
-+  rb_define_method(Archive, "replace_buffer", zipruby_archive_replace_buffer, -1);
-+  rb_define_method(Archive, "replace_file", zipruby_archive_replace_file, -1);
-   rb_define_method(Archive, "replace_filep", zipruby_archive_replace_filep, 2);
-   rb_define_method(Archive, "replace", zipruby_archive_replace_function, -1);
--  rb_define_method(Archive, "add_or_replace_buffer", zipruby_archive_add_or_replace_buffer, 2);
-+  rb_define_method(Archive, "add_or_replace_buffer", zipruby_archive_add_or_replace_buffer, -1);
-   rb_define_method(Archive, "add_or_replace_file", zipruby_archive_add_or_replace_file, -1);
-   rb_define_method(Archive, "add_or_replace_filep", zipruby_archive_add_or_replace_filep, -1);
-   rb_define_method(Archive, "add_or_replace", zipruby_archive_add_or_replace_function, -1);
--  rb_define_method(Archive, "update", zipruby_archive_update, 1);
-+  rb_define_method(Archive, "update", zipruby_archive_update, -1);
-   rb_define_method(Archive, "<<", zipruby_archive_add_filep, -1);
-   rb_define_method(Archive, "get_comment", zipruby_archive_get_comment, -1);
-   rb_define_method(Archive, "comment", zipruby_archive_get_comment, -1);
-@@ -320,24 +320,31 @@ static VALUE zipruby_archive_add_buffer(
- }
- 
- /* */
--static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE source) {
-+static VALUE zipruby_archive_replace_buffer(int argc, VALUE *argv, VALUE self) {
-   struct zipruby_archive *p_archive;
-   struct zip_source *zsource;
--  int i_index;
-+  VALUE index, source, flags;
-+  int i_index, i_flags = 0;
-   char *data;
-   off_t len;
- 
-+  rb_scan_args(argc, argv, "21", &index, &source, &flags);
-+
-   if (!rb_obj_is_instance_of(index, rb_cString) && !rb_obj_is_instance_of(index, rb_cFixnum)) {
-     rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or String)", rb_class2name(CLASS_OF(index)));
-   }
- 
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
-+
-   Check_Type(source, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
-   if (rb_obj_is_instance_of(index, rb_cFixnum)) {
-     i_index = NUM2INT(index);
--  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), ZIP_FL_NOCASE)) == -1) {
-+  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), i_flags)) == -1) {
-     rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", StringValuePtr(index));
-   }
- 
-@@ -365,18 +372,26 @@ static VALUE zipruby_archive_replace_buf
- }
- 
- /* */
--static VALUE zipruby_archive_add_or_replace_buffer(VALUE self, VALUE name, VALUE source) {
-+static VALUE zipruby_archive_add_or_replace_buffer(int argc, VALUE *argv, VALUE self) {
-   struct zipruby_archive *p_archive;
--  int index;
-+  VALUE name, source, flags;
-+  int index, i_flags = 0;
-+
-+  rb_scan_args(argc, argv, "21", &name, &source, &flags);
-+
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
- 
-   Check_Type(name, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
--  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
-+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
- 
-   if (index >= 0) {
--    return zipruby_archive_replace_buffer(self, INT2NUM(index), source);
-+    VALUE _args[] = { INT2NUM(index), source };
-+    return zipruby_archive_replace_buffer(2, _args, self);
-   } else {
-     return zipruby_archive_add_buffer(self, name, source);
-   }
-@@ -420,22 +435,29 @@ static VALUE zipruby_archive_add_file(in
- }
- 
- /* */
--static VALUE zipruby_archive_replace_file(VALUE self, VALUE index, VALUE fname) {
-+static VALUE zipruby_archive_replace_file(int argc, VALUE* argv, VALUE self) {
-   struct zipruby_archive *p_archive;
-   struct zip_source *zsource;
--  int i_index;
-+  VALUE index, fname, flags;
-+  int i_index, i_flags = 0;
-+
-+  rb_scan_args(argc, argv, "21", &index, &fname, &flags);
- 
-   if (!rb_obj_is_instance_of(index, rb_cString) && !rb_obj_is_instance_of(index, rb_cFixnum)) {
-     rb_raise(rb_eTypeError, "wrong argument type %s (expected Fixnum or String)", rb_class2name(CLASS_OF(index)));
-   }
- 
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
-+
-   Check_Type(fname, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
-   if (rb_obj_is_instance_of(index, rb_cFixnum)) {
-     i_index = NUM2INT(index);
--  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), ZIP_FL_NOCASE)) == -1) {
-+  } else if ((i_index = zip_name_locate(p_archive->archive, StringValuePtr(index), i_flags)) == -1) {
-     rb_raise(Error, "Replace file failed - %s: Archive does not contain a file", StringValuePtr(index));
-   }
- 
-@@ -455,11 +477,16 @@ static VALUE zipruby_archive_replace_fil
- 
- /* */
- static VALUE zipruby_archive_add_or_replace_file(int argc, VALUE *argv, VALUE self) {
--  VALUE name, fname;
-+  VALUE name, fname, flags;
-   struct zipruby_archive *p_archive;
--  int index;
-+  int index, i_flags = 0;
- 
--  rb_scan_args(argc, argv, "11", &name, &fname);
-+  rb_scan_args(argc, argv, "12", &name, &fname, &flags);
-+
-+  if (NIL_P(flags) && FIXNUM_P(fname)) {
-+    flags = fname;
-+    fname = Qnil;
-+  }
- 
-   if (NIL_P(fname)) {
-     fname = name;
-@@ -472,16 +499,22 @@ static VALUE zipruby_archive_add_or_repl
-     name = rb_funcall(rb_cFile, rb_intern("basename"), 1, fname);
-   }
- 
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
-+
-   Check_Type(name, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
--  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
-+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
- 
-   if (index >= 0) {
--    return zipruby_archive_replace_file(self, INT2NUM(index), fname);
-+    VALUE _args[] = { INT2NUM(index), fname };
-+    return zipruby_archive_replace_file(2, _args, self);
-   } else {
--    return zipruby_archive_add_file(argc, argv, self);
-+    VALUE _args[] = { name, fname };
-+    return zipruby_archive_add_file(2, _args, self);
-   }
- }
- 
-@@ -510,20 +543,28 @@ static VALUE zipruby_archive_add_filep(i
- /* */
- static VALUE zipruby_archive_replace_filep(VALUE self, VALUE index, VALUE file) {
-   VALUE source;
-+  VALUE _args[2];
- 
-   Check_Type(file, T_FILE);
-   source = rb_funcall(file, rb_intern("read"), 0);
- 
--  return zipruby_archive_replace_buffer(self, index,  source);
-+  _args[0] = index;
-+  _args[1] = source;
-+  return zipruby_archive_replace_buffer(2, _args, self);
- }
- 
- /* */
- static VALUE zipruby_archive_add_or_replace_filep(int argc, VALUE *argv, VALUE self) {
--  VALUE name, file;
-+  VALUE name, file, flags;
-   struct zipruby_archive *p_archive;
--  int index;
-+  int index, i_flags = 0;
- 
--  rb_scan_args(argc, argv, "11", &name, &file);
-+  rb_scan_args(argc, argv, "12", &name, &file, &flags);
-+
-+  if (NIL_P(flags) && FIXNUM_P(file)) {
-+    flags = file;
-+    file = Qnil;
-+  }
- 
-   if (NIL_P(file)) {
-     file = name;
-@@ -536,16 +577,21 @@ static VALUE zipruby_archive_add_or_repl
-     name = rb_funcall(rb_cFile, rb_intern("basename"), 1, rb_funcall(file, rb_intern("path"), 0));
-   }
- 
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
-+
-   Check_Type(name, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
--  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
-+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
- 
-   if (index >= 0) {
-     return zipruby_archive_replace_filep(self, INT2NUM(index), file);
-   } else {
--    return zipruby_archive_add_filep(argc, argv, self);
-+    VALUE _args[] = { name, file };
-+    return zipruby_archive_add_filep(2, _args, self);
-   }
- }
- 
-@@ -638,34 +684,52 @@ static VALUE zipruby_archive_replace_fun
- 
- /* */
- static VALUE zipruby_archive_add_or_replace_function(int argc, VALUE *argv, VALUE self) {
--  VALUE name, mtime;
-+  VALUE name, mtime, flags;
-   struct zipruby_archive *p_archive;
--  int index;
-+  int index, i_flags = 0;
-+
-+  rb_scan_args(argc, argv, "12", &name, &mtime, &flags);
-+
-+  if (NIL_P(flags) && FIXNUM_P(mtime)) {
-+    flags = mtime;
-+    mtime = Qnil;
-+  }
-+
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
- 
--  rb_scan_args(argc, argv, "11", &name, &mtime);
-   Check_Type(name, T_STRING);
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
- 
--  index = zip_name_locate(p_archive->archive, StringValuePtr(name), ZIP_FL_NOCASE);
-+  index = zip_name_locate(p_archive->archive, StringValuePtr(name), i_flags);
- 
-   if (index >= 0) {
--    VALUE args[] = { INT2NUM(index), mtime };
--    return zipruby_archive_replace_function(2, args, self);
-+    VALUE _args[] = { INT2NUM(index), mtime };
-+    return zipruby_archive_replace_function(2, _args, self);
-   } else {
--    return zipruby_archive_add_function(argc, argv, self);
-+    VALUE _args[] = { name, mtime };
-+    return zipruby_archive_add_function(2, _args, self);
-   }
- }
- 
- /* */
--static VALUE zipruby_archive_update(VALUE self, VALUE srcarchive) {
-+static VALUE zipruby_archive_update(int argc, VALUE *argv, VALUE self) {
-   struct zipruby_archive *p_archive, *p_srcarchive;
--  int i, num_files;
-+  VALUE srcarchive, flags;
-+  int i, num_files, i_flags = 0;
-+
-+  rb_scan_args(argc, argv, "11", &srcarchive, &flags);
- 
-   if (!rb_obj_is_instance_of(srcarchive, Archive)) {
-     rb_raise(rb_eTypeError, "wrong argument type %s (expected Zip::Archive)", rb_class2name(CLASS_OF(srcarchive)));
-   }
- 
-+  if (!NIL_P(flags)) {
-+    i_flags = NUM2INT(flags);
-+  }
-+
-   Data_Get_Struct(self, struct zipruby_archive, p_archive);
-   Check_Archive(p_archive);
-   Data_Get_Struct(srcarchive, struct zipruby_archive, p_srcarchive);
-@@ -735,7 +799,7 @@ static VALUE zipruby_archive_update(VALU
-       rb_raise(Error, "Update archive failed: %s", zip_strerror(p_srcarchive->archive));
-     }
- 
--    index = zip_name_locate(p_archive->archive, name, ZIP_FL_NOCASE);
-+    index = zip_name_locate(p_archive->archive, name, i_flags);
- 
-     if (index >= 0) {
-       if (zip_replace(p_archive->archive, i, zsource) == -1) {