update MacRuby's old process.c with CRuby 1.9.2

JosephKu · Jun 20, 2012 · a9070e0 · a9070e0
1 parent 2ad819e
commit a9070e0
Show file tree

Hide file tree

Showing 4 changed files with 949 additions and 556 deletions.
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
@@ -423,11 +423,15 @@ VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_a
 int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
 void rb_exec_arg_fixup(struct rb_exec_arg *e);
 int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
+int rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t);
 int rb_exec(const struct rb_exec_arg*);
+int rb_exec_err(const struct rb_exec_arg*, char*, size_t);
 rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE);
+rb_pid_t rb_fork_err(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t);
 rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
 void rb_syswait(rb_pid_t pid);
 rb_pid_t rb_spawn(int, VALUE*);
+rb_pid_t rb_spawn_err(int, VALUE*, char*, size_t);
 VALUE rb_detach_process(rb_pid_t pid);
 
 /* range.c */

diff --git a/include/ruby/io.h b/include/ruby/io.h
@@ -57,6 +57,8 @@ NORETURN(void rb_eof_error(void));
 
 long rb_io_primitive_read(struct rb_io_t *io_struct, char *buffer, long len);
 
+int rb_io_modestr_fmode(const char *modestr);
+int rb_io_modestr_oflags(const char *modestr);
 int rb_io_wait_readable(int fd);
 int rb_io_wait_writable(int fd);
 int rb_io_read_pending(rb_io_t *io_struct);

diff --git a/io.c b/io.c
@@ -266,6 +266,18 @@ convert_mode_string_to_oflags(VALUE s)
     return convert_fmode_to_oflags(convert_mode_string_to_fmode(s));
 }
 
+int
+rb_io_modestr_fmode(const char *modestr)
+{
+    return convert_mode_string_to_fmode(rb_str_new2(modestr));
+}
+
+int
+rb_io_modestr_oflags(const char *modestr)
+{
+    return convert_mode_string_to_oflags(rb_str_new2(modestr));
+}
+
 static int
 convert_oflags_to_fmode(int mode)
 {