Editing of man/mhfixmsg.man.

[nmh] / uip / mhbuildsbr.c

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 5607be1786ddf50ee5b7dfeaea0c81b659fde5ef..c8b8799ccf8c32fc1cd982b6c6a1bd2bc8850fac 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -343,7 +343,7 @@ finish_field:
 
        case BODY:
            fseek (in, (long) (-strlen (buf)), SEEK_CUR);
-           /* fall through */
+           /* FALLTHRU */
        case FILEEOF:
            break;
 
@@ -809,7 +809,7 @@ rock_and_roll:
                ct->c_encoding = CE_7BIT;
                goto call_init;
            }
-           /* else fall... */
+           /* FALLTHRU */
        case CT_MULTIPART:
            adios (NULL, "it doesn't make sense to define an in-line %s content",
                   ct->c_type == CT_MESSAGE ? "message" : "multipart");
@@ -1288,7 +1288,7 @@ compose_content (CT ct, int verbose)
                    case 'F':
                        /* %f, and stdout is not-redirected */
                        xstdout = 1;
-                       /* and fall... */
+                       /* FALLTHRU */
 
                    case 'f':
                        /*
@@ -1725,9 +1725,11 @@ build_headers (CT ct, int header_encoding)
     add_header (ct, np, vp);
 
     /*
-     * output the Content-ID, unless disabled by -nocontentid
+     * output the Content-ID, unless disabled by -nocontentid.  Note that
+     * RFC 2045 always requires a Content-ID header for message/external-body
+     * entities.
      */
-    if (contentidsw && ct->c_id) {
+    if ((contentidsw || ct->c_ctexbody) && ct->c_id) {
        np = mh_xstrdup(ID_FIELD);
        vp = concat (" ", ct->c_id, NULL);
        add_header (ct, np, vp);
@@ -2015,7 +2017,7 @@ setup_attach_content(CT ct, char *filename)
        if (strcasecmp(ct->c_ctinfo.ci_subtype, "external-body") == 0)
            adios(NULL, "external-body messages must be specified "
                "by mhbuild directives");
-       /* Fall through */
+       /* FALLTHRU */
 
     default:
        /*