From 31345380ac41f8b830104ea41b4b52e1e2b094a8 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/trunk@12568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/ChangeLog b/ChangeLog index 917f5534a2..f9b8bdacb4 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 02:49:16 2007 Koichi Sasada * vm.c (env_mark): fix to mark block.proc. diff --git a/eval.c b/eval.c index 52ad4295c8..692d967fa8 100644 --- a/eval.c +++ b/eval.c @@ -191,7 +191,21 @@ ruby_cleanup(int 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