concat.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 8926d76..3db6bfa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -370,6 +370,7 @@ noinst_HEADERS = \
     sbr/check_charset.h \
     sbr/client.h \
     sbr/closefds.h \
+    sbr/concat.h \
     sbr/context_del.h \
     sbr/context_find.h \
     sbr/context_foil.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 2e7bb32..970cd21 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,8 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
-char *concat (const char *, ...) ENDNULL;
-
 /*
  * Print null-terminated PROMPT to and flush standard output.  Read answers from
  * standard input until one matches an entry in SWITCHES.  When one matches,

diff --git a/sbr/concat.c b/sbr/concat.c
index 262b93f..b99f0c0 100644 (file)
--- a/sbr/concat.c
+++ b/sbr/concat.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "h/utils.h"
 
 

diff --git a/sbr/concat.h b/sbr/concat.h
new file mode 100644 (file)
index 0000000..83605c1
--- /dev/null
+++ b/sbr/concat.h
@@ -0,0 +1,8 @@
+/* concat.h -- concatenate a variable number (minimum of 1)
+ *             of strings in managed memory
+ *
+ * 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 *concat(const char *, ...) ENDNULL;

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 05e368b..48ab8d0 100644 (file)
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "context_find.h"
 
 

diff --git a/sbr/context_read.c b/sbr/context_read.c
index fe64fc1..b207201 100644 (file)
--- a/sbr/context_read.c
+++ b/sbr/context_read.c
@@ -22,6 +22,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "context_read.h"
 #include "context_find.h"
 #include "readconfig.h"

diff --git a/sbr/crawl_folders.c b/sbr/crawl_folders.c
index 9f1327c..23152d0 100644 (file)
--- a/sbr/crawl_folders.c
+++ b/sbr/crawl_folders.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "error.h"
 #include "h/crawl_folders.h"
 #include "h/utils.h"

diff --git a/sbr/credentials.c b/sbr/credentials.c
index b7eda96..910e097 100644 (file)
--- a/sbr/credentials.c
+++ b/sbr/credentials.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "ruserpass.h"
 #include "credentials.h"
 #include "context_find.h"

diff --git a/sbr/m_mktemp.c b/sbr/m_mktemp.c
index 1ec94c6..228de43 100644 (file)
--- a/sbr/m_mktemp.c
+++ b/sbr/m_mktemp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "r1bindex.h"
 #include "h/utils.h"
 #include "h/signals.h"

diff --git a/sbr/mime_type.c b/sbr/mime_type.c
index 91c6c39..ab2a9a0 100644 (file)
--- a/sbr/mime_type.c
+++ b/sbr/mime_type.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "readconfig.h"
 #include "error.h"
 #include "h/utils.h"

diff --git a/sbr/oauth.c b/sbr/oauth.c
index 195b9b8..2ed2b77 100755 (executable)
--- a/sbr/oauth.c
+++ b/sbr/oauth.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "trimcpy.h"
 #include "getcpy.h"
 #include "error.h"

diff --git a/sbr/oauth_prof.c b/sbr/oauth_prof.c
index 4d91b8b..13e5b97 100644 (file)
--- a/sbr/oauth_prof.c
+++ b/sbr/oauth_prof.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "getcpy.h"
 #include "context_find.h"
 

diff --git a/sbr/utils.c b/sbr/utils.c
index 9c4b9fd..f7f006a 100644 (file)
--- a/sbr/utils.c
+++ b/sbr/utils.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "concat.h"
 #include "r1bindex.h"
 #include "context_foil.h"
 #include "context_replace.h"

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 40c9ca1..22252d7 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/vfgets.h"
 #include "sbr/getcpy.h"
 #include "h/aliasbr.h"

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

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

diff --git a/uip/install-mh.c b/uip/install-mh.c
index 8983ed8..ee05102 100644 (file)
--- a/uip/install-mh.c
+++ b/uip/install-mh.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/context_save.h"
 #include "sbr/context_replace.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index e7b9c50..48b039e 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/r1bindex.h"
 #include "sbr/encode_rfc2047.h"
 #include "sbr/copyip.h"

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

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

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

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

diff --git a/uip/mhmisc.c b/uip/mhmisc.c
index 24fb9b2..fcec3c3 100644 (file)
--- a/uip/mhmisc.c
+++ b/uip/mhmisc.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/error.h"
 #include "h/mime.h"
 #include "h/mhparse.h"

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 9b72d91..ca9d303 100644 (file)
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/r1bindex.h"
 #include "sbr/ruserpass.h"
 #include "sbr/fmt_rfc2047.h"

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 2bac9d0..909506e 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/trimcpy.h"
 #include "sbr/check_charset.h"
 #include "sbr/getcpy.h"

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 28e0454..4cdd3d5 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"
 #include "sbr/uprf.h"

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

diff --git a/uip/packf.c b/uip/packf.c
index 65a47a7..31079a8 100644 (file)
--- a/uip/packf.c
+++ b/uip/packf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

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

diff --git a/uip/repl.c b/uip/repl.c
index 2f8492b..8ee26b8 100644 (file)
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_setcur.h"
 #include "sbr/seq_save.h"

diff --git a/uip/replsbr.c b/uip/replsbr.c
index 1a0c919..9308897 100644 (file)
--- a/uip/replsbr.c
+++ b/uip/replsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/closefds.h"
 #include "sbr/uprf.h"
 #include "sbr/escape_addresses.h"

diff --git a/uip/rmf.c b/uip/rmf.c
index 1347378..d492df1 100644 (file)
--- a/uip/rmf.c
+++ b/uip/rmf.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/smatch.h"
 #include "sbr/remdir.h"
 #include "sbr/ssequal.h"

diff --git a/uip/send.c b/uip/send.c
index 86bae68..b9d3bcf 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/seq_setprev.h"
 #include "sbr/seq_save.h"
 #include "sbr/showfile.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 5a74365..47df948 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/cpydgst.h"
 #include "sbr/trimcpy.h"
 #include "sbr/uprf.h"

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

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index ca9365d..8a73536 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/concat.h"
 #include "sbr/showfile.h"
 #include "sbr/smatch.h"
 #include "sbr/r1bindex.h"