arglist.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index bce4eb2..20a5527 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -362,6 +362,7 @@ noinst_HEADERS = \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \
     h/tws.h \
     h/utils.h \
     mts/smtp/smtp.h \

+    sbr/arglist.h \

     sbr/base64.h \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/base64.h \
     sbr/ctype-checked.h \
     sbr/error.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index c1c5484..9e82ddf 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -16,10 +16,6 @@ char *etcpath(char *) NONNULL(1);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);
 struct msgs_array;
 
 void add_profile_entry (const char *, const char *);

-char **argsplit (char *, char **, int *) NONNULL(1, 2);
-void argsplit_msgarg (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
-void argsplit_insert (struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
-void arglist_free (char *, char **);

 void ambigsw (const char *, const struct swit *) NONNULL(1, 2);
 int atooi(char *) NONNULL(1) PURE;
 char **brkstring (char *, char *, char *) NONNULL(1);
 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/arglist.c b/sbr/arglist.c
index 75c4882..0dde2c8 100644 (file)
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -7,6 +7,7 @@
 
 #include "h/mh.h"
 #include "error.h"
 
 #include "h/mh.h"
 #include "error.h"

+#include "arglist.h"

 #include "h/utils.h"
 
 /*
 #include "h/utils.h"
 
 /*

diff --git a/sbr/arglist.h b/sbr/arglist.h
new file mode 100644 (file)
index 0000000..29f9554
--- /dev/null
+++ b/sbr/arglist.h
@@ -0,0 +1,10 @@
+/* arglist.h -- Routines for handling argument lists for execvp() and friends
+ *
+ * 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 **argsplit(char *, char **, int *) NONNULL(1, 2);
+void arglist_free(char *, char **);
+void argsplit_msgarg(struct msgs_array *, char *, char **) NONNULL(1, 2, 3);
+void argsplit_insert(struct msgs_array *, char *, char **) NONNULL(1, 2, 3);

diff --git a/sbr/ext_hook.c b/sbr/ext_hook.c
index 8a4a91b..b8892e9 100644 (file)
--- a/sbr/ext_hook.c
+++ b/sbr/ext_hook.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "arglist.h"

 #include "error.h"
 
 int
 #include "error.h"
 
 int

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 2ef8859..f9d7f59 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "arglist.h"

 #include "error.h"
 #include "h/utils.h"
 #include "m_mktemp.h"
 #include "error.h"
 #include "h/utils.h"
 #include "m_mktemp.h"

diff --git a/sbr/m_popen.c b/sbr/m_popen.c
index db51f4b..ac36e6b 100644 (file)
--- a/sbr/m_popen.c
+++ b/sbr/m_popen.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "arglist.h"

 #include "error.h"
 #include "h/signals.h"
 #include "m_popen.h"
 #include "error.h"
 #include "h/signals.h"
 #include "m_popen.h"

diff --git a/sbr/refile.c b/sbr/refile.c
index 4e37591..ce31273 100644 (file)
--- a/sbr/refile.c
+++ b/sbr/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "arglist.h"

 #include "error.h"
 #include "h/utils.h"
 
 #include "error.h"
 #include "h/utils.h"
 

diff --git a/sbr/showfile.c b/sbr/showfile.c
index da8df2f..1ce6372 100644 (file)
--- a/sbr/showfile.c
+++ b/sbr/showfile.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "arglist.h"

 #include "error.h"
 
 
 #include "error.h"
 
 

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

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/tws.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/tws.h"

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

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/signals.h"
 #include "h/addrsbr.h"
 #include "sbr/error.h"
 #include "h/signals.h"
 #include "h/addrsbr.h"

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

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 071ff8a..fca4410 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/post.c b/uip/post.c
index 75a7749..6fbccdf 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/signals.h"

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 6436854..9f52a4b 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/rcvmail.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/rcvmail.h"

diff --git a/uip/refile.c b/uip/refile.c
index cebc5c9..58de202 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"
 #include "sbr/error.h"
 #include "h/done.h"
 #include "h/utils.h"

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

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"
 #include "sbr/error.h"
 #include "h/addrsbr.h"
 #include "h/fmt_scan.h"

diff --git a/uip/send.c b/uip/send.c
index 02c5cb8..3d559ff 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/done.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/done.h"

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

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"
 #include "sbr/error.h"
 #include "h/fmt_scan.h"
 #include "h/fmt_compile.h"

diff --git a/uip/show.c b/uip/show.c
index 51793fc..7573432 100644 (file)
--- a/uip/show.c
+++ b/uip/show.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include "h/mime.h"
 #include "h/done.h"
 #include "sbr/error.h"
 #include "h/mime.h"
 #include "h/done.h"

diff --git a/uip/viamail.c b/uip/viamail.c
index 58772dc..37066a4 100644 (file)
--- a/uip/viamail.c
+++ b/uip/viamail.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/md5.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 0127914..07bd22b 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
  */
 
 #include "h/mh.h"

+#include "sbr/arglist.h"

 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/mime.h"
 #include "sbr/error.h"
 #include <fcntl.h>
 #include "h/mime.h"