Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: Glitch with "eval" and "autoload"
On Sun, 24 Jan 2016 15:22:35 +0000
Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx> wrote:
> You shouldn't need to check the name, rather look for (fstpr->tp ==
> FS_FUNC). That ought to be fairly robust.
This is a little bit paranoid; the dupstring probably isn't needed
because we already take evasive action for cases like this, and I
don't know of a case where funcname will be NULL.
pws
diff --git a/Src/builtin.c b/Src/builtin.c
index 98ecb09..63f964d 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -3142,15 +3142,33 @@ bin_functions(char *name, char **argv, Options ops, int func)
queue_signals();
if (OPT_MINUS(ops,'X')) {
- if ((shf = (Shfunc) shfunctab->getnode(shfunctab, scriptname))) {
- DPUTS(!shf->funcdef,
- "BUG: Calling autoload from empty function");
+ Funcstack fs;
+ char *funcname = NULL;
+ for (fs = funcstack; fs; fs = fs->prev) {
+ if (fs->tp == FS_FUNC) {
+ /*
+ * dupstring here is paranoia but unlikely to be
+ * problematic
+ */
+ funcname = dupstring(fs->name);
+ break;
+ }
+ }
+ if (!funcname)
+ {
+ zerrnam(name, "bad autoload");
+ ret = 1;
} else {
- shf = (Shfunc) zshcalloc(sizeof *shf);
- shfunctab->addnode(shfunctab, ztrdup(scriptname), shf);
+ if ((shf = (Shfunc) shfunctab->getnode(shfunctab, funcname))) {
+ DPUTS(!shf->funcdef,
+ "BUG: Calling autoload from empty function");
+ } else {
+ shf = (Shfunc) zshcalloc(sizeof *shf);
+ shfunctab->addnode(shfunctab, ztrdup(funcname), shf);
+ }
+ shf->node.flags = on;
+ ret = eval_autoload(shf, funcname, ops, func);
}
- shf->node.flags = on;
- ret = eval_autoload(shf, scriptname, ops, func);
} else {
if (OPT_ISSET(ops,'U') && !OPT_ISSET(ops,'u'))
on &= ~PM_UNDEFINED;
diff --git a/Test/C04funcdef.ztst b/Test/C04funcdef.ztst
index 0951e2c..496577f 100644
--- a/Test/C04funcdef.ztst
+++ b/Test/C04funcdef.ztst
@@ -308,6 +308,19 @@
?(eval):6: command not found: firstfn1
?(eval):7: command not found: secondfn1
+ (
+ fpath=(.)
+ print "print oops was successfully autoloaded" >oops
+ oops() { eval autoload -X }
+ oops
+ which -x2 oops
+ )
+0:autoload containing eval
+>oops was successfully autoloaded
+>oops () {
+> print oops was successfully autoloaded
+>}
+
%clean
rm -f file.in file.out
Messages sorted by:
Reverse Date,
Date,
Thread,
Author