From: Bart Schaefer <schaefer@brasslantern.com>
To: "Zsh Hackers' List" <zsh-workers@zsh.org>
Subject: Re: 'whence' question
Date: Sat, 08 Nov 2014 13:55:08 -0800 [thread overview]
Message-ID: <141108135508.ZM32372@torch.brasslantern.com> (raw)
In-Reply-To: <CAH+w=7ZwAdoO7XzU6_j60f9+i-ft5t-d2st98i-ew2fEmQxDzw@mail.gmail.com>
On Nov 6, 1:58pm, Bart Schaefer wrote:
}
} Yes, we want something LIKE that, but simply calling zputs() doesn't
} handle either the -v or the -s options, and it seems a shame to
} duplicate all that code from the existing "if (all)" loop later in the
} function.
This is what I was thinking when I asked about ${(k)commands[(I)pat]}.
I wish there were a better way to make fetchcmdnamnode a closure, but
what you C is what you get ...
diff --git a/Src/builtin.c b/Src/builtin.c
index 5b711ed..c2af51f 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -3154,6 +3154,15 @@ bin_unset(char *name, char **argv, Options ops, int func)
/* type, whence, which, command */
+static LinkList matchednodes;
+
+static void
+fetchcmdnamnode(HashNode hn, UNUSED(int printflags))
+{
+ Cmdnam cn = (Cmdnam) hn;
+ addlinknode(matchednodes, cn->node.nam);
+}
+
/**/
int
bin_whence(char *nam, char **argv, Options ops, int func)
@@ -3165,7 +3174,7 @@ bin_whence(char *nam, char **argv, Options ops, int func)
int aliasflags;
int csh, all, v, wd;
int informed;
- char *cnam;
+ char *cnam, **allmatched = 0;
/* Check some option information */
csh = OPT_ISSET(ops,'c');
@@ -3198,6 +3207,10 @@ bin_whence(char *nam, char **argv, Options ops, int func)
/* With -m option -- treat arguments as a glob patterns */
if (OPT_ISSET(ops,'m')) {
+ if (all) {
+ pushheap();
+ matchednodes = newlinklist();
+ }
for (; *argv; argv++) {
/* parse the pattern */
tokenize(*argv);
@@ -3232,11 +3245,17 @@ bin_whence(char *nam, char **argv, Options ops, int func)
* was not used. Now search the path. */
cmdnamtab->filltable(cmdnamtab);
scanmatchtable(cmdnamtab, pprog, 1, 0, 0,
- cmdnamtab->printnode, printflags);
+ (all ? fetchcmdnamnode : cmdnamtab->printnode),
+ printflags);
unqueue_signals();
}
- return returnval;
+ if (all) {
+ allmatched = argv = zlinklist2array(matchednodes);
+ matchednodes = NULL;
+ popheap();
+ } else
+ return returnval;
}
/* Take arguments literally -- do not glob */
@@ -3244,7 +3263,7 @@ bin_whence(char *nam, char **argv, Options ops, int func)
for (; *argv; argv++) {
informed = 0;
- if (!OPT_ISSET(ops,'p')) {
+ if (!OPT_ISSET(ops,'p') && !allmatched) {
char *suf;
/* Look for alias */
@@ -3344,6 +3363,9 @@ bin_whence(char *nam, char **argv, Options ops, int func)
returnval = 1;
}
}
+ if (allmatched)
+ freearray(allmatched);
+
unqueue_signals();
return returnval;
}
--
Barton E. Schaefer
next prev parent reply other threads:[~2014-11-08 21:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <545A6D66.3080500@eastlink.ca>
[not found] ` <1458.1415209763@thecus.kiddle.eu>
[not found] ` <20141105180035.22f6e9b1@pwslap01u.europe.root.pri>
[not found] ` <141105204330.ZM2973@torch.brasslantern.com>
2014-11-06 21:10 ` Peter Stephenson
2014-11-06 21:58 ` Bart Schaefer
2014-11-08 20:41 ` Peter Stephenson
2014-11-09 18:51 ` Bart Schaefer
2014-11-10 5:15 ` 'whence' question and others Ray Andrews
2014-11-10 8:20 ` Bart Schaefer
2014-11-10 8:23 ` Bart Schaefer
2014-11-10 16:57 ` Ray Andrews
2014-11-10 19:53 ` Vin Shelton
2014-11-11 16:52 ` 'whence' question Ray Andrews
2014-11-11 19:14 ` Bart Schaefer
2014-11-11 19:38 ` Bart Schaefer
2014-11-11 20:22 ` Ray Andrews
2014-11-11 18:16 ` Ray Andrews
2014-11-11 19:33 ` Bart Schaefer
2014-11-11 20:40 ` Ray Andrews
2014-11-08 21:55 ` Bart Schaefer [this message]
2014-11-10 10:04 ` Peter Stephenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=141108135508.ZM32372@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).