From 99605583379b28502ba375bdfcd995ed19fc6754 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 9 Apr 2015 11:53:49 +0000 Subject: [PATCH] * 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/pty/pty.c | 2 +- internal.h | 2 +- io.c | 4 ++-- process.c | 8 ++++---- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a561f34adb..75557768f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Thu Apr 9 20:52:31 2015 Tanaka Akira + + * 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 * process.c (fd_clear_cloexec): Extracted from run_exec_dup2. diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 12555951b5..108a16e8e3 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -182,7 +182,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info, 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); diff --git a/internal.h b/internal.h index dc1cbaef20..73beaaf3cd 100644 --- a/internal.h +++ b/internal.h @@ -1251,7 +1251,7 @@ VALUE rb_execarg_new(int argc, const VALUE *argv, int accept_shell); 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); diff --git a/io.c b/io.c index 00b2bbcbe5..1743f61a89 100644 --- a/io.c +++ b/io.c @@ -5894,7 +5894,7 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len) 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 *modestr, int fmode, convconfig_t *convc 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); diff --git a/process.c b/process.c index 0910599772..24002a093a 100644 --- a/process.c +++ b/process.c @@ -2208,7 +2208,7 @@ fill_envp_buf_i(st_data_t st_key, st_data_t st_val, st_data_t arg) 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) 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 *argv, char *errmsg, size_t errmsg_bufle 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) 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));