zipruby 0.1.2 → 0.2.0

data/README.txt

@@ -43,7 +43,24 @@ https://rubyforge.org/frs/?group_id=6124
     
       # Zip::Archive includes Enumerable
       entry_names = ar.map do |f|
-        f.naem
+        f.name
+      end
+    end
+    
+    # read huge entry
+    BUFSIZE = 8192
+    
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.each do |f|
+        buf = ''
+    
+        while chunk = f.read(BUFSIZE)
+          buf << chunk
+        end
+        # or
+        # f.read do |chunk|
+        #   buf << chunk
+        # end
       end
     end
 
@@ -62,6 +79,20 @@ https://rubyforge.org/frs/?group_id=6124
       # add file to zip archive from buffer
       ar.add_buffer('zoo.txt', 'Hello, world!')
     end
+    
+    # include directory in zip archive
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.add_file('dirname/foo.txt', 'foo.txt')
+          # args: <entry name>,      <source>
+    
+      open('bar.txt') do |f|
+        ar.add_filep('dirname/bar.txt', f)
+             # args: <entry name>,      <source>
+      end
+    
+      ar.add_buffer('dirname/zoo.txt', 'Hello, world!')
+            # args: <entry name>,      <source>
+    end
 
 === modifying zip archives
 
@@ -83,13 +114,28 @@ https://rubyforge.org/frs/?group_id=6124
       ar.add_or_replace_file(3, 'foo.txt')
     end
     
-    # ar1 imports ar2 entries
+    # append comment    
+    Zip::Archive.open('filename.zip') do |ar|
+      ar.comment = <<-EOS
+        jugem jugem gokou no surikere
+        kaijari suigyo no
+        suigyoumatsu unraimatsu furaimatsu
+      EOS
+    end
+    
+    # ar1 import ar2 entries
     Zip::Archive.open('ar1.zip') do |ar1|
       Zip::Archive.open('ar2.zip') do |ar2|
         ar1.update(ar2)
       end
     end
 
+=== decrypt zip archives
+
+    require 'zipruby'
+    
+    Zip::Archive.decrypt('filename.zip', 'password')
+
 == License
     Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
     All rights reserved.

data/ext/libzip.vcproj

@@ -110,6 +110,10 @@
 			RelativePath=".\zip_close.c"
 			>
 		</File>
+		<File
+			RelativePath=".\zip_crypt.c"
+			>
+		</File>
 		<File
 			RelativePath=".\zip_delete.c"
 			>

data/ext/zip.h

@@ -203,6 +203,9 @@ const char *zip_strerror(struct zip *);
 int zip_unchange(struct zip *, int);
 int zip_unchange_all(struct zip *);
 int zip_unchange_archive(struct zip *);
+
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+int zip_decrypt(const char *path, const char *pwd, int pwdlen, int *errorp, int *wrongpwd);
 
 #ifdef __cplusplus
 }

data/ext/zip_close.c

