mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-24 17:00:32 +02:00
Code Releases Activity

34851: fix thinko from 34093 that short-circuited some "whence -m" searches

Browse source
This commit is contained in:
Barton E. Schaefer 2015-04-06 10:26:57 -07:00
parent 1fa68938dc
commit d4f50f2d18
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2015-04-06 Barton E. Schaefer <schaefer@zsh.org>
* 34851: Src/builtin.c: fix thinko from 34093 that short-circuited
some "whence -m" searches
2015-04-03 Barton E. Schaefer <schaefer@zsh.org>
* 34837: Src/glob.c: avoid loss of original file path when applying

12
Src/builtin.c
View file

@ -3236,21 +3236,23 @@ bin_whence(char *nam, char **argv, Options ops, int func)
/* -p option is for path search only. *
* We're not using it, so search for ... */
informed = /* logical OR of what follows */
/* aliases ... */
informed +=
scanmatchtable(aliastab, pprog, 1, 0, DISABLED,
aliastab->printnode, printflags) ||
aliastab->printnode, printflags);
/* and reserved words ... */
informed +=
scanmatchtable(reswdtab, pprog, 1, 0, DISABLED,
reswdtab->printnode, printflags) ||
reswdtab->printnode, printflags);
/* and shell functions... */
informed +=
scanmatchtable(shfunctab, pprog, 1, 0, DISABLED,
shfunctab->printnode, printflags) ||
shfunctab->printnode, printflags);
/* and builtins. */
informed +=
scanmatchtable(builtintab, pprog, 1, 0, DISABLED,
builtintab->printnode, printflags);
}