From 2dc9a8a9f60f6de9abacc8e29197c5e7eb6c19a4 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Tue, 28 Sep 1999 13:33:13 +0000 Subject: [PATCH] Explicitly use sigemptyset to clear a sigset_t. Explicit initialization of sa_flags added so that the 'struct sigaction' can be declared local in both functions that use the global (static) declaration. Remove the global declaration. --- lib/libftpio/ftpio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libftpio/ftpio.c b/lib/libftpio/ftpio.c index 45f7012a98b2..35f2b15a6030 100644 --- a/lib/libftpio/ftpio.c +++ b/lib/libftpio/ftpio.c @@ -509,15 +509,16 @@ ftp_timeout(int sig) /* Debug("ftp_pkg: ftp_timeout called - operation timed out"); */ } -static struct sigaction new; - static void ftp_set_timeout(void) { + struct sigaction new; char *cp; int ival; FtpTimedOut = FALSE; + sigemptyset(&new.sa_mask); + new.sa_flags = 0; new.sa_handler = ftp_timeout; sigaction(SIGALRM, &new, NULL); cp = getenv("FTP_TIMEOUT"); @@ -529,7 +530,11 @@ ftp_set_timeout(void) static void ftp_clear_timeout(void) { + struct sigaction new; + alarm(0); + sigemptyset(&new.sa_mask); + new.sa_flags = 0; new.sa_handler = SIG_DFL; sigaction(SIGALRM, &new, NULL); }