Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-09-27 06:54:26 +00:00
Code Issues Projects Releases Wiki Activity

hush: fix "for a in; do echo 'I should never run'; done" bug

Browse Source
This commit is contained in:
Denis Vlasenko 2008-06-17 12:09:21 +00:00
parent b6926109b7
commit 6eaf8deddd
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
shell/hush.c
View File

@ -2004,7 +2004,7 @@ static int run_list(struct pipe *pi)
|| (rpipe->res_word == RES_FOR && rpipe->next->res_word != RES_IN) || (rpipe->res_word == RES_FOR && rpipe->next->res_word != RES_IN)
) { ) {
/* TODO: what is tested in the first condition? */ /* TODO: what is tested in the first condition? */
syntax("malformed for"); /* 2nd condition: not followed by IN */ syntax("malformed for"); /* 2nd condition: FOR not followed by IN */
debug_printf_exec("run_list lvl %d return 1\n", run_list_level); debug_printf_exec("run_list lvl %d return 1\n", run_list_level);
return 1; return 1;
} }
@ -2898,7 +2898,8 @@ static int done_word(o_string *word, struct p_context *ctx)
ctx->pending_redirect = NULL; ctx->pending_redirect = NULL;
} }
#if ENABLE_HUSH_LOOPS #if ENABLE_HUSH_LOOPS
if (ctx->res_w == RES_FOR) { /* comment? */ /* comment? is it forcing "for" to have just one word (variable name)? */
if (ctx->res_w == RES_FOR) {
//TESTING //TESTING
//looks like (word->length == 0 && !word->nonnull) is true here, always //looks like (word->length == 0 && !word->nonnull) is true here, always
//(due to o_reset). done_word would return at once. Why then? //(due to o_reset). done_word would return at once. Why then?
@ -2910,8 +2911,8 @@ static int done_word(o_string *word, struct p_context *ctx)
return 0; return 0;
} }
/* The only possible error here is out of memory, in which case /* Command (member of a pipe) is complete. The only possible error here
* xmalloc exits. */ * is out of memory, in which case xmalloc exits. */
static int done_command(struct p_context *ctx) static int done_command(struct p_context *ctx)
{ {
/* The child is really already in the pipe structure, so /* The child is really already in the pipe structure, so
@ -2949,7 +2950,6 @@ static int done_command(struct p_context *ctx)
static void done_pipe(struct p_context *ctx, pipe_style type) static void done_pipe(struct p_context *ctx, pipe_style type)
{ {
struct pipe *new_p;
int not_null; int not_null;
debug_printf_parse("done_pipe entered, followup %d\n", type); debug_printf_parse("done_pipe entered, followup %d\n", type);
@ -2960,9 +2960,11 @@ static void done_pipe(struct p_context *ctx, pipe_style type)
ctx->ctx_inverted = 0; ctx->ctx_inverted = 0;
/* Without this check, even just <enter> on command line generates /* Without this check, even just <enter> on command line generates
* tree of three NOPs (!). Which is harmless but annoying. * tree of three NOPs (!). Which is harmless but annoying.
* IOW: it is safe to do it unconditionally. */ * IOW: it is safe to do it unconditionally.
if (not_null) { * RES_IN case is for "for a in; do ..." (empty IN set)
new_p = new_pipe(); * to work. */
if (not_null || ctx->pipe->res_word == RES_IN) {
struct pipe *new_p = new_pipe();
ctx->pipe->next = new_p; ctx->pipe->next = new_p;
ctx->pipe = new_p; ctx->pipe = new_p;
ctx->child = NULL; /* needed! */ ctx->child = NULL; /* needed! */

0
shell/hush_test/hush-bugs/empty_for.right → shell/hush_test/hush-misc/empty_for.right
View File

0
shell/hush_test/hush-bugs/empty_for.tests → shell/hush_test/hush-misc/empty_for.tests
View File