mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-11-27 15:01:00 +01:00
Code Releases Activity

zsh-workers/8766

Browse source
This commit is contained in:
Tanaka Akira 1999-11-24 10:44:00 +00:00
parent 832443b4b1
commit 4f0b974002
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Src/module.c
View file

@ -550,13 +550,16 @@ finish_module(Module m)
#endif /* !AIXDYNAMIC */ #endif /* !AIXDYNAMIC */
/**/ /**/
Module int
load_module(char const *name) load_module(char const *name)
{ {
Module m; Module m;
void *handle; void *handle;
LinkNode node, n; LinkNode node, n;
if (module_linked(name))
return 1;
if (!(node = find_module(name))) { if (!(node = find_module(name))) {
if (!(handle = do_load_module(name))) if (!(handle = do_load_module(name)))
return NULL; return NULL;
@ -576,36 +579,36 @@ load_module(char const *name)
return NULL; return NULL;
} }
m->flags &= ~MOD_SETUP; m->flags &= ~MOD_SETUP;
return m; return 1;
} }
m = (Module) getdata(node); m = (Module) getdata(node);
if (m->flags & MOD_SETUP) if (m->flags & MOD_SETUP)
return m; return 1;
if (m->flags & MOD_UNLOAD) if (m->flags & MOD_UNLOAD)
m->flags &= ~MOD_UNLOAD; m->flags &= ~MOD_UNLOAD;
else if (m->handle) else if (m->handle)
return m; return 1;
if (m->flags & MOD_BUSY) { if (m->flags & MOD_BUSY) {
zerr("circular dependencies for module %s", name, 0); zerr("circular dependencies for module %s", name, 0);
return NULL; return 0;
} }
m->flags |= MOD_BUSY; m->flags |= MOD_BUSY;
if (m->deps) if (m->deps)
for (n = firstnode(m->deps); n; incnode(n)) for (n = firstnode(m->deps); n; incnode(n))
if (!load_module((char *) getdata(n))) { if (!load_module((char *) getdata(n))) {
m->flags &= ~MOD_BUSY; m->flags &= ~MOD_BUSY;
return NULL; return 0;
} }
m->flags &= ~MOD_BUSY; m->flags &= ~MOD_BUSY;
if (!m->handle) { if (!m->handle) {
if (!(m->handle = do_load_module(name))) if (!(m->handle = do_load_module(name)))
return NULL; return 0;
m->flags |= MOD_SETUP; m->flags |= MOD_SETUP;
if (setup_module(m)) { if (setup_module(m)) {
finish_module(m->handle); finish_module(m->handle);
m->handle = NULL; m->handle = NULL;
m->flags &= ~MOD_SETUP; m->flags &= ~MOD_SETUP;
return NULL; return 0;
} }
} }
m->flags |= MOD_SETUP; m->flags |= MOD_SETUP;
@ -613,10 +616,10 @@ load_module(char const *name)
finish_module(m->handle); finish_module(m->handle);
m->handle = NULL; m->handle = NULL;
m->flags &= ~MOD_SETUP; m->flags &= ~MOD_SETUP;
return NULL; return 0;
} }
m->flags &= ~MOD_SETUP; m->flags &= ~MOD_SETUP;
return m; return 1;
} }
/* This ensures that the module with the name given as the second argument /* This ensures that the module with the name given as the second argument
@ -650,7 +653,7 @@ require_module(char *nam, char *module, int res, int test)
zwarnnam(nam, "%s: restricted", module, 0); zwarnnam(nam, "%s: restricted", module, 0);
return 0; return 0;
} else } else
return !!load_module(module); return load_module(module);
return 1; return 1;
} }