X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhbuild.c;h=9d9f553a3fe492e88d339c9a2ea6d9e8fe5db705;hb=1ae9fa8a84998e44e0234543162e257815d7e972;hp=bacec1003d26f62ecb697b4d678dfdf9f9b91da6;hpb=1691e80890e5d8ba258c51c214a3e91880e1db2b;p=mmh

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index bacec10..9d9f553 100644
--- 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 <zotnet/tws/tws.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,20 +59,21 @@ 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
-    { "help", 4 },
-#define	DEBUGSW                18
+#define	HELPSW                 19
+    { "help", 0 },
+#define	DEBUGSW                20
     { "debug", -5 },
     { NULL, 0 }
 };
 
 
-extern int errno;
-
 /* mhbuildsbr.c */
-extern int checksw;
 extern char *tmp;	/* directory to place temp files */
 
 /* mhcachesbr.c */
@@ -82,6 +88,7 @@ int verbosw = 0;
 int ebcdicsw = 0;
 int listsw   = 0;
 int rfc934sw = 0;
+int contentidsw = 1;
 
 /*
  * Temporary files
@@ -92,6 +99,7 @@ static int unlink_infile  = 0;
 static char outfile[BUFSIZ];
 static int unlink_outfile = 0;
 
+static void unlink_done (int) NORETURN;
 
 /* mhbuildsbr.c */
 CT build_mime (char *);
@@ -118,6 +126,8 @@ main (int argc, char **argv)
     CT ct, cts[2];
     FILE *fp;
 
+    done=unlink_done;
+
 #ifdef LOCALE
     setlocale(LC_ALL, "");
 #endif
@@ -216,6 +226,13 @@ main (int argc, char **argv)
 		sizesw = 0;
 		continue;
 
+	    case CONTENTIDSW:
+		contentidsw = 1;
+		continue;
+	    case NCONTENTIDSW:
+		contentidsw = 0;
+		continue;
+
 	    case VERBSW: 
 		verbosw++;
 		continue;
@@ -364,12 +381,12 @@ main (int argc, char **argv)
 
     free_content (ct);
     done (0);
-    /* NOT REACHED */
+    return 1;
 }
 
 
-void
-done (int status)
+static void
+unlink_done (int status)
 {
     /*
      * Check if we need to remove stray