cap-notify: Fix possible crash on 64-bit systems.

[solanum.git] / modules / m_list.c

diff --git a/modules/m_list.c b/modules/m_list.c
index c94eb3db2cc858b1af7cde7ad226344fb53fabf2..246a8de7869a857df4d85486df0c1376efaee441 100644 (file)
--- a/modules/m_list.c
+++ b/modules/m_list.c
@@ -48,6 +48,9 @@
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
+#include "inline/stringops.h"
+#include "s_assert.h"
+#include "logger.h"
 
 static rb_dlink_list safelisting_clients = { NULL, NULL, 0 };
 
@@ -57,13 +60,15 @@ static void _moddeinit(void);
 static int m_list(struct Client *, struct Client *, int, const char **);
 static int mo_list(struct Client *, struct Client *, int, const char **);
 
+static void list_one_channel(struct Client *source_p, struct Channel *chptr, int visible);
+
 static void safelist_check_cliexit(hook_data_client_exit * hdata);
 static void safelist_client_instantiate(struct Client *, struct ListClient *);
 static void safelist_client_release(struct Client *);
 static void safelist_one_channel(struct Client *source_p, struct Channel *chptr);
 static void safelist_iterate_client(struct Client *source_p);
 static void safelist_iterate_clients(void *unused);
-static void safelist_channel_named(struct Client *source_p, const char *name);
+static void safelist_channel_named(struct Client *source_p, const char *name, int operspy);
 
 struct Message list_msgtab = {
        "LIST", 0, 0, 0, MFLG_SLOW,
@@ -157,8 +162,10 @@ static int m_list(struct Client *client_p, struct Client *source_p, int parc, co
 static int mo_list(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        struct ListClient *params;
-       char *p, *args;
+       char *p;
+       char *args = NULL;
        int i;
+       int operspy = 0;
 
        if (source_p->localClient->safelist_data != NULL)
        {
@@ -167,10 +174,22 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
                return 0;
        }
 
+       if (parc > 1)
+       {
+               args = LOCAL_COPY(parv[1]);
+       }
+
+       if (args && *args == '!' && IsOperSpy(source_p))
+       {
+               args++;
+               report_operspy(source_p, "LIST", args);
+               operspy = 1;
+       }
+
        /* Single channel. */
-       if (parc > 1 && IsChannelName(parv[1]))
+       if (args && IsChannelName(args))
        {
-               safelist_channel_named(source_p, parv[1]);
+               safelist_channel_named(source_p, args, operspy);
                return 0;
        }
 
@@ -180,14 +199,12 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
        /* XXX rather arbitrary -- jilles */
        params->users_min = 3;
        params->users_max = INT_MAX;
-       params->operspy = 0;
-       params->created_min = params->topic_min = 
+       params->operspy = operspy;
+       params->created_min = params->topic_min =
                params->created_max = params->topic_max = 0;
 
-       if (parc > 1 && !EmptyString(parv[1]))
+       if (args && !EmptyString(args))
        {
-               args = LOCAL_COPY(parv[1]);
-
                /* Cancel out default minimum. */
                params->users_min = 0;
 
@@ -260,12 +277,6 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
                                        }
                                }
                        }
-                       /* Only accept operspy as the first option. */
-                       else if (*args == '!' && IsOperSpy(source_p) && i == 0)
-                       {
-                               params->operspy = 1;
-                               report_operspy(source_p, "LIST", p);
-                       }
 
                        if (EmptyString(p))
                                break;
@@ -279,6 +290,29 @@ static int mo_list(struct Client *client_p, struct Client *source_p, int parc, c
        return 0;
 }
 
+/*
+ * list_one_channel()
+ *
+ * inputs       - client pointer, channel pointer, whether normally visible
+ * outputs      - none
+ * side effects - a channel is listed
+ */
+static void list_one_channel(struct Client *source_p, struct Channel *chptr,
+               int visible)
+{
+       char topic[TOPICLEN + 1];
+
+       if (chptr->topic != NULL)
+               rb_strlcpy(topic, chptr->topic, sizeof topic);
+       else
+               topic[0] = '\0';
+       strip_colour(topic);
+       sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
+                  visible ? "" : "!",
+                  chptr->chname, rb_dlink_list_length(&chptr->members),
+                  topic);
+}
+
 /*
  * safelist_sendq_exceeded()
  *
@@ -353,41 +387,40 @@ static void safelist_client_release(struct Client *client_p)
 /*
  * safelist_channel_named()
  *
- * inputs       - client pointer, channel name
+ * inputs       - client pointer, channel name, operspy
  * outputs      - none
  * side effects - a named channel is listed
  */
