From e35dcae40fca1baebc202561040f5c6eec421613 Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Sun, 25 Sep 2016 19:18:43 +0100
Subject: 39436: Pass on status of SIGINT better.
Set lastval to 128 + SIGINT on interrupt.
Don't execute builtin if already interrupted at that point.
---
Src/exec.c | 3 ++-
Src/signals.c | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
(limited to 'Src')
diff --git a/Src/exec.c b/Src/exec.c
index a5086c33c..4e8934061 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3701,7 +3701,8 @@ execcmd(Estate state, int input, int output, int how, int last1)
state->pc = opc;
}
dont_queue_signals();
- lastval = execbuiltin(args, assigns, (Builtin) hn);
+ if (!errflag)
+ lastval = execbuiltin(args, assigns, (Builtin) hn);
if (do_save & BINF_COMMAND)
errflag &= ~ERRFLAG_ERROR;
restore_queue_signals(q);
diff --git a/Src/signals.c b/Src/signals.c
index 30dde713f..e2587dc72 100644
--- a/Src/signals.c
+++ b/Src/signals.c
@@ -646,6 +646,7 @@ zhandler(int sig)
inerrflush();
check_cursh_sig(SIGINT);
}
+ lastval = 128 + SIGINT;
}
break;
--
cgit 1.4.1