From 494d01410fff02ca7978b986b8010484253fbecf Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 6 Jun 2012 03:39:40 +0000
Subject: * process.c (rb_run_exec_options_err): allocate a temporary buffer
 for   run_exec_dup2() for restoring fds on non-fork environments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 process.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'process.c')

diff --git a/process.c b/process.c
index eb0c3a2a3c..6b907b3dba 100644
--- a/process.c
+++ b/process.c
@@ -2460,6 +2460,7 @@ rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char
         return 0;
 
     if (s) {
+        /* assume that s is always NULL on fork-able environments */
         s->options = soptions = hide_obj(rb_ary_new());
         s->redirect_fds = Qnil;
 	s->envp_str = s->envp_buf = 0;
@@ -2561,6 +2562,16 @@ rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char
         }
     }
 
+    if (s) {
+        VALUE ary = rb_ary_entry(s->options, EXEC_OPTION_DUP2);
+        if (!NIL_P(ary)) {
+            size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
+            VALUE tmpbuf = hide_obj(rb_str_new(0, len));
+            rb_str_set_len(tmpbuf, len);
+            s->dup2_tmpbuf = tmpbuf;
+        }
+    }
+
     return 0;
 }
 
-- 
cgit v1.2.3