diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-01 15:06:25 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2002-08-01 15:06:25 +0000 |
| commit | 8e90d2018cc807e9381330783d923b4efaee9786 (patch) | |
| tree | 8a08f5cea02bb471095f5e5d605f705c37d68f6f /Src/exec.c | |
| parent | ef74d743a0b5446376de4e40583968696bb703b3 (diff) | |
| download | zsh-8e90d2018cc807e9381330783d923b4efaee9786.tar.gz zsh-8e90d2018cc807e9381330783d923b4efaee9786.tar.xz zsh-8e90d2018cc807e9381330783d923b4efaee9786.zip | |
Dan Nelson: 17492: Quote output from xtrace
Diffstat (limited to 'Src/exec.c')
| -rw-r--r-- | Src/exec.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Src/exec.c b/Src/exec.c index 04a141679..494c1c260 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -1278,7 +1278,7 @@ makecline(LinkList list) for (node = firstnode(list); node; incnode(node)) { *ptr++ = (char *)getdata(node); - zputs(getdata(node), xtrerr); + quotedzputs(getdata(node), xtrerr); if (nextnode(node)) fputc(' ', xtrerr); } @@ -1548,8 +1548,10 @@ addvars(Estate state, Wordcode pc, int export) untokenize(peekfirst(vl)); val = ztrdup(ugetnode(vl)); } - if (xtr) - fprintf(xtrerr, "%s ", val); + if (xtr) { + quotedzputs(val, xtrerr); + fputc(' ', xtrerr); + } if (export && !strchr(name, '[')) { if (export < 0 && isset(RESTRICTED) && (pm = (Param) paramtab->removenode(paramtab, name)) && @@ -1589,8 +1591,10 @@ addvars(Estate state, Wordcode pc, int export) *ptr = NULL; if (xtr) { fprintf(xtrerr, "( "); - for (ptr = arr; *ptr; ptr++) - fprintf(xtrerr, "%s ", *ptr); + for (ptr = arr; *ptr; ptr++) { + quotedzputs(*ptr, xtrerr); + fputc(' ', xtrerr); + } fprintf(xtrerr, ") "); } assignaparam(name, arr, WC_ASSIGN_TYPE2(ac) == WC_ASSIGN_INC); @@ -3207,7 +3211,7 @@ execshfunc(Shfunc shf, LinkList args) for (lptr = firstnode(args); lptr; incnode(lptr)) { if (lptr != firstnode(args)) fputc(' ', xtrerr); - fprintf(xtrerr, "%s", (char *)getdata(lptr)); + quotedzputs((char *)getdata(lptr), xtrerr); } fputc('\n', xtrerr); fflush(xtrerr); |