* io.c (io_close): always calls "close" method of the receiver.

  [ruby-core:6911] [ruby-core:8112]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@10636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 5 deletions

diff --git a/io.c b/io.c
index 1b9cff03c6..1d34632e3b 100644
--- a/io.c
+++ b/io.c
@@ -2289,16 +2289,19 @@ rb_io_close_m(io)
 }
 
 static VALUE
-io_close(io)
+io_call_close(io)
     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(io)
+    VALUE io;
+{
+    return rb_rescue(io_call_close, io, 0, 0);
+}
+
 /*
  *  call-seq:
  *     ios.closed?    => true or false