From 112c3b6524d498870aea65f7bbb308bb358097de Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 3 Mar 2010 05:29:25 +0000 Subject: [PATCH] * Removed code from serv_chat.c that checks to see whether the final character was a newline. Moved it to memfmout() instead. memfmout() is now guaranteed to output a newline as its final character *if* it outputs any data at all. --- citadel/modules/chat/serv_chat.c | 1 - citadel/msgbase.c | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/citadel/modules/chat/serv_chat.c b/citadel/modules/chat/serv_chat.c index 79fe5932e..07ae009ee 100644 --- 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 78d5f296d..a8d420d98 100644 --- 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; + } } -- 2.39.2