kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c (rb_io_open_with_args): use rb_open_file instead of rb_io_open.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18726 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-20 11:33:36 +00:00
parent 9074da1b44
commit 65370097cd
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Aug 20 20:32:49 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_io_open_with_args): use rb_open_file instead of rb_io_open.
Wed Aug 20 20:16:17 2008 Tanaka Akira <akr@fsij.org>
* io.c (rb_scan_open_args): extracted from rb_open_file.

16
io.c
View file

@ -4807,19 +4807,11 @@ rb_io_open(const char *fname, const char *mode)
static VALUE
rb_io_open_with_args(int argc, VALUE *argv)
{
const char *mode;
VALUE pname, pmode;
VALUE io;
if (rb_scan_args(argc, argv, "11", &pname, &pmode) == 1) {
mode = "r";
}
else if (FIXNUM_P(pmode)) {
mode = rb_io_modenum_mode(FIX2INT(pmode));
}
else {
mode = StringValueCStr(pmode);
}
return rb_io_open(StringValueCStr(pname), mode);
io = io_alloc(rb_cFile);
rb_open_file(argc, argv, io);
return io;
}
static VALUE

18
test/ruby/test_io.rb
View file

@ -1225,4 +1225,22 @@ class TestIO < Test::Unit::TestCase
def test_uninitialized
assert_raise(IOError) { IO.allocate.print "" }
end
def test_nofollow
return unless defined? File::NOFOLLOW
mkcdtmpdir {
open("file", "w") {|f| f << "content" }
begin
File.symlink("file", "slnk")
rescue NotImplementedError
return
end
assert_raise(Errno::ELOOP) {
open("slnk", File::RDONLY|File::NOFOLLOW) {}
}
assert_raise(Errno::ELOOP) {
File.foreach("slnk", :open_args=>[File::RDONLY|File::NOFOLLOW]) {}
}
}
end
end