diff options
| author | Denys Vlasenko | 2021-06-15 18:12:13 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2021-06-15 18:14:27 +0200 |
| commit | 83a4967e50422867f340328d404994553e56b839 (patch) | |
| tree | 86252a41acc9884f7728e89fd09db2cd2965ca2a /shell | |
| parent | 1b7a9b68d0e9aa19147d7fda16eb9a6b54156985 (diff) | |
| download | busybox-83a4967e50422867f340328d404994553e56b839.zip busybox-83a4967e50422867f340328d404994553e56b839.tar.gz | |
hush: fix handling of "cmd && &"
function old new delta
done_pipe 213 231 +18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/shell/hush.c b/shell/hush.c index e271c04..e8d24d4 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -3696,9 +3696,10 @@ static void debug_print_tree(struct pipe *pi, int lvl) pin = 0; while (pi) { - fdprintf(2, "%*spipe %d %sres_word=%s followup=%d %s\n", + fdprintf(2, "%*spipe %d #cmds:%d %sres_word=%s followup=%d %s\n", lvl*2, "", pin, + pi->num_cmds, (IF_HAS_KEYWORDS(pi->pi_inverted ? "! " :) ""), RES[pi->res_word], pi->followup, PIPE[pi->followup] @@ -3841,6 +3842,9 @@ static void done_pipe(struct parse_context *ctx, pipe_style type) #endif /* Replace all pipes in ctx with one newly created */ ctx->list_head = ctx->pipe = pi; + /* for cases like "cmd && &", do not be tricked by last command + * being null - the entire {...} & is NOT null! */ + not_null = 1; } else { no_conv: ctx->pipe->followup = type; |