ircd: Zero out the global_client_list

[solanum.git] / modules / m_who.c

diff --git a/modules/m_who.c b/modules/m_who.c
index f70f2d0ecf2b72156b3d8cc70cd78f97a0a8b9c8..b7198a6593b4866453d2a624a272f6129a78590b 100644 (file)
--- a/modules/m_who.c
+++ b/modules/m_who.c
@@ -22,7 +22,6 @@
  *  USA
  */
 #include "stdinc.h"
-#include "common.h"
 #include "client.h"
 #include "channel.h"
 #include "hash.h"
@@ -55,13 +54,24 @@
 #define FIELD_ACCOUNT    0x0800
 #define FIELD_OPLEVEL    0x1000 /* meaningless and stupid, but whatever */
 
+static const char who_desc[] =
+       "Provides the WHO command to display information for users on a channel";
+
 struct who_format
 {
        int fields;
        const char *querytype;
 };
 
-static int m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+static void m_who(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
+
+static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
+                             int server_oper, int member,
+                             struct who_format *fmt);
+static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
+static void do_who(struct Client *source_p,
+                  struct Client *target_p, struct membership *msptr,
+                  struct who_format *fmt);
 
 struct Message who_msgtab = {
        "WHO", 0, 0, 0, 0,
@@ -82,25 +92,14 @@ _moddeinit(void)
 }
 
 mapi_clist_av1 who_clist[] = { &who_msgtab, NULL };
-DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, NULL);
-
-static void do_who_on_channel(struct Client *source_p, struct Channel *chptr,
-                             int server_oper, int member,
-                             struct who_format *fmt);
-
-static void who_global(struct Client *source_p, const char *mask, int server_oper, int operspy, struct who_format *fmt);
-
-static void do_who(struct Client *source_p,
-                  struct Client *target_p, struct membership *msptr,
-                  struct who_format *fmt);
-
+DECLARE_MODULE_AV2(who, _modinit, _moddeinit, who_clist, NULL, NULL, NULL, NULL, who_desc);
 
 /*
 ** m_who
 **      parv[1] = nickname mask list
 **      parv[2] = additional selection flag and format options
 */
-static int
+static void
 m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
        static time_t last_used = 0;
@@ -159,17 +158,17 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
        if((*(mask + 1) == '\0') && (*mask == '*'))
        {
                if(source_p->user == NULL)
-                       return 0;
+                       return;
 
                if((lp = source_p->user->channel.head) != NULL)
                {
                        msptr = lp->data;
-                       do_who_on_channel(source_p, msptr->chptr, server_oper, YES, &fmt);
+                       do_who_on_channel(source_p, msptr->chptr, server_oper, true, &fmt);
                }
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, "*");
-               return 0;
+               return;
        }
 
        if(IsOperSpy(source_p) && *mask == '!')
@@ -181,7 +180,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                {
                        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                        me.name, source_p->name, parv[1]);
-                       return 0;
+                       return;
                }
        }
 
@@ -199,27 +198,27 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                                                me.name, source_p->name, "WHO");
                                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                           me.name, source_p->name, "*");
-                               return 0;
+                               return;
                        }
 
                        if(operspy)
                                report_operspy(source_p, "WHO", chptr->chname);
 
                        if(IsMember(source_p, chptr) || operspy)
-                               do_who_on_channel(source_p, chptr, server_oper, YES, &fmt);
+                               do_who_on_channel(source_p, chptr, server_oper, true, &fmt);
                        else if(!SecretChannel(chptr))
-                               do_who_on_channel(source_p, chptr, server_oper, NO, &fmt);
+                               do_who_on_channel(source_p, chptr, server_oper, false, &fmt);
                }
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, parv[1] + operspy);
-               return 0;
+               return;
        }
 
        /* '/who nick' */
 
        if(((target_p = find_named_person(mask)) != NULL) &&
-          (!server_oper || IsOper(target_p)))
+          (!server_oper || SeesOper(target_p, source_p)))
        {
                int isinvis = 0;
 
@@ -248,7 +247,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 
                sendto_one(source_p, form_str(RPL_ENDOFWHO),
                           me.name, source_p->name, mask);
-               return 0;
+               return;
        }
 
        if(!IsFloodDone(source_p))
@@ -263,7 +262,7 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
                                        me.name, source_p->name, "WHO");
                        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                                   me.name, source_p->name, "*");
-                       return 0;
+                       return;
                }
                else
                        last_used = rb_current_time();
@@ -285,8 +284,6 @@ m_who(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p,
 
        sendto_one(source_p, form_str(RPL_ENDOFWHO),
                   me.name, source_p->name, mask);
-
-       return 0;
 }
 
 /* who_common_channel
@@ -317,7 +314,7 @@ who_common_channel(struct Client *source_p, struct Channel *chptr,
                if(!IsInvisible(target_p) || IsMarked(target_p))
                        continue;
 
-               if(server_oper && !IsOper(target_p))
+               if(server_oper && !SeesOper(target_p, source_p))
                        continue;
 
                SetMark(target_p);
@@ -390,7 +387,7 @@ who_global(struct Client *source_p, const char *mask, int server_oper, int opers
                        continue;
                }
 
-               if(server_oper && !IsOper(target_p))
+               if(server_oper && !SeesOper(target_p, source_p))
                        continue;
 
                if(maxmatches > 0)
@@ -438,7 +435,7 @@ do_who_on_channel(struct Client *source_p, struct Channel *chptr,
                msptr = ptr->data;
                target_p = msptr->client_p;
 
-               if(server_oper && !IsOper(target_p))
+               if(server_oper && !SeesOper(target_p, source_p))
                        continue;
 
                if(member || !IsInvisible(target_p))
@@ -491,7 +488,7 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
        const char *q;
 
        sprintf(status, "%c%s%s",
-                  target_p->user->away ? 'G' : 'H', IsOper(target_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
+                  target_p->user->away ? 'G' : 'H', SeesOper(target_p, source_p) ? "*" : "", msptr ? find_channel_status(msptr, fmt->fields || IsCapable(source_p, CLICAP_MULTI_PREFIX)) : "");
 
        if (fmt->fields == 0)
                sendto_one(source_p, form_str(RPL_WHOREPLY), me.name,
@@ -553,12 +550,12 @@ do_who(struct Client *source_p, struct Client *target_p, struct membership *mspt
 
                if (pos >= sizeof str)
                {
-                       static int warned = 0;
+                       static bool warned = false;
                        if (!warned)
                                sendto_realops_snomask(SNO_DEBUG, L_NETWIDE,
                                                "WHOX overflow while sending information about %s to %s",
                                                target_p->name, source_p->name);
-                       warned = 1;
+                       warned = true;
                }
                sendto_one(source_p, "%s", str);
        }