From d0fff9155bc55d9576be4c6ba5f656f5b4856ac4 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 31 Jul 2017 14:32:18 +0200 Subject: [PATCH] ash: fix display of ">&-" redirect in job strings function old new delta cmdtxt 558 569 +11 Signed-off-by: Denys Vlasenko --- shell/ash.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/shell/ash.c b/shell/ash.c index 5c2e06599..9c61ce618 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -4642,6 +4642,10 @@ cmdputs(const char *s) /* These can only happen inside quotes */ cc[0] = c; str = cc; +//FIXME: +// $ true $$ & +// $ +// [1]+ Done true ${\$} <<=== BUG: ${\$} is not a valid way to write $$ (${$} would be ok) c = '\\'; break; default: @@ -4823,7 +4827,10 @@ cmdtxt(union node *n) cmdputs(utoa(n->nfile.fd)); cmdputs(p); if (n->type == NTOFD || n->type == NFROMFD) { - cmdputs(utoa(n->ndup.dupfd)); + if (n->ndup.dupfd >= 0) + cmdputs(utoa(n->ndup.dupfd)); + else + cmdputs("-"); break; } n = n->nfile.fname; -- 2.25.1