Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 045146b..cfe776f 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -3,6 +3,10 @@
  * mhbuild.c -- expand/translate MIME composition files
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -11,11 +15,12 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -54,18 +59,20 @@ static struct swit switches[] = {
     { "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 }
 };
 
 
-extern int errno;
-
 /* mhbuildsbr.c */
 extern int checksw;
 extern char *tmp;      /* directory to place temp files */
@@ -82,6 +89,7 @@ int verbosw = 0;
 int ebcdicsw = 0;
 int listsw   = 0;
 int rfc934sw = 0;
+int contentidsw = 1;
 
 /*
  * Temporary files
@@ -216,6 +224,13 @@ main (int argc, char **argv)
                sizesw = 0;
                continue;
 
+           case CONTENTIDSW:
+               contentidsw = 1;
+               continue;
+           case NCONTENTIDSW:
+               contentidsw = 0;
+               continue;
+
            case VERBSW: 
                verbosw++;
                continue;