scansbr.c: Move interface to own file.

Merging in content of existing h/scansbr.h, though that only contained
one of the three prototypes.  The other two were in h/prototypes.h.

diff --git a/Makefile.am b/Makefile.am
index 94f82fcc4355f280f3b2bb29c443638656f06375..419b1b1845382ec63adaf571c97a6974b21e2256 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -357,7 +357,6 @@ noinst_HEADERS = \
     h/popsbr.h \
     h/prototypes.h \
     h/rcvmail.h \
     h/popsbr.h \
     h/prototypes.h \
     h/rcvmail.h \

-    h/scansbr.h \

     h/signals.h \
     h/tws.h \
     h/utils.h \
     h/signals.h \
     h/tws.h \
     h/utils.h \


@@ -461,6 +460,7 @@ noinst_HEADERS = \
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
     uip/replsbr.h \
     uip/mhoutsbr.h \
     uip/mhshowsbr.h \
     uip/replsbr.h \

+    uip/scansbr.h \

     #
 
 ##
     #
 
 ##

diff --git a/h/prototypes.h b/h/prototypes.h
index d47ac2241d458036e8d81b1292541231c8277198..f12652394186edd34bdad0351dd5df668cdb7848 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -17,9 +17,6 @@ struct msgs_array;
 
 int pidwait (pid_t, int);
 
 
 int pidwait (pid_t, int);
 

-void scan_detect_mbox_style (FILE *);
-void scan_finished(void);
-

 /*
  * prototypes for some routines in uip
  */
 /*
  * prototypes for some routines in uip
  */

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 0545c0df2089fbd702f365a52919173f56c50181..9f1f162e36892f984be75017b180b4eda37c407c 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"


@@ -14,7 +15,6 @@
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"

-#include "h/scansbr.h"

 #include "h/done.h"
 #include "h/utils.h"
 
 #include "h/done.h"
 #include "h/utils.h"
 

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 94c3b97913ef0a5bbc9c8fed359fa0d7322730b0..72f60f91bb80c3369299e9aa41ce654f314928ee 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/m_name.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"
 #include "sbr/m_name.h"
 #include "sbr/m_getfld.h"
 #include "sbr/getarguments.h"


@@ -31,7 +32,6 @@
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"
 #include "h/utils.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"
 #include "h/utils.h"

-#include "h/scansbr.h"

 #include "h/addrsbr.h"
 #include "h/done.h"
 #include "sbr/m_maildir.h"
 #include "h/addrsbr.h"
 #include "h/done.h"
 #include "sbr/m_maildir.h"

diff --git a/uip/inc.c b/uip/inc.c
index ac39f72527ff245c47ba44a9192b05d392999391..70dddbd564fa881a95a1fec87be8e8f0e1354e64 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
 #endif
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/m_name.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"
 #include "sbr/m_name.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/getarguments.h"


@@ -57,7 +58,6 @@
 #include "h/dropsbr.h"
 #include "h/popsbr.h"
 #include "h/fmt_scan.h"
 #include "h/dropsbr.h"
 #include "h/popsbr.h"
 #include "h/fmt_scan.h"

-#include "h/scansbr.h"

 #include "h/signals.h"
 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/signals.h"
 #include "h/tws.h"
 #include "h/mts.h"

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 77fa8bdd4f2c089b3a4bfc30035865d374980c8d..6f8ded3586caa928402876eff810ccf8f0a65f41 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/closefds.h"


@@ -21,7 +22,6 @@
 #include "h/signals.h"
 #include <setjmp.h>
 #include "h/rcvmail.h"
 #include "h/signals.h"
 #include <setjmp.h>
 #include "h/rcvmail.h"

-#include "h/scansbr.h"

 #include "h/fmt_scan.h"
 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/fmt_scan.h"
 #include "h/tws.h"
 #include "h/mts.h"

diff --git a/uip/scan.c b/uip/scan.c
index 654f378a8477e0f990ffee4c4aee345cdf7d6d14..b74b3607bbb7df662af2053d701dee770bdfadc1 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/m_name.h"
 #include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"


@@ -26,7 +27,6 @@
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "sbr/seq_getnum.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"

-#include "h/scansbr.h"

 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/done.h"
 #include "h/tws.h"
 #include "h/mts.h"
 #include "h/done.h"

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 28c382fe1180b480ec7fa2c1e8b25f8ed0e8479c..81abc7d4d4549960958af1dfe1b4ada7da136f82 100644 (file)
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "scansbr.h"

 #include "sbr/m_name.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"
 #include "sbr/m_name.h"
 #include "sbr/m_gmprot.h"
 #include "sbr/m_getfld.h"


@@ -13,7 +14,6 @@
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"

-#include "h/scansbr.h"

 #include "h/tws.h"
 #include "h/utils.h"
 #include "sbr/terminal.h"
 #include "h/tws.h"
 #include "h/utils.h"
 #include "sbr/terminal.h"

diff --git a/h/scansbr.h b/uip/scansbr.h
similarity index 72%
rename from h/scansbr.h
rename to uip/scansbr.h
index 0aa5cc5197eb8af0034b500cfca541fe9e5dff37..a7c8aed98498b6eef34bc4820b20ad75c2ece7b9 100644 (file)
--- a/h/scansbr.h
+++ b/uip/scansbr.h
@@ -1,5 +1,8 @@
-/* scansbr.h -- definitions for scan()
- */
+/* scansbr.h -- routines to help scan along...
+ *
+ * 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. */

 
 #define        SCNENC  2               /* message just fine, but encrypted(!!) */
 #define        SCNMSG  1               /* message just fine                    */
 
 #define        SCNENC  2               /* message just fine, but encrypted(!!) */
 #define        SCNMSG  1               /* message just fine                    */


@@ -30,8 +33,6 @@
 
 #define        WIDTH  78
 
 
 #define        WIDTH  78
 

-/*
- * prototypes
- */
-int scan (FILE *, int, int, char *, int, int, int, char *, long, int,
-          charstring_t *);
+int scan(FILE *, int, int, char *, int, int, int, char *, long, int, charstring_t *);
+void scan_finished(void);
+void scan_detect_mbox_style(FILE *);