From 072673ee41bf10822d44a88a21818e255ddfedbb Mon Sep 17 00:00:00 2001 From: knu Date: Sat, 24 May 2008 17:49:34 +0000 Subject: Merge from ruby_1_8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 608d1fa558..19164c10cf 100644 --- a/error.c +++ b/error.c @@ -952,18 +952,16 @@ syserr_eqq(self, exc) VALUE self, exc; { VALUE num, e; + ID en = rb_intern("errno"); - if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) return Qfalse; - if (self == rb_eSystemCallError) return Qtrue; + if (!rb_obj_is_kind_of(exc, rb_eSystemCallError)) { + if (!rb_respond_to(exc, en)) return Qfalse; + } + else if (self == rb_eSystemCallError) return Qtrue; - num = rb_attr_get(exc, rb_intern("errno")); + num = rb_attr_get(exc, en); if (NIL_P(num)) { - VALUE klass = CLASS_OF(exc); - - while (TYPE(klass) == T_ICLASS || FL_TEST(klass, FL_SINGLETON)) { - klass = (VALUE)RCLASS(klass)->super; - } - num = rb_const_get(klass, rb_intern("Errno")); + num = rb_funcall(exc, en, 0, 0); } e = rb_const_get(self, rb_intern("Errno")); if (FIXNUM_P(num) ? num == e : rb_equal(num, e)) -- cgit v1.2.3