From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Sat, 11 Nov 2017 23:59:22 +0000 (+0000)
Subject: smatch.c: Move interface to own file.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/cbe19f539e4de1a2adfb24574b6689a0784c8049?hp=9291a5f82480f2458e04cb9ea7e6749bc952b308

smatch.c: Move interface to own file.
---

diff --git a/Makefile.am b/Makefile.am
index eeb99980..5dc26b97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -429,6 +429,7 @@ noinst_HEADERS = \
     sbr/seq_list.h \
     sbr/seq_nameok.h \
     sbr/seq_print.h \
+    sbr/smatch.h \
     sbr/snprintb.h \
     sbr/ssequal.h \
     sbr/strindex.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index b706b429..44670f46 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -90,7 +90,6 @@ void seq_setcur (struct msgs *, int);
 void seq_setprev (struct msgs *);
 void seq_setunseen (struct msgs *, int);
 int showfile (char **, char *);
-int smatch(const char *, const struct swit *) PURE;
 
 /*
  * prototypes for some routines in uip
diff --git a/sbr/read_switch.c b/sbr/read_switch.c
index 6abce534..8cdbfe4f 100644
--- a/sbr/read_switch.c
+++ b/sbr/read_switch.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "smatch.h"
 
 
 int
diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index d13ae7a1..72f43726 100644
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "smatch.h"
 #include "brkstring.h"
 #include "ambigsw.h"
 #include "print_sw.h"
diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c
index cd43c579..2320ccbf 100644
--- a/sbr/read_switch_multiword_via_readline.c
+++ b/sbr/read_switch_multiword_via_readline.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "smatch.h"
 #include "brkstring.h"
 #include "ambigsw.h"
 #include "print_sw.h"
diff --git a/sbr/smatch.c b/sbr/smatch.c
index cb23e8f9..7a3f9024 100644
--- a/sbr/smatch.c
+++ b/sbr/smatch.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "smatch.h"
 
 
 int
diff --git a/sbr/smatch.h b/sbr/smatch.h
new file mode 100644
index 00000000..d85ab1da
--- /dev/null
+++ b/sbr/smatch.h
@@ -0,0 +1,7 @@
+/* smatch.h -- match a switch (option)
+ *
+ * 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. */
+
+int smatch(const char *, const struct swit *) PURE;
diff --git a/uip/ali.c b/uip/ali.c
index 229831b9..6e94f8c1 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/getcpy.h"
 #include "sbr/context_find.h"
 #include "sbr/brkstring.h"
diff --git a/uip/anno.c b/uip/anno.c
index 7ce3dbc3..8c4b08cc 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/trimcpy.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
diff --git a/uip/ap.c b/uip/ap.c
index b9a49cd7..0a09a213 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/getcpy.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/burst.c b/uip/burst.c
index a683dc5c..c6a82fe4 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"
 #include "sbr/getfolder.h"
diff --git a/uip/comp.c b/uip/comp.c
index 9a8b3775..29ca194d 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/refile.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
diff --git a/uip/dist.c b/uip/dist.c
index 28217b73..b8e2fc5b 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/refile.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
diff --git a/uip/dp.c b/uip/dp.c
index 2914980f..94586269 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/context_save.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/flist.c b/uip/flist.c
index 0e2e9dd5..c420b944 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ssequal.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index b7c48120..c43b412d 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/fmttest.c b/uip/fmttest.c
index 39f4ecc4..35bab752 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/snprintb.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_convert.h"
diff --git a/uip/folder.c b/uip/folder.c
index fe624464..46362578 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ssequal.h"
 #include "sbr/getcpy.h"
 #include "sbr/m_convert.h"
diff --git a/uip/forw.c b/uip/forw.c
index 1dffa975..cd68d0bf 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/refile.h"
 #include "sbr/cpydata.h"
 #include "sbr/cpydgst.h"
diff --git a/uip/imaptest.c b/uip/imaptest.c
index a1359386..2aa9e164 100644
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/client.h"
 #include "sbr/getcpy.h"
 #include "sbr/brkstring.h"
