]> jfr.im git - solanum.git/blobdiff - modules/m_whois.c
ircd/packet.c: make function definition consistent with declaration (#301)
[solanum.git] / modules / m_whois.c
index 281c6d8584f8491bbcffb27565f6c16540ba87e5..ecd8656937e337af284874f54c13f647fe59a1f5 100644 (file)
@@ -224,12 +224,7 @@ static void
 single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 {
        char buf[BUFSIZE];
-       int cur_len = 0;
-       int mlen;
-       char *t;
-       int tlen;
        hook_data_client hdata;
-       int extra_space = 0;
        struct sockaddr_in ip4;
 
        if(target_p->user == NULL)
@@ -242,7 +237,7 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                           target_p->name, target_p->username,
                           target_p->host, target_p->info);
 
-       cur_len = mlen = sprintf(buf, form_str(RPL_WHOISCHANNELS),
+       send_multiline_init(source_p, " ", form_str(RPL_WHOISCHANNELS),
                                    get_id(&me, source_p), get_id(source_p, source_p),
                                    target_p->name);
 
@@ -250,16 +245,8 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
         * in full names; note that serverhiding may require more space
         * for a different server name (not done here) -- jilles
         */
-       if (!MyConnect(source_p))
-       {
-               extra_space = strlen(source_p->name) - 9;
-               if (extra_space < 0)
-                       extra_space = 0;
-               extra_space += strlen(me.name) - 2; /* make sure >= 0 */
-               cur_len += extra_space;
-       }
-
-       t = buf + mlen;
+       send_multiline_remote_pad(source_p, &me);
+       send_multiline_remote_pad(source_p, source_p);
 
        hdata.client = source_p;
        hdata.target = target_p;
@@ -288,25 +275,15 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
 
                        if(hdata_vis.approved || operspy)
                        {
-                               if((cur_len + strlen(chptr->chname) + strlen("!@+ ")) > (BUFSIZE - strlen("\r\n")))
-                               {
-                                       sendto_one(source_p, "%s", buf);
-                                       cur_len = mlen + extra_space;
-                                       t = buf + mlen;
-                               }
-
-                               tlen = sprintf(t, "%s%s%s ",
+                               send_multiline_item(source_p, "%s%s%s",
                                                hdata_vis.approved ? "" : "!",
                                                find_channel_status(mt, 1),
                                                chptr->chname);
-                               t += tlen;
-                               cur_len += tlen;
                        }
                }
        }
 
-       if(cur_len > mlen + extra_space)
-               sendto_one(source_p, "%s", buf);
+       send_multiline_fini(source_p, NULL);
 
        sendto_one_numeric(source_p, RPL_WHOISSERVER, form_str(RPL_WHOISSERVER),
                           target_p->name, target_p->servptr->name,
@@ -316,28 +293,39 @@ single_whois(struct Client *source_p, struct Client *target_p, int operspy)
                sendto_one_numeric(source_p, RPL_AWAY, form_str(RPL_AWAY),
                                   target_p->name, target_p->user->away);
 
-       if((!ConfigFileEntry.hide_opers_in_whois || IsOper(source_p)) && SeesOper(target_p, source_p))
+       char *s = NULL;
+       if (IsService(target_p))
        {
-               sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
-                                  target_p->name,
-                                  IsService(target_p) ? ConfigFileEntry.servicestring :
-                                  (IsAdmin(target_p) ? GlobalSetOptions.adminstring :
-                                   GlobalSetOptions.operstring));
+               s = ConfigFileEntry.servicestring;
        }
-
-       if(!EmptyString(target_p->user->opername) && IsOper(target_p) && (target_p == source_p || HasPrivilege(source_p, "oper:privs")))
+       if (!EmptyString(target_p->user->opername) && IsOper(target_p))
        {
-               char buf[512];
-               const char *privset = "(missing)";
-               if (target_p->user->privset != NULL)
-                       privset = target_p->user->privset->name;
-               snprintf(buf, sizeof(buf), "is opered as %s, privset %s",
-                           target_p->user->opername, privset);
-               sendto_one_numeric(source_p, RPL_WHOISSPECIAL, form_str(RPL_WHOISSPECIAL),
-                                  target_p->name, buf);
+               if (target_p == source_p || HasPrivilege(source_p, "oper:privs"))
+               {
+                       const char *privset = "(missing)";
+                       if (target_p->user->privset != NULL)
+                               privset = target_p->user->privset->name;
+                       snprintf(buf, sizeof buf, "is opered as %s, privset %s", target_p->user->opername, privset);
+                       s = buf;
+               }
+               else if (IsOper(source_p) && SeesOper(target_p, source_p))
+               {
+                       snprintf(buf, sizeof buf, "is opered as %s", target_p->user->opername);
+                       s = buf;
+               }
+               else if (!ConfigFileEntry.hide_opers_in_whois && SeesOper(target_p, source_p))
+               {
+                       s = IsAdmin(target_p) ? GlobalSetOptions.adminstring :
+                           GlobalSetOptions.operstring;
+               }
+       }
+       if (s != NULL)
+       {
+               sendto_one_numeric(source_p, RPL_WHOISOPERATOR, form_str(RPL_WHOISOPERATOR),
+                               target_p->name, s);
        }
 
-       if(IsSSLClient(target_p))
+       if(IsSecureClient(target_p))
        {
                char cbuf[256] = "is using a secure connection";