From f527ad625d39eac59dc687ae11f90cee107d4f0a Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Jun 2012 04:23:03 +0000
Subject: * internal.h (rb_execarg): add close_others_given, close_others_do
 and   close_others_maxhint fields.

* process.c (EXEC_OPTION_CLOSE_OTHERS): removed.
  (rb_execarg_addopt): update the new fields, instead of options array.
  (check_exec_fds): take eargp as an argument.  update the
  close_others_maxhint field.
  (rb_execarg_fixup): follow the argument change of check_exec_fds.
  (rb_execarg_run_options): use the new fields.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog  | 12 ++++++++++++
 internal.h |  3 +++
 process.c  | 21 +++++++++------------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d1e61a23e..8ee9546f7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Sat Jun 23 13:20:47 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): add close_others_given, close_others_do and
+	  close_others_maxhint fields.
+
+	* process.c (EXEC_OPTION_CLOSE_OTHERS): removed.
+	  (rb_execarg_addopt): update the new fields, instead of options array.
+	  (check_exec_fds): take eargp as an argument.  update the
+	  close_others_maxhint field.
+	  (rb_execarg_fixup): follow the argument change of check_exec_fds.
+	  (rb_execarg_run_options): use the new fields.
+
 Sat Jun 23 10:41:59 2012  Tanaka Akira  <akr@fsij.org>
 
 	* internal.h (rb_execarg): add unsetenv_others_given and
diff --git a/internal.h b/internal.h
index 945599e699..140df9894f 100644
--- a/internal.h
+++ b/internal.h
@@ -180,8 +180,11 @@ struct rb_execarg {
     unsigned umask_given : 1;
     unsigned unsetenv_others_given : 1;
     unsigned unsetenv_others_do : 1;
+    unsigned close_others_given : 1;
+    unsigned close_others_do : 1;
     pid_t pgroup_pgid; /* asis(-1), new pgroup(0), specified pgroup (0<V). */
     mode_t umask_mask;
+    int close_others_maxhint;
 };
 
 /* argv_str contains extra two elements.
diff --git a/process.c b/process.c
index f13bee8c07..155186f067 100644
--- a/process.c
+++ b/process.c
@@ -1261,7 +1261,6 @@ enum {
     EXEC_OPTION_CLOSE,
     EXEC_OPTION_OPEN,
     EXEC_OPTION_DUP2_CHILD,
-    EXEC_OPTION_CLOSE_OTHERS,
     EXEC_OPTION_NEW_PGROUP
 };
 
@@ -1639,11 +1638,11 @@ rb_execarg_addopt(VALUE execarg_obj, VALUE key, VALUE val)
             eargp->umask_mask = cmask;
         }
         else if (id == rb_intern("close_others")) {
-            if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS))) {
+            if (eargp->close_others_given) {
                 rb_raise(rb_eArgError, "close_others option specified twice");
             }
-            val = RTEST(val) ? Qtrue : Qfalse;
-            rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, val);
+            eargp->close_others_given = 1;
+            eargp->close_others_do = RTEST(val) ? 1 : 0;
         }
         else if (id == rb_intern("in")) {
             key = INT2FIX(0);
@@ -1694,8 +1693,9 @@ check_exec_options_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
 }
 
 static VALUE
-check_exec_fds(VALUE options)
+check_exec_fds(struct rb_execarg *eargp)
 {
+    VALUE options = eargp->options;
     VALUE h = rb_hash_new();
     VALUE ary;
     int index, maxhint = -1;
@@ -1758,9 +1758,7 @@ check_exec_fds(VALUE options)
         }
     }
 
-    if (rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS) != Qfalse) {
-        rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, INT2FIX(maxhint));
-    }
+    eargp->close_others_maxhint = maxhint;
     return h;
 }
 
@@ -2119,7 +2117,7 @@ rb_execarg_fixup(VALUE execarg_obj)
     VALUE envopts;
     VALUE ary;
 
-    eargp->redirect_fds = check_exec_fds(eargp->options);
+    eargp->redirect_fds = check_exec_fds(eargp);
 
     ary = rb_ary_entry(eargp->options, EXEC_OPTION_DUP2);
     if (!NIL_P(ary)) {
@@ -2803,9 +2801,8 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
     }
 
 #ifdef HAVE_FORK
-    obj = rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS);
-    if (obj != Qfalse) {
-        rb_close_before_exec(3, FIX2INT(obj), eargp->redirect_fds); /* async-signal-safe */
+    if (!eargp->close_others_given || eargp->close_others_do) {
+        rb_close_before_exec(3, eargp->close_others_maxhint, eargp->redirect_fds); /* async-signal-safe */
     }
 #endif
 
-- 
cgit v1.2.3