Re: "whence -v" and function file names

[Daniel Hahler <genml+zsh-workers@xxxxxxxxxx>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 25.04.2015 21:51, Bart Schaefer wrote:

> In workers/34903 I posted a patch to append the function filename (when
> useful) to the "whence -v" output for functions.  I temporized:
> 
>> I'm undecided about whether the file name should be output using
>> nicezputs().
> 
> I settled on using quotedzputs(), which will make the filename both human
> readable and copy-paste-able.
> 
> 
> diff --git a/Src/hashtable.c b/Src/hashtable.c
> index 7a43062..ab381cc 100644
> --- a/Src/hashtable.c
> +++ b/Src/hashtable.c
> @@ -910,7 +910,7 @@ printshfuncnode(HashNode hn, int printflags)
>  {
>      Shfunc f = (Shfunc) hn;
>      char *t = 0;
> - 
> +
>      if ((printflags & PRINT_NAMEONLY) ||
>  	((printflags & PRINT_WHENCE_SIMPLE) &&
>  	!(printflags & PRINT_WHENCE_FUNCDEF))) {
> @@ -922,8 +922,16 @@ printshfuncnode(HashNode hn, int printflags)
>      if ((printflags & (PRINT_WHENCE_VERBOSE|PRINT_WHENCE_WORD)) &&
>  	!(printflags & PRINT_WHENCE_FUNCDEF)) {
>  	nicezputs(f->node.nam, stdout);
> -	printf((printflags & PRINT_WHENCE_WORD) ? ": function\n" :
> -	       " is a shell function\n");
> +	printf((printflags & PRINT_WHENCE_WORD) ? ": function" :
> +	       (f->node.flags & PM_UNDEFINED) ?
> +	       " is an autoload shell function" :
> +	       " is a shell function");
> +	if (f->filename && (printflags & PRINT_WHENCE_VERBOSE) &&
> +	    strcmp(f->filename, f->node.nam) != 0) {
> +	    printf(" from ");
> +	    quotedzputs(f->filename, stdout);
> +	}
> +	putchar('\n');
>  	return;
>      }


This is a nice addition, but it does not seem to work with compdef functions:

% whence -v _git
_git is an autoload shell function
% git <tab>
% whence -v _git
_git is a shell function

It would be nice if it could provide the path, at least with the second call.


Regards,
Daniel.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iD8DBQFVWP+FfAK/hT/mPgARAkdFAJ0TOGJ94lvSqB8ZzjfLsEugtqqXVACg/D2d
XZXu7fvUteUHBjp9sjxtl6o=
=AWLV
-----END PGP SIGNATURE-----