diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-20 11:46:50 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-20 11:46:50 +0000 |
| commit | b60713de73dd3de6c610becb07ec30683d98af6b (patch) | |
| tree | 9d3c097a7a158d9e44ea8bffdf69dd3b7461d7b6 /io.c | |
| parent | 826f98e688c5608dcb5aeb749d0511cf2724c3a3 (diff) | |
* internal.h (struct rb_execarg) moved and renamed from
struct rb_exec_arg in intern.h.
* include/ruby/intern.h (struct rb_exec_arg): refer Data object which
contains struct rb_execarg.
* process.c: use struct rb_execarg instead of struct rb_exec_arg
except functions declared in intern.h.
(rb_exec_arg_addopt): extract a pointer to struct rb_execarg from
struct rb_exec_arg.
(rb_exec_arg_init): ditto.
(rb_exec_arg_fixup): ditto.
(rb_run_exec_options_err): ditto.
(rb_run_exec_options): ditto.
(rb_exec_err): ditto.
(rb_exec): ditto.
* io.c: use struct rb_execarg instead of struct rb_exec_arg.
* ext/pty/pty.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -5342,7 +5342,7 @@ rb_pipe(int *pipes) #ifdef HAVE_FORK struct popen_arg { - struct rb_exec_arg *execp; + struct rb_execarg *execp; int modef; int pair[2]; int write_pair[2]; @@ -5466,7 +5466,7 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len) #endif static VALUE -pipe_open(struct rb_exec_arg *eargp, const char *modestr, int fmode, convconfig_t *convconfig) +pipe_open(struct rb_execarg *eargp, const char *modestr, int fmode, convconfig_t *convconfig) { VALUE prog = eargp ? (eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name) : Qfalse ; rb_pid_t pid = 0; @@ -5484,7 +5484,7 @@ pipe_open(struct rb_exec_arg *eargp, const char *modestr, int fmode, convconfig_ int pair[2], write_pair[2]; #endif #if !defined(HAVE_FORK) - struct rb_exec_arg sarg; + struct rb_execarg sarg; #endif FILE *fp = 0; int fd = -1; @@ -5727,7 +5727,7 @@ static VALUE pipe_open_v(int argc, VALUE *argv, const char *modestr, int fmode, convconfig_t *convconfig) { VALUE execarg_obj, ret; - struct rb_exec_arg *earg; + struct rb_execarg *earg; execarg_obj = rb_execarg_new(argc, argv, FALSE); earg = rb_execarg_get(execarg_obj); ret = pipe_open(earg, modestr, fmode, convconfig); @@ -5742,7 +5742,7 @@ pipe_open_s(VALUE prog, const char *modestr, int fmode, convconfig_t *convconfig int argc = 1; VALUE *argv = &prog; VALUE execarg_obj, ret; - struct rb_exec_arg *earg; + struct rb_execarg *earg; if (RSTRING_LEN(prog) == 1 && cmd[0] == '-') { #if !defined(HAVE_FORK) |