1.1 --- a/metamod/mutil.cpp Mon Aug 08 20:08:37 2005 +0000
1.2 +++ b/metamod/mutil.cpp Mon Aug 08 20:16:12 2005 +0000
1.3 @@ -36,6 +36,7 @@
1.4
1.5 #include <stdio.h> // vsnprintf(), etc
1.6 #include <stdarg.h> // vs_start(), etc
1.7 +#include <stdlib.h> // strtol()
1.8
1.9 #include <extdll.h> // always
1.10
1.11 @@ -287,12 +288,17 @@
1.12 return(buf);
1.13 }
1.14
1.15 -int mutil_LoadMetaPlugin(plid_t plid, const char *cmdline, PLUG_LOADTIME now, void **plugin_handle)
1.16 +int mutil_LoadMetaPlugin(plid_t plid, const char *fname, PLUG_LOADTIME now, void **plugin_handle)
1.17 {
1.18 MPlugin *pl_loaded;
1.19
1.20 + if (NULL == fname)
1.21 + {
1.22 + return ME_ARGUMENT;
1.23 + }
1.24 +
1.25 meta_errno = ME_NOERROR;
1.26 - if (! (pl_loaded=Plugins->plugin_addload(plid, cmdline, now)) )
1.27 + if (! (pl_loaded=Plugins->plugin_addload(plid, fname, now)) )
1.28 {
1.29 if (plugin_handle)
1.30 *plugin_handle = NULL;
1.31 @@ -304,14 +310,22 @@
1.32 }
1.33 }
1.34
1.35 -int mutil_UnloadMetaPlugin(plid_t plid, const char *cmdline, PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
1.36 +int mutil_UnloadMetaPlugin(plid_t plid, const char *fname, PLUG_LOADTIME now, PL_UNLOAD_REASON reason)
1.37 {
1.38 MPlugin *findp = NULL;
1.39 + int pindex;
1.40 + char* endptr;
1.41
1.42 - if (isdigit(cmdline[0]))
1.43 - findp = Plugins->find(atoi(cmdline));
1.44 + if (NULL == fname)
1.45 + {
1.46 + return ME_ARGUMENT;
1.47 + }
1.48 +
1.49 + pindex = strtol(fname, &endptr, 10);
1.50 + if (*fname != '\0' && *endptr == '\0')
1.51 + findp = Plugins->find(pindex);
1.52 else
1.53 - findp = Plugins->find_match(cmdline);
1.54 + findp = Plugins->find_match(fname);
1.55
1.56 if (!findp)
1.57 return (int)ME_NOTUNIQ;
1.58 @@ -328,6 +342,11 @@
1.59 {
1.60 MPlugin *findp;
1.61
1.62 + if (NULL == plugin_handle)
1.63 + {
1.64 + return ME_ARGUMENT;
1.65 + }
1.66 +
1.67 if (!(findp=Plugins->find((DLHANDLE)plugin_handle)))
1.68 return (int)ME_NOTUNIQ;
1.69