diff --git a/uip/inc.c b/uip/inc.c
index 302e0af4..64730537 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/getfolder.h"
 #include "sbr/ext_hook.h"
 #include "sbr/folder_read.h"
diff --git a/uip/install-mh.c b/uip/install-mh.c
index abbef09d..8983ed8f 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"
 #include "sbr/readconfig.h"
diff --git a/uip/mark.c b/uip/mark.c
index 0d4dd0c8..4485cedc 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/snprintb.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 7fcc0efd..212d8e6e 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_backup.h"
 #include "sbr/context_find.h"
 #include "sbr/readconfig.h"
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index dd0d8a23..b5a3f928 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/fmt_rfc2047.h"
 #include "sbr/cpydata.h"
 #include "sbr/trimcpy.h"
diff --git a/uip/mhical.c b/uip/mhical.c
index bb5a9eee..56c920b0 100644
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 8e6274ed..e300762d 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 72a90b72..3356add6 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 0fbdc6cd..b3d650bf 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/snprintb.h"
 #include "sbr/copyip.h"
diff --git a/uip/mhn.c b/uip/mhn.c
index 61e9de86..aaf92d9e 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 072787e7..caf72c1d 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 474d6f69..612e7de4 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index c0115d51..8d62e681 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhstore.c b/uip/mhstore.c
index f935a371..2552cd89 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 4e4298b0..28e04541 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/uprf.h"
 #include "sbr/getcpy.h"
diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index 5cc06f22..0a44a5f1 100644
--- a/uip/mkstemp.c
+++ b/uip/mkstemp.c
@@ -120,6 +120,7 @@ build_template(const char *directory, const char *prefix, const char *suffix)
 
 #if NMH
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/msgchk.c b/uip/msgchk.c
index 56f2fa80..4998353d 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/new.c b/uip/new.c
index f4e08e7f..9d04fc26 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/trimcpy.h"
 #include "sbr/vfgets.h"
diff --git a/uip/packf.c b/uip/packf.c
index eb9ea42d..855228ef 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/pick.c b/uip/pick.c
index 595fde7a..be83b234 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/picksbr.c b/uip/picksbr.c
index aff2fea7..2b2b1e86 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/fmt_rfc2047.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
diff --git a/uip/post.c b/uip/post.c
index 3fd1fff0..69cb644b 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/cpydgst.h"
 #include "sbr/uprf.h"
diff --git a/uip/prompter.c b/uip/prompter.c
index 8a76d0b2..d91173f2 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_atoi.h"
 #include "sbr/context_save.h"
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 73c86b39..89d07305 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 7a2c9152..31a18b0e 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index bd03196b..e10da6a5 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 4e22a8d0..22edfb6b 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/refile.c b/uip/refile.c
index eb63c9a5..c7cbf004 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
diff --git a/uip/repl.c b/uip/repl.c
index fd9d92d2..018d0d9b 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/refile.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
diff --git a/uip/rmf.c b/uip/rmf.c
index 33f44762..1347378a 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/remdir.h"
 #include "sbr/ssequal.h"
 #include "sbr/m_atoi.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index 2049e4ff..9dab87fe 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/scan.c b/uip/scan.c
index 1847037f..6d1684fb 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
diff --git a/uip/send.c b/uip/send.c
index 4a5bcfdb..79628092 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
diff --git a/uip/show.c b/uip/show.c
index 45bb4f01..7be59698 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/uprf.h"
 #include "sbr/check_charset.h"
diff --git a/uip/slocal.c b/uip/slocal.c
index 28cd02d6..28e403d7 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/strindex.h"
 #include "sbr/closefds.h"
 #include "sbr/trimcpy.h"
diff --git a/uip/sortm.c b/uip/sortm.c
index a9ce9854..e723ae11 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/uprf.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"
diff --git a/uip/viamail.c b/uip/viamail.c
index 6001183b..3d8ee6b7 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index a82b657a..2aad78ca 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/refile.h"
 #include "sbr/closefds.h"
diff --git a/uip/whom.c b/uip/whom.c
index cb49e7f2..e6487394 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/m_draft.h"
 #include "sbr/context_find.h"