kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

signal.c: raise SystemCallError for all failures

Browse source 
* signal.c (ruby_signal): return SIG_ERR as well as signal(2).

* signal.c (trap): raise SystemCallError for all failures when
  called as a method.

* signal.c (Init_signal): fail by [BUG] only if initialization is
  failed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-09-21 02:42:40 +00:00
parent e539565d9a
commit ae0299e306
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
signal.c
View file

@ -606,13 +606,7 @@ ruby_signal(int signum, sighandler_t handler)
} }
(void)VALGRIND_MAKE_MEM_DEFINED(&old, sizeof(old)); (void)VALGRIND_MAKE_MEM_DEFINED(&old, sizeof(old));
if (sigaction(signum, &sigact, &old) < 0) { if (sigaction(signum, &sigact, &old) < 0) {
int e = errno; return SIG_ERR;
if (e == EINVAL) {
rb_syserr_fail_str(e, rb_signo2signm(signum));
}
else if (e != 0) {
rb_bug_errno("sigaction", e);
}
} }
if (old.sa_flags & SA_SIGINFO) if (old.sa_flags & SA_SIGINFO)
return (sighandler_t)old.sa_sigaction; return (sighandler_t)old.sa_sigaction;
@ -1096,6 +1090,7 @@ trap(int sig, sighandler_t func, VALUE command)
* RUBY_VM_CHECK_INTS(). * RUBY_VM_CHECK_INTS().
*/ */
oldfunc = ruby_signal(sig, func); oldfunc = ruby_signal(sig, func);
if (oldfunc == SIG_ERR) rb_sys_fail_str(rb_signo2signm(sig));
oldcmd = vm->trap_list[sig].cmd; oldcmd = vm->trap_list[sig].cmd;
switch (oldcmd) { switch (oldcmd) {
case 0: case 0:
@ -1235,7 +1230,7 @@ sig_list(void)
return h; return h;
} }
static void static int
install_sighandler(int signum, sighandler_t handler) install_sighandler(int signum, sighandler_t handler)
{ {
sighandler_t old; sighandler_t old;
@ -1243,21 +1238,25 @@ install_sighandler(int signum, sighandler_t handler)
/* At this time, there is no subthread. Then sigmask guarantee atomics. */ /* At this time, there is no subthread. Then sigmask guarantee atomics. */
rb_disable_interrupt(); rb_disable_interrupt();
old = ruby_signal(signum, handler); old = ruby_signal(signum, handler);
if (old == SIG_ERR) return -1;
/* signal handler should be inherited during exec. */ /* signal handler should be inherited during exec. */
if (old != SIG_DFL) { if (old != SIG_DFL) {
ruby_signal(signum, old); ruby_signal(signum, old);
} }
rb_enable_interrupt(); rb_enable_interrupt();
return 0;
} }
#define install_sighandler(signum, handler) (install_sighandler(signum, handler) ? rb_bug(#signum) : (void)0)
#if defined(SIGCLD) || defined(SIGCHLD) #if defined(SIGCLD) || defined(SIGCHLD)
static void static int
init_sigchld(int sig) init_sigchld(int sig)
{ {
sighandler_t oldfunc; sighandler_t oldfunc;
rb_disable_interrupt(); rb_disable_interrupt();
oldfunc = ruby_signal(sig, SIG_DFL); oldfunc = ruby_signal(sig, SIG_DFL);
if (oldfunc == SIG_ERR) return -1;
if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) { if (oldfunc != SIG_DFL && oldfunc != SIG_IGN) {
ruby_signal(sig, oldfunc); ruby_signal(sig, oldfunc);
} }
@ -1265,7 +1264,9 @@ init_sigchld(int sig)
GET_VM()->trap_list[sig].cmd = 0; GET_VM()->trap_list[sig].cmd = 0;
} }
rb_enable_interrupt(); rb_enable_interrupt();
return 0;
} }
#define init_sigchld(signum) (init_sigchld(signum) ? rb_bug(#signum) : (void)0)
#endif #endif
void void