[git commit] hush: fix handling of "cmd && &"
Denys Vlasenko
vda.linux at googlemail.com
Tue Jun 15 16:14:27 UTC 2021
commit: https://git.busybox.net/busybox/commit/?id=83a4967e50422867f340328d404994553e56b839
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
done_pipe 213 231 +18
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
shell/hush.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/shell/hush.c b/shell/hush.c
index e271c04d6..e8d24d40b 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;
More information about the busybox-cvs
mailing list