Re: 'whence' question

[Bart Schaefer <schaefer@xxxxxxxxxxxxxxxx>]

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