Remove the char junk here, use an std::string

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

diff --git a/src/cmd_userhost.cpp b/src/cmd_userhost.cpp
index 28bba1e7f5d31fc0332594cc18b83ac6aa4a31b1..363ba611cf833cea6017dc111f2280ac41702bc6 100644 (file)
--- a/src/cmd_userhost.cpp
+++ b/src/cmd_userhost.cpp
@@ -24,29 +24,40 @@ extern "C" command_t* init_command(InspIRCd* Instance)
 
 CmdResult cmd_userhost::Handle (const char** parameters, int pcnt, userrec *user)
 {
-       char Return[MAXBUF],junk[MAXBUF];
-       snprintf(Return,MAXBUF,"302 %s :",user->nick);
+       std::string retbuf = std::string("302 ") + user->nick + " :";
+
        
        for (int i = 0; i < pcnt; i++)
        {
                userrec *u = ServerInstance->FindNick(parameters[i]);
+
                if ((u) && (u->registered == REG_ALL))
                {
-                       if(*u->oper)
-                               if(*user->oper)
-                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->host);
-                               else
-                                       snprintf(junk,MAXBUF,"%s*=+%s@%s ",u->nick,u->ident,u->dhost);
+                       retbuf = retbuf + " ";
+
+                       if (*u->oper)
+                       {
+                               retbuf = retbuf + "*=+";
+                       }
                        else
-                               if(*user->oper)
-                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->host);
-                               else
-                                       snprintf(junk,MAXBUF,"%s=+%s@%s ",u->nick,u->ident,u->dhost);
+                       {
+                               retbuf = retbuf + "=+";
+                       }
 
-                       strlcat(Return,junk,MAXBUF);
+                       retbuf = retbuf + u->ident + "@";
+
+                       if (*user->oper)
+                       {
+                               retbuf = retbuf + u->host;
+                       }
+                       else
+                       {
+                               retbuf = retbuf + u->dhost;
+                       }
                }
        }
-       user->WriteServ(Return);
+
+       user->WriteServ(retbuf);
 
        return CMD_SUCCESS;
 }