cadey
/
elemental-ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Branch merge.

This commit is contained in:
Valeriy Yatsko 2008-12-03 02:59:26 +03:00
parent 2cf629d9b5 3b0f3294cf
commit 4e2fdb1f81
4 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/modules.h
View File

@ -116,7 +116,6 @@ extern int unload_one_module(const char *, int);
extern int load_one_module(const char *, int); extern int load_one_module(const char *, int);
extern int load_a_module(const char *, int, int); extern int load_a_module(const char *, int, int);
extern int findmodule_byname(const char *); extern int findmodule_byname(const char *);
extern char *irc_basename(const char *);
extern void modules_init(void); extern void modules_init(void);
#endif /* INCLUDED_modules_h */ #endif /* INCLUDED_modules_h */

2
src/ircd_parser.y
View File

@ -296,7 +296,7 @@ loadmodule:
#ifndef STATIC_MODULES #ifndef STATIC_MODULES
char *m_bn; char *m_bn;
m_bn = irc_basename((char *) $2); m_bn = rb_basename((char *) $2);
if (findmodule_byname(m_bn) == -1) if (findmodule_byname(m_bn) == -1)
load_one_module($2, 0); load_one_module($2, 0);

29
src/modules.c
View File

@ -189,27 +189,6 @@ mod_clear_paths(void)
mod_paths.length = 0; mod_paths.length = 0;
} }
/* irc_basename
*
* input -
* output -
* side effects -
*/
char *
irc_basename(const char *path)
{
char *mod_basename = rb_malloc(strlen(path) + 1);
const char *s;
if(!(s = strrchr(path, '/')))
s = path;
else
s++;
(void) strcpy(mod_basename, s);
return mod_basename;
}
/* findmodule_byname /* findmodule_byname
* *
* input - * input -
@ -357,7 +336,7 @@ mo_modload(struct Client *client_p, struct Client *source_p, int parc, const cha
return 0; return 0;
} }
m_bn = irc_basename(parv[1]); m_bn = rb_basename(parv[1]);
if(findmodule_byname(m_bn) != -1) if(findmodule_byname(m_bn) != -1)
{ {
@ -388,7 +367,7 @@ mo_modunload(struct Client *client_p, struct Client *source_p, int parc, const c
return 0; return 0;
} }
m_bn = irc_basename(parv[1]); m_bn = rb_basename(parv[1]);
if((modindex = findmodule_byname(m_bn)) == -1) if((modindex = findmodule_byname(m_bn)) == -1)
{ {
@ -428,7 +407,7 @@ mo_modreload(struct Client *client_p, struct Client *source_p, int parc, const c
return 0; return 0;
} }
m_bn = irc_basename(parv[1]); m_bn = rb_basename(parv[1]);
if((modindex = findmodule_byname(m_bn)) == -1) if((modindex = findmodule_byname(m_bn)) == -1)
{ {
@ -793,7 +772,7 @@ load_a_module(const char *path, int warn, int core)
int *mapi_version; int *mapi_version;
mod_basename = irc_basename(path); mod_basename = rb_basename(path);
#ifdef CHARYBDIS_PROFILE #ifdef CHARYBDIS_PROFILE
tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_PROFILE); tmpptr = dlopen(path, RTLD_NOW | RTLD_LOCAL | RTLD_PROFILE);

2
src/newconf.c
View File

@ -263,7 +263,7 @@ conf_set_modules_module(void *data)
#ifndef STATIC_MODULES #ifndef STATIC_MODULES
char *m_bn; char *m_bn;
m_bn = irc_basename((char *) data); m_bn = rb_basename((char *) data);
if(findmodule_byname(m_bn) != -1) if(findmodule_byname(m_bn) != -1)
return; return;