* docs/MAIL.FILTERING: added note on removing procmail -f or

[mmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index a43627f..fd21acd 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -15,6 +15,7 @@
 #include <signal.h>
 #include <fcntl.h>
 #include <h/mime.h>
+#include <h/tws.h>
 #include <h/utils.h>
 
 #ifdef TIME_WITH_SYS_TIME
@@ -40,7 +41,6 @@ char *altmsg   = NULL;                /*  .. */
 char *annotext = NULL;
 char *distfile = NULL;
 
-static int armed = 0;
 static jmp_buf env;
 
 static char    body_file_name[MAXPATHLEN + 1];         /* name of temporary file for body content */
@@ -55,12 +55,12 @@ static      FILE    *composition_file;                      /* composition file pointer */
  * external prototypes
  */
 int sendsbr (char **, int, char *, struct stat *, int, char *, int);
-int done (int);
 char *getusername (void);
 
 /*
  * static prototypes
  */
+static void armed_done (int) NORETURN;
 static void alert (char *, int);
 static int tmp_fd (void);
 static void anno (int, struct stat *);
@@ -117,7 +117,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
        }
     }
 
-    armed++;
+    done=armed_done;
     switch (setjmp (env)) {
     case OK: 
        /*
@@ -153,7 +153,7 @@ sendsbr (char **vec, int vecp, char *drft, struct stat *st, int rename_drft, cha
        break;
     }
 
-    armed = 0;
+    done=exit;
     if (distfile)
        unlink (distfile);
 
@@ -400,7 +400,7 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
     if ((p = strrchr(file_name, '.')) != (char *)0) {
        for (np = m_defs; np; np = np->n_next) {
-           if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && strcasecmp(p, np->n_field) == 0) {
+           if (strncasecmp(np->n_name, "mhshow-suffix-", 14) == 0 && mh_strcasecmp(p, np->n_field) == 0) {
                content_type = np->n_name + 14;
                break;
            }
@@ -488,17 +488,37 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
 
         break;
     case 1:
-        /* Suppress Content-Id, insert simple Content-Disposition. */
-        (void) fprintf (composition_file, "#%s <>{attachment}", content_type);
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert simple Content-Disposition. */
+            (void) fprintf (composition_file,
+                            "#%s; name=\"%s\" <>{attachment}",
+                            content_type,
+                            ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
+        }
 
         break;
     case 2:
-        /* Suppress Content-Id, insert Content-Disposition with
-           modification date. */
-        (void) fprintf (composition_file,
-                        "#%s <>{attachment; modification-date=\"%s\"}",
-                        content_type,
-                        dtime (&st.st_mtim, 0));
+        if (stringdex (m_maildir(invo_name), file_name) == 0) {
+            /* Content had been placed by send into a temp file.
+               Don't generate Content-Disposition header, because
+               it confuses Microsoft Outlook, Build 10.0.6626, at
+               least. */
+            (void) fprintf (composition_file, "#%s <>", content_type);
+        } else {
+            /* Suppress Content-Id, insert Content-Disposition with
+               modification date. */
+            (void) fprintf (composition_file,
+                            "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
+                            content_type,
+                            ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
+                            dtime (&st.st_mtime, 0));
+        }
 
         break;
     default:
@@ -550,13 +570,13 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                /*
                 * This header field is discarded.
                 */
-               if (!strcasecmp (name, "Message-ID")) {
+               if (!mh_strcasecmp (name, "Message-ID")) {
                    while (state == FLDPLUS)
                        state = m_getfld (state, name, buffer, sizeof(buffer), in);
                } else if (uprf (name, XXX_FIELD_PRF)
-                       || !strcasecmp (name, VRSN_FIELD)
-                       || !strcasecmp (name, "Subject")
-                       || !strcasecmp (name, "Encrypted")) {
+                       || !mh_strcasecmp (name, VRSN_FIELD)
+                       || !mh_strcasecmp (name, "Subject")
+                       || !mh_strcasecmp (name, "Encrypted")) {
                    /*
                     * These header fields are copied to the enclosed
                     * header of the first message in the collection
@@ -565,7 +585,7 @@ splitmsg (char **vec, int vecp, char *drft, struct stat *st, int delay)
                     * version of it, can be copied to the header
                     * of each messsage/partial in the collection.
                     */
-                   if (!strcasecmp (name, "Subject")) {
+                   if (!mh_strcasecmp (name, "Subject")) {
                        size_t sublen;
 
                        strncpy (subject, buffer, BUFSIZ);
@@ -989,7 +1009,7 @@ annoaux (int fd)
     }
     if (!(mp = folder_read (folder))) {
        if (debugsw)
-           admonish (NULL, "unable to read folder %s");
+           admonish (NULL, "unable to read folder %s", folder);
        return;
     }
 
@@ -1054,12 +1074,10 @@ oops:
 }
 
 
-int
-done (int status)
+static void
+armed_done (int status)
 {
-    if (armed)
-       longjmp (env, status ? status : NOTOK);
+    longjmp (env, status ? status : NOTOK);
 
     exit (status);
-    return 1;  /* dead code to satisfy the compiler */
 }