Changeset c6e00b9 in code for icb.c

Timestamp:

Aug 24, 2017, 2:41:37 PM (8 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

4c07461

Parents:

c3f5bda

Message:

Split long open and private messages

File:

• icb.c (modified) (5 diffs)

icb.c

@@ -257 +257 @@
         struct icb_group *ig = is->group;
         struct icb_session *s;
-        int res, buflen = 1;
+        int res, buflen;
 
         if (strlen(msg) == 0) {
@@ -264 +264 @@
         }
 
-        res = snprintf(&buf[1], sizeof buf - 1, "%c%s%c%s", ICB_M_OPEN,
-            is->nick, ICB_M_SEP, msg);
-        if (res < 0) {
-                icb_error(is, "Format error");
-                return;
-        }
-        buflen += MIN((size_t)res, sizeof buf - 1);
-        buf[0] = buflen;
-
-        logger(ig->name, is->nick, msg);
-
-        LIST_FOREACH(s, &ig->sess, entry) {
-                if (s == is)
-                        continue;
-                icbd_send(s, buf, buflen + 1);
-        }
+        do {
+                res = snprintf(&buf[1], sizeof buf - 1, "%c%s%c%s", ICB_M_OPEN,
+                    is->nick, ICB_M_SEP, msg);
+                if (res < 0) {
+                        icbd_log(is, LOG_ERR, "Format error in %s", __func__);
+                        return;
+                }
+                /* res doesn't include the terminating NUL*/
+                buflen = MIN((size_t)res + 1, sizeof buf - 1);
+                buf[0] = buflen;
+
+                logger(ig->name, is->nick, msg);
+
+                LIST_FOREACH(s, &ig->sess, entry) {
+                        if (s == is)
+                                continue;
+                        icbd_send(s, buf, buflen + 1);
+                }
+
+                msg += buflen - 1;
+        } while (res > buflen - 1);
 }
 
@@ -290 +295 @@
         struct icb_group *ig = is->group;
         struct icb_session *s;
+        char buf[ICB_MSGSIZE];
         char whom[ICB_MAXNICKLEN];
+        int res, buflen;
 
         icb_vis(whom, to, ICB_MAXNICKLEN, VIS_SP);
@@ -314 +321 @@
                 }
         }
-        icb_sendfmt(s, "%c%s%c%s", ICB_M_PERSONAL, is->nick, ICB_M_SEP, msg);
+
+        do {
+                res = snprintf(&buf[1], sizeof buf - 1, "%c%s%c%s",
+                    ICB_M_PERSONAL, is->nick, ICB_M_SEP, msg);
+                if (res < 0) {
+                        icbd_log(is, LOG_ERR, "Format error in %s", __func__);
+                        return;
+                }
+                /* res doesn't include the terminating NUL*/
+                buflen = MIN((size_t)res + 1, sizeof buf - 1);
+                buf[0] = buflen;
+
+                icbd_send(s, buf, buflen + 1);
+
+                msg += buflen - 1;
+        } while (res > buflen - 1);
 }
 
@@ -659 +681 @@
                 return;
         }
-        buflen += MIN((size_t)res, sizeof buf - 1);
+        buflen += MIN((size_t)res + 1, sizeof buf - 1);
         buf[0] = buflen;
         icbd_send(is, buf, buflen + 1);