mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-30 07:10:58 +02:00
Code Releases Activity

40536: Prepend directory to $fpath.

Browse source 
Used if parent function is autoloaded by absolute path so
as to find functions in the same suite without shell code
modification.
This commit is contained in:
Peter Stephenson 2017-02-13 16:32:50 +00:00
parent 64c67581d2
commit f5272bccd8
3 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2017-02-13 Peter Stephenson <p.stephenson@samsung.com>
* Sebastian: 40536: Src/builtin.c, Src/zsh.h: prepend directory
of function autoload with absolute path to fpath if loading a
function by relative path.
2017-02-10 Oliver Kiddle <opk@zsh.org>
* 40512: Completion/Unix/Command/_entr: new entr completion

36
Src/builtin.c
View file

@ -3032,8 +3032,44 @@ add_autoload_function(Shfunc shf, char *funcname)
dircache_set(&shf->filename, NULL);
dircache_set(&shf->filename, dir);
shf->node.flags |= PM_LOADDIR;
shf->node.flags |= PM_ABSPATH_USED;
shfunctab->addnode(shfunctab, ztrdup(nam), shf);
} else {
Shfunc shf2;
Funcstack fs;
const char *calling_f = NULL;
char buf[PATH_MAX+1];
/* Find calling function */
for (fs = funcstack; fs; fs = fs->prev) {
if (fs->tp == FS_FUNC && fs->name && (!shf->node.nam || 0 != strcmp(fs->name,shf->node.nam))) {
calling_f = fs->name;
break;
}
}
/* Get its directory */
if (calling_f) {
/* Should contain load directory, and be loaded via absolute path */
if ((shf2 = (Shfunc) shfunctab->getnode2(shfunctab, calling_f))
&& (shf2->node.flags & PM_LOADDIR) && (shf2->node.flags & PM_ABSPATH_USED)
&& shf2->filename)
{
if (strlen(shf2->filename) + strlen(funcname) + 1 < PATH_MAX)
{
sprintf(buf, "%s/%s", shf2->filename, funcname);
/* Set containing directory if the function file
* exists (do normal FPATH processing otherwise) */
if (!access(buf, R_OK)) {
dircache_set(&shf->filename, NULL);
dircache_set(&shf->filename, shf2->filename);
shf->node.flags |= PM_LOADDIR;
shf->node.flags |= PM_ABSPATH_USED;
}
}
}
}
shfunctab->addnode(shfunctab, ztrdup(funcname), shf);
}
}

1
Src/zsh.h
View file

@ -1807,6 +1807,7 @@ struct tieddata {
#define PM_READONLY (1<<10) /* readonly */
#define PM_TAGGED (1<<11) /* tagged */
#define PM_EXPORTED (1<<12) /* exported */
#define PM_ABSPATH_USED (1<<12) /* (function): loaded using absolute path */
/* The following are the same since they *
* both represent -U option to typeset */