providers/opm: use a name that makes more sense for this variable

[solanum.git] / ircd / msgbuf.c

diff --git a/ircd/msgbuf.c b/ircd/msgbuf.c
index 67581b0cb446ade826cb866b157a7e8a449003bf..50538d27031d049c231bdedd9e4ebc1c0aab584d 100644 (file)
--- a/ircd/msgbuf.c
+++ b/ircd/msgbuf.c
@@ -22,6 +22,8 @@
 #include "stdinc.h"
 #include "ircd_defs.h"
 #include "msgbuf.h"
+#include "client.h"
+#include "ircd.h"
 
 /*
  * parse a message into a MsgBuf.
@@ -33,7 +35,6 @@ msgbuf_parse(struct MsgBuf *msgbuf, char *line)
        char *ch;
        char *parv[MAXPARA];
        size_t n_para;
-       int i;
 
        /* skip any leading spaces */
        for (ch = line; *ch && *ch == ' '; ch++)
@@ -106,20 +107,33 @@ msgbuf_parse(struct MsgBuf *msgbuf, char *line)
                return 1;
 
        msgbuf->cmd = parv[0];
-       for (i = 0; i < n_para; i++)
+       for (size_t i = 0; i < n_para; i++)
                msgbuf_append_para(msgbuf, parv[i]);
 
        return 0;
 }
 
+static int
+msgbuf_has_matching_tags(struct MsgBuf *msgbuf, unsigned int capmask)
+{
+       for (size_t i = 0; i < msgbuf->n_tags; i++)
+       {
+               if ((msgbuf->tags[i].capmask & capmask) != 0)
+                       return 1;
+       }
+
+       return 0;
+}
+
 static void
 msgbuf_unparse_tags(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int capmask)
 {
-       int i;
+       if (!msgbuf_has_matching_tags(msgbuf, capmask))
+               return;
 
        *buf = '@';
 
-       for (i = 0; i < msgbuf->n_tags; i++)
+       for (size_t i = 0; i < msgbuf->n_tags; i++)
        {
                if ((msgbuf->tags[i].capmask & capmask) == 0)
                        continue;
@@ -140,18 +154,21 @@ msgbuf_unparse_tags(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned in
        rb_strlcat(buf, " ", buflen);
 }
 
-static void
+void
 msgbuf_unparse_prefix(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int capmask)
 {
-       int i;
-
        memset(buf, 0, buflen);
 
        if (msgbuf->n_tags > 0)
                msgbuf_unparse_tags(buf, buflen, msgbuf, capmask);
 
-       if (msgbuf->origin)
-               rb_snprintf_append(buf, buflen, ":%s ", msgbuf->origin);
+       rb_snprintf_append(buf, buflen, ":%s ", msgbuf->origin != NULL ? msgbuf->origin : me.name);
+
+       if (msgbuf->cmd != NULL)
+               rb_snprintf_append(buf, buflen, "%s ", msgbuf->cmd);
+
+       if (msgbuf->target != NULL)
+               rb_snprintf_append(buf, buflen, "%s ", msgbuf->target);
 }
 
 /*
@@ -163,11 +180,9 @@ msgbuf_unparse_prefix(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned
 int
 msgbuf_unparse(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int capmask)
 {
-       int i;
-
        msgbuf_unparse_prefix(buf, buflen, msgbuf, capmask);
 
-       for (i = 0; i < msgbuf->n_para; i++)
+       for (size_t i = msgbuf->cmd != NULL ? 0 : 1; i < msgbuf->n_para; i++)
        {
                if (i == (msgbuf->n_para - 1))
                {
@@ -182,3 +197,43 @@ msgbuf_unparse(char *buf, size_t buflen, struct MsgBuf *msgbuf, unsigned int cap
 
        return 0;
 }
+
+/*
+ * unparse a MsgBuf stem + format string into a buffer
+ * if origin is NULL, me.name will be used.
+ * cmd may not be NULL.
+ * returns 0 on success, 1 on error.
+ */
+int
+msgbuf_vunparse_fmt(char *buf, size_t buflen, struct MsgBuf *head, unsigned int capmask, const char *fmt, va_list va)
+{
+       char *ws;
+       size_t prefixlen;
+
+       msgbuf_unparse_prefix(buf, buflen, head, capmask);
+       prefixlen = strlen(buf);
+
+       ws = buf + prefixlen;
+       vsnprintf(ws, buflen - prefixlen, fmt, va);
+
+       return 0;
+}
+
+/*
+ * unparse a MsgBuf stem + format string into a buffer (with va_list handling)
+ * if origin is NULL, me.name will be used.
+ * cmd may not be NULL.
+ * returns 0 on success, 1 on error.
+ */
+int
+msgbuf_unparse_fmt(char *buf, size_t buflen, struct MsgBuf *head, unsigned int capmask, const char *fmt, ...)
+{
+       va_list va;
+       int res;
+
+       va_start(va, fmt);
+       res = msgbuf_vunparse_fmt(buf, buflen, head, capmask, fmt, va);
+       va_end(va);
+
+       return res;
+}