* Minor tweaks to RFC822 output to keep brain-damanged MS Outlook from dying

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 5a18bdae45a03bdf4f1e1e62c57e1a7f2a2d3297..4cf56dc4333bd52b75e3d501fe90b5549d7dd6de 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 1.466  2000/02/22 16:37:28  ajc
+* Minor tweaks to RFC822 output to keep brain-damanged MS Outlook from dying
+
 Revision 1.465  2000/02/22 04:17:56  ajc
 * Got bounce messages working (mostly ... testers, please beat this up!)
 * Changed 'FIX' comments to 'FIXME' (less conflict, plus vim highlights it!)
@@ -1647,4 +1650,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncnsrd.mt-kisco.ny.us>
        * Initial CVS import 
-

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index b4ed04e1f26fad003dfeb477b0cbb07de4d17d53..df17f3c4f975b63f1a1af650aa0a4d113e9f69c1 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -468,7 +468,8 @@ void do_help_subst(char *buffer)
 void memfmout(
        int width,              /* screen width to use */
        char *mptr,             /* where are we going to get our text from? */
-       char subst)             /* nonzero if we should do substitutions */
+       char subst,             /* nonzero if we should do substitutions */
+       char *nl)               /* string to terminate lines with */
 {
        int a, b, c;
        int real = 0;
@@ -507,7 +508,7 @@ FMTA:       if (subst) {
        if (((ch == 13) || (ch == 10)) && (old != 13) && (old != 10))
                ch = 32;
        if (((old == 13) || (old == 10)) && (isspace(real))) {
-               cprintf("\n");
+               cprintf("%s", nl);
                c = 1;
        }
        if (ch > 126)
@@ -515,7 +516,7 @@ FMTA:       if (subst) {
 
        if (ch > 32) {
                if (((strlen(aaa) + c) > (width - 5)) && (strlen(aaa) > (width - 5))) {
-                       cprintf("\n%s", aaa);
+                       cprintf("%s%s", nl, aaa);
                        c = strlen(aaa);
                        aaa[0] = 0;
                }
@@ -525,7 +526,7 @@ FMTA:       if (subst) {
        }
        if (ch == 32) {
                if ((strlen(aaa) + c) > (width - 5)) {
-                       cprintf("\n");
+                       cprintf("%s", nl);
                        c = 1;
                }
                cprintf("%s ", aaa);
@@ -535,14 +536,14 @@ FMTA:     if (subst) {
                goto FMTA;
        }
        if ((ch == 13) || (ch == 10)) {
-               cprintf("%s\n", aaa);
+               cprintf("%s%s", aaa, nl);
                c = 1;
                strcpy(aaa, "");
                goto FMTA;
        }
        goto FMTA;
 
-FMTEND:        cprintf("%s\n", aaa);
+FMTEND:        cprintf("%s%s", aaa, nl);
 }
 
 
@@ -1049,7 +1050,7 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
         * message to the reader's screen width.
         */
        if (TheMessage->cm_format_type == FMT_CITADEL) {
-               memfmout(80, mptr, 0);
+               memfmout(80, mptr, 0, nl);
        }
 
        /* If the message on disk is format 4 (MIME), we've gotta hand it

diff --git a/citadel/msgbase.h b/citadel/msgbase.h
index 8f46a86030364642ec1bb54b654c06b35189e3ee..466e188036a702ca90144e70aa6789432d25887c 100644 (file)
--- a/citadel/msgbase.h
+++ b/citadel/msgbase.h
@@ -48,7 +48,7 @@ void get_mm (void);
 void cmd_msgs (char *cmdbuf);
 void help_subst (char *strbuf, char *source, char *dest);
 void do_help_subst (char *buffer);
-void memfmout (int width, char *mptr, char subst);
+void memfmout (int width, char *mptr, char subst, char *nl);
 void output_mime_parts(char *);
 void cmd_msg0 (char *cmdbuf);
 void cmd_msg2 (char *cmdbuf);

diff --git a/citadel/serv_chat.c b/citadel/serv_chat.c
index 42134ac7765f501a5adf828211a4a0a4fb3d5f47..6416b78b254e14f8152640452e3c575b44201f76 100644 (file)
--- a/citadel/serv_chat.c
+++ b/citadel/serv_chat.c
@@ -403,7 +403,7 @@ void cmd_pexp(char *argbuf)
                        cprintf("Message ");
                cprintf("from %s:\n", ptr->sender);
                if (ptr->text != NULL)
-                       memfmout(80, ptr->text, 0);
+                       memfmout(80, ptr->text, 0, "\n");
 
                holdptr = ptr->next;
                if (ptr->text != NULL) phree(ptr->text);
@@ -438,7 +438,7 @@ void cmd_gexp(char *argbuf) {
                ptr->sender,                            /* sender of msg */
                config.c_nodename);                     /* static for now */
        if (ptr->text != NULL) {
-               memfmout(80, ptr->text, 0);
+               memfmout(80, ptr->text, 0, "\n");
                if (ptr->text[strlen(ptr->text)-1] != '\n') cprintf("\n");
                phree(ptr->text);
                }