readconfig.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 034fd41a624308184cd77a3fc0d5de1898775c49..879308fd391cf0912b8909156f4350265bd5c576 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -384,6 +384,7 @@ noinst_HEADERS = \
     sbr/print_version.h \
     sbr/push.h \
     sbr/read_line.h \
     sbr/print_version.h \
     sbr/push.h \
     sbr/read_line.h \

+    sbr/readconfig.h \

     sbr/seq_add.h \
     sbr/seq_bits.h \
     sbr/seq_del.h \
     sbr/seq_add.h \
     sbr/seq_bits.h \
     sbr/seq_del.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 4be454f4fa6d7f1d929fe1ee7f552bfef6d606b9..5b8061b659ed1adcbe8f52d233d97f9fffe1f39e 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,8 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
 
 struct msgs_array;
 

-void add_profile_entry (const char *, const char *);
-

 /*
  * Check to see if we can display a given character set natively.
  * Arguments include:
 /*
  * Check to see if we can display a given character set natively.
  * Arguments include:


@@ -170,7 +168,6 @@ void m_unknown2(m_getfld_state_t *);
 char *nmh_getpass(const char *);
 int pidwait (pid_t, int);
 char *r1bindex(char *, int) PURE;
 char *nmh_getpass(const char *);
 int pidwait (pid_t, int);
 char *r1bindex(char *, int) PURE;

-void readconfig (struct node **, FILE *, const char *, int);

 int refile (char **, char *);
 
 /*
 int refile (char **, char *);
 
 /*

diff --git a/sbr/context_read.c b/sbr/context_read.c
index acee3949bdb3dc4d94a84754d9e6db44b0bfafed..7aa68681996effe4d3b34d05e2c3b07ee75fb572 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "readconfig.h"

 #include "path.h"
 #include "error.h"
 #include "lock_file.h"
 #include "path.h"
 #include "error.h"
 #include "lock_file.h"

diff --git a/sbr/mime_type.c b/sbr/mime_type.c
index 3693021669fb4d42c345cfd6275b319a53e98aaa..91c6c3980c8d1c7d77d880c5f5bae63087162964 100644 (file)
--- a/sbr/mime_type.c
+++ b/sbr/mime_type.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "readconfig.h"

 #include "error.h"
 #include "h/utils.h"
 #include "h/tws.h"
 #include "error.h"
 #include "h/utils.h"
 #include "h/tws.h"

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5a850b04b53d349f6cfd5f6868eb3081b557805d..c744a3e55054fab7384441b062327c8edbcfeb09 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "readconfig.h"

 #include "error.h"
 #include "h/utils.h"
 
 #include "error.h"
 #include "h/utils.h"
 

diff --git a/sbr/readconfig.h b/sbr/readconfig.h
new file mode 100644 (file)
index 0000000..c47790f
--- /dev/null
+++ b/sbr/readconfig.h
@@ -0,0 +1,9 @@
+/* readconfig.h -- base routine to read nmh configuration files
+ *              -- such as nmh profile, context file, or mhn.defaults.
+ *
+ * This code is Copyright (c) 2017, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information. */
+
+void readconfig(struct node **, FILE *, const char *, int);
+void add_profile_entry(const char *, const char *);

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 5e08fa7a296409189342c07730cdf1fcfdb67972..8fab5d86babc390ef783187f7ebbdadb6dad31e1 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 711f26ccf917e8eae4b1de6911f1d0a456a866b0..e5e50c69565e980214d2bb4f94bada90200d474f 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index ae871044fda062769c81a0f839943b6a4d8f8d4a..a1ea169c1dbbaae9e7ec572e92ef01ce719b0a31 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index 5a5981ec8f4e53b5a1497aa6899219733a3627cd..49c1c83fc076633917732442149d62db875ca3bf 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index b01a33832cae3eb2f2e6de633c01ad6e70b0894b..fcf045228821c704eba0051f0767debab4c5abdf 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 9a3700d8f869afa1352c6b5bfb35355a99cc672b..adc11d0ef0eec38f9ca64c6f03f54dec95fa940b 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/post.c b/uip/post.c
index 60c37c8b9d05420e6ee1c81787bbff01794a0dcc..3812f8925994a9de13768239f7c7d921a73bce11 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/readconfig.h"

 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"