brkstring.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 2fabf7c8c995e123dd4e43b17b305a110acd9f4f..034fd41a624308184cd77a3fc0d5de1898775c49 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,6 +366,7 @@ noinst_HEADERS = \
     sbr/arglist.h \
     sbr/atooi.h \
     sbr/base64.h \
+    sbr/brkstring.h \
     sbr/ctype-checked.h \
     sbr/error.h \
     sbr/lock_file.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 80d0cb6bf838107e837c2d1b2cd9c2ba443cbe7c..4be454f4fa6d7f1d929fe1ee7f552bfef6d606b9 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 *);
-char **brkstring (char *, char *, char *) NONNULL(1);
 
 /*
  * Check to see if we can display a given character set natively.

diff --git a/sbr/arglist.c b/sbr/arglist.c
index 0dde2c86d06d52edf067499b60be5ff8e087c9ab..bf88eb2d92968bee4254b99d77b4c92a1ac5630e 100644 (file)
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "error.h"
 #include "arglist.h"
 #include "h/utils.h"

diff --git a/sbr/brkstring.c b/sbr/brkstring.c
index 599ac31ac7c6a215890da1c5b53579f0d4f72cc7..8f1c297fab69ed4b28ee05b07fc4109f1afaf594 100644 (file)
--- a/sbr/brkstring.c
+++ b/sbr/brkstring.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "h/utils.h"
 
 /* allocate this number of pointers at a time */

diff --git a/sbr/brkstring.h b/sbr/brkstring.h
new file mode 100644 (file)
index 0000000..f727179
--- /dev/null
+++ b/sbr/brkstring.h
@@ -0,0 +1,8 @@
+/* brkstring.h -- (destructively) split a string into
+ *             -- an array of substrings
+ *
+ * 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 **brkstring(char *, char *, char *) NONNULL(1);

diff --git a/sbr/getarguments.c b/sbr/getarguments.c
index 829c9b3020c606c847d8f85aa440406508f4c604..b91019d90b2f94f7792a7ed4f0309c6853e9ccd5 100644 (file)
--- a/sbr/getarguments.c
+++ b/sbr/getarguments.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "h/utils.h"
 
 char **

diff --git a/sbr/netsec.c b/sbr/netsec.c
index 0109288cd4b870a2c446f89c7e03727054d6e62a..6a72495b6b50e6d0b3c4b282e8b1ceaa0c6c2b61 100644 (file)
--- a/sbr/netsec.c
+++ b/sbr/netsec.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "h/utils.h"
 #include "h/netsec.h"
 #include "h/oauth.h"

diff --git a/sbr/read_switch_multiword.c b/sbr/read_switch_multiword.c
index 1b68405004093915bba237bcce3e64cf60fa1c06..d13ae7a1df1432f83e4186c5f87638ca68d4e515 100644 (file)
--- a/sbr/read_switch_multiword.c
+++ b/sbr/read_switch_multiword.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "ambigsw.h"
 #include "print_sw.h"
 #include "h/signals.h"

diff --git a/sbr/read_switch_multiword_via_readline.c b/sbr/read_switch_multiword_via_readline.c
index 93542733267b65b63223b29402cb60be22f9dfc8..cd43c57936631881339fb0cdef8344b176861fb4 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 "brkstring.h"
 #include "ambigsw.h"
 #include "print_sw.h"
 

diff --git a/sbr/seq_read.c b/sbr/seq_read.c
index 01f5475c6c37c0c18a39f96ed3035b24dd8b6a43..5e0e1a85dec1cf5945bfd81dc387ea4427dd9eb7 100644 (file)
--- a/sbr/seq_read.c
+++ b/sbr/seq_read.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "error.h"
 #include "h/utils.h"
 #include "lock_file.h"

diff --git a/sbr/seq_setprev.c b/sbr/seq_setprev.c
index cfdfd6106450773f0aa00eb01e681d69825be960..0dab8e6c9fb8708ea8feedbd7ba49b71073d58e3 100644 (file)
--- a/sbr/seq_setprev.c
+++ b/sbr/seq_setprev.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "seq_add.h"
 #include "h/utils.h"
 

diff --git a/sbr/seq_setunseen.c b/sbr/seq_setunseen.c
index 4c92f156e4fd322b4ff9ec425ff231dc3e72c398..74212d8dbe7d90835ad69fd9f5c77df081a688db 100644 (file)
--- a/sbr/seq_setunseen.c
+++ b/sbr/seq_setunseen.c
@@ -7,6 +7,7 @@
  */
 
 #include "h/mh.h"