@@ -58,10 +58,12 @@ static int add_data_comp(zip_source_callback, void *, struct zip_stat *,
 static int add_data_uncomp(zip_source_callback, void *, struct zip_stat *,
 			   FILE *, struct zip_error *);
 static void ch_set_error(struct zip_error *, zip_source_callback, void *);
-static int copy_data(FILE *, off_t, FILE *, struct zip_error *);
-static int _zip_cdir_set_comment(struct zip_cdir *, struct zip *);
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+//static int copy_data(FILE *, off_t, FILE *, struct zip_error *);
+//static int _zip_cdir_set_comment(struct zip_cdir *, struct zip *);
 static int _zip_changed(struct zip *, int *);
-static char *_zip_create_temp_output(struct zip *, FILE **);
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+//static char *_zip_create_temp_output(struct zip *, FILE **);
 
 
 
@@ -451,7 +453,8 @@ ch_set_error(struct zip_error *error, zip_source_callback cb, void *ud)
 
 
 
-static int
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+/*static*/ int
 copy_data(FILE *fs, off_t len, FILE *ft, struct zip_error *error)
 {
     char buf[BUFSIZE];
@@ -484,7 +487,8 @@ copy_data(FILE *fs, off_t len, FILE *ft, struct zip_error *error)
 
 
 
-static int
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+/*static*/ int
 _zip_cdir_set_comment(struct zip_cdir *dest, struct zip *src)
 {
     if (src->ch_comment_len != -1) {
@@ -533,7 +537,8 @@ _zip_changed(struct zip *za, int *survivorsp)
 
 
 
-static char *
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+/*static*/ char *
 _zip_create_temp_output(struct zip *za, FILE **outp)
 {
     char *temp;

data/ext/zip_crypt.c

@@ -0,0 +1,291 @@
+/*
+ zip_crypt.c -- zip encryption support
+ Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+ based on zip_close.c
+*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#include <io.h>
+#define close(f) _close(f)
+#define rename(s, d) (MoveFileExA((s), (d), MOVEFILE_REPLACE_EXISTING) ? 0 : -1)
+#endif
+
+#include "zip.h"
+#include "zipint.h"
+
+#define ZIPENC_HEAD_LEN 12
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
+static zipenc_crc32(uLong crc, char c) {
+  return crc32(crc ^ 0xffffffffL, &c, 1) ^ 0xffffffffL;
+}
+
+static void update_keys(uLong *keys, char c) {
+  keys[0] = zipenc_crc32(keys[0], c);
+  keys[1] = keys[1] + (keys[0] & 0xff);
+  keys[1] = keys[1] * 134775813L + 1;
+  c = (char) (keys[1] >> 24);
+  keys[2] = zipenc_crc32(keys[2], c);
+}
+
+static unsigned char decrypt_byte(uLong *keys) {
+  unsigned short temp;
+
+  temp = (unsigned short) (keys[2] | 2);
+  return (temp * (temp ^ 1)) >> 8;
+}
+
+static void init_keys(uLong *keys, const char *password, size_t len) {
+  int i;
+
+  keys[0] = 305419896L;
+  keys[1] = 591751049L;
+  keys[2] = 878082192L;
+
+  for (i = 0; i < len; i++) {
+    update_keys(keys, password[i]);
+  }
+}
+
+static int decrypt_header(unsigned long *keys, char *buffer, struct zip_dirent *de) {
+  int i;
+  char c;
+  unsigned short dostime, dosdate;
+
+  for (i = 0; i < ZIPENC_HEAD_LEN; i++) {
+    c = buffer[i] ^ decrypt_byte(keys);
+    update_keys(keys, c);
+    buffer[i] = c;
+  }
+
+  _zip_u2d_time(de->last_mod, &dostime, &dosdate);
+
+  if (de->bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
+    return ((c & 0xff) == (de->crc >> 24)) ? 0 : -1;
+  } else {
+    return ((c & 0xff) == (dostime >> 8)) ? 0 : -1;
+  }
+}
+
+static void decrypt_data(uLong *keys, char *buffer, size_t n) {
+  int i;
+
+  for (i = 0; i < n; i++) {
+    char temp = buffer[i] ^ decrypt_byte(keys);
+    update_keys(keys, temp);
+    buffer[i] = temp;
+  }
+}
+
+static int copy_decrypt(FILE *src, off_t len, const char *pwd, int pwdlen, struct zip_dirent *de, FILE *dest, struct zip_error *error, int *wrongpwd) {
+  char buf[BUFSIZE];
+  uLong keys[3];
+  int n;
+
+  *wrongpwd = 0;
+
+  if (len == 0) {
+    return 0;
+  }
+
+  init_keys(keys, pwd, pwdlen);
+
+  if (fread(buf, 1, ZIPENC_HEAD_LEN, src) < 0) {
+    _zip_error_set(error, ZIP_ER_READ, errno);
+  }
+
+  if (decrypt_header(keys, buf, de) == -1) {
+    // XXX: _zip_error_set
+    *wrongpwd = 1;
+    return -1;
+  }
+
+  while (len > 0) {
+    if ((n = fread(buf, 1, MIN(len,  sizeof(buf)), src)) < 0) {
+      _zip_error_set(error, ZIP_ER_READ, errno);
+      return -1;
+    } else if (n == 0) {
+      _zip_error_set(error, ZIP_ER_EOF, 0);
+      return -1;
+    }
+
+    decrypt_data(keys, buf, n);
+
+    if (fwrite(buf, 1, n, dest) != ((size_t) n)) {
+      _zip_error_set(error, ZIP_ER_WRITE, errno);
+      return -1;
+    }
+
+    len -= n;
+  }
+
+  return 0;
+}
+
+static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt, int *wrongpwd) {
+  int i, error = 0;
+  char *temp;
+  FILE *out;
+#ifndef _WIN32
+  mode_t mask;
+#endif
+  struct zip_cdir *cd;
+  struct zip_dirent de;
+  int reopen_on_error = 0;
+
+  if (za == NULL) {
+    return -1;
+  }
+
+  if (za->nentry < 1) {
+    _zip_free(za);
+    return 0;
+  }
+
+  if ((cd = _zip_cdir_new(za->nentry, &za->error)) == NULL) {
+    return -1;
+  }
+
+  for (i = 0; i < za->nentry; i++) {
+    _zip_dirent_init(&cd->entry[i]);
+  }
+
+  if (_zip_cdir_set_comment(cd, za) == -1) {
+    _zip_cdir_free(cd);
+    return -1;
+  }
+
+  if ((temp = _zip_create_temp_output(za, &out)) == NULL) {
+    _zip_cdir_free(cd);
+    return -1;
+  }
+
+  for (i = 0; i < za->nentry; i++) {
+    int encrypted;
+
+    if (fseeko(za->zp, za->cdir->entry[i].offset, SEEK_SET) != 0) {
+      _zip_error_set(&za->error, ZIP_ER_SEEK, errno);
+      error = 1;
+      break;
+    }
+
+    if (_zip_dirent_read(&de, za->zp, NULL, 0, 1, &za->error) != 0) {
+      error = 1;
+      break;
+    }
+
+    if (de.bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
+      de.crc = za->cdir->entry[i].crc;
+      de.comp_size = za->cdir->entry[i].comp_size;
+      de.uncomp_size = za->cdir->entry[i].uncomp_size;
+      de.bitflags &= ~ZIP_GPBF_DATA_DESCRIPTOR;
+    }
+
+    memcpy(cd->entry + i, za->cdir->entry + i, sizeof(cd->entry[i]));
+    cd->entry[i].offset = ftello(out);
+
+    encrypted = de.bitflags & ZIP_GPBF_ENCRYPTED;
+
+    if (decrypt && encrypted) {
+      de.comp_size -= ZIPENC_HEAD_LEN;
+      de.bitflags &= ~ZIP_GPBF_ENCRYPTED;
+      cd->entry[i].comp_size -= ZIPENC_HEAD_LEN;
+      cd->entry[i].bitflags &= ~ZIP_GPBF_ENCRYPTED;
+    } else if (!decrypt && !encrypted) {
+      // XXX
+    }
+
+    if (_zip_dirent_write(&de, out, 1, &za->error) < 0) {
+      error = 1;
+      break;
+    }
+
+    if (decrypt && encrypted) {
+      error = (copy_decrypt(za->zp, cd->entry[i].comp_size, pwd, pwdlen, &de, out, &za->error, wrongpwd) < 0);
+    } else if (!decrypt && !encrypted) {
+      // XXX
+      error = (copy_data(za->zp, cd->entry[i].comp_size, out, &za->error) < 0);
+    } else {
+      error = (copy_data(za->zp, cd->entry[i].comp_size, out, &za->error) < 0);
+    }
+
+    if (error) {
+      break;
+    }
+
+    _zip_dirent_finalize(&de);
+  }
+
+  if (!error && _zip_cdir_write(cd, out, &za->error) < 0) {
+    error = 1;
+  }
+
+  cd->nentry = 0;
+  _zip_cdir_free(cd);
+
+  if (error) {
+    _zip_dirent_finalize(&de);
+    fclose(out);
+    remove(temp);
+    free(temp);
+    return -1;
+  }
+
+  if (fclose(out) != 0) {
+    _zip_error_set(&za->error, ZIP_ER_CLOSE, errno);
+    remove(temp);
+    free(temp);
+    return -1;
+  }
+
+  if (za->zp) {
+    fclose(za->zp);
+    za->zp = NULL;
+    reopen_on_error = 1;
+  }
+
+  if (rename(temp, za->zn) != 0) {
+    _zip_error_set(&za->error, ZIP_ER_RENAME, errno);
+    remove(temp);
+    free(temp);
+
+    if (reopen_on_error) {
+      za->zp = fopen(za->zn, "rb");
+    }
+
+    return -1;
+  }
+
+#ifndef _WIN32
+  mask = umask(0);
+  umask(mask);
+  chmod(za->zn, 0666&~mask);
+#endif
+
+  free(temp);
+  return 0;
+}
+
+int zip_decrypt(const char *path, const char *pwd, int pwdlen, int *errorp, int *wrongpwd) {
+  struct zip *za;
+  int res;
+
+  if (pwd == NULL || pwdlen < 1) {
+    return -1;
+  }
+
+  if ((za = zip_open(path, 0, errorp)) == NULL) {
+    return -1;
+  }
+
+  res = _zip_crypt(za, pwd, pwdlen, 1, wrongpwd);
+  _zip_free(za);
+
+  return res;
+}

data/ext/zip_dirent.c

@@ -48,7 +48,8 @@
 static time_t _zip_d2u_time(int, int);
 static char *_zip_readfpstr(FILE *, unsigned int, int, struct zip_error *);
 static char *_zip_readstr(unsigned char **, int, int, struct zip_error *);
-static void _zip_u2d_time(time_t, unsigned short *, unsigned short *);
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+//static void _zip_u2d_time(time_t, unsigned short *, unsigned short *);
 static void _zip_write2(unsigned short, FILE *);
 static void _zip_write4(unsigned int, FILE *);
 
@@ -516,7 +517,8 @@ _zip_write4(unsigned int i, FILE *fp)
 
 
 
-static void
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+/*static*/ void
 _zip_u2d_time(time_t time, unsigned short *dtime, unsigned short *ddate)
 {
     struct tm *tm;

data/ext/zipint.h

@@ -237,4 +237,10 @@ int _zip_set_name(struct zip *, int, const char *);
 int _zip_unchange(struct zip *, int, int);
 void _zip_unchange_data(struct zip_entry *);
 
+// modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+int copy_data(FILE *fs, off_t len, FILE *ft, struct zip_error *error);
+int _zip_cdir_set_comment(struct zip_cdir *, struct zip *);
+char *_zip_create_temp_output(struct zip *, FILE **);
+void _zip_u2d_time(time_t, unsigned short *, unsigned short *);
+
 #endif /* zipint.h */

data/ext/zipruby.h

@@ -1,8 +1,9 @@
 #ifndef __ZIPRUBY_H__
 #define __ZIPRUBY_H__
 
-#define VERSION "0.1.2"
+#define VERSION "0.2.0"
 #define ERRSTR_BUFSIZE 256
+#define DATA_BUFSIZE 8192
 
 void Init_zipruby();
 

data/ext/zipruby_archive.c

@@ -9,6 +9,7 @@
 static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -48,6 +49,7 @@ void Init_zipruby_archive() {
   rb_define_alloc_func(Archive, zipruby_archive_alloc);
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
+  rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -131,7 +133,27 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
   } else {
     return archive;
   }
-};
+}
+
+/* */
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp, wrongpwd;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+    if (wrongpwd) {
+      rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
+    } else {
+      char errstr[ERRSTR_BUFSIZE];
+      zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+      rb_raise(Error, "Decrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+    }
+  }
+
+  return Qnil;
+}
 
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
@@ -269,7 +291,11 @@ static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE sourc
   Check_Archive(p_archive);
 
   len = RSTRING(source)->len;
-  data = malloc(len);
+
+  if ((data = malloc(len)) == NULL) {
+    rb_raise(rb_eRuntimeError, "Replace file failed: Cannot allocate memory");
+  }
+
   memcpy(data, StringValuePtr(source), len);
 
   if ((zsource = zip_source_buffer(p_archive->archive, data, len, 1)) == NULL) {

data/ext/zipruby_file.c

@@ -13,13 +13,15 @@
 #include "zipruby_stat.h"
 #include "ruby.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 static VALUE zipruby_file(VALUE klass);
 static VALUE zipruby_file_alloc(VALUE klass);
 static void zipruby_file_mark(struct zipruby_file *p);
 static void zipruby_file_free(struct zipruby_file *p);
 static VALUE zipruby_file_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_close(VALUE self);
-static VALUE zipruby_file_read(VALUE self);
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_stat(VALUE self);
 static VALUE zipruby_file_get_comment(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_set_comment(VALUE self, VALUE comment);
@@ -46,7 +48,7 @@ void Init_zipruby_file() {
   rb_define_alloc_func(File, zipruby_file_alloc);
   rb_define_method(File, "initialize", zipruby_file_initialize, -1);
   rb_define_method(File, "close", zipruby_file_close, 0);
-  rb_define_method(File, "read", zipruby_file_read, 0);
+  rb_define_method(File, "read", zipruby_file_read, -1);
   rb_define_method(File, "stat", zipruby_file_stat, 0);
   rb_define_method(File, "get_comment", zipruby_file_get_comment, -1);
   rb_define_method(File, "comment", zipruby_file_get_comment, -1);
@@ -162,27 +164,55 @@ static VALUE zipruby_file_close(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_file_read(VALUE self) {
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
+  VALUE size, retval = Qnil;
   struct zipruby_file *p_file;
   struct zip_stat sb;
-  char *buf;
+  int block_given;
+  size_t bytes_left;
+  char buf[DATA_BUFSIZE];
+  ssize_t n;
 
+  rb_scan_args(argc, argv, "01", &size);
   Data_Get_Struct(self, struct zipruby_file, p_file);
   Check_File(p_file);
-
   zip_stat_init(&sb);
 
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }
 
-  buf = alloca(sb.size);
-  
-  if (zip_fread(p_file->file, buf, sb.size) == -1) {
+  if (NIL_P(size)) {
+    bytes_left = sb.size;
+  } else {
+    bytes_left = NUM2LONG(size);
+  }
+
+  if (bytes_left <= 0) {
+    return Qnil;
+  }
+
+  block_given = rb_block_given_p();
+
+  while ((n = zip_fread(p_file->file, buf, MIN(bytes_left, sizeof(buf)))) > 0) {
+    if (block_given) {
+      rb_yield(rb_str_new(buf, n));
+    } else {
+      if (NIL_P(retval)) {
+        retval = rb_str_new(buf, n);
+      } else {
+        rb_str_buf_cat(retval, buf, n);
+      }
+    }
+
+    bytes_left -= n;
+  }
+
+  if (n == -1) {
     rb_raise(Error, "Read file failed: %s", zip_file_strerror(p_file->file));
   }
 
-  return rb_str_new(buf, sb.size);
+  return retval;
 }
 
 /* */

data/zipruby.c

@@ -28,6 +28,7 @@ void Init_zipruby() {
 static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -67,6 +68,7 @@ void Init_zipruby_archive() {
   rb_define_alloc_func(Archive, zipruby_archive_alloc);
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
+  rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -150,7 +152,27 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
   } else {
     return archive;
   }
-};
+}
+
+/* */
+static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp, wrongpwd;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+    if (wrongpwd) {
+      rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
+    } else {
+      char errstr[ERRSTR_BUFSIZE];
+      zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+      rb_raise(Error, "Decrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+    }
+  }
+
+  return Qnil;
+}
 
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
@@ -288,7 +310,11 @@ static VALUE zipruby_archive_replace_buffer(VALUE self, VALUE index, VALUE sourc
   Check_Archive(p_archive);
 
   len = RSTRING(source)->len;
-  data = malloc(len);
+
+  if ((data = malloc(len)) == NULL) {
+    rb_raise(rb_eRuntimeError, "Replace file failed: Cannot allocate memory");
+  }
+
   memcpy(data, StringValuePtr(source), len);
 
   if ((zsource = zip_source_buffer(p_archive->archive, data, len, 1)) == NULL) {
@@ -825,13 +851,15 @@ void Init_zipruby_error() {
 #include "zipruby_stat.h"
 #include "ruby.h"
 
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+
 static VALUE zipruby_file(VALUE klass);
 static VALUE zipruby_file_alloc(VALUE klass);
 static void zipruby_file_mark(struct zipruby_file *p);
 static void zipruby_file_free(struct zipruby_file *p);
 static VALUE zipruby_file_initialize(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_close(VALUE self);
-static VALUE zipruby_file_read(VALUE self);
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_stat(VALUE self);
 static VALUE zipruby_file_get_comment(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_file_set_comment(VALUE self, VALUE comment);
@@ -858,7 +886,7 @@ void Init_zipruby_file() {
   rb_define_alloc_func(File, zipruby_file_alloc);
   rb_define_method(File, "initialize", zipruby_file_initialize, -1);
   rb_define_method(File, "close", zipruby_file_close, 0);
-  rb_define_method(File, "read", zipruby_file_read, 0);
+  rb_define_method(File, "read", zipruby_file_read, -1);
   rb_define_method(File, "stat", zipruby_file_stat, 0);
   rb_define_method(File, "get_comment", zipruby_file_get_comment, -1);
   rb_define_method(File, "comment", zipruby_file_get_comment, -1);
@@ -974,27 +1002,55 @@ static VALUE zipruby_file_close(VALUE self) {
 }
 
 /* */
-static VALUE zipruby_file_read(VALUE self) {
+static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
+  VALUE size, retval = Qnil;
   struct zipruby_file *p_file;
   struct zip_stat sb;
-  char *buf;
+  int block_given;
+  size_t bytes_left;
+  char buf[DATA_BUFSIZE];
+  ssize_t n;
 
+  rb_scan_args(argc, argv, "01", &size);
   Data_Get_Struct(self, struct zipruby_file, p_file);
   Check_File(p_file);
-
   zip_stat_init(&sb);
 
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }
 
-  buf = alloca(sb.size);
-  
-  if (zip_fread(p_file->file, buf, sb.size) == -1) {
+  if (NIL_P(size)) {
+    bytes_left = sb.size;
+  } else {
+    bytes_left = NUM2LONG(size);
+  }
+
+  if (bytes_left <= 0) {
+    return Qnil;
+  }
+
+  block_given = rb_block_given_p();
+
+  while ((n = zip_fread(p_file->file, buf, MIN(bytes_left, sizeof(buf)))) > 0) {
+    if (block_given) {
+      rb_yield(rb_str_new(buf, n));
+    } else {
+      if (NIL_P(retval)) {
+        retval = rb_str_new(buf, n);
+      } else {
+        rb_str_buf_cat(retval, buf, n);
+      }
+    }
+
+    bytes_left -= n;
+  }
+
+  if (n == -1) {
     rb_raise(Error, "Read file failed: %s", zip_file_strerror(p_file->file));
   }
 
-  return rb_str_new(buf, sb.size);
+  return retval;
 }
 
 /* */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-26 00:00:00 +09:00
+date: 2008-04-30 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -45,6 +45,7 @@ files:
 - ext/zip_add.c
 - ext/zip_add_dir.c
 - ext/zip_close.c
+- ext/zip_crypt.c
 - ext/zip_delete.c
 - ext/zip_dirent.c
 - ext/zip_entry_free.c