h/utils.h: Move in nmh_init() prototype from h/prototypes.h.

diff --git a/h/prototypes.h b/h/prototypes.h
index 28d21f0..9f8dc2e 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -543,14 +543,3 @@ const char *nmh_cred_get_password(nmh_creds_t creds);
  * Free an allocated nmh_creds structure.
  */
 void nmh_credentials_free(nmh_creds_t creds);
-
-/*
- * program initialization
- *
- * argv0        - argv[0], presumably the program name
- * read_context - 0: don't read context
- *              - 1: read context, check nmh version, and issue warning message
- *                   if non-existent or old
- *              - 2: read context, don't check nmh version
- */
-int nmh_init(const char *argv0, int read_context);

diff --git a/h/utils.h b/h/utils.h
index c5991f4..56dec30 100644 (file)
--- a/h/utils.h
+++ b/h/utils.h
@@ -98,6 +98,16 @@ int contains8bit(const char *start, const char *end);
  */
 int scan_input (int fd, int *eightbit);
 
+/*
+ * program initialization
+ *
+ * argv0        - argv[0], presumably the program name
+ * read_context - 0: don't read context
+ *              - 1: read context, check nmh version, and issue warning message
+ *                   if non-existent or old
+ *              - 2: read context, don't check nmh version
+ */
+int nmh_init(const char *argv0, int read_context);
 
 /*
  * Compares prior version of nmh with current version.  Returns 1

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 12e2391..6a6ef7c 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -9,6 +9,7 @@
 #include <h/fmt_scan.h>
 #include <h/fmt_compile.h>
 #include <h/scansbr.h>
+#include <h/utils.h>
 
 #define FMTDUMP_SWITCHES \
     X("form formatfile", 0, FORMSW) \

diff --git a/uip/mhl.c b/uip/mhl.c
index 59c233d..ea7a244 100644 (file)
--- a/uip/mhl.c
+++ b/uip/mhl.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 int

diff --git a/uip/mhparam.c b/uip/mhparam.c
index 1498884..17705bc 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -10,6 +10,7 @@
 
 #include <h/mh.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #define MHPARAM_SWITCHES \
     X("components", 0, COMPSW) \

diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index ac34c75..b7acbb1 100644 (file)
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -15,9 +15,12 @@
 #endif /* HAVE_CONFIG_H */
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <string.h>
 #include <stdio.h>
 
+#include <h/utils.h>
+
 #if ! defined HAVE_MKSTEMPS
 #   define HAVE_MKSTEMPS 0
 #endif /* ! HAVE_MKSTEMPS */

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 44d9352..3bc7f23 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <h/mts.h>
 #include <h/tws.h>
+#include <h/utils.h>
 #include <pwd.h>
 
 #include <h/popsbr.h>

diff --git a/uip/prompter.c b/uip/prompter.c
index 0532c21..cdab14e 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -8,6 +8,7 @@
 #include <h/mh.h>
 #include <fcntl.h>
 #include <h/signals.h>
+#include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 #include <setjmp.h>
 

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 9215b00..6235e5e 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -10,6 +10,7 @@
 #include <h/rcvmail.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 
 #define RCVPACK_SWITCHES \
     X("mbox", 0, MBOXSW) \

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index bb07856..7e22d0a 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -9,6 +9,7 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <h/mts.h>
+#include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 
 #define RCVSTORE_SWITCHES \

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 3b83708..0c717b4 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -17,6 +17,7 @@
 #include <h/scansbr.h>
 #include <h/tws.h>
 #include <h/mts.h>
+#include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 #include <fcntl.h>
 

diff --git a/uip/viamail.c b/uip/viamail.c
index e7af770..3c92f5f 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -12,6 +12,7 @@
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
+#include <h/utils.h>
 #include "../sbr/m_mktemp.h"
 
 #define VIAMAIL_SWITCHES \

diff --git a/uip/whatnow.c b/uip/whatnow.c
index 4fffddb..86a17f9 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 int