diff options
| author | Simon Glass <sjg@chromium.org> | 2014-05-30 14:41:50 -0600 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-05 14:38:38 -0400 |
| commit | 587e1d43e786ad70ce52a47f74b98d785098e378 (patch) | |
| tree | 464469dd667ebe074cdff5fb323fdbf8b7a4b928 /common/cli_hush.c | |
| parent | c9bcb6f13d08caa1db13bb8067941340eb3546d8 (diff) | |
| download | blackbird-obmc-uboot-587e1d43e786ad70ce52a47f74b98d785098e378.tar.gz blackbird-obmc-uboot-587e1d43e786ad70ce52a47f74b98d785098e378.zip | |
Fix hush to give the correct return code for a simple command
When a simple command like 'false' is provided, hush should return the
result of that command. However, hush only does this if the
FLAG_EXIT_FROM_LOOP flag is provided. Without this flag, hush will
happily execute the empty string command immediate after 'false' and
then return a success code.
This behaviour does not seem very useful, and requiring the flag also
seems wrong, since it means that hush will execute only the first command
in a sequence.
Add a check for empty string and fall out of the loop in that case. That
at least fixes the simple command case. This is a change in behaviour but
it is unlikely that the old behaviour would be considered correct in any
case.
Reported-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cli_hush.c')
| -rw-r--r-- | common/cli_hush.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/cli_hush.c b/common/cli_hush.c index 0f069b010a..e0c436f1a7 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -3215,7 +3215,9 @@ static int parse_stream_outer(struct in_str *inp, int flag) free_pipe_list(ctx.list_head,0); } b_free(&temp); - } while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP)); /* loop on syntax errors, return on EOF */ + /* loop on syntax errors, return on EOF */ + } while (rcode != -1 && !(flag & FLAG_EXIT_FROM_LOOP) && + (inp->peek != static_peek || b_peek(inp))); #ifndef __U_BOOT__ return 0; #else |
