From c3d9e9dbaffc1733022111a99fef6fc89020add9 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Fri, 26 Oct 2018 14:13:00 +0200
Subject: [PATCH] report allies without bsdstring

---
 src/report.c | 133 +++++++++++++++++++++++----------------------------
 1 file changed, 59 insertions(+), 74 deletions(-)

diff --git a/src/report.c b/src/report.c
index 5d2ed4598..abad4c4fb 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1514,93 +1514,78 @@ static void
 show_allies(const faction * f, const ally * allies, char *buf, size_t size)
 {
     int allierte = 0;
-    int i = 0, h, hh = 0;
-    int bytes, dh = 0;
+    int i = 0, h, hh = 0, dh = 0;
     const ally *sf;
-    char *bufp = buf;             /* buf already contains data */
-
-    --size;                       /* leave room for a null-terminator */
-
+   
     for (sf = allies; sf; sf = sf->next) {
         int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL);
-        if (mode > 0)
+        if (mode > 0) {
             ++allierte;
+        }
     }
 
-    for (sf = allies; sf; sf = sf->next) {
-        int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL);
-        if (mode <= 0)
-            continue;
-        i++;
-        if (dh) {
-            if (i == allierte) {
-                bytes = (int)str_strlcpy(bufp, LOC(f->locale, "list_and"), size);
+    if (allierte > 0) {
+        sbstring sbs;
+        sbs_init(&sbs, buf, size);
+
+        for (sf = allies; sf; sf = sf->next) {
+            int mode = alliedgroup(NULL, f, sf->faction, sf, HELP_ALL);
+            if (mode <= 0)
+                continue;
+            i++;
+            if (dh) {
+                if (i == allierte) {
+                    sbs_strcat(&sbs, LOC(f->locale, "list_and"));
+                }
+                else {
+                    sbs_strcat(&sbs, ", ");
+                }
+            }
+            dh = 1;
+            hh = 0;
+            sbs_strcat(&sbs, factionname(sf->faction));
+            sbs_strcat(&sbs, " (");
+            if ((mode & HELP_ALL) == HELP_ALL) {
+                sbs_strcat(&sbs, LOC(f->locale, parameters[P_ANY]));
             }
             else {
-                bytes = (int)str_strlcpy(bufp, ", ", size);
-            }
-            if (wrptr(&bufp, &size, bytes) != 0)
-                WARN_STATIC_BUFFER();
-        }
-        dh = 1;
-        hh = 0;
-        bytes = (int)str_strlcpy(bufp, factionname(sf->faction), size);
-        if (wrptr(&bufp, &size, bytes) != 0)
-            WARN_STATIC_BUFFER();
-        bytes = (int)str_strlcpy(bufp, " (", size);
-        if (wrptr(&bufp, &size, bytes) != 0)
-            WARN_STATIC_BUFFER();
-        if ((mode & HELP_ALL) == HELP_ALL) {
-            bytes = (int)str_strlcpy(bufp, LOC(f->locale, parameters[P_ANY]), size);
-            if (wrptr(&bufp, &size, bytes) != 0)
-                WARN_STATIC_BUFFER();
-        }
-        else {
-            for (h = 1; h <= HELP_TRAVEL; h *= 2) {
-                int p = MAXPARAMS;
-                if ((mode & h) == h) {
-                    switch (h) {
-                    case HELP_TRAVEL:
-                        p = P_TRAVEL;
-                        break;
-                    case HELP_MONEY:
-                        p = P_MONEY;
-                        break;
-                    case HELP_FIGHT:
-                        p = P_FIGHT;
-                        break;
-                    case HELP_GIVE:
-                        p = P_GIVE;
-                        break;
-                    case HELP_GUARD:
-                        p = P_GUARD;
-                        break;
-                    case HELP_FSTEALTH:
-                        p = P_FACTIONSTEALTH;
-                        break;
+                for (h = 1; h <= HELP_TRAVEL; h *= 2) {
+                    int p = MAXPARAMS;
+                    if ((mode & h) == h) {
+                        switch (h) {
+                        case HELP_TRAVEL:
+                            p = P_TRAVEL;
+                            break;
+                        case HELP_MONEY:
+                            p = P_MONEY;
+                            break;
+                        case HELP_FIGHT:
+                            p = P_FIGHT;
+                            break;
+                        case HELP_GIVE:
+                            p = P_GIVE;
+                            break;
+                        case HELP_GUARD:
+                            p = P_GUARD;
+                            break;
+                        case HELP_FSTEALTH:
+                            p = P_FACTIONSTEALTH;
+                            break;
+                        }
+                    }
+                    if (p != MAXPARAMS) {
+                        if (hh) {
+                            sbs_strcat(&sbs, ", ");
+                        }
+                        sbs_strcat(&sbs, LOC(f->locale, parameters[p]));
+                        hh = 1;
                     }
                 }
-                if (p != MAXPARAMS) {
-                    if (hh) {
-                        bytes = (int)str_strlcpy(bufp, ", ", size);
-                        if (wrptr(&bufp, &size, bytes) != 0)
-                            WARN_STATIC_BUFFER();
-                    }
-                    bytes = (int)str_strlcpy(bufp, LOC(f->locale, parameters[p]), size);
-                    if (wrptr(&bufp, &size, bytes) != 0)
-                        WARN_STATIC_BUFFER();
-                    hh = 1;
-                }
             }
+            sbs_strcat(&sbs, ")");
         }
-        bytes = (int)str_strlcpy(bufp, ")", size);
-        if (wrptr(&bufp, &size, bytes) != 0)
-            WARN_STATIC_BUFFER();
+        sbs_strcat(&sbs, ".");
     }
-    bytes = (int)str_strlcpy(bufp, ".", size);
-    if (wrptr(&bufp, &size, bytes) != 0)
-        WARN_STATIC_BUFFER();
-    *bufp = 0;
 }
 
 static void allies(struct stream *out, const faction * f)