1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* process.c (save_env): don't use EXEC_OPTION_UNSETENV_OTHERS.

Browse Source 
(rb_execarg_run_options): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36198 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-23 08:22:53 +00:00
parent 26ecb6cbc4
commit 92af9dddc8
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> Sat Jun 23 17:04:08 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add env_modification field. * internal.h (rb_execarg): add env_modification field.

6
process.c
View File

@ -2713,7 +2713,8 @@ save_env(struct rb_execarg *sargp)
(VALUE)ary); (VALUE)ary);
sargp->env_modification = 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 #endif
@ -2751,8 +2752,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp,
#endif #endif
#if !defined(HAVE_FORK) #if !defined(HAVE_FORK)
obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS); if (eargp->unsetenv_others_given && eargp->unsetenv_others_do) {
if (RTEST(obj)) {
save_env(sargp); save_env(sargp);
rb_env_clear(); rb_env_clear();
} }