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

* process.c (rb_spawn_internal): new function to specify

Browse Source 
default_close_others.
  (rb_spawn): specify default_close_others true.
  (rb_f_system): call rb_spawn_internal with default_close_others as
  false.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-04-25 15:50:24 +00:00
parent 4d93af26df
commit fe9b92f149
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Apr 26 00:47:43 2008 Tanaka Akira <akr@fsij.org>
* process.c (rb_spawn_internal): new function to specify
default_close_others.
(rb_spawn): specify default_close_others true.
(rb_f_system): call rb_spawn_internal with default_close_others as
false.
Fri Apr 25 17:56:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Apr 25 17:56:25 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* gc.c (free_unused_heaps): preserve last used heap segment to * gc.c (free_unused_heaps): preserve last used heap segment to

26
process.c
View File

@ -2544,14 +2544,26 @@ rb_syswait(rb_pid_t pid)
} }
} }
rb_pid_t static rb_pid_t
rb_spawn(int argc, VALUE *argv) rb_spawn_internal(int argc, VALUE *argv, int default_close_others)
{ {
rb_pid_t status; rb_pid_t status;
VALUE prog; VALUE prog;
struct rb_exec_arg earg; struct rb_exec_arg earg;
int argc2 = argc;
VALUE *argv2 = argv, env = Qnil, opthash = Qnil;
VALUE close_others = ID2SYM(rb_intern("close_others"));
prog = rb_exec_initarg(argc, argv, Qtrue, &earg); prog = rb_exec_getargs(&argc2, &argv2, Qtrue, &env, &opthash);
if (default_close_others) {
if (NIL_P(opthash)) {
opthash = rb_hash_new();
RBASIC(opthash)->klass = 0;
}
if (!st_lookup(RHASH_TBL(opthash), close_others, 0))
rb_hash_aset(opthash, close_others, Qtrue);
}
rb_exec_initarg2(prog, argc2, argv2, env, opthash, &earg);
#if defined HAVE_FORK #if defined HAVE_FORK
status = rb_fork(&status, rb_exec_atfork, &earg, earg.redirect_fds); status = rb_fork(&status, rb_exec_atfork, &earg, earg.redirect_fds);
@ -2581,6 +2593,12 @@ rb_spawn(int argc, VALUE *argv)
return status; return status;
} }
rb_pid_t
rb_spawn(int argc, VALUE *argv)
{
return rb_spawn_internal(argc, argv, Qtrue);
}
/* /*
* call-seq: * call-seq:
* system([env,] cmd [, arg, ...] [,options]) => true, false or nil * system([env,] cmd [, arg, ...] [,options]) => true, false or nil
@ -2618,7 +2636,7 @@ rb_f_system(int argc, VALUE *argv)
chfunc = signal(SIGCHLD, SIG_DFL); chfunc = signal(SIGCHLD, SIG_DFL);
#endif #endif
status = rb_spawn(argc, argv); status = rb_spawn_internal(argc, argv, Qfalse);
#if defined(HAVE_FORK) || defined(HAVE_SPAWNV) #if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
if (status > 0) { if (status > 0) {
rb_syswait(status); rb_syswait(status);

9
test/ruby/test_process.rb
View File

@ -419,9 +419,9 @@ class TestProcess < Test::Unit::TestCase
assert_equal("ba\n", r.read) assert_equal("ba\n", r.read)
} }
with_pipe {|r, w| with_pipe {|r, w|
Process.wait spawn("echo bi >&#{w.fileno}") Process.wait spawn("exec 2>/dev/null; echo bi >&#{w.fileno}")
w.close w.close
assert_equal("bi\n", r.read) assert_equal("", r.read)
} }
with_pipe {|r, w| with_pipe {|r, w|
Process.wait fork { exec("echo bu >&#{w.fileno}") } Process.wait fork { exec("echo bu >&#{w.fileno}") }
@ -464,6 +464,11 @@ class TestProcess < Test::Unit::TestCase
assert_equal("", r.read) assert_equal("", r.read)
File.unlink("err") File.unlink("err")
} }
with_pipe {|r, w|
Process.wait spawn("echo bi >&#{w.fileno}", :close_others=>false)
w.close
assert_equal("bi\n", r.read)
}
with_pipe {|r, w| with_pipe {|r, w|
Process.wait fork { exec("exec >/dev/null 2>err; echo mu >&#{w.fileno}", :close_others=>true) } Process.wait fork { exec("exec >/dev/null 2>err; echo mu >&#{w.fileno}", :close_others=>true) }
w.close w.close