diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 12 |
2 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Thu Jul 27 17:01:01 2006 Yukihiro Matsumoto <matz@ruby-lang.org> + + * io.c (io_close): always calls "close" method of the receiver. + [ruby-core:6911] [ruby-core:8112] + Thu Jul 27 16:41:15 2006 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/openssl/ossl.h: move <ruby.h> inclusion point to shut up @@ -2226,15 +2226,17 @@ rb_io_close_m(VALUE io) } static VALUE -io_close(VALUE io) +io_call_close(VALUE io) { - if (TYPE(io) == T_FILE) { - rb_io_close(io); - return Qnil; - } return rb_funcall(io, rb_intern("close"), 0, 0); } +static VALUE +io_close(VALUE io) +{ + return rb_rescue(io_call_close, io, 0, 0); +} + /* * call-seq: * ios.closed? => true or false |