Add configuration for building with Travis-CI.

[user/henk/code/inspircd.git] / src / helperfuncs.cpp

diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index 7058cf8d3673f258a4a9000292d4713a7f3c4e9f..439320c1e00d85334c29d3da845357b246d11cfa 100644 (file)
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -100,11 +100,6 @@ User* InspIRCd::FindNickOnly(const char* nick)
 }
 
 User *InspIRCd::FindUUID(const std::string &uid)
-{
-       return FindUUID(uid.c_str());
-}
-
-User *InspIRCd::FindUUID(const char *uid)
 {
        user_hash::iterator finduuid = this->Users->uuidlist->find(uid);
 
@@ -114,6 +109,11 @@ User *InspIRCd::FindUUID(const char *uid)
        return finduuid->second;
 }
 
+User *InspIRCd::FindUUID(const char *uid)
+{
+       return FindUUID(std::string(uid));
+}
+
 /* find a channel record by channel name and return a pointer to it */
 Channel* InspIRCd::FindChan(const char* chan)
 {
@@ -140,7 +140,7 @@ Channel* InspIRCd::FindChan(const std::string &chan)
 /* Send an error notice to all users, registered or not */
 void InspIRCd::SendError(const std::string &s)
 {
-       for (std::vector<LocalUser*>::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
+       for (LocalUserList::const_iterator i = this->Users->local_users.begin(); i != this->Users->local_users.end(); i++)
        {
                User* u = *i;
                if (u->registered == REG_ALL)
@@ -339,8 +339,8 @@ bool IsNickHandler::Call(const char* n, size_t max)
                return false;
        }
 
-       /* too long? or not -- pointer arithmetic rocks */
-       return (p < max);
+       /* too long? or not */
+       return (p <= max);
 }
 
 /* return true for good ident, false else */
@@ -495,7 +495,26 @@ bool InspIRCd::SilentULine(const std::string& sserver)
 
 std::string InspIRCd::TimeString(time_t curtime)
 {
-       return std::string(ctime(&curtime),24);
+#ifdef _WIN32
+       if (curtime < 0)
+               curtime = 0;
+#endif
+
+       struct tm* timeinfo = localtime(&curtime);
+       if (!timeinfo)
+       {
+               curtime = 0;
+               timeinfo = localtime(&curtime);
+       }
+
+       // If the calculated year exceeds four digits or is less than the year 1000,
+       // the behavior of asctime() is undefined
+       if (timeinfo->tm_year + 1900 > 9999)
+               timeinfo->tm_year = 9999 - 1900;
+       else if (timeinfo->tm_year + 1900 < 1000)
+               timeinfo->tm_year = 0;
+
+       return std::string(asctime(timeinfo),24);
 }
 
 // You should only pass a single character to this.