ruby-changes:23874
From: akr <ko1@a...>
Date: Tue, 5 Jun 2012 22:30:03 +0900 (JST)
Subject: [ruby-changes:23874] akr:r35925 (trunk): * internal.h: rb_exec_arg and related stuff moved from intern.h
akr 2012-06-05 22:29:54 +0900 (Tue, 05 Jun 2012) New Revision: 35925 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35925 Log: * internal.h: rb_exec_arg and related stuff moved from intern.h * include/ruby/intern.h (rb_proc_exec_n): removed. Modified files: trunk/ChangeLog trunk/include/ruby/intern.h trunk/internal.h Index: include/ruby/intern.h =================================================================== --- include/ruby/intern.h (revision 35924) +++ include/ruby/intern.h (revision 35925) @@ -588,27 +588,7 @@ /* process.c */ void rb_last_status_set(int status, rb_pid_t pid); VALUE rb_last_status_get(void); -struct rb_exec_arg { - const char *prog; - VALUE options; - VALUE redirect_fds; - VALUE progname; - int use_shell; - VALUE argv_str; - VALUE argv_buf; - VALUE envp_str; - VALUE envp_buf; - VALUE dup2_tmpbuf; -}; -int rb_proc_exec_n(int, VALUE*, const char*); int rb_proc_exec(const char*); -VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e); -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); VALUE rb_f_exec(int,VALUE*); Index: ChangeLog =================================================================== --- ChangeLog (revision 35924) +++ ChangeLog (revision 35925) @@ -1,3 +1,9 @@ +Tue Jun 5 22:28:46 2012 Tanaka Akira <akr@f...> + + * internal.h: rb_exec_arg and related stuff moved from intern.h + + * include/ruby/intern.h (rb_proc_exec_n): removed. + Tue Jun 5 21:57:22 2012 Tanaka Akira <akr@f...> * process.c (rb_exec_arg_fixup): allocate a temporary buffer for Index: internal.h =================================================================== --- internal.h (revision 35924) +++ internal.h (revision 35925) @@ -159,6 +159,19 @@ /* process.c */ +struct rb_exec_arg { + const char *prog; + VALUE options; + VALUE redirect_fds; + VALUE progname; + int use_shell; + VALUE argv_str; + VALUE argv_buf; + VALUE envp_str; + VALUE envp_buf; + VALUE dup2_tmpbuf; +}; + /* argv_str contains extra two elements. * The beginning one is for /bin/sh used by exec_with_sh. * The last one for terminating NULL used by execve. @@ -166,6 +179,14 @@ #define ARGVSTR2ARGC(argv_str) (RSTRING_LEN(argv_str) / sizeof(char *) - 2) #define ARGVSTR2ARGV(argv_str) ((char **)RSTRING_PTR(argv_str) + 1) +VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e); +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); + /* rational.c */ VALUE rb_lcm(VALUE x, VALUE y); VALUE rb_rational_reciprocal(VALUE x); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/