From 3747f6b6ab20ac9082909dd0cb3376e4e35f2c6c Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Tue, 1 Sep 2015 11:26:06 -0700 Subject: 36376: handle signals during read1char() so it is possible to interrupt correct/correctall prompts --- Src/utils.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Src/utils.c') 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); -- cgit v1.2.3 From cbe00216fe2b61a4d00cd6bd8189063efc5e132a Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 1 Sep 2015 23:14:37 +0200 Subject: 36380: Avoid gcc case syntax --- Src/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Src/utils.c') diff --git a/Src/utils.c b/Src/utils.c index 90f7c3317..ca68eae32 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3088,7 +3088,8 @@ morefmt: case '#': case '_': case '-': - case '0' ... '9': + case '0': case '1': case '2': case '3': case '4': + case '5': case '6': case '7': case '8': case '9': goto morefmt; strftimehandling: default: -- cgit v1.2.3