* ---------------------------------------------------
*/
-/* $Core: libIRCDhelper */
+/* $Core */
#include "inspircd.h"
-#include "wildcard.h"
#include "xline.h"
#include "exitcodes.h"
{
if ((*i)->registered == REG_ALL)
{
- (*i)->WriteServ("NOTICE %s :%s",(*i)->nick,s.c_str());
+ (*i)->WriteServ("NOTICE %s :%s",(*i)->nick.c_str(),s.c_str());
}
else
{
}
/* true for valid channel name, false else */
-bool InspIRCd::IsChannel(const char *chname)
+bool IsChannelHandler::Call(const char *chname, size_t max)
{
- char *c;
+ const char *c = chname + 1;
/* check for no name - don't check for !*chname, as if it is empty, it won't be '#'! */
if (!chname || *chname != '#')
return false;
}
- c = (char *)chname + 1;
while (*c)
{
switch (*c)
c++;
}
-
+
+ size_t len = c - chname;
/* too long a name - note funky pointer arithmetic here. */
- if ((c - chname) > CHANMAX)
+ if (len > max)
{
return false;
}
}
/* true for valid nickname, false else */
-bool IsNickHandler::Call(const char* n)
+bool IsNickHandler::Call(const char* n, size_t max)
{
if (!n || !*n)
return false;
- int p = 0;
- for (char* i = (char*)n; *i; i++, p++)
+ unsigned int p = 0;
+ for (const char* i = n; *i; i++, p++)
{
if ((*i >= 'A') && (*i <= '}'))
{
}
/* too long? or not -- pointer arithmetic rocks */
- return (p < NICKMAX - 1);
+ return (p < max);
}
/* return true for good ident, false else */
if (!n || !*n)
return false;
- for (char* i = (char*)n; *i; i++)
+ for (const char* i = n; *i; i++)
{
if ((*i >= 'A') && (*i <= '}'))
{
return true;
}
-bool InspIRCd::IsSID(const std::string &str)
+bool IsSIDHandler::Call(const std::string &str)
{
/* Returns true if the string given is exactly 3 characters long,
* starts with a digit, and the other two characters are A-Z or digits
{
if (Config->logpath.empty())
{
- std::string path = std::string(home) + "/.inspircd";
- if (!mkdir(path.c_str(), 0700))
- {
- /* Log to ~/.inspircd/ircd.log */
- Config->logpath = path + "/startup.log";
- }
- else
- {
- /* Couldn't make ~/.inspircd directory, log to current dir */
- Config->logpath = "./startup.log";
- printf("\nWARNING: Unable to create directory: %s (%s)\n", path.c_str(), strerror(errno));
- }
+ Config->logpath = "./startup.log";
}
- Config->log_file = fopen(Config->logpath.c_str(),"a+");
+ if (!Config->log_file)
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
}
else
{
return std::string(ctime(&curtime),24);
}
+// You should only pass a single character to this.
+void InspIRCd::AddExtBanChar(char c)
+{
+ std::string &tok = Config->data005;
+ std::string::size_type ebpos;
+
+ if ((ebpos = tok.find(" EXTBAN=,")) == std::string::npos)
+ {
+ tok.append(" EXTBAN=,");
+ tok.push_back(c);
+ }
+ else
+ tok.insert(ebpos + 9, 1, c);
+}