autogen.sh is not necessary at this time, and did not work anyway.

[irc/rqf/shadowircd.git] / src / modules.c

diff --git a/src/modules.c b/src/modules.c
index 02bbd575c14b0e02a4ffc9496b1974e022c1fc20..dd977e53c05c1438b031d4cce7ed331ba2f37b49 100644 (file)
--- 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);
@@ -179,39 +177,18 @@ mod_add_path(const char *path)
 void
 mod_clear_paths(void)
 {
-       rb_dlink_node *ptr, *rb_free(;
+       rb_dlink_node *ptr, *next_ptr;
 
-       RB_DLINK_FOREACH_SAFE(ptr, rb_free(, mod_paths.head)
+       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;
        mod_paths.length = 0;
 }
 
-/* irc_basename
- *
- * input       -
- * output      -
- * side effects -
- */
-char *
-irc_basename(const char *path)
-{
-       char *mod_basename = MyMalloc(strlen(path) + 1);
-       const char *s;
-
-       if(!(s = strrchr(path, '/')))
-               s = path;
-       else
-               s++;
-
-       (void) strcpy(mod_basename, s);
-       return mod_basename;
-}
-
 /* findmodule_byname
  *
  * input        -
@@ -248,7 +225,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;
 
@@ -359,18 +336,18 @@ mo_modload(struct Client *client_p, struct Client *source_p, int parc, const cha
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        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;
 }
@@ -390,19 +367,19 @@ mo_modunload(struct Client *client_p, struct Client *source_p, int parc, const c
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        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 +388,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;
 }
 
@@ -430,12 +407,12 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c
                return 0;
        }
 
-       m_bn = irc_basename(parv[1]);
+       m_bn = rb_basename(parv[1]);
 
        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 +421,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 +433,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;
 }
 
@@ -535,6 +512,10 @@ mo_modrestart(struct Client *client_p, struct Client *source_p, int parc, const
 #define RTLD_NOW RTLD_LAZY     /* openbsd deficiency */
 #endif
 
+#ifndef RTLD_LOCAL
+#define RTLD_LOCAL 0
+#endif
+
 #ifdef CHARYBDIS_PROFILE
 # ifndef RTLD_PROFILE
 #  warning libdl may not support profiling, sucks. :(
@@ -757,7 +738,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));
 
@@ -791,12 +772,12 @@ load_a_module(const char *path, int warn, int core)
 
        int *mapi_version;
 
-       mod_basename = irc_basename(path);
+       mod_basename = rb_basename(path);
 
 #ifdef CHARYBDIS_PROFILE
-       tmpptr = dlopen(path, RTLD_NOW | RTLD_PROFILE);
+       tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_PROFILE);
 #else
-       tmpptr = dlopen(path, RTLD_NOW);
+       tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL);
 #endif
 
        if(tmpptr == NULL)
@@ -806,7 +787,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 +808,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 +825,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 +860,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 +869,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 +887,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 +906,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;
 }