diff options
| author | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2002-06-26 02:48:44 +0000 |
|---|---|---|
| committer | Gregory Neil Shapiro <gshapiro@FreeBSD.org> | 2002-06-26 02:48:44 +0000 |
| commit | 739ac4d4d3a1d1d68eae4e7bd59c179d842864d2 (patch) | |
| tree | b35f716ab0dae216026e8ad27c85a951ee743a03 /contrib/sendmail/libsm | |
| parent | 94c01205742119acdf56dbbd22fc274e5e38cfd4 (diff) | |
Notes
Diffstat (limited to 'contrib/sendmail/libsm')
| -rw-r--r-- | contrib/sendmail/libsm/Makefile.m4 | 1 | ||||
| -rw-r--r-- | contrib/sendmail/libsm/clock.c | 9 |
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/sendmail/libsm/Makefile.m4 b/contrib/sendmail/libsm/Makefile.m4 index 957eb09222e2..563cf1083834 100644 --- a/contrib/sendmail/libsm/Makefile.m4 +++ b/contrib/sendmail/libsm/Makefile.m4 @@ -1,3 +1,4 @@ +dnl $Id: Makefile.m4,v 1.64.2.1 2002/06/21 21:58:29 ca Exp $ define(`confREQUIRE_LIBUNIX') include(confBUILDTOOLSDIR`/M4/switch.m4') diff --git a/contrib/sendmail/libsm/clock.c b/contrib/sendmail/libsm/clock.c index ada9689980af..fb7e9112eaa0 100644 --- a/contrib/sendmail/libsm/clock.c +++ b/contrib/sendmail/libsm/clock.c @@ -12,7 +12,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: clock.c,v 1.35 2002/03/22 18:34:38 gshapiro Exp $") +SM_RCSID("@(#)$Id: clock.c,v 1.35.2.1 2002/06/20 05:14:45 gshapiro Exp $") #include <unistd.h> #include <time.h> #include <errno.h> @@ -257,9 +257,6 @@ sm_clear_events() #endif /* SM_CONF_SETITIMER */ int wasblocked; - if (SmEventQueue == NULL) - return; - /* nothing will be left in event queue, no need for an alarm */ #if SM_CONF_SETITIMER clr.it_interval.tv_sec = 0; @@ -270,6 +267,10 @@ sm_clear_events() #else /* SM_CONF_SETITIMER */ (void) alarm(0); #endif /* SM_CONF_SETITIMER */ + + if (SmEventQueue == NULL) + return; + wasblocked = sm_blocksignal(SIGALRM); /* find the end of the EventQueue */ |