X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_alias.cpp;h=e0e4e647797aba3e1d8f2b5902f8094fd342bb28;hb=bc344671460c1675fbc31504fd1ffc03ff58a135;hp=6ec6caf1039489d3d70741da2533569806049a69;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp index 6ec6caf10..e0e4e6477 100644 --- a/src/modules/m_alias.cpp +++ b/src/modules/m_alias.cpp @@ -74,8 +74,6 @@ class ModuleAlias : public Module : Module(Me) { ReadAliases(); - pars.resize(MAXPARAMETERS); - Me->Modules->Attach(I_OnPreCommand, this); Me->Modules->Attach(I_OnRehash, this); @@ -87,7 +85,7 @@ class ModuleAlias : public Module virtual Version GetVersion() { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version(1,2,0,1,VF_VENDOR,API_VERSION); } std::string GetVar(std::string varname, const std::string &original_line) @@ -126,7 +124,7 @@ class ModuleAlias : public Module } } - virtual int OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line) + virtual int OnPreCommand(const std::string &command, const std::vector ¶meters, User *user, bool validated, const std::string &original_line) { User *u = NULL; @@ -247,16 +245,15 @@ class ModuleAlias : public Module SearchAndReplace(newline, "\r", "$"); irc::tokenstream ss(newline); - const char* parv[MAXPARAMETERS]; - int x = 0; + pars.clear(); + std::string command, token; - while (ss.GetToken(pars[x]) && x < MAXPARAMETERS) + ss.GetToken(command); + while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS)) { - parv[x] = pars[x].c_str(); - x++; + pars.push_back(token); } - - ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user); + ServerInstance->Parser->CallHandler(command, pars, user); } virtual void OnRehash(User* user, const std::string ¶meter)