For sysname()s between 6 and 10 characters, use "MMail/name" instead of

"MultiMail" for the Blue Wave tear line; also check the length isn't too
long for reader_name (but this should never happen). Not well tested yet.

Author: wmcbrine

config.h

@@ -5,6 +5,7 @@
 #define MM_MINOR 51
 
 #define MM_NAME "MultiMail"
+#define MM_SNAME "MMail"
 #define MM_VERNUM STR(MM_MAJOR) "." STR(MM_MINOR)
 #define MM_TOPHEADER MM_NAME "/%.16s v" MM_VERNUM
 

mmail/bw.cc

@@ -838,10 +838,21 @@ void bwreply::addHeader(FILE *uplFile)
     strncpy((char *) newUplHeader.vernum, MM_VERNUM, 20);
     for (int c = 0; newUplHeader.vernum[c]; newUplHeader.vernum[c++] -= 10);
 
-    int tearlen = sprintf((char *) newUplHeader.reader_name, MM_NAME
-                          "/%s", sysname());
-    strcpy((char *) newUplHeader.reader_tear, ((tearlen < 16) ?
-           (char *) newUplHeader.reader_name : MM_NAME));
+    const char *name = sysname();
+    size_t len = strlen(name);
+
+    if (len < 80 - sizeof(MM_NAME))
+        sprintf((char *) newUplHeader.reader_name, MM_NAME "/%s", name);
+    else
+        strcpy((char *) newUplHeader.reader_name, MM_NAME);
+
+    if (len < 16 - sizeof(MM_NAME))
+        strcpy((char *) newUplHeader.reader_tear,
+               (char *) newUplHeader.reader_name);
+    else if (len < 16 - sizeof(MM_SNAME))
+        sprintf((char *) newUplHeader.reader_tear, MM_SNAME "/%s", name);
+    else
+        strcpy((char *) newUplHeader.reader_tear, MM_NAME);
 
     strcpy((char *) newUplHeader.loginname, baseClass->getLoginName());
     strcpy((char *) newUplHeader.aliasname, baseClass->getAliasName());