[bug #4302] errno is not always an extern int

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index bacec10..b16e8c9 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,8 +15,8 @@
 #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>
@@ -57,15 +61,13 @@ static struct swit switches[] = {
 #define VERSIONSW              16
     { "version", 0 },
 #define        HELPSW                 17
-    { "help", 4 },
+    { "help", 0 },
 #define        DEBUGSW                18
     { "debug", -5 },
     { NULL, 0 }
 };
 
 
-extern int errno;
-
 /* mhbuildsbr.c */
 extern int checksw;
 extern char *tmp;      /* directory to place temp files */
@@ -363,12 +365,11 @@ main (int argc, char **argv)
     unlink_outfile = 0;
 
     free_content (ct);
-    done (0);
-    /* NOT REACHED */
+    return done (0);
 }
 
 
-void
+int
 done (int status)
 {
     /*
@@ -381,4 +382,5 @@ done (int status)
        unlink (outfile);
 
     exit (status);
+    return 1;  /* dead code to satisfy the compiler */
 }