d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quote -x tracing output so it is unambiguous.

Browse Source 
It is usually but not always suitable for re-input to the shell.

Approved by:	ed (mentor) (implicit)
This commit is contained in:
Jilles Tjoelker 2009-06-23 22:53:34 +00:00
parent 50c202c592
commit 689f1cbba5
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=194786
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/sh/eval.c
View File

@ -642,17 +642,32 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
/* Print the command if xflag is set. */
if (xflag) {
char sep = 0;
const char *p;
out2str(ps4val());
for (sp = varlist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
out2str(sp->text);
p = sp->text;
while (*p != '=' && *p != '\0')
out2c(*p++);
if (*p != '\0') {
out2c(*p++);
out2qstr(p);
}
sep = ' ';
}
for (sp = arglist.list ; sp ; sp = sp->next) {
if (sep != 0)
outc(' ', &errout);
out2str(sp->text);
/* Disambiguate command looking like assignment. */
if (sp == arglist.list &&
strchr(sp->text, '=') != NULL &&
strchr(sp->text, '\'') == NULL) {
out2c('\'');
out2str(sp->text);
out2c('\'');
} else
out2qstr(sp->text);
sep = ' ';
}
outc('\n', &errout);