JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

block things like SIGWINCH¹ during builtin sleep, they get rescheduled

Browse Source 
on unblock just fine and hurt since they interrupt select(2)

① and² SIGPIPE, SIGINFO, SIGUSR{1,2} in addition to already blocked SIGCHLD
② exact list open for suggestions – I’ve got no idea what I’m doing…
This commit is contained in:
tg 2012-03-24 18:47:04 +00:00
parent 21c15c0b8f
commit e83e43aaa5
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
funcs.c
View File

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.208 2012/03/03 19:28:45 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.209 2012/03/24 18:47:04 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -3660,10 +3660,25 @@ c_sleep(const char **wp)
bi_errorf("%s: %s '%s'", Tsynerr, strerror(errno), wp[0]); bi_errorf("%s: %s '%s'", Tsynerr, strerror(errno), wp[0]);
else { else {
#ifndef MKSH_NOPROSPECTOFWORK #ifndef MKSH_NOPROSPECTOFWORK
sigset_t omask; sigset_t omask, bmask;
/* block SIGCHLD from interrupting us, though */ /* block a number of signals from interrupting us, though */
sigprocmask(SIG_BLOCK, &sm_sigchld, &omask); (void)sigemptyset(&bmask);
(void)sigaddset(&bmask, SIGPIPE);
(void)sigaddset(&bmask, SIGCHLD);
#ifdef SIGWINCH
(void)sigaddset(&bmask, SIGWINCH);
#endif
#ifdef SIGINFO
(void)sigaddset(&bmask, SIGINFO);
#endif
#ifdef SIGUSR1
(void)sigaddset(&bmask, SIGUSR1);
#endif
#ifdef SIGUSR2
(void)sigaddset(&bmask, SIGUSR2);
#endif
sigprocmask(SIG_BLOCK, &bmask, &omask);
#endif #endif
if (select(1, NULL, NULL, NULL, &tv) == 0 || errno == EINTR) if (select(1, NULL, NULL, NULL, &tv) == 0 || errno == EINTR)
/* /*
@ -3674,6 +3689,7 @@ c_sleep(const char **wp)
else else
bi_errorf("%s: %s", Tselect, strerror(errno)); bi_errorf("%s: %s", Tselect, strerror(errno));
#ifndef MKSH_NOPROSPECTOFWORK #ifndef MKSH_NOPROSPECTOFWORK
/* this will re-schedule signal delivery */
sigprocmask(SIG_SETMASK, &omask, NULL); sigprocmask(SIG_SETMASK, &omask, NULL);
#endif #endif
} }