diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-18 04:52:59 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-06-18 04:52:59 +0000 |
commit | 2edae81a186799dd75a8ead32e9ac0dd758c6e80 (patch) | |
tree | 8f2712c95c1f84c9c3ba3221917d784d8199e608 | |
parent | fc13ba2b9fb3614744791b66da435d0ec1b5aab4 (diff) |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 14 |
2 files changed, 19 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Mon Jun 18 13:54:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <nobu@ruby-lang.org> * variable.c (rb_path2class): get rid of dangling pointer caused by @@ -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; } |