summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-04-13 06:26:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-04-13 06:26:30 +0000
commit081df640833fb4871048bcecffe61f110facd352 (patch)
tree8cf9347f856e702560eb98221f55c2f72a47c25f
parent83c961665def138e78a66d8bef0b4fa1da49ac69 (diff)
file.c: chardev is loadable
* file.c (ruby_is_fd_loadable): allow character devices to load, e.g., `ruby /dev/null` exits successfully. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--file.c2
-rw-r--r--test/ruby/test_rubyoptions.rb5
2 files changed, 6 insertions, 1 deletions
diff --git a/file.c b/file.c
index 6aa7dfb720..12299adad6 100644
--- a/file.c
+++ b/file.c
@@ -5959,7 +5959,7 @@ ruby_is_fd_loadable(int fd)
if (S_ISREG(st.st_mode))
return 1;
- if (S_ISFIFO(st.st_mode))
+ if (S_ISFIFO(st.st_mode) || S_ISCHR(st.st_mode))
return -1;
if (S_ISDIR(st.st_mode))
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index ddfd5f1883..e6659d4c30 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -1020,4 +1020,9 @@ class TestRubyOptions < Test::Unit::TestCase
end
end
end
+
+ def test_null_script
+ skip "#{IO::NULL} is not a character device" unless File.chardev?(IO::NULL)
+ assert_in_out_err([IO::NULL], success: true)
+ end
end