m_privs: refactor to use multiline

diff --git a/include/messages.h b/include/messages.h
index dbdf704e299d9280674285a049f8be28b6971a24..604498414d432524f201ee31b270e3175e76fc1e 100644 (file)
--- a/include/messages.h
+++ b/include/messages.h
@@ -78,7 +78,7 @@
 #define NUMERIC_STR_263      ":%s 263 %s %s :This command could not be completed because it has been used recently, and is rate-limited."
 #define NUMERIC_STR_265      "%d %d :Current local users %d, max %d"
 #define NUMERIC_STR_266      "%d %d :Current global users %d, max %d"
-#define NUMERIC_STR_270      "%s :%s"
+#define NUMERIC_STR_270      ":%s 270 %s %s :%s"
 #define NUMERIC_STR_276      "%s :has client certificate fingerprint %s"
 #define NUMERIC_STR_281      ":%s 281 %s %s"
 #define NUMERIC_STR_282      ":%s 282 %s :End of /ACCEPT list."

diff --git a/modules/m_privs.c b/modules/m_privs.c
index 29e141ae0ced1c4e5836cea9b9c133f5d74bf9cf..112f06a1f4dead686b6b4d8cbba6d9da80baa183 100644 (file)
--- a/modules/m_privs.c
+++ b/modules/m_privs.c
@@ -81,57 +81,49 @@ static struct mode_table auth_client_table[] = {
 
 DECLARE_MODULE_AV2(privs, NULL, NULL, privs_clist, NULL, NULL, NULL, NULL, privs_desc);
 
-static void append_priv(struct Client *source_p, struct Client *target_p, char *buf, const char *s1, const char *s2)
-{
-       /* 510 - ":" - " 270 " - " " - " :* " */
-       size_t sourcelen = strlen(source_p->name);
-       if (sourcelen < 9) sourcelen = 9;
-       size_t limit = 499 - strlen(me.name) - sourcelen - strlen(target_p->name);
-       if (strlen(s1) + strlen(s2) + strlen(buf) + 1 > limit)
-       {
-               sendto_one_numeric(source_p, RPL_PRIVS, "%s :* %s", target_p->name, buf);
-               buf[0] = '\0';
-       }
-       if (buf[0] != '\0')
-               rb_strlcat(buf, " ", BUFSIZE);
-       rb_strlcat(buf, s1, BUFSIZE);
-       rb_strlcat(buf, s2, BUFSIZE);
-}
-
 static void show_privs(struct Client *source_p, struct Client *target_p)
 {
-       char buf[BUFSIZE];
        struct mode_table *p;
 
-       buf[0] = '\0';
+       send_multiline_init(source_p, " ", form_str(RPL_PRIVS),
+                       get_id(&me, source_p),
+                       get_id(source_p, source_p),
+                       target_p->name,
+                       "* ");
+
+       send_multiline_remote_pad(source_p, &me);
+       send_multiline_remote_pad(source_p, source_p);
 
        if (target_p->user->privset)
                for (char *s = target_p->user->privset->privs; s != NULL; (s = strchr(s, ' ')) && s++)
                {
                        char *c = strchr(s, ' ');
                        if (c) *c = '\0';
-                       append_priv(source_p, target_p, buf, s, "");
+                       send_multiline_item(source_p, "%s", s);
                        if (c) *c = ' ';
                }
 
        if (IsOper(target_p))
        {
                if (target_p->user->opername)
-                       append_priv(source_p, target_p, buf, "operator:", target_p->user->opername);
+                       send_multiline_item(source_p, "operator:%s", target_p->user->opername);
 
                if (target_p->user->privset)
-                       append_priv(source_p, target_p, buf, "privset:", target_p->user->privset->name);
+                       send_multiline_item(source_p, "privset:%s", target_p->user->privset->name);
        }
        p = &auth_client_table[0];
        while (p->name != NULL)
        {
                if (target_p->flags & p->mode)
-                       append_priv(source_p, target_p, buf, p->name, "");
+                       send_multiline_item(source_p, "%s", p->name);
                p++;
        }
 
-       if (buf[0] != '\0')
-               sendto_one_numeric(source_p, RPL_PRIVS, "%s :%s", target_p->name, buf);
+       send_multiline_fini(source_p, form_str(RPL_PRIVS),
+                       get_id(&me, source_p),
+                       get_id(source_p, source_p),
+                       target_p->name,
+                       "");
 }
 
 static void