summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorBarton E. Schaefer <schaefer@zsh.org>2015-09-01 11:26:06 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2015-09-01 11:26:06 -0700
commit3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c (patch)
treeeacc1309abf7dfe2df4109a074df5fe4e48ea937 /Src
parent21382e0b20c697e83d0bc903a5e17b75e5979995 (diff)
downloadzsh-3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c.tar.gz
zsh-3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c.tar.xz
zsh-3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c.zip
36376: handle signals during read1char() so it is possible to interrupt correct/correctall prompts
Diffstat (limited to 'Src')
-rw-r--r--Src/utils.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/Src/utils.c b/Src/utils.c
index 4c4dc55cd..90f7c3317 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2538,11 +2538,16 @@ static int
 read1char(int echo)
 {
     char c;
+    int q = queue_signal_level();
 
+    dont_queue_signals();
     while (read(SHTTY, &c, 1) != 1) {
-	if (errno != EINTR || errflag || retflag || breaks || contflag)
+	if (errno != EINTR || errflag || retflag || breaks || contflag) {
+	    restore_queue_signals(q);
 	    return -1;
+	}
     }
+    restore_queue_signals(q);
     if (echo)
 	write_loop(SHTTY, &c, 1);
     return STOUC(c);