[Nmh-commits] nmh uip/mhbuild.c uip/mhbuildsbr.c man/mhbuild....

[David Levine]

CVSROOT:        /sources/nmh
Module name:    nmh
Branch:         
Changes by:     David Levine <address@hidden>   06/01/31 02:50:58

Modified files:
        uip            : mhbuild.c mhbuildsbr.c 
        man            : mhbuild.man 
        .              : ChangeLog 

Log message:
        Added -nocontentid (and -contentid, for symmetry) switch to mhbuild.  
This allows users to disable generation of the Content-ID: header in MIME 
messages, in order to placate broken version(s) of Outlook.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhbuild.c.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/uip/mhbuildsbr.c.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/man/mhbuild.man.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/nmh/nmh/ChangeLog.diff?tr1=1.231&tr2=1.232&r1=text&r2=text

Patches:
Index: nmh/ChangeLog
diff -u nmh/ChangeLog:1.231 nmh/ChangeLog:1.232
--- nmh/ChangeLog:1.231 Sun Jan 29 19:34:42 2006
+++ nmh/ChangeLog       Tue Jan 31 02:50:58 2006
@@ -1,3 +1,15 @@
+2006-01-17  David Levine <address@hidden>
+
+       * uip/mhbuild.c, uip/mhbuildsbr.c, man/mhbuild.man:  added
+       -nocontentid switch, to disable generation of Content-ID:
+       header in MIME messages.  (Also added -contentid for
+       symmetry.)  The default configuration of Microsoft Outlook,
+       Build 10.0.3416, in particular, doesn't see attachments in
+       incoming messages if there are Content-ID headers, see
+       http://home.cwru.edu/~wrv/eudoraoutlookfix.html.  This allows
+       users to easily accomodate that by adding
+       mhbuild: -nocontentid to their .mh_profile.
+
 2006-01-29  Oliver Kiddle  <address@hidden>
 
        * bug 4360: uip/replsbr.c: remove trailing newlines from components
Index: nmh/man/mhbuild.man
diff -u nmh/man/mhbuild.man:1.6 nmh/man/mhbuild.man:1.7
--- nmh/man/mhbuild.man:1.6     Thu Jan 25 21:15:54 2001
+++ nmh/man/mhbuild.man Tue Jan 31 02:50:57 2006
@@ -1,6 +1,6 @@
 .\"
 .\" %nmhwarning%
-.\" $Id: mhbuild.man,v 1.6 2001/01/25 21:15:54 ssen Exp $
+.\" $Id: mhbuild.man,v 1.7 2006/01/31 02:50:57 levine Exp $
 .\"
 .TH MHBUILD %manext1% "%nmhdate%" MH.6.8 [%nmhversion%]
 .SH NAME
@@ -15,6 +15,7 @@
 .RB [ \-headers " | " \-noheaders ]
 .RB [ \-ebcdicsafe " | " \-noebcdicsafe ]
 .RB [ \-rfc934mode " | " \-norfc934mode ]
+.RB [ \-contentid " | " \-nocontentid ]
 .RB [ \-verbose " | " \-noverbose ]
 .RB [ \-check " | " \-nocheck ]
 .RB [ \-version ]
@@ -312,9 +313,13 @@
 .PP
 By default,
 .B mhbuild
-will generate a unique \*(lqContent-ID:\*(rq for
-each directive; however, the user may override this by defining the ID
-using the \*(lq<\*(rq and \*(lq>\*(rq characters.
+will generate a unique \*(lqContent-ID:\*(rq for each directive,
+corresponding to each message part; however, the user may override
+this by defining the ID using the \*(lq<\*(rq and \*(lq>\*(rq
+characters.  The
+.B \-nocontentid
+switch suppresses creation of all \*(lqContent-ID:\*(rq headers,
+even in the top level of the message.
 .PP
 In addition to the various directives, plaintext can be present.
 Plaintext is gathered, until a directive is found or the draft is
@@ -642,6 +647,7 @@
 .RB ` \-headers '
 .RB ` \-realsize '
 .RB ` \-norfc934mode '
+.RB ` \-contentid '
 .RB ` \-nocheck '
 .RB ` \-noebcdicsafe '
 .RB ` \-noverbose '
Index: nmh/uip/mhbuild.c
diff -u nmh/uip/mhbuild.c:1.9 nmh/uip/mhbuild.c:1.10
--- nmh/uip/mhbuild.c:1.9       Fri Jan  6 21:51:44 2006
+++ nmh/uip/mhbuild.c   Tue Jan 31 02:50:57 2006
@@ -2,7 +2,7 @@
 /*
  * mhbuild.c -- expand/translate MIME composition files
  *
- * $Id: mhbuild.c,v 1.9 2006/01/06 21:51:44 bress Exp $
+ * $Id: mhbuild.c,v 1.10 2006/01/31 02:50:57 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -59,11 +59,15 @@
     { "rcache policy", 0 },
 #define        WCACHESW               15
     { "wcache policy", 0 },
-#define VERSIONSW              16
+#define        CONTENTIDSW            16
+    { "contentid", 0 },
+#define        NCONTENTIDSW           17
+    { "nocontentid", 0 },
+#define VERSIONSW              18
     { "version", 0 },
-#define        HELPSW                 17
+#define        HELPSW                 19
     { "help", 0 },
-#define        DEBUGSW                18
+#define        DEBUGSW                20
     { "debug", -5 },
     { NULL, 0 }
 };
@@ -85,6 +89,7 @@
 int ebcdicsw = 0;
 int listsw   = 0;
 int rfc934sw = 0;
+int contentidsw = 1;
 
 /*
  * Temporary files
@@ -219,6 +224,13 @@
                sizesw = 0;
                continue;
 
+           case CONTENTIDSW:
+               contentidsw = 1;
+               continue;
+           case NCONTENTIDSW:
+               contentidsw = 0;
+               continue;
+
            case VERBSW: 
                verbosw++;
                continue;
Index: nmh/uip/mhbuildsbr.c
diff -u nmh/uip/mhbuildsbr.c:1.10 nmh/uip/mhbuildsbr.c:1.11
--- nmh/uip/mhbuildsbr.c:1.10   Mon Jan  2 03:17:42 2006
+++ nmh/uip/mhbuildsbr.c        Tue Jan 31 02:50:57 2006
@@ -2,7 +2,7 @@
 /*
  * mhbuildsbr.c -- routines to expand/translate MIME composition files
  *
- * $Id: mhbuildsbr.c,v 1.10 2006/01/02 03:17:42 bress Exp $
+ * $Id: mhbuildsbr.c,v 1.11 2006/01/31 02:50:57 levine Exp $
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -51,6 +51,7 @@
 extern int ebcdicsw;
 extern int listsw;
 extern int rfc934sw;
+extern int contentidsw;
 
 extern int endian;     /* mhmisc.c */
 
@@ -3932,9 +3933,9 @@
     add_header (ct, np, vp);
 
     /*
-     * output the Content-ID
+     * output the Content-ID, unless disabled by -nocontentid
      */
-    if (ct->c_id) {
+    if (contentidsw && ct->c_id) {
        np = add (ID_FIELD, NULL);
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);