diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 15:50:24 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 15:50:24 +0000 |
commit | 99acd378d82d60d446ef12ccdaa332ef29df3243 (patch) | |
tree | f2843a1f95940bc33da9d8725692463d25e17022 | |
parent | d1f332d16a282b579a9edd144a9eb2cfc1d6115e (diff) | |
download | ruby-99acd378d82d60d446ef12ccdaa332ef29df3243.tar.gz |
* signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and
SIG_DFL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47417 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | signal.c | 10 |
2 files changed, 13 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sat Sep 6 00:49:41 2014 Tanaka Akira <akr@fsij.org> + + * signal.c (ruby_signal): Don't set SA_SIGINFO for SIG_IGN and + SIG_DFL. + Fri Sep 5 21:45:33 2014 Tanaka Akira <akr@fsij.org> * process.c (disable_child_handler_before_fork): New function. @@ -569,8 +569,14 @@ ruby_signal(int signum, sighandler_t handler) sigemptyset(&sigact.sa_mask); #ifdef USE_SIGALTSTACK - sigact.sa_sigaction = (ruby_sigaction_t*)handler; - sigact.sa_flags = SA_SIGINFO; + if (handler == SIG_IGN || handler == SIG_DFL) { + sigact.sa_handler = handler; + sigact.sa_flags = 0; + } + else { + sigact.sa_sigaction = (ruby_sigaction_t*)handler; + sigact.sa_flags = SA_SIGINFO; + } #else sigact.sa_handler = handler; sigact.sa_flags = 0; |