diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:22:07 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:22:07 +0000 |
commit | a33f0de6a93f31f5f456e62a291d56bf0d913922 (patch) | |
tree | 198fa45009500e40bd32236a0ce5f06235592ecd | |
parent | 8d88e620563221271ae100707d6f164633526f1e (diff) |
merges r21746 from trunk into ruby_1_9_1.
* signal.c (trap_handler): also accepts symbols. [ruby-dev:37823]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | signal.c | 4 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Fri Jan 23 13:26:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * signal.c (trap_handler): also accepts symbols. [ruby-dev:37823] + Thu Jan 22 18:14:04 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (create_makefile): removes installed files under @@ -753,6 +753,10 @@ trap_handler(VALUE *cmd, int sig) } else { command = rb_check_string_type(*cmd); + if (NIL_P(command) && SYMBOL_P(*cmd)) { + command = rb_id2str(SYM2ID(*cmd)); + if (!command) rb_raise(rb_eArgError, "bad handler"); + } if (!NIL_P(command)) { SafeStringValue(command); /* taint check */ *cmd = command; |