1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* internal.h (rb_execarg_parent_start): Renamed from rb_execarg_fixup.

Browse Source 
* 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
This commit is contained in:
akr 2015-04-09 11:53:49 +00:00
parent 00478a98ac
commit 9960558337
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Apr 9 20:52:31 2015 Tanaka Akira <akr@fsij.org>
* 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@fsij.org> Thu Apr 9 20:35:12 2015 Tanaka Akira <akr@fsij.org>
* process.c (fd_clear_cloexec): Extracted from run_exec_dup2. * process.c (fd_clear_cloexec): Extracted from run_exec_dup2.

2
ext/pty/pty.c
View File

@ -182,7 +182,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
carg.execarg_obj = rb_execarg_new(argc, argv, 1); carg.execarg_obj = rb_execarg_new(argc, argv, 1);
carg.eargp = rb_execarg_get(carg.execarg_obj); 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); getDevice(&master, &slave, SlaveName, 0);

2
internal.h
View File

@ -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. */ 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); 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); 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); 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); VALUE rb_execarg_extract_options(VALUE execarg_obj, VALUE opthash);
void rb_execarg_setenv(VALUE execarg_obj, VALUE env); void rb_execarg_setenv(VALUE execarg_obj, VALUE env);

4
io.c
View File

@ -5894,7 +5894,7 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len)
static VALUE static VALUE
rb_execarg_fixup_v(VALUE execarg_obj) rb_execarg_fixup_v(VALUE execarg_obj)
{ {
rb_execarg_fixup(execarg_obj); rb_execarg_parent_start(execarg_obj);
return Qnil; return Qnil;
} }
@ -6079,7 +6079,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
cmd = StringValueCStr(prog); cmd = StringValueCStr(prog);
} }
if (!NIL_P(execarg_obj)) { if (!NIL_P(execarg_obj)) {
rb_execarg_fixup(execarg_obj); rb_execarg_parent_start(execarg_obj);
rb_execarg_run_options(eargp, sargp, NULL, 0); rb_execarg_run_options(eargp, sargp, NULL, 0);
} }
fp = popen(cmd, modestr); fp = popen(cmd, modestr);

8
process.c
View File

@ -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); static long run_exec_dup2_tmpbuf_size(long n);
void void
rb_execarg_fixup(VALUE execarg_obj) rb_execarg_parent_start(VALUE execarg_obj)
{ {
struct rb_execarg *eargp = rb_execarg_get(execarg_obj); struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
int unsetenv_others; int unsetenv_others;
@ -2370,7 +2370,7 @@ rb_f_exec(int argc, const VALUE *argv)
execarg_obj = rb_execarg_new(argc, argv, TRUE); execarg_obj = rb_execarg_new(argc, argv, TRUE);
eargp = rb_execarg_get(execarg_obj); 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; fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
#if defined(__APPLE__) || defined(__HAIKU__) #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); execarg_obj = rb_execarg_new(argc, argv, TRUE);
eargp = rb_execarg_get(execarg_obj); 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); ret = rb_spawn_process(eargp, errmsg, errmsg_buflen);
RB_GC_GUARD(execarg_obj); RB_GC_GUARD(execarg_obj);
return ret; return ret;
@ -4211,7 +4211,7 @@ rb_f_spawn(int argc, VALUE *argv)
execarg_obj = rb_execarg_new(argc, argv, TRUE); execarg_obj = rb_execarg_new(argc, argv, TRUE);
eargp = rb_execarg_get(execarg_obj); 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; fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name;
pid = rb_spawn_process(eargp, errmsg, sizeof(errmsg)); pid = rb_spawn_process(eargp, errmsg, sizeof(errmsg));