-static void safelist_channel_named(struct Client *source_p, const char *name)
+static void safelist_channel_named(struct Client *source_p, const char *name, int operspy)
 {
        struct Channel *chptr;
        char *p;
-       char *n = LOCAL_COPY(name);
+       int visible;
 
        sendto_one(source_p, form_str(RPL_LISTSTART), me.name, source_p->name);
 
-       if ((p = strchr(n, ',')))
+       if ((p = strchr(name, ',')))
                *p = '\0';
 
-       if (*n == '\0')
+       if (*name == '\0')
        {
                sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), name);
                sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
                return;
        }
 
-       chptr = find_channel(n);
+       chptr = find_channel(name);
 
        if (chptr == NULL)
        {
-               sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), n);
+               sendto_one_numeric(source_p, ERR_NOSUCHNICK, form_str(ERR_NOSUCHNICK), name);
                sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
                return;
        }
 
-       if (!SecretChannel(chptr) || IsMember(source_p, chptr))
-               sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name, "",
-                          chptr->chname, rb_dlink_list_length(&chptr->members),
-                          chptr->topic == NULL ? "" : chptr->topic);
+       visible = !SecretChannel(chptr) || IsMember(source_p, chptr);
+       if (visible || operspy)
+               list_one_channel(source_p, chptr, visible);
 
        sendto_one(source_p, form_str(RPL_LISTEND), me.name, source_p->name);
        return;
@@ -404,8 +437,10 @@ static void safelist_channel_named(struct Client *source_p, const char *name)
 static void safelist_one_channel(struct Client *source_p, struct Channel *chptr)
 {
        struct ListClient *safelist_data = source_p->localClient->safelist_data;
+       int visible;
 
-       if (SecretChannel(chptr) && !IsMember(source_p, chptr) && !safelist_data->operspy)
+       visible = !SecretChannel(chptr) || IsMember(source_p, chptr);
+       if (!visible && !safelist_data->operspy)
                return;
 
        if ((unsigned int)chptr->members.length < safelist_data->users_min
@@ -426,10 +461,7 @@ static void safelist_one_channel(struct Client *source_p, struct Channel *chptr)
        if (safelist_data->created_max && chptr->channelts > safelist_data->created_max)
                return;
 
-       sendto_one(source_p, form_str(RPL_LIST), me.name, source_p->name,
-                  (safelist_data->operspy && SecretChannel(chptr)) ? "!" : "",
-                  chptr->chname, rb_dlink_list_length(&chptr->members),
-                  chptr->topic == NULL ? "" : chptr->topic);
+       list_one_channel(source_p, chptr, visible);
 }
 
 /*
@@ -452,7 +484,7 @@ static void safelist_iterate_client(struct Client *source_p)
                        return;
                }
 
-               RB_DLINK_FOREACH(ptr, channelTable[iter].head) 
+               RB_DLINK_FOREACH(ptr, channelTable[iter].head)
                        safelist_one_channel(source_p, (struct Channel *) ptr->data);
        }
 
@@ -463,6 +495,6 @@ static void safelist_iterate_clients(void *unused)
 {
        rb_dlink_node *n, *n2;
 
-       RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head) 
+       RB_DLINK_FOREACH_SAFE(n, n2, safelisting_clients.head)
                safelist_iterate_client((struct Client *)n->data);
 }