diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2003-02-17 11:41:58 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-02-17 11:41:58 +0000 |
| commit | 40c29457f285deaba4959dd23d5f2dd859ddb956 (patch) | |
| tree | eef78ccf4dd50dd9ef37a4a8764e01ebfd9733ce | |
| parent | 18249: new completion function for user mode linux (diff) | |
| download | zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar.gz zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar.bz2 zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar.lz zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar.xz zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.tar.zst zsh-40c29457f285deaba4959dd23d5f2dd859ddb956.zip | |
18251: Fix select and make it respect EOF
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Src/loop.c | 4 | ||||
| -rw-r--r-- | Src/parse.c | 10 |
3 files changed, 15 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2003-02-17 Peter Stephenson <pws@csr.com> + + * 18251: Src/parse.c, Src/loop.c: 15030 broke `select' a year + and a half ago and no-one noticed till now; also make `select' + return on an EOF without complaining. + 2003-02-17 Oliver Kiddle <opk@zsh.org> * 18249: Completion/Linux/Command/_uml: new completion function diff --git a/Src/loop.c b/Src/loop.c index 4da5a50f0..ebb07445b 100644 --- a/Src/loop.c +++ b/Src/loop.c @@ -202,7 +202,7 @@ execselect(Estate state, int do_exec) wordcode code = state->pc[-1]; char *str, *s, *name; LinkNode n; - int i, usezle; + int i, usezle, oignoreeof = opts[IGNOREEOF]; FILE *inp; size_t more; LinkList args; @@ -238,6 +238,7 @@ execselect(Estate state, int do_exec) inp = fdopen(dup(usezle ? SHTTY : 0), "r"); more = selectlist(args, 0); loop = state->pc; + opts[IGNOREEOF] = 0; for (;;) { for (;;) { if (empty(bufstack)) { @@ -301,6 +302,7 @@ execselect(Estate state, int do_exec) fclose(inp); loops--; state->pc = end; + opts[IGNOREEOF] = oignoreeof; return lastval; } diff --git a/Src/parse.c b/Src/parse.c index a6c4cd10b..d7aaa9f63 100644 --- a/Src/parse.c +++ b/Src/parse.c |