From be3f63416d7c2dafbd03c20b3f5a414570bbeff1 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Tue, 27 Nov 2018 04:17:16 +0100
Subject: [PATCH] some factions have very long names, breaking my buffer. use
 sbstring with care. fix hackish utf8 space detection.

---
 src/report.c  | 10 +++++++---
 src/reports.c |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/report.c b/src/report.c
index 11146a8d5..fd642d10f 100644
--- a/src/report.c
+++ b/src/report.c
@@ -1528,11 +1528,14 @@ struct show_s {
     size_t maxlen;
 };
 
+/* TODO: does not test for non-ascii unicode spaces. */
+#define IS_UTF8_SPACE(pos) (*pos > 0 && *pos <= CHAR_MAX && isspace(*pos))
+
 void pump_paragraph(sbstring *sbp, stream *out, size_t maxlen, bool isfinal)
 {
     while (sbs_length(sbp) > maxlen) {
         char *pos, *begin = sbp->begin;
-        while (*begin && isspace(*begin)) {
+        while (*begin && IS_UTF8_SPACE(begin)) {
             /* eat whitespace */
             ++begin;
         }
@@ -1551,7 +1554,7 @@ void pump_paragraph(sbstring *sbp, stream *out, size_t maxlen, bool isfinal)
                 swrite(begin, 1, len, out);
                 newline(out);
 
-                while (*pos && isspace(*pos)) {
+                while (*pos && IS_UTF8_SPACE(pos)) {
                     ++pos;
                     ++len;
                 }
@@ -1564,7 +1567,7 @@ void pump_paragraph(sbstring *sbp, stream *out, size_t maxlen, bool isfinal)
     }
     if (isfinal) {
         char *pos = sbp->begin;
-        while (*pos && isspace(*pos)) {
+        while (*pos && IS_UTF8_SPACE(pos)) {
             /* eat whitespace */
             ++pos;
         }
@@ -1590,6 +1593,7 @@ static int show_allies_cb(struct allies *all, faction *af, int status, void *uda
         }
     }
     sbs_strcat(sbp, factionname(af));
+    pump_paragraph(sbp, show->out, show->maxlen, false);
     sbs_strcat(sbp, " (");
     if ((mode & HELP_ALL) == HELP_ALL) {
         sbs_strcat(sbp, LOC(f->locale, parameters[P_ANY]));
diff --git a/src/reports.c b/src/reports.c
index 56c6fd2b1..a5874551b 100644
--- a/src/reports.c
+++ b/src/reports.c
@@ -1687,7 +1687,7 @@ int reports(void)
     faction *f;
     FILE *mailit;
     int retval = 0;
-    char path[4096];
+    char path[PATH_MAX];
     const char * rpath = reportpath();
 
     log_info("Writing reports for turn %d:", turn);