m_getfld.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 68ec278..52cdfdd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -405,6 +405,7 @@ noinst_HEADERS = \
     sbr/m_backup.h \
     sbr/m_convert.h \
     sbr/m_draft.h \
+    sbr/m_getfld.h \
     sbr/m_maildir.h \
     sbr/m_mktemp.h \
     sbr/m_popen.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index d3f05ac..12abb1d 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,19 +15,9 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
-m_getfld_state_t m_getfld_state_init(FILE *iob);
-void m_getfld_state_reset (m_getfld_state_t *);
-void m_getfld_state_destroy (m_getfld_state_t *);
-void m_getfld_track_filepos (m_getfld_state_t *, FILE *);
-void m_getfld_track_filepos2(m_getfld_state_t *);
-int m_getfld (m_getfld_state_t *, char[NAMESZ], char *, int *, FILE *);
-int m_getfld2(m_getfld_state_t *, char[NAMESZ], char *, int *);
 int m_gmprot (void) PURE;
 char *m_name (int);
 
-void m_unknown(m_getfld_state_t *, FILE *);
-void m_unknown2(m_getfld_state_t *);
-
 int pidwait (pid_t, int);
 
 void scan_detect_mbox_style (FILE *);

diff --git a/sbr/m_getfld.c b/sbr/m_getfld.c
index 5647dd1..940b3ef 100644 (file)
--- a/sbr/m_getfld.c
+++ b/sbr/m_getfld.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_getfld.h"
 #include "error.h"
 #include "h/mts.h"
 #include "h/utils.h"

diff --git a/sbr/m_getfld.h b/sbr/m_getfld.h
new file mode 100644 (file)
index 0000000..966b209
--- /dev/null
+++ b/sbr/m_getfld.h
@@ -0,0 +1,15 @@
+/* m_getfld.h -- read/parse a message
+ *
+ * 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. */
+
+m_getfld_state_t m_getfld_state_init(FILE *);
+void m_getfld_state_reset(m_getfld_state_t *);
+void m_getfld_track_filepos(m_getfld_state_t *, FILE *);
+void m_getfld_track_filepos2(m_getfld_state_t *);
+void m_getfld_state_destroy(m_getfld_state_t *);
+int m_getfld(m_getfld_state_t *, char[NAMESZ], char *, int *, FILE *);
+int m_getfld2(m_getfld_state_t *, char[NAMESZ], char *, int *);
+void m_unknown(m_getfld_state_t *, FILE *);
+void m_unknown2(m_getfld_state_t *);

diff --git a/sbr/oauth.c b/sbr/oauth.c
index 2ed2b77..0c13f3b 100755 (executable)
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "m_getfld.h"
 #include "concat.h"
 #include "trimcpy.h"
 #include "getcpy.h"

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 0df1b57..5ff9b69 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "m_getfld.h"
 #include "trimcpy.h"
 #include "getcpy.h"
 #include "readconfig.h"

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index e63f810..20d16ce 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "m_getfld.h"
 #include "seq_read.h"
 #include "ssequal.h"
 #include "trimcpy.h"

diff --git a/uip/distsbr.c b/uip/distsbr.c
index 4e931ec..b86e5a0 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/cpydata.h"
 #include "sbr/uprf.h"
 #include "sbr/m_backup.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 21e6de6..782ce51 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"

diff --git a/uip/forwsbr.c b/uip/forwsbr.c
index 7e86244..07ea3ae 100644 (file)
--- a/uip/forwsbr.c
+++ b/uip/forwsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getcpy.h"
 #include "sbr/error.h"
 #include <fcntl.h>

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index 48b039e..e996cc0 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/concat.h"
 #include "sbr/r1bindex.h"
 #include "sbr/encode_rfc2047.h"

diff --git a/uip/mhcachesbr.c b/uip/mhcachesbr.c
index 44faf5d..1cdd6fd 100644 (file)
--- a/uip/mhcachesbr.c
+++ b/uip/mhcachesbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/read_yes_or_no_if_tty.h"
 #include "sbr/trimcpy.h"
 #include "sbr/error.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index 5312fd1..29486af 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 1a7125e..8d532e3 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"

diff --git a/uip/mhparse.c b/uip/mhparse.c
index a519c7a..54bef78 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/read_yes_or_no_if_tty.h"
 #include "sbr/concat.h"
 #include "sbr/r1bindex.h"

diff --git a/uip/new.c b/uip/new.c
index 6736790..3dc6412 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 2b2b1e8..bee22f2 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/smatch.h"
 #include "sbr/fmt_rfc2047.h"
 #include "sbr/brkstring.h"

diff --git a/uip/post.c b/uip/post.c
index 27f7ad8..1dd794d 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"

diff --git a/uip/prompter.c b/uip/prompter.c
index b5fb93a..51be893 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/cpydata.h"

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 85e877d..5436e5d 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/cpydata.h"

diff --git a/uip/replsbr.c b/uip/replsbr.c
index e9f250b..089c48b 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/read_switch.h"
 #include "sbr/concat.h"
 #include "sbr/closefds.h"

diff --git a/uip/scansbr.c b/uip/scansbr.c
index e7cad88..6bbe170 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getcpy.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 47df948..1b65efb 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/concat.h"
 #include "sbr/cpydgst.h"
 #include "sbr/trimcpy.h"

diff --git a/uip/show.c b/uip/show.c
index 99a6608..ec56e53 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/slocal.c b/uip/slocal.c
index cc1aa7b..f332edd 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/strindex.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index e8a0f4d..b43934c 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 68a56ba..a3f036e 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword_via_readline.h"
 #include "sbr/concat.h"