From 92af9dddc8f55e0331bf2fc0ee985be4f433b339 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 23 Jun 2012 08:22:53 +0000
Subject: * process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.  
 (rb_execarg_run_options): ditto.

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

(limited to 'process.c')

diff --git a/process.c b/process.c
index 61a0d01aa9..164a5230a5 100644
--- a/process.c
+++ b/process.c
@@ -2713,7 +2713,8 @@ save_env(struct rb_execarg *sargp)
                           (VALUE)ary);
             sargp->env_modification = ary;
         }
-        rb_ary_store(soptions, EXEC_OPTION_UNSETENV_OTHERS, Qtrue);
+        sargp->unsetenv_others_given = 1;
+        sargp->unsetenv_others_do = 1;
     }
 }
 #endif
@@ -2751,8 +2752,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
 #endif
 
 #if !defined(HAVE_FORK)
-    obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS);
-    if (RTEST(obj)) {
+    if (eargp->unsetenv_others_given && eargp->unsetenv_others_do) {
         save_env(sargp);
         rb_env_clear();
     }
-- 
cgit v1.2.3