From 722ccb1492a5f3aaa71eacc97a684e82d13df07b Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sun, 18 Feb 2001 15:18:43 +1100
Subject:  - (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only
 for    SIGALRM.

---
 ChangeLog | 4 +++-
 misc.c    | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2b11b6d0..9dd054dda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
    <tim@multitalents.net>
  - (stevesk) misc.c: cpp rework of SA_(INTERRUPT|RESTART) handling.
  - (stevesk) scp.c: use mysignal() for updateprogressmeter() handler.
+ - (djm) SA_INTERRUPT is the converse of SA_RESTART, apply it only for 
+   SIGALRM.
 
 20010217
  - (bal) OpenBSD Sync:
@@ -4028,4 +4030,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - 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 $
diff --git a/misc.c b/misc.c
index 6ce66fc45..743011654 100644
--- a/misc.c
+++ b/misc.c
@@ -108,13 +108,13 @@ mysignal(int sig, mysig_t act)
 		memset(&sa, 0, sizeof(sa));
 		sigemptyset(&sa.sa_mask);
 		sa.sa_flags = 0;
-		if (sig == SIGCHLD)
 #if defined(SA_RESTART)
+		if (sig == SIGCHLD)
 			sa.sa_flags |= SA_RESTART;
-#elif defined(SA_INTERRUPT)
+#endif
+#if defined(SA_INTERRUPT)
+		if (sig == SIGALRM)
 			sa.sa_flags |= SA_INTERRUPT;
-#else
-			;
 #endif
 		sa.sa_handler = act;
 		if (sigaction(sig, &sa, NULL) == -1)
-- 
cgit v1.2.3