diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/webrick/server.rb | 6 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 3 |
3 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Aug 27 18:05:42 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> + + * lib/webrick/server.rb: use IO::NULL instead of '/dev/null' + * test/ruby/test_string.rb: ditto. + Thu Aug 27 15:24:57 2015 Koichi Sasada <ko1@atdot.net> * compile.c (iseq_set_sequence): rename variable names diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb index 1d87cdae70..73395a406d 100644 --- a/lib/webrick/server.rb +++ b/lib/webrick/server.rb @@ -48,9 +48,9 @@ module WEBrick exit!(0) if fork Dir::chdir("/") File::umask(0) - STDIN.reopen("/dev/null") - STDOUT.reopen("/dev/null", "w") - STDERR.reopen("/dev/null", "w") + STDIN.reopen(IO::NULL) + STDOUT.reopen(IO::NULL, "w") + STDERR.reopen(IO::NULL, "w") yield if block_given? end end diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index 2768a65441..fba8d51b35 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -464,8 +464,7 @@ class TestString < Test::Unit::TestCase end end - null = File.exist?("/dev/null") ? "/dev/null" : "NUL" # maybe DOSISH - assert_equal("", File.read(null).clone, '[ruby-dev:32819] reported by Kazuhiro NISHIYAMA') + assert_equal("", File.read(IO::NULL).clone, '[ruby-dev:32819] reported by Kazuhiro NISHIYAMA') end def test_concat |