From 6837681a4cb9405da1560dbfc3c1bcc97a7d1177 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 28 Apr 2008 03:50:14 +0000 Subject: [PATCH] * process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify close_exec on having no fork environment (but still meaningless). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ process.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27ab610fe8..f3c139b52f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 28 12:48:57 2008 NAKAMURA Usaku + + * process.c (rb_exec_arg_addopt, rb_exec_arg_addopt): now can specify + close_exec on having no fork environment (but still meaningless). + Mon Apr 28 11:11:29 2008 Tanaka Akira * process.c (run_exec_options): don't call FIX2INT for nil. diff --git a/process.c b/process.c index 2a38392055..7d72133ea5 100644 --- a/process.c +++ b/process.c @@ -1434,7 +1434,6 @@ rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val) } rb_ary_store(options, EXEC_OPTION_UMASK, LONG2NUM(cmask)); } -#ifdef HAVE_FORK else if (id == rb_intern("close_others")) { if (!NIL_P(rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS))) { rb_raise(rb_eArgError, "close_others option specified twice"); @@ -1442,7 +1441,6 @@ rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val) val = RTEST(val) ? Qtrue : Qfalse; rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, val); } -#endif else if (id == rb_intern("in")) { key = INT2FIX(0); goto redirect; @@ -1512,11 +1510,9 @@ check_exec_fds(VALUE options) } } } -#ifdef HAVE_FORK if (RTEST(rb_ary_entry(options, EXEC_OPTION_CLOSE_OTHERS))) { rb_ary_store(options, EXEC_OPTION_CLOSE_OTHERS, INT2FIX(maxhint)); } -#endif return h; }