From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Mon, 6 Nov 2017 23:59:41 +0000 (+0000)
Subject: ambigsw.c: Move interface to own file.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/be2db0893c180332a66245514a5d72985597f181?hp=04ee0c3f6ad7e4177cc43a0c57f046013a4fbac9

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

diff --git a/Makefile.am b/Makefile.am
index e6cc4dc4..fbfaa25b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -362,6 +362,7 @@ noinst_HEADERS = \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
+    sbr/ambigsw.h \
     sbr/arglist.h \
     sbr/base64.h \
     sbr/ctype-checked.h \
diff --git a/h/prototypes.h b/h/prototypes.h
index 8078bb5d..04bb9c20 100644
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -16,7 +16,6 @@ char *etcpath(char *) NONNULL(1);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
-void ambigsw (const char *, const struct swit *) NONNULL(1, 2);
 int atooi(char *) NONNULL(1) PURE;
 char **brkstring (char *, char *, char *) NONNULL(1);
 
diff --git a/sbr/ambigsw.c b/sbr/ambigsw.c
index e36bb11a..cbd19230 100644
--- a/sbr/ambigsw.c
+++ b/sbr/ambigsw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "ambigsw.h"
 #include "print_sw.h"
 #include "error.h"
 
diff --git a/sbr/ambigsw.h b/sbr/ambigsw.h
new file mode 100644
index 00000000..fd112187
--- /dev/null
+++ b/sbr/ambigsw.h
@@ -0,0 +1,7 @@
+/* ambigsw.h -- report an ambiguous switch
+ *
+ * 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 ambigsw(const char *, const struct swit *) NONNULL(1, 2);
diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index d66bd254..1b684050 100644
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "ambigsw.h"
 #include "print_sw.h"
 #include "h/signals.h"
 #include <setjmp.h>
diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c
index 7fad5354..93542733 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 "ambigsw.h"
 #include "print_sw.h"
 
 #ifdef READLINE_SUPPORT
diff --git a/uip/ali.c b/uip/ali.c
index 9853d668..8c5cd360 100644
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/anno.c b/uip/anno.c
index 61d07dbd..e4b2887d 100644
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/ap.c b/uip/ap.c
index cb31fdbd..fa2b871f 100644
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/burst.c b/uip/burst.c
index aab18141..da8cfc0c 100644
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/comp.c b/uip/comp.c
index 9c151cf9..c4f31b75 100644
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/dist.c b/uip/dist.c
index 294e4f24..87a5ba1e 100644
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/dp.c b/uip/dp.c
index ac6fb97b..b49269a0 100644
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/flist.c b/uip/flist.c
index c430335c..00a907a8 100644
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index 4898c702..b7c48120 100644
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/fmttest.c b/uip/fmttest.c
index e2189645..08a244f2 100644
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/folder.c b/uip/folder.c
index 94648293..01178fb2 100644
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/forw.c b/uip/forw.c
index 78fc48ba..dc858539 100644
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/imaptest.c b/uip/imaptest.c
index be276fb1..da45d491 100644
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/inc.c b/uip/inc.c
index da3eb96d..5fde59a8 100644
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/install-mh.c b/uip/install-mh.c
index 9e7cd3db..5e08fa7a 100644
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mark.c b/uip/mark.c
index 7bafbda8..3da1c03b 100644
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 09c8efec..711f26cc 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index d5f9ab0d..ae871044 100644
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhical.c b/uip/mhical.c
index 402d5ad9..bb5a9eee 100644
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhlist.c b/uip/mhlist.c
index 80878234..5d089082 100644
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index 1118c8bc..72a90b72 100644
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 42786b7a..56093b8e 100644
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhn.c b/uip/mhn.c
index d2e7d9de..5a5981ec 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhparam.c b/uip/mhparam.c
index 6db9b3ad..50bdf209 100644
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/mhpath.c b/uip/mhpath.c
index 95a9d755..4f6a7c3f 100644
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhshow.c b/uip/mhshow.c
index 1f53a2b6..b01a3383 100644
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mhstore.c b/uip/mhstore.c
index 7285e5f8..9a3700d8 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index e17ff1c3..5cc06f22 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/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/msgchk.c b/uip/msgchk.c
index 12b5ee2d..56f2fa80 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/new.c b/uip/new.c
index af333a28..5f918da1 100644
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/packf.c b/uip/packf.c
index 6b092142..4420b9cb 100644
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/pick.c b/uip/pick.c
index 5939da17..e4ad0dcc 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/picksbr.c b/uip/picksbr.c
index 9fe07cd2..4732785c 100644
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/error.h"
 #include "h/tws.h"
 #include "h/picksbr.h"
diff --git a/uip/post.c b/uip/post.c
index 68ff0254..60c37c8b 100644
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/prompter.c b/uip/prompter.c
index 5ffb10cc..d0e885ad 100644
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index bfcf57d4..d45a56d7 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 0df80379..7a2c9152 100644
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 1b14119a..073c35a5 100644
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 530b5b5f..e8e74243 100644
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/error.h"
diff --git a/uip/refile.c b/uip/refile.c
index 8637ada3..a23c5872 100644
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/repl.c b/uip/repl.c
index 0bd33b83..80ece930 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/rmf.c b/uip/rmf.c
index eaa01b71..c7afa709 100644
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/rmm.c b/uip/rmm.c
index f000fb7c..126ef328 100644
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/scan.c b/uip/scan.c
index 30b8f9e8..377ab161 100644
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/send.c b/uip/send.c
index d5ac70e5..7324816b 100644
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/push.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/show.c b/uip/show.c
index bc09bfad..8b749f40 100644
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/slocal.c b/uip/slocal.c
index b8131691..9f784f8d 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/sortm.c b/uip/sortm.c
index 8013c055..0d918dab 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
diff --git a/uip/viamail.c b/uip/viamail.c
index abe5d166..f6d34c3f 100644
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"
 #include "sbr/arglist.h"
diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 9bfda0fe..07b13e77 100644
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/push.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
diff --git a/uip/whom.c b/uip/whom.c
index d7bd2cac..6264298c 100644
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"