From: Sven Wischnowsky <wischnow@berkom.de>
To: zsh-workers@sunsite.dk
Subject: Re: [falk@debian.org: Bug#107528: "while do done" gets into uninterruptable loop]
Date: Mon, 25 Feb 2002 10:18:45 +0100 [thread overview]
Message-ID: <15482.373.362707.374283@wischnow.berkom.de> (raw)
In-Reply-To: <20020221040542.GA6331@dman.com>
Clint Adams wrote:
> > The patch below looks stupid (and it may well be), but it's the easiest
> > I can think of. I think I better not commit this until I get replies.
> > (Most of it is re-indentation of that loop, there's just a tiny bit of
> > added code at the top.)
>
> This seems to work; I don't have any objection to its committal.
Nor have I. And since noone else complained I'm just going to commit
it.
Bye
Sven
Index: Src/loop.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/loop.c,v
retrieving revision 1.7
diff -u -r1.7 loop.c
--- Src/loop.c 23 Oct 2001 16:17:05 -0000 1.7
+++ Src/loop.c 25 Feb 2002 09:18:48 -0000
@@ -380,37 +380,53 @@
cmdpush(isuntil ? CS_UNTIL : CS_WHILE);
loops++;
loop = state->pc;
- for (;;) {
- state->pc = loop;
- noerrexit = 1;
- execlist(state, 1, 0);
- noerrexit = olderrexit;
- if (!((lastval == 0) ^ isuntil)) {
- if (breaks)
- breaks--;
- lastval = oldval;
- break;
- }
- if (retflag) {
- lastval = oldval;
- break;
- }
- execlist(state, 1, 0);
- if (breaks) {
- breaks--;
- if (breaks || !contflag)
- break;
- contflag = 0;
- }
- if (errflag) {
- lastval = 1;
- break;
- }
- if (retflag)
- break;
- freeheap();
- oldval = lastval;
- }
+
+ if (loop[0] == WC_END && loop[1] == WC_END) {
+
+ /* This is an empty loop. Make sure the signal handler sets the
+ * flags and then just wait for someone hitting ^C. */
+
+ int old_simple_pline = simple_pline;
+
+ simple_pline = 1;
+
+ while (!breaks)
+ ;
+ breaks--;
+
+ simple_pline = old_simple_pline;
+ } else
+ for (;;) {
+ state->pc = loop;
+ noerrexit = 1;
+ execlist(state, 1, 0);
+ noerrexit = olderrexit;
+ if (!((lastval == 0) ^ isuntil)) {
+ if (breaks)
+ breaks--;
+ lastval = oldval;
+ break;
+ }
+ if (retflag) {
+ lastval = oldval;
+ break;
+ }
+ execlist(state, 1, 0);
+ if (breaks) {
+ breaks--;
+ if (breaks || !contflag)
+ break;
+ contflag = 0;
+ }
+ if (errflag) {
+ lastval = 1;
+ break;
+ }
+ if (retflag)
+ break;
+ freeheap();
+ oldval = lastval;
+ }
cmdpop();
popheap();
loops--;
--
Sven Wischnowsky wischnow@berkom.de
prev parent reply other threads:[~2002-02-25 9:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2001-08-03 14:54 Clint Adams
2001-08-07 13:55 ` Sven Wischnowsky
2002-02-21 4:05 ` Clint Adams
2002-02-25 9:18 ` Sven Wischnowsky [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=15482.373.362707.374283@wischnow.berkom.de \
--to=wischnow@berkom.de \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).