diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/list.c | 10 | ||||
| -rw-r--r-- | src/log.c | 9 | ||||
| -rw-r--r-- | src/main.c | 8 | ||||
| -rw-r--r-- | src/modules.c | 104 |
4 files changed, 117 insertions, 14 deletions
diff --git a/src/list.c b/src/list.c index 3bb9be8fa..17bbaf74c 100644 --- a/src/list.c +++ b/src/list.c @@ -83,10 +83,13 @@ are given, detailed information about those nicks is displayed.\n\ if (chdir(services_dir) < 0) { fprintf(stderr, "chdir(%s): %s\n", services_dir, strerror(errno)); + ModuleRunTimeDirCleanUp(); exit(1); } - if (!read_config(0)) + if (!read_config(0)) { + ModuleRunTimeDirCleanUp(); exit(1); + } load_ns_dbase(); lang_init(); @@ -169,10 +172,13 @@ are given, detailed information about those channels is displayed.\n\ if (chdir(services_dir) < 0) { fprintf(stderr, "chdir(%s): %s\n", services_dir, strerror(errno)); + ModuleRunTimeDirCleanUp(); exit(1); } - if (!read_config(0)) + if (!read_config(0)) { + ModuleRunTimeDirCleanUp(); exit(1); + } load_ns_dbase(); load_cs_dbase(); @@ -247,6 +247,9 @@ void fatal(const char *fmt, ...) if (servsock >= 0) anope_cmd_global(NULL, "FATAL ERROR! %s", buf2); + /* one of the many places this needs to be called from */ + ModuleRunTimeDirCleanUp(); + exit(1); } @@ -283,6 +286,9 @@ void fatal_perror(const char *fmt, ...) anope_cmd_global(NULL, "FATAL ERROR! %s: %s", buf2, strerror(errno_save)); + /* one of the many places this needs to be called from */ + ModuleRunTimeDirCleanUp(); + exit(1); } @@ -323,5 +329,8 @@ void fatal_sockerror(const char *fmt, ...) anope_cmd_global(NULL, "FATAL ERROR! %s: %s", buf2, strerror(errno_save)); + /* one of the many places this needs to be called from */ + ModuleRunTimeDirCleanUp(); + exit(1); } diff --git a/src/main.c b/src/main.c index 081b6ad00..ff0af6a01 100644 --- a/src/main.c +++ b/src/main.c @@ -309,6 +309,8 @@ static void services_shutdown(void) /* First don't unload protocol module, then do so */ modules_unload_all(true, false); modules_unload_all(true, true); + /* just in case they weren't all removed at least run once */ + ModuleRunTimeDirCleanUp(); } /*************************************************************************/ @@ -567,6 +569,9 @@ int main(int ac, char **av, char **envp) #endif { do_listnicks(ac, av); + modules_unload_all(1, 0); + modules_unload_all(1, 1); + ModuleRunTimeDirCleanUp(); return 0; } #ifdef _WIN32 @@ -576,6 +581,9 @@ int main(int ac, char **av, char **envp) #endif { do_listchans(ac, av); + modules_unload_all(1, 0); + modules_unload_all(1, 1); + ModuleRunTimeDirCleanUp(); return 0; } diff --git a/src/modules.c b/src/modules.c index bdeb179f3..5843168e7 100644 --- a/src/modules.c +++ b/src/modules.c @@ -626,20 +626,20 @@ int loadModule(Module * m, User * u) return MOD_ERR_NOLOAD; } if (func) { - version = (int (*)())ano_modsym(m->handle,"getAnopeBuildVersion");
- if (version) {
- if (version() >= VERSION_BUILD ) {
- if(debug) {
- alog("Module %s compiled against current or newer anope revision %d, this is %d",m->name,version(),VERSION_BUILD);
- }
- } else {
+ version = (int (*)())ano_modsym(m->handle,"getAnopeBuildVersion"); + if (version) { + if (version() >= VERSION_BUILD ) { + if(debug) { + alog("Module %s compiled against current or newer anope revision %d, this is %d",m->name,version(),VERSION_BUILD); + } + } else { alog("Module %s is compiled against an old version of anope (%d) current is %d", m->name, version(), VERSION_BUILD); alog("Rebuild module %s against the current version to resolve this error", m->name); - ano_modclose(m->handle);
- ano_modclearerr();
- return MOD_ERR_NOLOAD;
- }
- } else {
+ ano_modclose(m->handle); + ano_modclearerr(); + return MOD_ERR_NOLOAD; + } + } else { ano_modclose(m->handle); ano_modclearerr(); alog("Module %s is compiled against an older version of anope (unknown)", m->name); @@ -2788,4 +2788,84 @@ void handleModuleOperationQueue(void) mod_current_user = NULL; } +void ModuleRunTimeDirCleanUp(void) +{ +#ifndef _WIN32 + DIR *dirp; + struct dirent *dp; +#else + BOOL fFinished; + HANDLE hList; + TCHAR szDir[MAX_PATH + 1]; + TCHAR szSubDir[MAX_PATH + 1]; + WIN32_FIND_DATA FileData; + char buffer[_MAX_PATH]; +#endif + char dirbuf[BUFSIZE]; + char filebuf[BUFSIZE]; + + +#ifndef _WIN32 + snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir); +#else + snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime"); +#endif + + if (debug) { + alog("debug: Cleaning out Module run time directory (%s) - this may take a moment please wait", dirbuf); + } + +#ifndef _WIN32 + if ((dirp = opendir(dirbuf)) == NULL) { + if (debug) { + alog("debug: cannot open directory (%s)", dirbuf); + } + return; + } + while ((dp = readdir(dirp)) != NULL) { + if (dp->d_ino == 0) { + continue; + } + if (!stricmp(dp->d_name, ".") || !stricmp(dp->d_name, "..")) { + continue; + } + snprintf(filebuf, BUFSIZE, "%s/%s", dirbuf, dp->d_name); + unlink(filebuf); + } + closedir(dirp); +#else + /* Get the current working directory: */ + if (_getcwd(buffer, _MAX_PATH) == NULL) { + if (debug) { + alog("debug: Unable to set Current working directory"); + } + } + snprintf(szDir, sizeof(szDir), "%s\\%s\\*", buffer, dirname); + + hList = FindFirstFile(szDir, &FileData); + if (hList != INVALID_HANDLE_VALUE) { + fFinished = FALSE; + while (!fFinished) { + if (!(FileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) { + snprintf(filebuf, BUFSIZE, "%s/%s", dirbuf, FileData.cFileName); + DeleteFile(filebuf); + } + if (!FindNextFile(hList, &FileData)) { + if (GetLastError() == ERROR_NO_MORE_FILES) { + fFinished = TRUE; + } + } + } + } else { + if (debug) { + alog("debug: Invalid File Handle. GetLastError reports %d\n", GetLastError()); + } + } + FindClose(hList); +#endif + if (debug) { + alog("debug: Module run time directory has been cleaned out"); + } +} + /* EOF */ |