#include "stdinc.h"
#include "ircd_defs.h"
-#include "common.h"
#include "s_conf.h"
#include "client.h"
#include "hash.h"
rb_dlink_list links_cache_list;
char user_motd_changed[MAX_DATE_STRING];
-struct Dictionary *help_dict_oper = NULL;
-struct Dictionary *help_dict_user = NULL;
+rb_dictionary *help_dict_oper = NULL;
+rb_dictionary *help_dict_user = NULL;
/* init_cache()
*
user_motd_changed[0] = '\0';
- user_motd = cache_file(MPATH, "ircd.motd", 0);
- oper_motd = cache_file(OPATH, "opers.motd", 0);
+ user_motd = cache_file(ircd_paths[IRCD_PATH_IRCD_MOTD], "ircd.motd", 0);
+ oper_motd = cache_file(ircd_paths[IRCD_PATH_IRCD_OMOTD], "opers.motd", 0);
memset(&links_cache_list, 0, sizeof(links_cache_list));
- help_dict_oper = rb_dictionary_create("oper help", strcasecmp);
- help_dict_user = rb_dictionary_create("user help", strcasecmp);
+ help_dict_oper = rb_dictionary_create("oper help", rb_strcasecmp);
+ help_dict_user = rb_dictionary_create("user help", rb_strcasecmp);
}
/*
rb_free(line->data);
rb_free(line);
}
+ else
+ {
+ rb_free_rb_dlink_node(ptr);
+ }
}
rb_free(cacheptr);
struct dirent *ldirent= NULL;
char filename[PATH_MAX];
struct cachefile *cacheptr;
- struct DictionaryIter iter;
+ rb_dictionary_iter iter;
#if defined(S_ISLNK) && defined(HAVE_LSTAT)
struct stat sb;
#endif
- DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper)
+ RB_DICTIONARY_FOREACH(cacheptr, &iter, help_dict_oper)
{
rb_dictionary_delete(help_dict_oper, cacheptr->name);
free_cachefile(cacheptr);
}
- DICTIONARY_FOREACH(cacheptr, &iter, help_dict_user)
+ RB_DICTIONARY_FOREACH(cacheptr, &iter, help_dict_user)
{
rb_dictionary_delete(help_dict_user, cacheptr->name);
free_cachefile(cacheptr);
}
- helpfile_dir = opendir(HPATH);
+ helpfile_dir = opendir(ircd_paths[IRCD_PATH_OPERHELP]);
if(helpfile_dir == NULL)
return;
{
if(ldirent->d_name[0] == '.')
continue;
- snprintf(filename, sizeof(filename), "%s/%s", HPATH, ldirent->d_name);
+ snprintf(filename, sizeof(filename), "%s/%s", ircd_paths[IRCD_PATH_OPERHELP], ldirent->d_name);
cacheptr = cache_file(filename, ldirent->d_name, HELP_OPER);
rb_dictionary_add(help_dict_oper, cacheptr->name, cacheptr);
}
closedir(helpfile_dir);
- helpfile_dir = opendir(UHPATH);
+ helpfile_dir = opendir(ircd_paths[IRCD_PATH_USERHELP]);
if(helpfile_dir == NULL)
return;
{
if(ldirent->d_name[0] == '.')
continue;
- snprintf(filename, sizeof(filename), "%s/%s", UHPATH, ldirent->d_name);
+ snprintf(filename, sizeof(filename), "%s/%s", ircd_paths[IRCD_PATH_USERHELP], ldirent->d_name);
#if defined(S_ISLNK) && defined(HAVE_LSTAT)
if(lstat(filename, &sb) < 0)
struct stat sb;
struct tm *local_tm;
- if(stat(MPATH, &sb) == 0)
+ if(stat(ircd_paths[IRCD_PATH_IRCD_MOTD], &sb) == 0)
{
local_tm = localtime(&sb.st_mtime);
}
}
free_cachefile(user_motd);
- user_motd = cache_file(MPATH, "ircd.motd", 0);
+ user_motd = cache_file(ircd_paths[IRCD_PATH_IRCD_MOTD], "ircd.motd", 0);
}