diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-23 08:22:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-23 08:22:53 +0000 |
commit | 92af9dddc8f55e0331bf2fc0ee985be4f433b339 (patch) | |
tree | 3af05b06d8b14b9e14dada6efc032d2ad870afaf | |
parent | 26ecb6cbc4d6ebd3fcb7d8a1f829e2910ad26bdc (diff) | |
download | ruby-92af9dddc8f55e0331bf2fc0ee985be4f433b339.tar.gz |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | process.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Jun 23 17:22:02 2012 Tanaka Akira <akr@fsij.org> + + * process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS. + (rb_execarg_run_options): ditto. + Sat Jun 23 17:04:08 2012 Tanaka Akira <akr@fsij.org> * internal.h (rb_execarg): add env_modification field. @@ -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(); } |