readconfig.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 034fd41..879308f 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 4be454f..5b8061b 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 acee394..7aa6868 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 3693021..91c6c39 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 5a850b0..c744a3e 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 5e08fa7..8fab5d8 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 711f26c..e5e50c6 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 ae87104..a1ea169 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 5a5981e..49c1c83 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 b01a338..fcf0452 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 9a3700d..adc11d0 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 60c37c8..3812f89 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"