From: Sebastian Gniazdowski <psprint2@fastmail.com>
To: zsh-workers@zsh.org
Subject: [PATCH] Autoload and absolute paths.. Maybe after all
Date: Mon, 13 Feb 2017 03:56:28 -0800 [thread overview]
Message-ID: <1486986988.3279143.879221432.39EBDA40@webmail.messagingengine.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2907 bytes --]
Hello,
following doesn't work:
# mkdir ~/myfunctions
# mv /usr/local/share/zsh/5.3.1-dev-0/functions/calendar* ~/myfunctions
# autoload ~/myfunctions/calendar
# calendar
calendar:36: calendar_scandate: function definition file not found
called this a very big problem. Directory ~/myfunctions doesn't make
sense. Below is a patch that addresses this. Maybe the code looks good?
diff --git a/Src/builtin.c b/Src/builtin.c
index 394d206..16784d7 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -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);
}
}
diff --git a/Src/zsh.h b/Src/zsh.h
index c387414..f2c2790 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -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 */
--
Sebastian Gniazdowski
psprint2@fastmail.com
[-- Attachment #2: autoload_patch.diff --]
[-- Type: text/plain, Size: 2448 bytes --]
diff --git a/Src/builtin.c b/Src/builtin.c
index 394d206..16784d7 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -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);
}
}
diff --git a/Src/zsh.h b/Src/zsh.h
index c387414..f2c2790 100644
--- a/Src/zsh.h
+++ b/Src/zsh.h
@@ -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 */
next reply other threads:[~2017-02-13 11:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20170213115826epcas3p2b4e5f1c47646bcf67aeafef97d5d8acb@epcas3p2.samsung.com>
2017-02-13 11:56 ` Sebastian Gniazdowski [this message]
2017-02-13 15:19 ` Peter Stephenson
2017-02-13 16:00 ` Sebastian Gniazdowski
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=1486986988.3279143.879221432.39EBDA40@webmail.messagingengine.com \
--to=psprint2@fastmail.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).