merge http://hg.quakenet.org/snircd/diff/0760b66e7816/ircd/m_names.c

[irc/quakenet/snircd.git] / ircd / m_names.c

diff --git a/ircd/m_names.c b/ircd/m_names.c
index ab5facd52e4848aaf3eb98d756970f5f9b77da23..4d2ddcd54ed6968f85f66ec5dd86c8ead0e4a8df 100644 (file)
--- a/ircd/m_names.c
+++ b/ircd/m_names.c
@@ -20,7 +20,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: m_names.c,v 1.22.2.1 2005/10/06 04:00:26 entrope Exp $
+ * $Id: m_names.c,v 1.22.2.2 2005/11/17 00:05:00 entrope Exp $
  */
 
 /*
@@ -189,14 +189,6 @@ void do_names(struct Client* sptr, struct Channel* chptr, int filter)
       /* space, modifier, nick, \r \n \0 */
     { 
       send_reply(sptr, (filter & NAMES_DEL) ? RPL_DELNAMREPLY : RPL_NAMREPLY, buf);
-      strcpy(buf, "* ");
-      ircd_strncpy(buf + 2, chptr->chname, len + 1);
-      buf[len + 2] = 0;
-      strcat(buf, " :");
-      if (PubChannel(chptr))
-        *buf = '=';
-      else if (SecretChannel(chptr))
-        *buf = '@';
       idx = len + 4;
       flag = 0;
       needs_space=0;
@@ -242,7 +234,8 @@ int m_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   
   s = strchr(para, ','); /* Recursively call m_names for each comma-separated channel. Eww. */
   if (s) {
-    parv[1+showingdelayed] = ++s;
+    *s++ = '\0';
+    parv[1+showingdelayed] = s;
     m_names(cptr, sptr, parc, parv);
   }
  
@@ -389,7 +382,8 @@ int ms_names(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   
   s = strchr(para, ','); /* Recursively call m_names for each comma-separated channel. */
   if (s) {
-    parv[1+!!showingdelayed] = ++s;
+    *s++ = '\0';
+    parv[1+!!showingdelayed] = s;
     m_names(cptr, sptr, parc, parv);
   }