diff -r 71a284715890 -r 701dd0890b79 metamod/mutil.cpp --- a/metamod/mutil.cpp Mon Aug 08 20:08:37 2005 +0000 +++ b/metamod/mutil.cpp Mon Aug 08 20:16:12 2005 +0000 @@ -36,6 +36,7 @@ #include // vsnprintf(), etc #include // vs_start(), etc +#include // strtol() #include // always @@ -287,12 +288,17 @@ return(buf); } -int mutil_LoadMetaPlugin(plid_t plid, const char *cmdline, PLUG_LOADTIME now, void **plugin_handle) +int mutil_LoadMetaPlugin(plid_t plid, const char *fname, PLUG_LOADTIME now, void **plugin_handle) { MPlugin *pl_loaded; + if (NULL == fname) + { + return ME_ARGUMENT; + } + meta_errno = ME_NOERROR; - if (! (pl_loaded=Plugins->plugin_addload(plid, cmdline, now)) ) + if (! (pl_loaded=Plugins->plugin_addload(plid, fname, now)) ) { if (plugin_handle) *plugin_handle = NULL; @@ -304,14 +310,22 @@ } } -int mutil_UnloadMetaPlugin(plid_t plid, const char *cmdline, PLUG_LOADTIME now, PL_UNLOAD_REASON reason) +int mutil_UnloadMetaPlugin(plid_t plid, const char *fname, PLUG_LOADTIME now, PL_UNLOAD_REASON reason) { MPlugin *findp = NULL; + int pindex; + char* endptr; - if (isdigit(cmdline[0])) - findp = Plugins->find(atoi(cmdline)); + if (NULL == fname) + { + return ME_ARGUMENT; + } + + pindex = strtol(fname, &endptr, 10); + if (*fname != '\0' && *endptr == '\0') + findp = Plugins->find(pindex); else - findp = Plugins->find_match(cmdline); + findp = Plugins->find_match(fname); if (!findp) return (int)ME_NOTUNIQ; @@ -328,6 +342,11 @@ { MPlugin *findp; + if (NULL == plugin_handle) + { + return ME_ARGUMENT; + } + if (!(findp=Plugins->find((DLHANDLE)plugin_handle))) return (int)ME_NOTUNIQ;