read_switch_multiword.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index e17cd54..5db1235 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -420,6 +420,7 @@ noinst_HEADERS = \
     sbr/r1bindex.h \
     sbr/read_line.h \
     sbr/read_switch.h \
     sbr/r1bindex.h \
     sbr/read_line.h \
     sbr/read_switch.h \

+    sbr/read_switch_multiword.h \

     sbr/read_yes_or_no_if_tty.h \
     sbr/readconfig.h \
     sbr/refile.h \
     sbr/read_yes_or_no_if_tty.h \
     sbr/readconfig.h \
     sbr/refile.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index acf51d9..c08b645 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,14 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
 
 struct msgs_array;
 

-/*
- * Print null-terminated PROMPT to and flush standard output.  Read multi-word
- * answers from standard input until a first word matches an entry in SWITCHES.
- * When one matches, return a pointer to an array of pointers to the words.
- * Return NULL on EOF, interrupt, or other error.
- */
-char **read_switch_multiword(const char *PROMPT, const struct swit *SWITCHES);
-

 /*
  * Same as read_switch_multiword but using readline(3) for input.
  */
 /*
  * Same as read_switch_multiword but using readline(3) for input.
  */

diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index 72f4372..ff75a01 100644 (file)
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "read_switch_multiword.h"

 #include "smatch.h"
 #include "brkstring.h"
 #include "ambigsw.h"
 #include "smatch.h"
 #include "brkstring.h"
 #include "ambigsw.h"

diff --git a/sbr/read_switch_multiword.h b/sbr/read_switch_multiword.h
new file mode 100644 (file)
index 0000000..98205e9
--- /dev/null
+++ b/sbr/read_switch_multiword.h
@@ -0,0 +1,13 @@
+/* read_switch_multiword.h -- get an answer from the user and return a string array
+ *
+ * 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. */
+
+/*
+ * Print null-terminated PROMPT to and flush standard output.  Read multi-word
+ * answers from standard input until a first word matches an entry in SWITCHES.
+ * When one matches, return a pointer to an array of pointers to the words.
+ * Return NULL on EOF, interrupt, or other error.
+ */
+char **read_switch_multiword(const char *, const struct swit *);

diff --git a/uip/comp.c b/uip/comp.c
index 069e9fb..2143625 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/showfile.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/showfile.h"

diff --git a/uip/dist.c b/uip/dist.c
index ba1ae41..7e1b2de 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/forw.c b/uip/forw.c
index 6985888..63b902e 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 4cdd3d5..d9091a8 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"

diff --git a/uip/repl.c b/uip/repl.c
index 8ee26b8..976c7a6 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/send.c b/uip/send.c
index b9d3bcf..98d353d 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/read_switch_multiword.h"

 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"