ruby-changes:38112
From: akr <ko1@a...>
Date: Thu, 9 Apr 2015 20:54:09 +0900 (JST)
Subject: [ruby-changes:38112] akr:r50193 (trunk): * internal.h (rb_execarg_parent_start): Renamed from rb_execarg_fixup.
akr 2015-04-09 20:53:49 +0900 (Thu, 09 Apr 2015) New Revision: 50193 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50193 Log: * internal.h (rb_execarg_parent_start): Renamed from rb_execarg_fixup. * process.c: Follows the above change. * io.c: Ditto. * ext/pty/pty.c: Ditto. Modified files: trunk/ChangeLog trunk/ext/pty/pty.c trunk/internal.h trunk/io.c trunk/process.c Index: ChangeLog =================================================================== --- ChangeLog (revision 50192) +++ ChangeLog (revision 50193) @@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Thu Apr 9 20:52:31 2015 Tanaka Akira <akr@f...> + + * internal.h (rb_execarg_parent_start): Renamed from rb_execarg_fixup. + + * process.c: Follows the above change. + + * io.c: Ditto. + + * ext/pty/pty.c: Ditto. + Thu Apr 9 20:35:12 2015 Tanaka Akira <akr@f...> * process.c (fd_clear_cloexec): Extracted from run_exec_dup2. Index: io.c =================================================================== --- io.c (revision 50192) +++ io.c (revision 50193) @@ -5894,7 +5894,7 @@ popen_exec(void *pp, char *errmsg, size_ https://github.com/ruby/ruby/blob/trunk/io.c#L5894 static VALUE rb_execarg_fixup_v(VALUE execarg_obj) { - rb_execarg_fixup(execarg_obj); + rb_execarg_parent_start(execarg_obj); return Qnil; } @@ -6079,7 +6079,7 @@ pipe_open(VALUE execarg_obj, const char https://github.com/ruby/ruby/blob/trunk/io.c#L6079 cmd = StringValueCStr(prog); } if (!NIL_P(execarg_obj)) { - rb_execarg_fixup(execarg_obj); + rb_execarg_parent_start(execarg_obj); rb_execarg_run_options(eargp, sargp, NULL, 0); } fp = popen(cmd, modestr); Index: process.c =================================================================== --- process.c (revision 50192) +++ process.c (revision 50193) @@ -2208,7 +2208,7 @@ fill_envp_buf_i(st_data_t st_key, st_dat https://github.com/ruby/ruby/blob/trunk/process.c#L2208 static long run_exec_dup2_tmpbuf_size(long n); void -rb_execarg_fixup(VALUE execarg_obj) +rb_execarg_parent_start(VALUE execarg_obj) { struct rb_execarg *eargp = rb_execarg_get(execarg_obj); int unsetenv_others; @@ -2370,7 +2370,7 @@ rb_f_exec(int argc, const VALUE *argv) https://github.com/ruby/ruby/blob/trunk/process.c#L2370 execarg_obj = rb_execarg_new(argc, argv, TRUE); eargp = rb_execarg_get(execarg_obj); - rb_execarg_fixup(execarg_obj); + rb_execarg_parent_start(execarg_obj); fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; #if defined(__APPLE__) || defined(__HAIKU__) @@ -3846,7 +3846,7 @@ rb_spawn_internal(int argc, const VALUE https://github.com/ruby/ruby/blob/trunk/process.c#L3846 execarg_obj = rb_execarg_new(argc, argv, TRUE); eargp = rb_execarg_get(execarg_obj); - rb_execarg_fixup(execarg_obj); + rb_execarg_parent_start(execarg_obj); ret = rb_spawn_process(eargp, errmsg, errmsg_buflen); RB_GC_GUARD(execarg_obj); return ret; @@ -4211,7 +4211,7 @@ rb_f_spawn(int argc, VALUE *argv) https://github.com/ruby/ruby/blob/trunk/process.c#L4211 execarg_obj = rb_execarg_new(argc, argv, TRUE); eargp = rb_execarg_get(execarg_obj); - rb_execarg_fixup(execarg_obj); + rb_execarg_parent_start(execarg_obj); fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; pid = rb_spawn_process(eargp, errmsg, sizeof(errmsg)); Index: ext/pty/pty.c =================================================================== --- ext/pty/pty.c (revision 50192) +++ ext/pty/pty.c (revision 50193) @@ -182,7 +182,7 @@ establishShell(int argc, VALUE *argv, st https://github.com/ruby/ruby/blob/trunk/ext/pty/pty.c#L182 carg.execarg_obj = rb_execarg_new(argc, argv, 1); carg.eargp = rb_execarg_get(carg.execarg_obj); - rb_execarg_fixup(carg.execarg_obj); + rb_execarg_parent_start(carg.execarg_obj); getDevice(&master, &slave, SlaveName, 0); Index: internal.h =================================================================== --- internal.h (revision 50192) +++ internal.h (revision 50193) @@ -1251,7 +1251,7 @@ VALUE rb_execarg_new(int argc, const VAL https://github.com/ruby/ruby/blob/trunk/internal.h#L1251 struct rb_execarg *rb_execarg_get(VALUE execarg_obj); /* dangerous. needs GC guard. */ VALUE rb_execarg_init(int argc, const VALUE *argv, int accept_shell, VALUE execarg_obj); int rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val); -void rb_execarg_fixup(VALUE execarg_obj); +void rb_execarg_parent_start(VALUE execarg_obj); int rb_execarg_run_options(const struct rb_execarg *e, struct rb_execarg *s, char* errmsg, size_t errmsg_buflen); VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash); void rb_execarg_setenv(VALUE execarg_obj, VALUE env); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/