Re: 'whence' question

[Peter Stephenson <p.w.stephenson@ntlworld.com>]

On Thu, 6 Nov 2014 13:58:56 -0800
Bart Schaefer <schaefer@brasslantern.com> wrote:
> On Thu, Nov 6, 2014 at 1:10 PM, Peter Stephenson <
> p.w.stephenson@ntlworld.com> wrote:
> 
> >
> > Don't we want something like this?
> >
> 
> 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.

I hadn't worked out which additional options -m handled	as it's all
hidden in functions.

It's not worth factoring out the common code; it would need a whole heap
of options passing in, passing back a value ignored in one case,
passing in both a string and a pattern where only one is used each
time...  Unless someone else can see a neater way.  Anyway, I will
commit this and someone else can apply their elegant optimisations.

The results would look better with a bit more sorting, but that's a
separate issue.

pws

diff --git a/Src/builtin.c b/Src/builtin.c
index 5b711ed..dd22d09 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -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();
 	}