ruby-ripmime 0.1.4 → 0.1.5

data/ext/ruby-ripmime.c

@@ -21,36 +21,31 @@ static VALUE ruby_ripmime_decode(VALUE self, VALUE mailpack, VALUE outputdir) {
     rb_raise(rb_eArgError, "outputdir is empty");
   }
 
-  fp_err = tmpfile();
-
-  if (fp_err == NULL) {
-    rb_raise(rb_eRuntimeError, strerror(errno));
+  if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, mailpack) != Qtrue) {
+    rb_raise(rb_eArgError, "no such file: %s", RSTRING_PTR(mailpack));
   }
 
-  fd_stdout = dup(fileno(stdout));
-
-  if (fd_stdout == -1) {
-    rb_raise(rb_eRuntimeError, strerror(errno));
+  if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, outputdir) != Qtrue) {
+    rb_funcall(rb_cDir, rb_intern("mkdir"), 1, outputdir);
   }
 
-  fd_stderr = dup(fileno(stderr));
-
-  if (dup2(fileno(fp_err), fileno(stdout)) == -1) {
-    rb_raise(rb_eRuntimeError, strerror(errno));
-  }
+  fp_err = tmpfile();
 
-  if (dup2(fileno(fp_err), fileno(stderr)) == -1) {
+  if (fp_err == NULL) {
     rb_raise(rb_eRuntimeError, strerror(errno));
   }
 
   RIPMIME_init(&rm);
+
   MIME_set_name_by_type(1);
+  LOGGER_set_output_mode(_LOGGER_FILE);
+  LOGGER_set_output_file(fp_err);
 
   // XXX: for strdup memory leak (ripMIME 1.4.0.10)
   rm.outputdir = NULL;
   rm.mailpack = NULL;
 
-  ret = RIPMIME_decode(&rm, StringValuePtr(mailpack), StringValuePtr(outputdir));
+  ret = RIPMIME_decode(&rm, RSTRING_PTR(mailpack), RSTRING_PTR(outputdir));
 
   // XXX: for strdup memory leak (ripMIME 1.4.0.10)
   if (rm.outputdir) {
@@ -62,22 +57,6 @@ static VALUE ruby_ripmime_decode(VALUE self, VALUE mailpack, VALUE outputdir) {
     free(rm.mailpack);
   }
 
-  if (dup2(fd_stdout, fileno(stdout)) == -1) {
-    rb_raise(rb_eRuntimeError, strerror(errno));
-  }
-
-  if (dup2(fd_stdout, fileno(stderr)) == -1) {
-    rb_raise(rb_eRuntimeError, strerror(errno));
-  }
-
-  if (close(fd_stdout) == -1) {
-    rb_warn(strerror(errno));
-  }
-
-  if (close(fd_stderr) == -1) {
-    rb_warn(strerror(errno));
-  }
-
   rewind(fp_err);
 
   errmsg = rb_str_new(0, 0);

data/ext/ruby-ripmime.h

@@ -3,7 +3,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
 #include <ripmime-api.h>
 #include <ruby.h>
@@ -17,4 +16,8 @@
 
 int MIME_set_name_by_type(int level);
 
+#define _LOGGER_FILE 3
+int LOGGER_set_output_mode(int modechoice);
+int LOGGER_set_output_file(FILE *f);
+
 #endif //__RUBY_RIPMIME_H__

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-ripmime
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - winebarrel