Fixed -mime for forw and repl.

[mmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 150c175..9c335bd 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -192,10 +192,7 @@ attach(char *draft_file_name)
        int length;  /* length of attachment header field name */
        char *p;  /* miscellaneous string pointer */
 
-       /*
-       ** Open up the draft file.
-       */
-
+       /* Open up the draft file. */
        if ((draft_file = fopen(draft_file_name, "r")) == (FILE *)0)
                adios(NULL, "can't open draft file `%s'.",
                                draft_file_name);
@@ -204,7 +201,6 @@ attach(char *draft_file_name)
        **  Allocate a buffer to hold the header components as they're read in.
        **  This buffer might need to be quite large, so we grow it as needed.
        */
-
        field = (char *)mh_xmalloc(field_size = 256);
 
        /*
@@ -214,7 +210,6 @@ attach(char *draft_file_name)
        ** because we're done.  Read to the end of the headers even if
        ** we have no attachments.
        */
-
        length = strlen(attach_hdr);
 
        has_attachment = 0;
@@ -231,7 +226,6 @@ attach(char *draft_file_name)
        ** Check if body contains at least one non-blank (= not empty)
        ** and if it contains any non-ASCII chars (= need MIME).
        */
-
        has_body = 0;
        non_ascii = 0;
 
@@ -319,10 +313,15 @@ attach(char *draft_file_name)
        while (get_line() != EOF && *field != '\0' && *field != '-') {
                if (strncasecmp(field, attach_hdr, length) == 0 &&
                                field[length] == ':') {
-                       for (p = field + length + 1; *p == ' ' || *p == '\t';
-                                       p++)
-                               ;
-                       make_mime_composition_file_entry(p);
+                       for (p = field+length+1; *p==' ' || *p=='\t'; p++) {
+                               continue;
+                       }
+                       if (*p == '+') {
+                               /* forwarded message */
+                               fprintf(composition_file, "#forw [forwarded message(s)] %s\n", p);
+                       } else {
+                               make_mime_composition_file_entry(p);
+                       }
                }
        }