From 05b06b1c08263af07b2297aac0c842dafca39445 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sun, 6 Feb 2005 20:36:09 +0000 Subject: fix autoloaded trap bug; rejig use of trapfuncs (now traplists); improve trap tests --- Src/Modules/zftp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Src/Modules/zftp.c') diff --git a/Src/Modules/zftp.c b/Src/Modules/zftp.c index 399070939..f97cde46f 100644 --- a/Src/Modules/zftp.c +++ b/Src/Modules/zftp.c @@ -436,7 +436,8 @@ zfunalarm(void) } else alarm(0); if (sigtrapped[SIGALRM] || interact) { - if (sigfuncs[SIGALRM] || !sigtrapped[SIGALRM]) + if (siglists[SIGALRM] || !sigtrapped[SIGALRM] || + (sigtrapped[SIGALRM] & ZSIG_FUNC)) install_handler(SIGALRM); else signal_ignore(SIGALRM); @@ -452,7 +453,7 @@ static void zfunpipe() { if (sigtrapped[SIGPIPE]) { - if (sigfuncs[SIGPIPE]) + if (siglists[SIGPIPE] || (sigtrapped[SIGPIPE] & ZSIG_FUNC)) install_handler(SIGPIPE); else signal_ignore(SIGPIPE); -- cgit 1.4.1