1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2014-05-09 23:48:47 +00:00
parent 5d488225a4
commit 08928bb528
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat May 10 08:47:36 2014 Tanaka Akira <akr@fsij.org>
* signal.c (trap): Return "SYSTEM_DEFAULT" if SIG_DFL is set.
Fri May 9 14:27:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 9 14:27:05 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (RUBY_SETJMP_TYPE): check for setjmp type after * configure.in (RUBY_SETJMP_TYPE): check for setjmp type after

1
signal.c
View File

@ -976,6 +976,7 @@ trap(int sig, sighandler_t func, VALUE command)
switch (oldcmd) { switch (oldcmd) {
case 0: case 0:
if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE"); if (oldfunc == SIG_IGN) oldcmd = rb_str_new2("IGNORE");
else if (oldfunc == SIG_DFL) oldcmd = rb_str_new2("SYSTEM_DEFAULT");
else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT"); else if (oldfunc == sighandler) oldcmd = rb_str_new2("DEFAULT");
else oldcmd = Qnil; else oldcmd = Qnil;
break; break;

7
test/ruby/test_signal.rb
View File

@ -175,6 +175,13 @@ class TestSignal < Test::Unit::TestCase
end; end;
end if Process.respond_to?(:kill) end if Process.respond_to?(:kill)
def test_trap_system_default
assert_separately([], <<-End)
trap(:QUIT, "SYSTEM_DEFAULT")
assert_equal("SYSTEM_DEFAULT", trap(:QUIT, "DEFAULT"))
End
end
def test_signal_requiring def test_signal_requiring
t = Tempfile.new(%w"require_ensure_test .rb") t = Tempfile.new(%w"require_ensure_test .rb")
t.puts "sleep" t.puts "sleep"