m_cap: Try to append caps even if one is too long

[solanum.git] / modules / m_accept.c

diff --git a/modules/m_accept.c b/modules/m_accept.c
index 06a341b4a4e75315d038c02962a913a308b64938..cd3074b546d6bec1fb6edd9acdd5e340ed47e55b 100644 (file)
--- a/modules/m_accept.c
+++ b/modules/m_accept.c
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: m_accept.c 254 2005-09-21 23:35:12Z nenolod $
  */
 
 #include "stdinc.h"
@@ -36,28 +34,32 @@
 #include "parse.h"
 #include "modules.h"
 
-static int m_accept(struct Client *, struct Client *, int, const char **);
+static const char accept_desc[] =
+       "Provides the ACCEPT command for use with Caller ID/user mode +g";
+
+static void m_accept(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 static void build_nicklist(struct Client *, char *, char *, const char *);
 
 static void add_accept(struct Client *, struct Client *);
 static void list_accepts(struct Client *);
 
 struct Message accept_msgtab = {
-       "ACCEPT", 0, 0, 0, MFLG_SLOW | MFLG_UNREG,
+       "ACCEPT", 0, 0, 0, 0,
        {mg_unreg, {m_accept, 2}, mg_ignore, mg_ignore, mg_ignore, {m_accept, 2}}
 };
 
 mapi_clist_av1 accept_clist[] = {
        &accept_msgtab, NULL
 };
-DECLARE_MODULE_AV1(accept, NULL, NULL, accept_clist, NULL, NULL, "$Revision: 254 $");
+
+DECLARE_MODULE_AV2(accept, NULL, NULL, accept_clist, NULL, NULL, NULL, NULL, accept_desc);
 
 /*
  * m_accept - ACCEPT command handler
  *      parv[1] = servername
  */
-static int
-m_accept(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+m_accept(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        char *nick;
        char *p = NULL;
@@ -69,7 +71,7 @@ m_accept(struct Client *client_p, struct Client *source_p, int parc, const char
        if(*parv[1] == '*')
        {
                list_accepts(source_p);
-               return 0;
+               return;
        }
 
        build_nicklist(source_p, addbuf, delbuf, parv[1]);
@@ -122,15 +124,13 @@ m_accept(struct Client *client_p, struct Client *source_p, int parc, const char
                if(accept_num >= ConfigFileEntry.max_accept)
                {
                        sendto_one(source_p, form_str(ERR_ACCEPTFULL), me.name, source_p->name);
-                       return 0;
+                       return;
                }
 
                /* why is this here? */
                /* del_from accept(target_p, source_p); */
                add_accept(source_p, target_p);
        }
-
-       return 0;
 }
 
 /*
@@ -140,7 +140,7 @@ m_accept(struct Client *client_p, struct Client *source_p, int parc, const char
  *             - pointer to addbuffer
  *             - pointer to remove buffer
  *             - pointer to list of nicks
- * output      - 
+ * output      -
  * side effects - addbuf/delbuf are modified to give valid nicks
  */
 static void
@@ -151,7 +151,6 @@ build_nicklist(struct Client *source_p, char *addbuf, char *delbuf, const char *
        int lenadd;
        int lendel;
        int del;
-       struct Client *target_p;
        char *n = LOCAL_COPY(nicks);
 
        *addbuf = *delbuf = '\0';
@@ -166,9 +165,9 @@ build_nicklist(struct Client *source_p, char *addbuf, char *delbuf, const char *
                        name++;
                }
 
-               if((target_p = find_named_person(name)) == NULL)
+               if(find_named_person(name) == NULL)
                {
-                       sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
+                       sendto_one_numeric(source_p, ERR_NOSUCHNICK,
                                           form_str(ERR_NOSUCHNICK), name);
                        continue;
                }
@@ -246,16 +245,16 @@ list_accepts(struct Client *source_p)
                                *nicks = '\0';
                        }
 
-                       len += rb_snprintf(nicks + len, sizeof(nicks) - len, "%s ", target_p->name);
+                       len += snprintf(nicks + len, sizeof(nicks) - len, "%s ", target_p->name);
                        count++;
                }
        }
 
        if(*nicks)
-               sendto_one(source_p, form_str(RPL_ACCEPTLIST), 
+               sendto_one(source_p, form_str(RPL_ACCEPTLIST),
                           me.name, source_p->name, nicks);
 
-       sendto_one(source_p, form_str(RPL_ENDOFACCEPT), 
+       sendto_one(source_p, form_str(RPL_ENDOFACCEPT),
                   me.name, source_p->name);
 
 }