cpydata.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index 6db5c22..8dad031 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -374,6 +374,7 @@ noinst_HEADERS = \
     sbr/context_read.h \
     sbr/context_replace.h \
     sbr/context_save.h \
+    sbr/cpydata.h \
     sbr/cpydgst.h \
     sbr/ctype-checked.h \
     sbr/discard.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 3bf5a99..4b5e0b7 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -19,7 +19,6 @@ int client(char *, char *, char *, int, int);
 void closefds(int);
 char *concat (const char *, ...) ENDNULL;
 char **copyip (char **, char **, int);
-void cpydata (int, int, const char *, const char *);
 int decode_rfc2047 (char *, char *, size_t);
 
 /*

diff --git a/sbr/cpydata.c b/sbr/cpydata.c
index 0760bb4..2ba9da6 100644 (file)
--- a/sbr/cpydata.c
+++ b/sbr/cpydata.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "cpydata.h"
 #include "error.h"
 
 void

diff --git a/sbr/cpydata.h b/sbr/cpydata.h
new file mode 100644 (file)
index 0000000..e66ec09
--- /dev/null
+++ b/sbr/cpydata.h
@@ -0,0 +1,7 @@
+/* cpydata.h -- copy all data from one fd to another
+ *
+ * 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. */
+
+void cpydata(int, int, const char *, const char *);

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 898af0d..903a077 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "cpydata.h"
 #include "m_atoi.h"
 #include "ext_hook.h"
 #include "folder_realloc.h"

diff --git a/uip/annosbr.c b/uip/annosbr.c
index ce212ef..9f05b24 100644 (file)
--- a/uip/annosbr.c
+++ b/uip/annosbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/m_backup.h"
 #include "sbr/error.h"
 #include "h/tws.h"

diff --git a/uip/comp.c b/uip/comp.c
index 027ba3d..2da3801 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"

diff --git a/uip/dist.c b/uip/dist.c
index 1aa5727..7a7fd01 100644 (file)
--- a/uip/dist.c
+++ b/uip/dist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/getfolder.h"

diff --git a/uip/distsbr.c b/uip/distsbr.c
index f48fbbe..4e931ec 100644 (file)
--- a/uip/distsbr.c
+++ b/uip/distsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/uprf.h"
 #include "sbr/m_backup.h"
 #include "sbr/error.h"

diff --git a/uip/forw.c b/uip/forw.c
index 2482a1c..25d41da 100644 (file)
--- a/uip/forw.c
+++ b/uip/forw.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/cpydgst.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index f77eeb1..68a3598 100644 (file)
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -14,6 +14,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/trimcpy.h"
 #include "sbr/uprf.h"
 #include "sbr/check_charset.h"

diff --git a/uip/mhfixmsg.c b/uip/mhfixmsg.c
index f095612..68c1bf7 100644 (file)
--- a/uip/mhfixmsg.c
+++ b/uip/mhfixmsg.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/trimcpy.h"
 #include "sbr/m_convert.h"
 #include "sbr/m_backup.h"

diff --git a/uip/post.c b/uip/post.c
index e85708d..3fd1fff 100644 (file)
--- a/uip/post.c
+++ b/uip/post.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/cpydgst.h"
 #include "sbr/uprf.h"
 #include "sbr/context_foil.h"

diff --git a/uip/prompter.c b/uip/prompter.c
index 378f2ab..8a76d0b 100644 (file)
--- a/uip/prompter.c
+++ b/uip/prompter.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/m_atoi.h"
 #include "sbr/context_save.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 6f6f555..73c86b3 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/context_find.h"
 #include "sbr/ambigsw.h"
 #include "sbr/pidstatus.h"

diff --git a/uip/rcvstore.c b/uip/rcvstore.c
index 7b0d68d..bd03196 100644 (file)
--- a/uip/rcvstore.c
+++ b/uip/rcvstore.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/getfolder.h"
 #include "sbr/folder_read.h"
 #include "sbr/folder_free.h"

diff --git a/uip/send.c b/uip/send.c
index 0a893a1..0242456 100644 (file)
--- a/uip/send.c
+++ b/uip/send.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/cpydata.h"
 #include "sbr/m_draft.h"
 #include "sbr/m_convert.h"
 #include "sbr/folder_read.h"