* fmout(): Ignore \r (carriage return) characters in messages

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index dcc5c19a61df0cc869e72b42d1ed2249638a75b6..6fa59f4758403039190a6adf951bae1ec7acf33f 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
  $Log$
+ Revision 601.116  2003/01/17 10:06:54  error
+ * fmout():  Ignore \r (carriage return) characters in messages
+
  Revision 601.115  2003/01/17 04:36:04  ajc
  * whobbs.c: fix bad call to CtdlGetServInfo() so we can get our session ID
    and the name of the BBS
@@ -4410,4 +4413,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/commands.c b/citadel/commands.c
index e7b307adead776fc0946f74c6768937ce49d3d8b..bb9d20cb90a13d0cd52654651cff7cd882a1e579 100644 (file)
--- a/citadel/commands.c
+++ b/citadel/commands.c
@@ -1315,6 +1315,11 @@ int fmout(
 
        /* Run the message body */
        while (*e) {
+               /* Catch characters that shouldn't be there at all */
+               if (*e == '\r') {
+                       e++;
+                       continue;
+               }
                /* First, are we looking at a newline? */
                if (*e == '\n') {
                        e++;