zipruby 0.2.9 → 0.3.0

data/LICENSE.libzip

@@ -0,0 +1,27 @@
+Copyright (C) 1999-2008 Dieter Baron and Thomas Klausner
+The authors can be contacted at <libzip@nih.at>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+3. The names of the authors may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.txt

@@ -155,14 +155,14 @@ https://rubyforge.org/frs/?group_id=6124
     Zip::Archive.encrypt('filename.zip', 'password')
     # or
     # Zip::Archive.encrypt('filename.zip') do |ar|
-    #   ar.encrypt('filename.zip', 'password')
+    #   ar.encrypt('password')
     # end
     
     # decrypt
     Zip::Archive.decrypt('filename.zip', 'password')
     # or
     # Zip::Archive.decrypt('filename.zip') do |ar|
-    #   ar.decrypt('filename.zip', 'password')
+    #   ar.decrypt('password')
     # end
 
 === modifying zip data in memory
@@ -199,7 +199,7 @@ https://rubyforge.org/frs/?group_id=6124
     end
 
 == License
-    Copyright (c) 2008 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
+    Copyright (c) 2008,2009 SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
     All rights reserved.
     
     Redistribution and use in source and binary forms, with or without modification,

data/ext/tmpfile.c

@@ -1,173 +1,175 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifdef _WIN32
-#include <windows.h>
-#include <io.h>
-#include <fcntl.h>
-#include <share.h>
-#endif
-
-#include "tmpfile.h"
-#include "ruby.h"
-
-#ifndef _WIN32
-#ifndef HAVE_MKSTEMP
-int _zip_mkstemp(char *);
-#define mkstemp _zip_mkstemp
-#endif
-#endif
-
-static int write_from_proc(VALUE proc, int fd);
-static VALUE proc_call(VALUE proc);
-
-char *zipruby_tmpnam(void *data, int len) {
-  char *filnam;
-
-#ifdef _WIN32
-  int fd;
-  char tmpdirnam[_MAX_PATH];
-  char tmpfilnam[_MAX_PATH];
-  int namlen;
-
-  memset(tmpdirnam, 0, _MAX_PATH);
-
-  if (GetTempPathA(_MAX_PATH, tmpdirnam) == 0) {
-    return NULL;
-  }
-
-  memset(tmpfilnam, 0, _MAX_PATH);
-
-  if (GetTempFileNameA(tmpdirnam, "zrb", 0, tmpfilnam) == 0) {
-    return NULL;
-  }
-
-  namlen = strlen(tmpfilnam) + 1;
-
-  if ((filnam = calloc(namlen, sizeof(char))) == NULL) {
-    return NULL;
-  }
-
-  if (strcpy_s(filnam, namlen, tmpfilnam) != 0) {
-    free(filnam);
-    return NULL;
-  }
-
-  if (data) {
-    if ((_sopen_s(&fd, filnam, _O_WRONLY | _O_BINARY, _SH_DENYRD, _S_IWRITE)) != 0) {
-      free(filnam);
-      return NULL;
-    }
-
-    if (len < 0) {
-      if (write_from_proc((VALUE) data, fd) == -1) {
-        free(filnam);
-        return NULL;
-      }
-    } else {
-      if (_write(fd, data, len) == -1) {
-        free(filnam);
-        return NULL;
-      }
-    }
-
-    if (_close(fd) == -1) {
-      free(filnam);
-      return NULL;
-    }
-  }
-#else
-  int fd;
-#ifdef P_tmpdir
-  int namlen = 16 + strlen(P_tmpdir);
-  char *dirnam = P_tmpdir;
-#else
-  int namlen = 20;
-  char *dirnam = "/tmp";
-#endif
-
-  if ((filnam = calloc(namlen, sizeof(char))) == NULL) {
-    return NULL;
-  }
-
-  strcpy(filnam, dirnam);
-  strcat(filnam, "/zipruby.XXXXXX");
-
-  if ((fd = mkstemp(filnam)) == -1) {
-    free(filnam);
-    return NULL;
-  }
-
-  if (data) {
-    if (len < 0) {
-      if (write_from_proc((VALUE) data, fd) == -1) {
-        free(filnam);
-        return NULL;
-      }
-    } else {
-      if (write(fd, data, len) == -1) {
-        free(filnam);
-        return NULL;
-      }
-    }
-  }
-
-  if (close(fd) == -1) {
-    free(filnam);
-    return NULL;
-  }
-#endif
-
-  return filnam;
-}
-
-void zipruby_rmtmp(const char *tmpfilnam) {
-  struct stat st;
-
-  if (!tmpfilnam) {
-    return;
-  }
-
-  if (stat(tmpfilnam, &st) != 0) {
-    return;
-  }
-
-#ifdef _WIN32
-  _unlink(tmpfilnam);
-#else
-  unlink(tmpfilnam);
-#endif
-}
-
-static int write_from_proc(VALUE proc, int fd) {
-  while (1) {
-    VALUE src = rb_protect(proc_call, proc, NULL);
-
-    if (TYPE(src) != T_STRING) {
-      break;
-    }
-
-    if (RSTRING_LEN(src) < 1) {
-      break;
-    }
-
-#ifdef _WIN32
-    if (_write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
-      return -1;
-    }
-#else
-    if (write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
-      return -1;
-    }
-#endif
-  }
-
-  return 0;
-}
-
-static VALUE proc_call(VALUE proc) {
-  return rb_funcall(proc, rb_intern("call"), 0);
-}
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef _WIN32
+#if RUBY_VERSION_MAJOR == 1 && RUBY_VERSION_MINOR == 8
+#include <windows.h>
+#endif
+#include <io.h>
+#include <fcntl.h>
+#include <share.h>
+#endif
+
+#include "tmpfile.h"
+#include "ruby.h"
+
+#ifndef _WIN32
+#ifndef HAVE_MKSTEMP
+int _zip_mkstemp(char *);
+#define mkstemp _zip_mkstemp
+#endif
+#endif
+
+static int write_from_proc(VALUE proc, int fd);
+static VALUE proc_call(VALUE proc);
+
+char *zipruby_tmpnam(void *data, int len) {
+  char *filnam;
+
+#ifdef _WIN32
+  int fd;
+  char tmpdirnam[_MAX_PATH];
+  char tmpfilnam[_MAX_PATH];
+  int namlen;
+
+  memset(tmpdirnam, 0, _MAX_PATH);
+
+  if (GetTempPathA(_MAX_PATH, tmpdirnam) == 0) {
+    return NULL;
+  }
+
+  memset(tmpfilnam, 0, _MAX_PATH);
+
+  if (GetTempFileNameA(tmpdirnam, "zrb", 0, tmpfilnam) == 0) {
+    return NULL;
+  }
+
+  namlen = strlen(tmpfilnam) + 1;
+
+  if ((filnam = calloc(namlen, sizeof(char))) == NULL) {
+    return NULL;
+  }
+
+  if (strcpy_s(filnam, namlen, tmpfilnam) != 0) {
+    free(filnam);
+    return NULL;
+  }
+
+  if (data) {
+    if ((_sopen_s(&fd, filnam, _O_WRONLY | _O_BINARY, _SH_DENYRD, _S_IWRITE)) != 0) {
+      free(filnam);
+      return NULL;
+    }
+
+    if (len < 0) {
+      if (write_from_proc((VALUE) data, fd) == -1) {
+        free(filnam);
+        return NULL;
+      }
+    } else {
+      if (_write(fd, data, len) == -1) {
+        free(filnam);
+        return NULL;
+      }
+    }
+
+    if (_close(fd) == -1) {
+      free(filnam);
+      return NULL;
+    }
+  }
+#else
+  int fd;
+#ifdef P_tmpdir
+  int namlen = 16 + strlen(P_tmpdir);
+  char *dirnam = P_tmpdir;
+#else
+  int namlen = 20;
+  char *dirnam = "/tmp";
+#endif
+
+  if ((filnam = calloc(namlen, sizeof(char))) == NULL) {
+    return NULL;
+  }
+
+  strcpy(filnam, dirnam);
+  strcat(filnam, "/zipruby.XXXXXX");
+
+  if ((fd = mkstemp(filnam)) == -1) {
+    free(filnam);
+    return NULL;
+  }
+
+  if (data) {
+    if (len < 0) {
+      if (write_from_proc((VALUE) data, fd) == -1) {
+        free(filnam);
+        return NULL;
+      }
+    } else {
+      if (write(fd, data, len) == -1) {
+        free(filnam);
+        return NULL;
+      }
+    }
+  }
+
+  if (close(fd) == -1) {
+    free(filnam);
+    return NULL;
+  }
+#endif
+
+  return filnam;
+}
+
+void zipruby_rmtmp(const char *tmpfilnam) {
+  struct stat st;
+
+  if (!tmpfilnam) {
+    return;
+  }
+
+  if (stat(tmpfilnam, &st) != 0) {
+    return;
+  }
+
+#ifdef _WIN32
+  _unlink(tmpfilnam);
+#else
+  unlink(tmpfilnam);
+#endif
+}
+
+static int write_from_proc(VALUE proc, int fd) {
+  while (1) {
+    VALUE src = rb_protect(proc_call, proc, NULL);
+
+    if (TYPE(src) != T_STRING) {
+      break;
+    }
+
+    if (RSTRING_LEN(src) < 1) {
+      break;
+    }
+
+#ifdef _WIN32
+    if (_write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
+      return -1;
+    }
+#else
+    if (write(fd, RSTRING_PTR(src), RSTRING_LEN(src)) == -1) {
+      return -1;
+    }
+#endif
+  }
+
+  return 0;
+}
+
+static VALUE proc_call(VALUE proc) {
+  return rb_funcall(proc, rb_intern("call"), 0);
+}

