ambigsw.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index e6cc4dc..fbfaa25 100644 (file)
--- 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 8078bb5..04bb9c2 100644 (file)
--- 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 e36bb11..cbd1923 100644 (file)
--- 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 (file)
index 0000000..fd11218
--- /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 d66bd25..1b68405 100644 (file)
--- 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 7fad535..9354273 100644 (file)
--- 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 9853d66..8c5cd36 100644 (file)
--- 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 61d07db..e4b2887 100644 (file)
--- 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 cb31fdb..fa2b871 100644 (file)
--- 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 aab1814..da8cfc0 100644 (file)
--- 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 9c151cf..c4f31b7 100644 (file)
--- 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 294e4f2..87a5ba1 100644 (file)
--- 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 ac6fb97..b49269a 100644 (file)
--- 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 c430335..00a907a 100644 (file)
--- 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 4898c70..b7c4812 100644 (file)
--- 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 e218964..08a244f 100644 (file)
--- 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 9464829..01178fb 100644 (file)
--- 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 78fc48b..dc85853 100644 (file)
--- 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 be276fb..da45d49 100644 (file)
--- 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 da3eb96..5fde59a 100644 (file)
--- 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 9e7cd3d..5e08fa7 100644 (file)
--- 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 7bafbda..3da1c03 100644 (file)
--- 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 09c8efe..711f26c 100644 (file)
--- 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 d5f9ab0..ae87104 100644 (file)
--- 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 402d5ad..bb5a9ee 100644 (file)
--- 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 8087823..5d08908 100644 (file)
--- 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 1118c8b..72a90b7 100644 (file)
--- 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 42786b7..56093b8 100644 (file)
--- 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 d2e7d9d..5a5981e 100644 (file)
--- 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 6db9b3a..50bdf20 100644 (file)
--- 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 95a9d75..4f6a7c3 100644 (file)
--- 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 1f53a2b..b01a338 100644 (file)
--- 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 7285e5f..9a3700d 100644 (file)
--- 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 e17ff1c..5cc06f2 100644 (file)
--- 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 12b5ee2..56f2fa8 100644 (file)
--- 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 af333a2..5f918da 100644 (file)
--- 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 6b09214..4420b9c 100644 (file)
--- 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 5939da1..e4ad0dc 100644 (file)
--- 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 9fe07cd..4732785 100644 (file)
--- 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 68ff025..60c37c8 100644 (file)
--- 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 5ffb10c..d0e885a 100644 (file)
--- 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 bfcf57d..d45a56d 100644 (file)
--- 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 0df8037..7a2c915 100644 (file)
--- 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 1b14119..073c35a 100644 (file)
--- 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 530b5b5..e8e7424 100644 (file)
--- 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 8637ada..a23c587 100644 (file)
--- 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 0bd33b8..80ece93 100644 (file)
--- 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 eaa01b7..c7afa70 100644 (file)
--- 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 f000fb7..126ef32 100644 (file)
--- 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 30b8f9e..377ab16 100644 (file)
--- 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 d5ac70e..7324816 100644 (file)
--- 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 bc09bfa..8b749f4 100644 (file)
--- 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 b813169..9f784f8 100644 (file)
--- 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 8013c05..0d918da 100644 (file)
--- 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 abe5d16..f6d34c3 100644 (file)
--- 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 9bfda0f..07b13e7 100644 (file)
--- 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 d7bd2ca..6264298 100644 (file)
--- 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"