tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for 

SIGALRM.
This commit is contained in:
Damien Miller 2001-02-18 15:18:43 +11:00
parent 93c17d9eed
commit 722ccb1492
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21,6 +21,8 @@
<tim@multitalents.net> <tim@multitalents.net>
- (stevesk) misc.c: cpp rework of SA_(INTERRUPT|RESTART) handling. - (stevesk) misc.c: cpp rework of SA_(INTERRUPT|RESTART) handling.
- (stevesk) scp.c: use mysignal() for updateprogressmeter() handler. - (stevesk) scp.c: use mysignal() for updateprogressmeter() handler.
- (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for
SIGALRM.
20010217 20010217
- (bal) OpenBSD Sync: - (bal) OpenBSD Sync:
@ -4028,4 +4030,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.794 2001/02/18 03:55:16 stevesk Exp $ $Id: ChangeLog,v 1.795 2001/02/18 04:18:43 djm Exp $

8
misc.c
View File

@ -108,13 +108,13 @@ mysignal(int sig, mysig_t act)
memset(&sa, 0, sizeof(sa)); memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask); sigemptyset(&sa.sa_mask);
sa.sa_flags = 0; sa.sa_flags = 0;
if (sig == SIGCHLD)
#if defined(SA_RESTART) #if defined(SA_RESTART)
if (sig == SIGCHLD)
sa.sa_flags |= SA_RESTART; sa.sa_flags |= SA_RESTART;
#elif defined(SA_INTERRUPT) #endif
#if defined(SA_INTERRUPT)
if (sig == SIGALRM)
sa.sa_flags |= SA_INTERRUPT; sa.sa_flags |= SA_INTERRUPT;
#else
;
#endif #endif
sa.sa_handler = act; sa.sa_handler = act;
if (sigaction(sig, &sa, NULL) == -1) if (sigaction(sig, &sa, NULL) == -1)