bug #18630, #18631, #18632, #18634: various patches from Craig Leres

[mmh] / uip / sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index f8384f7..aeba011 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -498,8 +498,9 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
         } else {
             /* Suppress Content-Id, insert simple Content-Disposition. */
             (void) fprintf (composition_file,
-                            "#%s <>{attachment}",
-                            content_type);
+                            "#%s; name=\"%s\" <>{attachment}",
+                            content_type,
+                            ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1);
         }
 
         break;
@@ -514,8 +515,9 @@ make_mime_composition_file_entry(char *file_name, int attachformat)
             /* Suppress Content-Id, insert Content-Disposition with
                modification date. */
             (void) fprintf (composition_file,
-                            "#%s <>{attachment; modification-date=\"%s\"}",
+                            "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}",
                             content_type,
+                            ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1,
                             dtime (&st.st_mtime, 0));
         }
 
@@ -1008,7 +1010,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;
     }