Added charlcat which appends a single char to a char* string (range checked)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3416 e03df62e-2008-0410-955e-edbf42e46eb7

3 files changed, 30 insertions, 14 deletions

diff --git a/include/helperfuncs.h b/include/helperfuncs.h
index c5939f8ba..933aeaca1 100644
--- a/include/helperfuncs.h
+++ b/include/helperfuncs.h
@@ -87,4 +87,6 @@ std::string GetFullProgDir(char** argv, int argc);
 int InsertMode(std::string &output, const char* modes, unsigned short section);
 bool IsValidChannelName(const char *);
 
+inline int charlcat(char* x,char y,int z);
+
 #endif
diff --git a/src/cmd_who.cpp b/src/cmd_who.cpp
index ecb52ea29..624006758 100644
--- a/src/cmd_who.cpp
+++ b/src/cmd_who.cpp
@@ -84,11 +84,11 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
 						// Bug Fix #29
 						*tmp = 0;
 						if (*i->second->awaymsg) {
-							strlcat(tmp, "G", 9);
+							charlcat(tmp, 'G', 9);
 						} else {
-							strlcat(tmp, "H", 9);
+							charlcat(tmp, 'H', 9);
 						}
-						if (*i->second->oper) { strlcat(tmp, "*", 9); }
+						if (*i->second->oper) { charlcat(tmp, '*', 9); }
 						WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr ? Ptr->name : "*", i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
 						if (n_list++ > Config->MaxWhoResults)
 						{
@@ -121,11 +121,11 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
 						// Fix Bug #29 - Part 2..
 						*tmp = 0;
 						if (*i->second->awaymsg) {
-							strlcat(tmp, "G", 9);
+							charlcat(tmp, 'G', 9);
 						} else {
-							strlcat(tmp, "H", 9);
+							charlcat(tmp, 'H', 9);
 						}
-						if (*i->second->oper) { strlcat(tmp, "*", 9); }
+						if (*i->second->oper) { charlcat(tmp, '*', 9); }
 						strlcat(tmp, cmode(i->second, Ptr),5);
 						WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, Ptr->name, i->second->ident, i->second->dhost, i->second->server, i->second->nick, tmp, i->second->fullname);
                                                 n_list++;
@@ -152,11 +152,11 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
 				// Bug Fix #29 -- Part 29..
 				*tmp = 0;
 				if (*u->awaymsg) {
-					strlcat(tmp, "G" ,9);
+					charlcat(tmp, 'G' ,9);
 				} else {
-					strlcat(tmp, "H" ,9);
+					charlcat(tmp, 'H' ,9);
 				}
-				if (*u->oper) { strlcat(tmp, "*" ,9); }
+				if (*u->oper) { charlcat(tmp, '*' ,9); }
 				WriteServ(user->fd,"352 %s %s %s %s %s %s %s :0 %s",user->nick, u->chans.size() && u->chans[0].channel ? u->chans[0].channel->name
                                 : "*", u->ident, u->dhost, u->server, u->nick, tmp, u->fullname);
 			}
@@ -174,9 +174,9 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
 				userrec* oper = *i;
 				*tmp = 0;
 				if (*oper->awaymsg) {
-					strlcat(tmp, "G" ,9);
+					charlcat(tmp, 'G' ,9);
 				} else {
-					strlcat(tmp, "H" ,9);
+					charlcat(tmp, 'H' ,9);
 				}
                                 WriteServ(user->fd,"352 %s %s %s %s %s %s %s* :0 %s", user->nick, oper->chans.size() && oper->chans[0].channel ? oper->chans[0].channel->name 
 				: "*", oper->ident, oper->dhost, oper->server, oper->nick, tmp, oper->fullname);
@@ -187,4 +187,3 @@ void cmd_who::Handle (char **parameters, int pcnt, userrec *user)
 	}
 }
 
-
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index eed073a35..1ea214264 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -1175,7 +1175,7 @@ char* chanmodes(chanrec *chan, bool showkey)
                         std::string extparam = chan->GetModeParameter(chan->custom_modes[z]);
                         if (extparam != "")
                         {
-                                strlcat(sparam," ",MAXBUF);
+                                charlcat(sparam,' ',MAXBUF);
                                 strlcat(sparam,extparam.c_str(),MAXBUF);
                         }
                 }
@@ -1213,7 +1213,7 @@ void userlist(userrec *user,chanrec *c)
                 }
                 strlcat(list,cmode(otheruser,c),MAXBUF);
                 strlcat(list,otheruser->nick,MAXBUF);
-                strlcat(list," ",MAXBUF);
+                charlcat(list,' ',MAXBUF);
                 if (strlen(list)>(480-NICKMAX))
                 {
                         /* list overflowed into
@@ -1567,3 +1567,18 @@ bool IsValidChannelName(const char *chname)
 
 		return true;
 }
+
+inline int charlcat(char* x,char y,int z)
+{
+        char* x__n = x;
+        int v = 0;
+        while(*x__n++)
+                v++;
+        if (v < z - 1)
+        {
+                *--x__n = y;
+                *++x__n = 0;
+        }
+	return v;
+}
+