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

diff --git a/h/prototypes.h b/h/prototypes.h
index 28d21f0b29b0e645550aa8501e82aa97fd294ff2..9f8dc2ea378237446467be1da593a260c5e8b876 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 c5991f42ed96c8dc47acc31212f446f847ec515d..56dec3092de1c1e5773dd47c14a582d0ee26d50d 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 12e2391ad968e5b339c3a71a93302bc365e91a39..6a6ef7cbdd1851879e7c2e43ca850fc894daedbb 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 59c233dd3c15e8fd679e574046769d0b4da1f492..ea7a244ce55b0e55579d6c442feece7c29339432 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 149888471b2d0f064b78ec2c555f11615e203924..17705bc894346f04508edbdf4cac0e99805d5eb6 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 ac34c752190fcdd29f1bbd44b7e6bfc4b36f1fdc..b7acbb1460051c7ed103d8c55006ea3f16de2642 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 44d9352845b4a5b89512ba6ed43c9a52ebed6801..3bc7f230fc9bdb2bb8e412b379e192a1e781262d 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 0532c2194d2dfc5b666b27522c1f38b50e49fb18..cdab14e33e2ed32ce08b4efaa73826ef5ad33de5 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 9215b00e198b5a9a4a949d729c424e13e84cb27e..6235e5e96625b9247ac986ba7628b2bee5536af5 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 bb07856e9d8a0d982941df824c8bee099ab330f0..7e22d0af33605cf9c43d28375e54569928682cac 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 3b837081d2e367db2ad0391271adbb67a10f8949..0c717b457eb54346c1b009d07a686a69f2191fcd 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 e7af7706865a30d20f960bb71b28f183b746715f..3c92f5fdaa1e091a1d1817fd6eaa92612a573d9f 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 4fffddb95d4d134bed4ca3b96c8685fecca67dbd..86a17f9329a9aad9755410022c40716f9931dcfa 100644 (file)
--- a/uip/whatnow.c
+++ b/uip/whatnow.c
@@ -6,6 +6,7 @@
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 int