mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-22 16:20:23 +02:00
Code Releases Activity

Handle -a option to whence in combination with -m.

Browse source
This commit is contained in:
Peter Stephenson 2014-11-08 20:49:07 +00:00
parent 63f3030aaa
commit 0ccbc3873f
2 changed files with 46 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2014-11-08 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 33653: Src/builtin.c: handle -a option to whence in
combination with -m.
2014-11-08 Barton E. Schaefer <schaefer@zsh.org>
* 33648: Completion/Unix/Command/_gpg: complete for gpg2 as well

46
Src/builtin.c
View file

@ -3228,11 +3228,47 @@ bin_whence(char *nam, char **argv, Options ops, int func)
scanmatchtable(builtintab, pprog, 1, 0, DISABLED,
builtintab->printnode, printflags);
}
/* Done search for `internal' commands, if the -p option *
* was not used. Now search the path. */
cmdnamtab->filltable(cmdnamtab);
scanmatchtable(cmdnamtab, pprog, 1, 0, 0,
cmdnamtab->printnode, printflags);
if (all) {
char **pp, *buf, *fn;
DIR *od;
pushheap();
for (pp = path; *pp; pp++) {
if (!**pp)
continue;
od = opendir(*pp);
if (!od)
continue;
while ((fn = zreaddir(od, 0))) {
if (!pattry(pprog, fn))
continue;
buf = zhtricat(*pp, "/", fn);
if (iscom(buf)) {
if (wd) {
printf("%s: command\n", fn);
} else {
if (v && !csh)
zputs(fn, stdout), fputs(" is ", stdout);
zputs(buf, stdout);
if (OPT_ISSET(ops,'s'))
print_if_link(buf);
fputc('\n', stdout);
}
}
}
closedir(od);
}
popheap();
} else {
/* Done search for `internal' commands, if the -p option *
* was not used. Now search the path. */
cmdnamtab->filltable(cmdnamtab);
scanmatchtable(cmdnamtab, pprog, 1, 0, 0,
cmdnamtab->printnode, printflags);
}
unqueue_signals();
}