getarguments.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 65f519c..68ec278 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -395,6 +395,7 @@ noinst_HEADERS = \
     sbr/folder_pack.h \
     sbr/folder_read.h \
     sbr/folder_realloc.h \
+    sbr/getarguments.h \
     sbr/getcpy.h \
     sbr/geteditor.h \
     sbr/getfolder.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 0c52e91..d3f05ac 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,8 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
-char **getarguments (char *, int, char **, int);
-
 m_getfld_state_t m_getfld_state_init(FILE *iob);
 void m_getfld_state_reset (m_getfld_state_t *);
 void m_getfld_state_destroy (m_getfld_state_t *);

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index a7ac1be..1ab1163 100644 (file)
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "getarguments.h"
 #include "context_find.h"
 #include "brkstring.h"
 #include "h/utils.h"

diff --git a/sbr/getarguments.h b/sbr/getarguments.h
new file mode 100644 (file)
index 0000000..74fa8c7
--- /dev/null
+++ b/sbr/getarguments.h
@@ -0,0 +1,7 @@
+/* getarguments.h -- Get the argument vector ready to go.
+ *
+ * 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. */
+
+char **getarguments(char *, int, char **, int);

diff --git a/uip/ali.c b/uip/ali.c
index 6e94f8c..d14b38a 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/getcpy.h"
 #include "sbr/context_find.h"

diff --git a/uip/anno.c b/uip/anno.c
index 8671ff6..0207d47 100644 (file)
--- a/uip/anno.c
+++ b/uip/anno.c
@@ -42,6 +42,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/ap.c b/uip/ap.c
index 0a09a21..83295af 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/getcpy.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/burst.c b/uip/burst.c
index 6e401d4..5048e4d 100644 (file)
--- a/uip/burst.c
+++ b/uip/burst.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/comp.c b/uip/comp.c
index 2143625..34d46bb 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"

diff --git a/uip/dist.c b/uip/dist.c
index 7e1b2de..0dc2cca 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/dp.c b/uip/dp.c
index 9458626..00edef0 100644 (file)
--- a/uip/dp.c
+++ b/uip/dp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/context_save.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/flist.c b/uip/flist.c
index c420b94..aedfd88 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ssequal.h"
 #include "sbr/getfolder.h"

diff --git a/uip/fmtdump.c b/uip/fmtdump.c
index c43b412..0545c0d 100644 (file)
--- a/uip/fmtdump.c
+++ b/uip/fmtdump.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 030e80a..21e6de6 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/folder.c b/uip/folder.c
index 9072246..13a9c46 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/forw.c b/uip/forw.c
index 63b902e..2886d05 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/imaptest.c b/uip/imaptest.c
index 2aa9e16..9009159 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/client.h"
 #include "sbr/getcpy.h"

diff --git a/uip/inc.c b/uip/inc.c
index 1066801..3692647 100644 (file)
--- a/uip/inc.c
+++ b/uip/inc.c
@@ -31,6 +31,7 @@
 #endif
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 97e1ac4..ac2c5c9 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"

diff --git a/uip/mark.c b/uip/mark.c
index b0c91d1..72328ba 100644 (file)
--- a/uip/mark.c
+++ b/uip/mark.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"
 #include "sbr/snprintb.h"

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 212d8e6..1ef8421 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/m_backup.h"
 #include "sbr/context_find.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index aabe1c5..5312fd1 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/mhical.c b/uip/mhical.c
index b2cd5b0..d0ebd13 100644 (file)
--- a/uip/mhical.c
+++ b/uip/mhical.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhlist.c b/uip/mhlist.c
index f4aa532..ec6c5a8 100644 (file)
--- a/uip/mhlist.c
+++ b/uip/mhlist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/mhlogin.c b/uip/mhlogin.c
index ba48f4c..5e6d161 100644 (file)
--- a/uip/mhlogin.c
+++ b/uip/mhlogin.c
@@ -10,6 +10,7 @@
 #include <string.h>
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index cfd8074..1a7125e 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"

diff --git a/uip/mhn.c b/uip/mhn.c
index 4cd99d7..c6f861a 100644 (file)
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/mhparam.c b/uip/mhparam.c
index caf72c1..65082a0 100644 (file)
--- a/uip/mhparam.c
+++ b/uip/mhparam.c
@@ -9,6 +9,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/mhpath.c b/uip/mhpath.c
index 27a8ec6..46b2436 100644 (file)
--- a/uip/mhpath.c
+++ b/uip/mhpath.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 8b07cb9..9367f00 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 56b186a..a1837bf 100644 (file)
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/mkstemp.c b/uip/mkstemp.c
index 0a44a5f..b7fa5ae 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/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"

diff --git a/uip/msgchk.c b/uip/msgchk.c
index 4998353..411686e 100644 (file)
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"

diff --git a/uip/new.c b/uip/new.c
index 03d89a3..6736790 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"

diff --git a/uip/packf.c b/uip/packf.c
index 19ab1d4..727e00d 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_yes_or_no_if_tty.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/pick.c b/uip/pick.c
index 3290330..6ca9eaa 100644 (file)
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/post.c b/uip/post.c
index 2a2d814..27f7ad8 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/cpydata.h"

diff --git a/uip/prompter.c b/uip/prompter.c
index d91173f..b5fb93a 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/m_atoi.h"

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 89d0730..85e877d 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/cpydata.h"
 #include "sbr/context_find.h"

diff --git a/uip/rcvpack.c b/uip/rcvpack.c
index 31a18b0..a6efb62 100644 (file)
--- a/uip/rcvpack.c
+++ b/uip/rcvpack.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index e01a5a2..2484aaa 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/rcvtty.c b/uip/rcvtty.c
index 22edfb6..77fa8bd 100644 (file)
--- a/uip/rcvtty.c
+++ b/uip/rcvtty.c
@@ -11,6 +11,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/refile.c b/uip/refile.c
index c985d38..68202ae 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/repl.c b/uip/repl.c
index 976c7a6..7581c17 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/rmf.c b/uip/rmf.c
index 1e7f90c..37e7162 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_yes_or_no_if_tty.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"

diff --git a/uip/rmm.c b/uip/rmm.c
index 38ff284..df28926 100644 (file)
--- a/uip/rmm.c
+++ b/uip/rmm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/smatch.h"
 #include "sbr/m_convert.h"

diff --git a/uip/scan.c b/uip/scan.c
index ea6f0fc..6534768 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/smatch.h"

diff --git a/uip/send.c b/uip/send.c
index 98d353d..08c87b4 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword.h"
 #include "sbr/concat.h"
 #include "sbr/seq_setprev.h"

diff --git a/uip/show.c b/uip/show.c
index f77b8f0..99a6608 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setunseen.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"

diff --git a/uip/slocal.c b/uip/slocal.c
index 28e403d..cc1aa7b 100644 (file)
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -20,6 +20,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/strindex.h"
 #include "sbr/closefds.h"

diff --git a/uip/sortm.c b/uip/sortm.c
index 79e53fd..e8a0f4d 100644 (file)
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/viamail.c b/uip/viamail.c
index 6e889b6..8856702 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/context_find.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index a2f872c..68a56ba 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/read_switch_multiword_via_readline.h"
 #include "sbr/concat.h"
 #include "sbr/showfile.h"

diff --git a/uip/whom.c b/uip/whom.c
index e648739..9b03e16 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/getarguments.h"
 #include "sbr/smatch.h"
 #include "sbr/closefds.h"
 #include "sbr/m_draft.h"