summaryrefslogtreecommitdiff
path: root/src/modules.c
diff options
context:
space:
mode:
authorrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-11-08 20:47:50 +0000
committerrob rob@31f1291d-b8d6-0310-a050-a5561fc1590b <rob rob@31f1291d-b8d6-0310-a050-a5561fc1590b@5417fbe8-f217-4b02-8779-1006273d7864>2005-11-08 20:47:50 +0000
commitfbf820b4e6e597502b71f6ada16e4e9b667d1030 (patch)
treeb8902a1b17d0281a3ef1446deb9afe9073474b0b /src/modules.c
parent2cfdc0869594a6e4f69b103cd321e52f24ad98ab (diff)
Remove tmp modules from the runtime folder when we can. Currently we cant remove them if we segfaulted, pretty much every other instance is now dealt with.
git-svn-id: svn://svn.anope.org/anope/trunk@936 31f1291d-b8d6-0310-a050-a5561fc1590b git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@670 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'src/modules.c')
-rw-r--r--src/modules.c40
1 files changed, 21 insertions, 19 deletions
diff --git a/src/modules.c b/src/modules.c
index 6825bb1db..8c37fb61c 100644
--- a/src/modules.c
+++ b/src/modules.c
@@ -207,36 +207,38 @@ void modules_delayed_init(void)
* And if that isn't enough discouragement, you'll wake up with your
* both legs broken tomorrow ;) -GD
*/
-void modules_unload_all(void)
+void modules_unload_all(boolean fini)
{
#ifdef USE_MODULES
int idx;
ModuleHash *mh, *next;
- void (*func) (void);
-
+ void (*func) (void);
+
for (idx = 0; idx < MAX_CMD_HASH; idx++) {
mh = MODULE_HASH[idx];
while (mh) {
next = mh->next;
-
- if (prepForUnload(mh->m) != MOD_ERR_OK) {
- mh = next;
+ if(fini) {
+ if (prepForUnload(mh->m) != MOD_ERR_OK) {
+ mh = next;
continue;
- }
+ }
- func = (void (*)(void))ano_modsym(mh->m->handle, "AnopeFini");
- if (func) {
- mod_current_module_name = mh->m->name;
- func(); /* exec AnopeFini */
- mod_current_module_name = NULL;
- }
-
- if ((ano_modclose(mh->m->handle)) != 0)
- alog(ano_moderr());
- else
- delModule(mh->m);
+ func = (void (*)(void))ano_modsym(mh->m->handle, "AnopeFini");
+ if (func) {
+ mod_current_module_name = mh->m->name;
+ func(); /* exec AnopeFini */
+ mod_current_module_name = NULL;
+ }
- mh = next;
+ if ((ano_modclose(mh->m->handle)) != 0)
+ alog(ano_moderr());
+ else
+ delModule(mh->m);
+ } else {
+ delModule(mh->m);
+ }
+ mh = next;
}
}
#endif