[Nmh-commits] [SCM] The nmh Mail Handling System branch, master, updated. 6bd76adcc81f4a725352c338a39212bcdefb0a4b

[David Levine]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The nmh Mail Handling System".

The branch, master has been updated
       via  6bd76adcc81f4a725352c338a39212bcdefb0a4b (commit)
      from  8cb5a3fb4327ce476d5422dec81c2aa6d6a2c5de (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/nmh.git/commit/?id=6bd76adcc81f4a725352c338a39212bcdefb0a4b


commit 6bd76adcc81f4a725352c338a39212bcdefb0a4b
Author: David Levine <address@hidden>
Date:   Sat Jan 7 10:03:35 2012 -0600

    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.

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));

-----------------------------------------------------------------------

Summary of changes:
 man/send.man  |    5 ++++-
 uip/sendsbr.c |    9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The nmh Mail Handling System