mhbuild: Removed -rfc934mode switch, which is only useful for non-MIME systems.

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 5cccd2a..fd6cee0 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -37,23 +37,19 @@ static struct swit switches[] = {
        { "list", 0 },
 #define NLISTSW  3
        { "nolist", 0 },
-#define RFC934SW  4
-       { "rfc934mode", 0 },
-#define NRFC934SW  5
-       { "norfc934mode", 0 },
-#define VERBSW  6
+#define VERBSW  4
        { "verbose", 0 },
-#define NVERBSW  7
+#define NVERBSW  5
        { "noverbose", 0 },
-#define CONTENTIDSW  8
+#define CONTENTIDSW  6
        { "contentid", 0 },
-#define NCONTENTIDSW  9
+#define NCONTENTIDSW  7
        { "nocontentid", 0 },
-#define VERSIONSW  10
+#define VERSIONSW  8
        { "version", 0 },
-#define HELPSW  11
+#define HELPSW  9
        { "help", 0 },
-#define DEBUGSW  12
+#define DEBUGSW  10
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -100,7 +96,6 @@ int debugsw = 0;
 int verbosw = 0;
 
 int listsw   = 0;
-int rfc934sw = 0;
 int contentidsw = 1;
 
 /*
@@ -192,13 +187,6 @@ main(int argc, char **argv)
                                listsw = 0;
                                continue;
 
-                       case RFC934SW:
-                               rfc934sw++;
-                               continue;
-                       case NRFC934SW:
-                               rfc934sw = 0;
-                               continue;
-
                        case CONTENTIDSW:
                                contentidsw = 1;
                                continue;
@@ -1157,37 +1145,8 @@ compose_content(CT ct)
                                return NOTOK;
                }
 
-               /*
-               ** If the -rfc934mode switch is given, then check all
-               ** the subparts of a multipart/digest.  If they are all
-               ** message/rfc822, then mark this content and all
-               ** subparts with the rfc934 compatibility mode flag.
-               */
-               if (rfc934sw && ct->c_subtype == MULTI_DIGEST) {
-                       int is934 = 1;
-
-                       for (part = m->mp_parts; part; part = part->mp_next) {
-                               CT p = part->mp_part;
-
-                               if (p->c_subtype != MESSAGE_RFC822) {
-                                       is934 = 0;
-                                       break;
-                               }
-                       }
-                       ct->c_rfc934 = is934;
-                       for (part = m->mp_parts; part; part = part->mp_next) {
-                               CT p = part->mp_part;
-
-                               if ((p->c_rfc934 = is934))
-                                       p->c_end++;
-                       }
-               }
-
                if (listsw) {
                        ct->c_end = (partnum = strlen(prefix) + 2) + 2;
-                       if (ct->c_rfc934)
-                               ct->c_end += 1;
-
                        for (part = m->mp_parts; part; part = part->mp_next)
                                ct->c_end += part->mp_part->c_end + partnum;
                }
@@ -1606,16 +1565,6 @@ build_headers(CT ct)
        }
 
        /*
-       ** Skip the output of Content-Type, parameters, content
-       ** description and disposition, and Content-ID if the
-       ** content is of type "message" and the rfc934 compatibility
-       ** flag is set (which means we are inside multipart/digest
-       ** and the switch -rfc934mode was given).
-       */
-       if (ct->c_type == CT_MESSAGE && ct->c_rfc934)
-               goto skip_headers;
-
-       /*
        ** output the content type and subtype
        */
        np = getcpy(TYPE_FIELD);
@@ -1691,7 +1640,6 @@ build_headers(CT ct)
                add_header(ct, np, vp);
        }
 
-skip_headers:
        /*
        ** output the Content-Transfer-Encoding
        */