data/ext/tmpfile.h

@@ -1,9 +1,9 @@
-#ifndef __TMPFILE_H__
-#define __TMPFILE_H__
-
-#include <stdio.h>
-
-char *zipruby_tmpnam(void *data, int len);
-void zipruby_rmtmp(const char *tmpfilnam);
-
-#endif
+#ifndef __TMPFILE_H__
+#define __TMPFILE_H__
+
+#include <stdio.h>
+
+char *zipruby_tmpnam(void *data, int len);
+void zipruby_rmtmp(const char *tmpfilnam);
+
+#endif

data/ext/zip.h

@@ -46,7 +46,7 @@ extern "C" {
 #include <stdio.h>
 #include <time.h>
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(ssize_t)
 typedef int ssize_t;
 #endif
 

data/ext/zip_error_to_str.c

@@ -41,6 +41,8 @@
 #include <string.h>
 
 #ifdef _WIN32
+#define snprintf(s, n, f, ...) _snprintf((s), (n), (f), __VA_ARGS__)
+#else
 #define snprintf _snprintf
 #endif
 

data/ext/zipint.h

@@ -40,7 +40,7 @@
 
 #include "zip.h"
 #ifndef _WIN32
-#include "config.h"
+//#include "config.h"
 #endif
 
 #ifndef HAVE_MKSTEMP

data/ext/zipruby.c

@@ -1,18 +1,18 @@
-#ifdef _WIN32
-__declspec(dllexport) void Init_zipruby(void);
-#endif
-
-#include "zipruby.h"
-#include "zipruby_zip.h"
-#include "zipruby_archive.h"
-#include "zipruby_file.h"
-#include "zipruby_stat.h"
-#include "zipruby_error.h"
-
-void Init_zipruby() {
-  Init_zipruby_zip();
-  Init_zipruby_archive();
-  Init_zipruby_file();
-  Init_zipruby_stat();
-  Init_zipruby_error();
-}
+#ifdef _WIN32
+__declspec(dllexport) void Init_zipruby(void);
+#endif
+
+#include "zipruby.h"
+#include "zipruby_zip.h"
+#include "zipruby_archive.h"
+#include "zipruby_file.h"
+#include "zipruby_stat.h"
+#include "zipruby_error.h"
+
+void Init_zipruby() {
+  Init_zipruby_zip();
+  Init_zipruby_archive();
+  Init_zipruby_file();
+  Init_zipruby_stat();
+  Init_zipruby_error();
+}

data/ext/zipruby.h

@@ -1,25 +1,28 @@
-#ifndef __ZIPRUBY_H__
-#define __ZIPRUBY_H__
-
-#include "ruby.h"
-
-#ifndef RSTRING_PTR
-#define RSTRING_PTR(s) (RSTRING(s)->ptr)
-#endif
-#ifndef RSTRING_LEN
-#define RSTRING_LEN(s) (RSTRING(s)->len)
-#endif
-
-#define Check_IO(x) do { \
-  if (!rb_obj_is_instance_of((x), rb_cIO)) { \
-    rb_raise(rb_eTypeError, "wrong argument type %s (expected IO)", rb_class2name(CLASS_OF(x))); \
-  } \
-} while(0)
-
-#define VERSION "0.2.9"
-#define ERRSTR_BUFSIZE 256
-#define DATA_BUFSIZE 8192
-
-void Init_zipruby();
-
-#endif
+#ifndef __ZIPRUBY_H__
+#define __ZIPRUBY_H__
+
+#include "ruby.h"
+
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
+#define Check_IO(x) do { \
+  const char *classname = rb_class2name(CLASS_OF(x)); \
+  if (rb_obj_is_kind_of((x), rb_cIO)) { \
+    rb_io_binmode(x); \
+  } else if (strcmp(classname, "StringIO") != 0) { \
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected IO or StringIO)", classname); \
+  } \
+} while(0)
+
+#define VERSION "0.3.0"
+#define ERRSTR_BUFSIZE 256
+#define DATA_BUFSIZE 8192
+
+void Init_zipruby();
+
+#endif