pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-30 13:06:38 +02:00
Code Activity

BUILD : 1.7.19 (1289) BUGS : 768 NOTES : Fixed module runtime directory not always being cleaned up nicely

Browse Source 
git-svn-id: svn://svn.anope.org/anope/trunk@1289 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1007 5417fbe8-f217-4b02-8779-1006273d7864
This commit is contained in:
geniusdex geniusdex@31f1291d-b8d6-0310-a050-a5561fc1590b
2007-08-29 19:05:59 +00:00
parent 56800d4103
commit 3c1a2fbfca
8 changed files with 130 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Changes
+3
View File
@@ -31,6 +31,9 @@ Anope Version S V N
08/29 F OperServ SGLINE ADD now strips a trailing space from the mask. [#761]
08/29 F TS6 UID generation for all supported TS6 IRCDs. [#731]
Provided by Trystan <trystan@nomadirc.net> - 2007
08/29 F Module runtime directory not always properly cleaned up. [#768]
Provided by nenolod <nenolod@nenolod.net> - 2007
08/29 F TS6 UID generation for Charybdis. [#731]
include/extern.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "slist.h"
E void ModuleRunTimeDirCleanUp(void);
E char *uplink;
include/services.h
+4
View File
@@ -109,6 +109,10 @@
#endif
#endif
#ifndef _WIN32
#include <dirent.h>
#endif
#ifdef USE_RDB
# define MAX_SQL_BUF 4096
#endif
src/list.c
+8 -2
View File
@@ -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();
src/log.c
+9
View File
@@ -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);
}
src/main.c
+8
View File
@@ -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;
}
src/modules.c
+92 -12
View File
@@ -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 */
version.log
+5 -1
View File
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
VERSION_MINOR="7"
VERSION_PATCH="19"
VERSION_EXTRA="-svn"
VERSION_BUILD="1288"
VERSION_BUILD="1289"
# $Log$
#
# BUILD : 1.7.19 (1289)
# BUGS : 768
# NOTES : Fixed module runtime directory not always being cleaned up nicely
#
# BUILD : 1.7.19 (1288)
# BUGS : 761
# NOTES : Fixing up a comment from the last commit