summaryrefslogtreecommitdiff
path: root/Src/Modules/zftp.c
diff options
context:
space:
mode:
Diffstat (limited to 'Src/Modules/zftp.c')
-rw-r--r--Src/Modules/zftp.c5
1 files changed, 3 insertions, 2 deletions
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);