tarruby 0.1.2-mswin32 → 0.1.3-mswin32

data/ext/tarruby.c

@@ -8,6 +8,7 @@
 #endif
 #include "libtar.h"
 #include "ruby.h"
+#include "rubysig.h"
 
 #ifndef RSTRING_PTR
 #define RSTRING_PTR(s) (RSTRING(s)->ptr)
@@ -32,7 +33,7 @@
 
 #define INT2TIME(i) rb_funcall(rb_cTime, rb_intern("at"), 1, INT2NUM(i))
 
-#define VERSION "0.1.2"
+#define VERSION "0.1.3"
 
 static VALUE Tar;
 static VALUE Error;
@@ -275,6 +276,7 @@ static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
   VALUE realdir, savedir;
   struct tarruby_tar *p_tar;
   char *s_realdir, *s_savedir = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "11", &realdir, &savedir);
   Check_Type(realdir, T_STRING);
@@ -289,7 +291,11 @@ static VALUE tarruby_append_tree(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_append_tree(p_tar->tar, s_realdir, s_savedir) != 0) {
+  TRAP_BEG;
+  result = tar_append_tree(p_tar->tar, s_realdir, s_savedir);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Append tree failed: %s", strerror(errno));
   }
 
@@ -343,6 +349,7 @@ static VALUE tarruby_extract_glob(int argc, VALUE *argv, VALUE self) {
   VALUE globname, prefix;
   struct tarruby_tar *p_tar;
   char *s_globname, *s_prefix = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "11", &globname, &prefix);
   Check_Type(globname, T_STRING);
@@ -355,7 +362,11 @@ static VALUE tarruby_extract_glob(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_extract_glob(p_tar->tar, s_globname, s_prefix) != 0) {
+  TRAP_BEG;
+  result = tar_extract_glob(p_tar->tar, s_globname, s_prefix);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Extract archive failed: %s", strerror(errno));
   }
 
@@ -369,6 +380,7 @@ static VALUE tarruby_extract_all(int argc, VALUE *argv, VALUE self) {
   VALUE prefix;
   struct tarruby_tar *p_tar;
   char *s_prefix = NULL;
+  int result = -1;
 
   rb_scan_args(argc, argv, "01", &prefix);
 
@@ -379,7 +391,11 @@ static VALUE tarruby_extract_all(int argc, VALUE *argv, VALUE self) {
 
   Data_Get_Struct(self, struct tarruby_tar, p_tar);
 
-  if (tar_extract_all(p_tar->tar, s_prefix) != 0) {
+  TRAP_BEG;
+  result = tar_extract_all(p_tar->tar, s_prefix);
+  TRAP_END;
+
+  if (result != 0) {
     rb_raise(Error, "Extract archive failed: %s", strerror(errno));
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tarruby
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: mswin32
 authors: 
 - winebarrel
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-13 00:00:00 +09:00
+date: 2008-09-14 00:00:00 +09:00
 default_executable: 
 dependencies: []