mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-04 10:41:11 +02:00
Code Releases Activity

40404: Only quote command in whence output with -v.

Browse source
This commit is contained in:
Peter Stephenson 2017-01-24 11:12:41 +00:00
parent c861b17bbf
commit 3e5badb0c9
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2017-01-24 Peter Stephenson <p.stephenson@samsung.com>
* 40404: Src/builtin.c: quoting of commands in whence should
only apply to whence -v.
2017-01-23 Peter Stephenson <p.stephenson@samsung.com>
* 40391: Completion/compinit, Doc/Zsh/builtins.yo,

12
Src/builtin.c
View file

@ -3774,9 +3774,11 @@ bin_whence(char *nam, char **argv, Options ops, int func)
if (wd) {
printf("%s: command\n", *argv);
} else {
if (v && !csh)
if (v && !csh) {
zputs(*argv, stdout), fputs(" is ", stdout);
quotedzputs(buf, stdout);
quotedzputs(buf, stdout);
} else
zputs(buf, stdout);
if (OPT_ISSET(ops,'s') || OPT_ISSET(ops, 'S'))
print_if_link(buf, OPT_ISSET(ops, 'S'));
fputc('\n', stdout);
@ -3806,9 +3808,11 @@ bin_whence(char *nam, char **argv, Options ops, int func)
if (wd) {
printf("%s: command\n", *argv);
} else {
if (v && !csh)
if (v && !csh) {
zputs(*argv, stdout), fputs(" is ", stdout);
quotedzputs(cnam, stdout);
quotedzputs(cnam, stdout);
} else
zputs(cnam, stdout);
if (OPT_ISSET(ops,'s') || OPT_ISSET(ops,'S'))
print_if_link(cnam, OPT_ISSET(ops,'S'));
fputc('\n', stdout);