From 6bd76adcc81f4a725352c338a39212bcdefb0a4b Mon Sep 17 00:00:00 2001 From: David Levine Date: Sat, 7 Jan 2012 10:03:35 -0600 Subject: [PATCH] Added Content-Description header with the filename of the attachment, with attachformats 1 and 2. This seems to be common practice now and gives mhlist something useful to display. --- man/send.man | 5 ++++- uip/sendsbr.c | 9 +++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/man/send.man b/man/send.man index ff191c4..d9158c8 100644 --- a/man/send.man +++ b/man/send.man @@ -116,7 +116,8 @@ includes the .I x-unix-mode attribute as noted above. A value of .B 1 -suppresses both that and the \*(lqContent-Description\*(rq header, and +suppresses that, puts the file name in the +\*(lqContent-Description\*(rq header, and adds a \*(lqContent-Disposition\*(rq header. A value of .B 2 adds the file @@ -139,10 +140,12 @@ Content-Description: ASCII text -attachformat 1: Content-Type: text/plain; name="VERSION"; charset="us-ascii" +Content-Description: VERSION Content-Disposition: attachment; filename="VERSION" -attachformat 2: Content-Type: text/plain; name="VERSION"; charset="us-ascii" +Content-Description: VERSION Content-Disposition: attachment; filename="VERSION"; modification-date="Mon, 19 Dec 2005 22:39:51 -0600" .fi .PP diff --git a/uip/sendsbr.c b/uip/sendsbr.c index 57ef007..110050d 100644 --- a/uip/sendsbr.c +++ b/uip/sendsbr.c @@ -500,9 +500,10 @@ make_mime_composition_file_entry(char *file_name, int attachformat) least. */ (void) fprintf (composition_file, "#%s <>", content_type); } else { - /* Suppress Content-Id, insert simple Content-Disposition. */ + /* Suppress Content-Id, insert simple Content-Disposition + and Content-Description with filename. */ (void) fprintf (composition_file, - "#%s; name=\"%s\" <>{attachment}", + "#%1$s; name=\"%2$s\" <> [%2$s]{attachment}", content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1); } @@ -517,9 +518,9 @@ make_mime_composition_file_entry(char *file_name, int attachformat) (void) fprintf (composition_file, "#%s <>", content_type); } else { /* Suppress Content-Id, insert Content-Disposition with - modification date. */ + modification date and Content-Description wtih filename. */ (void) fprintf (composition_file, - "#%s; name=\"%s\" <>{attachment; modification-date=\"%s\"}", + "#%1$s; name=\"%2$s\" <>[%2$s]{attachment; modification-date=\"%3$s\"}", content_type, ((p = strrchr(file_name, '/')) == (char *)0) ? file_name : p + 1, dtime (&st.st_mtime, 0)); -- 1.7.10.4