BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ash: fix display of ">&-" redirect in job strings 

function                                             old     new   delta
cmdtxt                                               558     569     +11

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
1_28_stable
Denys Vlasenko 2017-07-31 14:32:18 +02:00
parent 75481d3634
commit d0fff9155b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shell/ash.c
View File

@ -4642,6 +4642,10 @@ cmdputs(const char *s)
/* These can only happen inside quotes */ /* These can only happen inside quotes */
cc[0] = c; cc[0] = c;
str = cc; str = cc;
//FIXME:
// $ true $$ &
// $ <cr>
// [1]+ Done true ${\$} <<=== BUG: ${\$} is not a valid way to write $$ (${$} would be ok)
c = '\\'; c = '\\';
break; break;
default: default:
@ -4823,7 +4827,10 @@ cmdtxt(union node *n)
cmdputs(utoa(n->nfile.fd)); cmdputs(utoa(n->nfile.fd));
cmdputs(p); cmdputs(p);
if (n->type == NTOFD || n->type == NFROMFD) { if (n->type == NTOFD || n->type == NFROMFD) {
if (n->ndup.dupfd >= 0)
cmdputs(utoa(n->ndup.dupfd)); cmdputs(utoa(n->ndup.dupfd));
else
cmdputs("-");
break; break;
} }
n = n->nfile.fname; n = n->nfile.fname;