* Removed code from serv_chat.c that checks to see whether the final character was...

diff --git a/citadel/modules/chat/serv_chat.c b/citadel/modules/chat/serv_chat.c
index 79fe5932eb68d40b4cfec5ffa389b027e60e73ae..07ae009ee000df9067dad302fa3accd48c463f31 100644 (file)
--- a/citadel/modules/chat/serv_chat.c
+++ b/citadel/modules/chat/serv_chat.c
@@ -567,7 +567,6 @@ void cmd_gexp(char *argbuf) {
 
        if (ptr->text != NULL) {
                memfmout(ptr->text, "\n");
-               if (ptr->text[strlen(ptr->text)-1] != '\n') cprintf("\n");
                free(ptr->text);
        }
 

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 78d5f296db3d57b94da381428b04b1a66b442a17..a8d420d98a94a0675c5fd98bd2d171ebdd94764e 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -971,6 +971,12 @@ void memfmout(
                        }
                }
        }
+       if (len) {
+               client_write(outbuf, len);
+               len = 0;
+               client_write(nl, nllen);
+               column = 0;
+       }
 }