diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-09 12:44:35 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-04-09 12:44:35 +0000 |
| commit | f6b1dd28c9b765c361e228276bbd2e4fcd13687b (patch) | |
| tree | 1c114e54a231608bccc96d3e1fc511d05ee759e3 /ext | |
| parent | 99605583379b28502ba375bdfcd995ed19fc6754 (diff) | |
* internal.h (rb_execarg_parent_end): Declared.
* process.c: "spawn" opens files in the parent process.
(check_exec_redirect): Add an placeholder for fd in parameters
for fd_open.
(check_exec_fds_1): Delete fd_open condition.
(check_exec_fds): Don't call check_exec_fds_1 with fd_open.
(rb_execarg_parent_start): Open files specified as "spawn" options
and add "dup2" options.
(rb_execarg_parent_end): New function to close opened fds.
(run_exec_open): Removed.
(rb_execarg_run_options): Don't call run_exec_open.
(rb_spawn_internal): Call rb_execarg_parent_end.
* io.c (pipe_open): Call rb_execarg_parent_end.
* ext/pty/pty.c (establishShell): Call rb_execarg_parent_end.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pty/pty.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 108a16e8e3..16aaf9d149 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -196,12 +196,14 @@ establishShell(int argc, VALUE *argv, struct pty_info *info, int e = errno; close(master); close(slave); + rb_execarg_parent_end(carg.execarg_obj); errno = e; if (status) rb_jump_tag(status); rb_sys_fail(errbuf[0] ? errbuf : "fork failed"); } close(slave); + rb_execarg_parent_end(carg.execarg_obj); info->child_pid = pid; info->fd = master; |