X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/cc200171d7c40be3b204460f9c14d5d37e771866..016746cfc222a0df1fc8892e0930ab9c2790b69e:/src/modules.c diff --git a/src/modules.c b/src/modules.c index 78a795b..a8b84af 100644 --- a/src/modules.c +++ b/src/modules.c @@ -28,7 +28,7 @@ #include "modules.h" -#include "s_log.h" +#include "logger.h" #include "ircd.h" #include "client.h" #include "send.h" @@ -37,8 +37,7 @@ #include "numeric.h" #include "parse.h" #include "ircd_defs.h" -#include "irc_string.h" -#include "sprintf_irc.h" +#include "match.h" @@ -69,7 +68,6 @@ static const char *core_module_table[] = { "m_part", "m_quit", "m_server", - "m_sjoin", "m_squit", NULL }; @@ -164,7 +162,7 @@ mod_add_path(const char *path) if(mod_find_path(path)) return; - pathst = MyMalloc(sizeof(struct module_path)); + pathst = rb_malloc(sizeof(struct module_path)); strcpy(pathst->path, path); rb_dlinkAddAlloc(pathst, &mod_paths); @@ -183,8 +181,8 @@ mod_clear_paths(void) RB_DLINK_FOREACH_SAFE(ptr, next_ptr, mod_paths.head) { - MyFree(ptr->data); - free_rb_dlink_node(ptr); + rb_free(ptr->data); + rb_free_rb_dlink_node(ptr); } mod_paths.head = mod_paths.tail = NULL; @@ -200,7 +198,7 @@ mod_clear_paths(void) char * irc_basename(const char *path) { - char *mod_basename = MyMalloc(strlen(path) + 1); + char *mod_basename = rb_malloc(strlen(path) + 1); const char *s; if(!(s = strrchr(path, '/'))) @@ -248,7 +246,7 @@ load_all_modules(int warn) modules_init(); - modlist = (struct module **) MyMalloc(sizeof(struct module) * (MODS_INCREMENT)); + modlist = (struct module **) rb_malloc(sizeof(struct module) * (MODS_INCREMENT)); max_mods = MODS_INCREMENT; @@ -364,13 +362,13 @@ mo_modload(struct Client *client_p, struct Client *source_p, int parc, const cha if(findmodule_byname(m_bn) != -1) { sendto_one_notice(source_p, ":Module %s is already loaded", m_bn); - MyFree(m_bn); + rb_free(m_bn); return 0; } load_one_module(parv[1], 0); - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -395,14 +393,14 @@ mo_modunload(struct Client *client_p, struct Client *source_p, int parc, const c if((modindex = findmodule_byname(m_bn)) == -1) { sendto_one_notice(source_p, ":Module %s is not loaded", m_bn); - MyFree(m_bn); + rb_free(m_bn); return 0; } if(modlist[modindex]->core == 1) { sendto_one_notice(source_p, ":Module %s is a core module and may not be unloaded", m_bn); - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -411,7 +409,7 @@ mo_modunload(struct Client *client_p, struct Client *source_p, int parc, const c sendto_one_notice(source_p, ":Module %s is not loaded", m_bn); } - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -435,7 +433,7 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c if((modindex = findmodule_byname(m_bn)) == -1) { sendto_one_notice(source_p, ":Module %s is not loaded", m_bn); - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -444,7 +442,7 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c if(unload_one_module(m_bn, 1) == -1) { sendto_one_notice(source_p, ":Module %s is not loaded", m_bn); - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -456,7 +454,7 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c exit(0); } - MyFree(m_bn); + rb_free(m_bn); return 0; } @@ -757,7 +755,7 @@ unload_one_module(const char *name, int warn) dlclose(modlist[modindex]->address); - MyFree(modlist[modindex]->name); + rb_free(modlist[modindex]->name); memcpy(&modlist[modindex], &modlist[modindex + 1], sizeof(struct module) * ((num_mods - 1) - modindex)); @@ -806,7 +804,7 @@ load_a_module(const char *path, int warn, int core) sendto_realops_snomask(SNO_GENERAL, L_ALL, "Error loading module %s: %s", mod_basename, err); ilog(L_MAIN, "Error loading module %s: %s", mod_basename, err); - MyFree(mod_basename); + rb_free(mod_basename); return -1; } @@ -827,7 +825,7 @@ load_a_module(const char *path, int warn, int core) mod_basename); ilog(L_MAIN, "Data format error: module %s has no MAPI header.", mod_basename); (void) dlclose(tmpptr); - MyFree(mod_basename); + rb_free(mod_basename); return -1; } @@ -844,7 +842,7 @@ load_a_module(const char *path, int warn, int core) "Module %s indicated failure during load.", mod_basename); dlclose(tmpptr); - MyFree(mod_basename); + rb_free(mod_basename); return -1; } if(mheader->mapi_command_list) @@ -879,7 +877,7 @@ load_a_module(const char *path, int warn, int core) "Module %s has unknown/unsupported MAPI version %d.", mod_basename, *mapi_version); dlclose(tmpptr); - MyFree(mod_basename); + rb_free(mod_basename); return -1; } @@ -888,11 +886,11 @@ load_a_module(const char *path, int warn, int core) increase_modlist(); - modlist[num_mods] = MyMalloc(sizeof(struct module)); + modlist[num_mods] = rb_malloc(sizeof(struct module)); modlist[num_mods]->address = tmpptr; modlist[num_mods]->version = ver; modlist[num_mods]->core = core; - DupString(modlist[num_mods]->name, mod_basename); + modlist[num_mods]->name = rb_strdup(mod_basename); modlist[num_mods]->mapi_header = mapi_version; modlist[num_mods]->mapi_version = MAPI_VERSION(*mapi_version); num_mods++; @@ -906,7 +904,7 @@ load_a_module(const char *path, int warn, int core) ilog(L_MAIN, "Module %s [version: %s; MAPI version: %d] loaded at 0x%lx", mod_basename, ver, MAPI_VERSION(*mapi_version), (unsigned long) tmpptr); } - MyFree(mod_basename); + rb_free(mod_basename); return 0; } @@ -925,11 +923,11 @@ increase_modlist(void) if((num_mods + 1) < max_mods) return; - new_modlist = (struct module **) MyMalloc(sizeof(struct module) * + new_modlist = (struct module **) rb_malloc(sizeof(struct module) * (max_mods + MODS_INCREMENT)); memcpy((void *) new_modlist, (void *) modlist, sizeof(struct module) * num_mods); - MyFree(modlist); + rb_free(modlist); modlist = new_modlist; max_mods += MODS_INCREMENT; }