about summary refs log tree commit diff
path: root/Src/builtin.c
diff options
context:
space:
mode:
authorTanaka Akira <akr@users.sourceforge.net>1999-11-24 16:20:58 +0000
committerTanaka Akira <akr@users.sourceforge.net>1999-11-24 16:20:58 +0000
commitf8b0dee88051065d4667fe41dd1bc81905c2b07c (patch)
treed305a5589d775d1fa38f7486a2b58bfc567d9379 /Src/builtin.c
parentf853592fa0e6dc1246c8c23932bbd3265e537728 (diff)
downloadzsh-f8b0dee88051065d4667fe41dd1bc81905c2b07c.tar.gz
zsh-f8b0dee88051065d4667fe41dd1bc81905c2b07c.tar.xz
zsh-f8b0dee88051065d4667fe41dd1bc81905c2b07c.zip
zsh-workers/8770
Diffstat (limited to 'Src/builtin.c')
-rw-r--r--Src/builtin.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/Src/builtin.c b/Src/builtin.c
index 075a03b17..5d4b2be2c 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -123,12 +123,7 @@ static struct builtin builtins[] =
     BUILTIN("whence", 0, bin_whence, 0, -1, 0, "acmpvfsw", NULL),
     BUILTIN("where", 0, bin_whence, 0, -1, 0, "pmsw", "ca"),
     BUILTIN("which", 0, bin_whence, 0, -1, 0, "ampsw", "c"),
-
-#ifdef DYNAMIC
     BUILTIN("zmodload", 0, bin_zmodload, 0, -1, 0, "ILabcfdipue", NULL),
-#else
-    BUILTIN("zmodload", 0, bin_zmodload, 0, -1, 0, "ei", NULL),
-#endif
 };
 
 /****************************************/
@@ -229,14 +224,11 @@ execbuiltin(LinkList args, Builtin bn)
 
     arg = (char *) ugetnode(args);
 
-#ifdef DYNAMIC
     if (!bn->handlerfunc) {
 	zwarnnam(name, "autoload failed", NULL, 0);
 	deletebuiltin(bn->nam);
 	return 1;
     }
-#endif
-
     /* get some information about the command */
     flags = bn->flags;
     optstr = bn->optstr;
@@ -3209,6 +3201,8 @@ zexit(int val, int from_signal)
 	if (in_exit++ && from_signal) {
 	    LASTALLOC_RETURN;
 	}
+	exit_modules();
+
 	if (isset(MONITOR)) {
 	    /* send SIGHUP to any jobs left running  */
 	    killrunjobs(from_signal);