#include "parse.h"
#include "ircd_defs.h"
#include "irc_string.h"
-#include "memory.h"
-#include "tools.h"
#include "sprintf_irc.h"
int num_mods = 0;
int max_mods = MODS_INCREMENT;
-static dlink_list mod_paths;
+static rb_dlink_list mod_paths;
static int mo_modload(struct Client *, struct Client *, int, const char **);
static int mo_modlist(struct Client *, struct Client *, int, const char **);
static struct module_path *
mod_find_path(const char *path)
{
- dlink_node *ptr;
+ rb_dlink_node *ptr;
struct module_path *mpath;
- DLINK_FOREACH(ptr, mod_paths.head)
+ RB_DLINK_FOREACH(ptr, mod_paths.head)
{
mpath = ptr->data;
pathst = MyMalloc(sizeof(struct module_path));
strcpy(pathst->path, path);
- dlinkAddAlloc(pathst, &mod_paths);
+ rb_dlinkAddAlloc(pathst, &mod_paths);
}
/* mod_clear_paths()
void
mod_clear_paths(void)
{
- dlink_node *ptr, *next_ptr;
+ rb_dlink_node *ptr, *rb_free(;
- DLINK_FOREACH_SAFE(ptr, next_ptr, mod_paths.head)
+ RB_DLINK_FOREACH_SAFE(ptr, rb_free(, mod_paths.head)
{
MyFree(ptr->data);
- free_dlink_node(ptr);
+ free_rb_dlink_node(ptr);
}
mod_paths.head = mod_paths.tail = NULL;
len = strlen(ldirent->d_name);
if((len > 3) && !strcmp(ldirent->d_name+len-3, SHARED_SUFFIX))
{
- (void) ircsnprintf(module_fq_name, sizeof(module_fq_name), "%s/%s", AUTOMODPATH, ldirent->d_name);
+ (void) rb_snprintf(module_fq_name, sizeof(module_fq_name), "%s/%s", AUTOMODPATH, ldirent->d_name);
(void) load_a_module(module_fq_name, warn, 0);
}
for (i = 0; core_module_table[i]; i++)
{
- ircsnprintf(module_name, sizeof(module_name), "%s/%s%s", MODPATH,
+ rb_snprintf(module_name, sizeof(module_name), "%s/%s%s", MODPATH,
core_module_table[i], SHARED_SUFFIX);
if(load_a_module(module_name, warn, 1) == -1)
load_one_module(const char *path, int coremodule)
{
char modpath[MAXPATHLEN];
- dlink_node *pathst;
+ rb_dlink_node *pathst;
struct module_path *mpath;
struct stat statbuf;
if (server_state_foreground == 1)
inotice("loading module %s ...", path);
- DLINK_FOREACH(pathst, mod_paths.head)
+ RB_DLINK_FOREACH(pathst, mod_paths.head)
{
mpath = pathst->data;
- ircsnprintf(modpath, sizeof(modpath), "%s/%s", mpath->path, path);
+ rb_snprintf(modpath, sizeof(modpath), "%s/%s", mpath->path, path);
if((strstr(modpath, "../") == NULL) && (strstr(modpath, "/..") == NULL))
{
if(stat(modpath, &statbuf) == 0)