From 2edae81a186799dd75a8ead32e9ac0dd758c6e80 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 18 Jun 2007 04:52:59 +0000 Subject: * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured in at_exit blocks. [ruby-core:11263] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 14c7030d81..54e39b7d00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jun 18 13:54:36 2007 Nobuyoshi Nakada + + * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured + in at_exit blocks. [ruby-core:11263] + Mon Jun 18 01:14:10 2007 Nobuyoshi Nakada * variable.c (rb_path2class): get rid of dangling pointer caused by diff --git a/eval.c b/eval.c index 8b0d7038bd..1c60aeb635 100644 --- a/eval.c +++ b/eval.c @@ -1600,8 +1600,22 @@ ruby_cleanup(ex) VALUE sig = rb_iv_get(err, "signo"); ruby_default_signal(NUM2INT(sig)); } + else if (ex == 0) { + ex = 1; + } } +#if EXIT_SUCCESS != 0 || EXIT_FAILURE != 1 + switch (ex) { +#if EXIT_SUCCESS != 0 + case 0: return EXIT_SUCCESS; +#endif +#if EXIT_FAILURE != 1 + case 1: return EXIT_FAILURE; +#endif + } +#endif + return ex; } -- cgit v1.2.3