+#include "brkstring.h"
 #include "seq_getnum.h"
 #include "seq_del.h"
 #include "seq_add.h"

diff --git a/uip/ali.c b/uip/ali.c
index 8c5cd360d36641789c80a29dcc2c740231d396a1..b4fe3d85abd580db794a90b3a833923506d50371 100644 (file)
--- a/uip/ali.c
+++ b/uip/ali.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"

diff --git a/uip/flist.c b/uip/flist.c
index 00a907a8c40cb2e4cf1a10b9f6af77a3b3aceb3a..54202459b98220248a757d5a68b81eba0afa5bf0 100644 (file)
--- a/uip/flist.c
+++ b/uip/flist.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/fmttest.c b/uip/fmttest.c
index 08a244f2e1fbb8efdf09db1f8ff3572ba37c64ef..ee8790a4572815836afe96461b942dbd2ec4146e 100644 (file)
--- a/uip/fmttest.c
+++ b/uip/fmttest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/folder.c b/uip/folder.c
index 01178fb2b190170e9c139d9c9b99122a0e687717..46090eda6ad1f5bc3dd4e64c17e7d295311d4e0b 100644 (file)
--- a/uip/folder.c
+++ b/uip/folder.c
@@ -8,6 +8,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/imaptest.c b/uip/imaptest.c
index da45d491e8a04bd9fb02ce79cdcb2335f994275d..6c5d0046d90407045cbf046f4e3828e112b3a28c 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index adaadd10d7bd873bd21d52cef8a8df777dd1e667..3588078a09c07bd2180de234de87de925b98e2de 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/path.h"
 #include "sbr/error.h"

diff --git a/uip/mhlsbr.c b/uip/mhlsbr.c
index 56093b8eb359fadf7415f04d64bf1985f6e72e1b..8224980e38c5233e84a8c33233763b6d2d54c906 100644 (file)
--- a/uip/mhlsbr.c
+++ b/uip/mhlsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"
 #include "sbr/print_version.h"

diff --git a/uip/new.c b/uip/new.c
index 5f918da11bbe78e6c56a7991a126494e80600eeb..5df7f0b4061501e1f18bb321c2d3e91a4943b1aa 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -12,6 +12,7 @@
 #include <sys/types.h>
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/print_version.h"
 #include "sbr/print_help.h"

diff --git a/uip/picksbr.c b/uip/picksbr.c
index 4732785cae3b5b81ba5c80afe3019f9542e4cd05..346dcc7031063426aac22b27420d854659ffd874 100644 (file)
--- a/uip/picksbr.c
+++ b/uip/picksbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/error.h"
 #include "h/tws.h"

diff --git a/uip/scan.c b/uip/scan.c
index 377ab161153dc0416a3d2247e7edfb313826ccfd..77341eb9625caf9dc494eb5448cf51039e113a03 100644 (file)
--- a/uip/scan.c
+++ b/uip/scan.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"

diff --git a/uip/send.c b/uip/send.c
index 7324816be0519cecb3b5e46f5fc55473b0314d64..faa40afed18348d4acaabc0f3f475dbcfac2fc0b 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/push.h"
 #include "sbr/path.h"

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index f96779c117da580c46b6ca6cdcca46dc2280a676..3d911484e1e5a7049b0e7056366b24c168b475fc 100644 (file)
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/pidstatus.h"
 #include "sbr/arglist.h"
 #include "sbr/error.h"

diff --git a/uip/whatnowsbr.c b/uip/whatnowsbr.c
index 07b13e77306631da0b7628605ebc887dcd6a423a..e8e2e7112bf3aa7f3f938c22cca62915823a0460 100644 (file)
--- a/uip/whatnowsbr.c
+++ b/uip/whatnowsbr.c
@@ -38,6 +38,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/push.h"
 #include "sbr/path.h"

diff --git a/uip/whom.c b/uip/whom.c
index 6264298c764af6e7bf0deb36694d1e87f375df72..d3e5c5fc0b397eb31560e2b8c4b03c1e22ac0cbd 100644 (file)
--- a/uip/whom.c
+++ b/uip/whom.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"
 #include "sbr/path.h"
 #include "sbr/print_version.h"