client.c: Move interface to own file.

diff --git a/Makefile.am b/Makefile.am
index fc3561b..3d1353b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -368,6 +368,7 @@ noinst_HEADERS = \
     sbr/base64.h \
     sbr/brkstring.h \
     sbr/check_charset.h \
+    sbr/client.h \
     sbr/closefds.h \
     sbr/context_del.h \
     sbr/context_find.h \

diff --git a/h/prototypes.h b/h/prototypes.h
index 07aebef..5f8f8e0 100644 (file)
--- a/h/prototypes.h
+++ b/h/prototypes.h
@@ -15,7 +15,6 @@ char *etcpath(char *) NONNULL(1);
 
 struct msgs_array;
 
-int client(char *, char *, char *, int, int);
 char *concat (const char *, ...) ENDNULL;
 int decode_rfc2047 (char *, char *, size_t);
 

diff --git a/mts/smtp/smtp.c b/mts/smtp/smtp.c
index 0887e1c..15b2f20 100644 (file)
--- a/mts/smtp/smtp.c
+++ b/mts/smtp/smtp.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/client.h"
 #include "sbr/error.h"
 #include "smtp.h"
 #include "h/mts.h"

diff --git a/sbr/client.c b/sbr/client.c
index a90d4e0..572f8ee 100644 (file)
--- a/sbr/client.c
+++ b/sbr/client.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "client.h"
 #include "h/mts.h"
 #include "h/utils.h"
 #include <sys/socket.h>

diff --git a/sbr/client.h b/sbr/client.h
new file mode 100644 (file)
index 0000000..e339cc9
--- /dev/null
+++ b/sbr/client.h
@@ -0,0 +1,7 @@
+/* client.h -- connect to a server
+ *
+ * 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. */
+
+int client(char *, char *, char *, int, int);

diff --git a/uip/imaptest.c b/uip/imaptest.c
index 7a119cd..a135938 100644 (file)
--- a/uip/imaptest.c
+++ b/uip/imaptest.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/client.h"
 #include "sbr/getcpy.h"
 #include "sbr/brkstring.h"
 #include "sbr/ambigsw.h"

diff --git a/uip/popsbr.c b/uip/popsbr.c
index b3c85d3..c17d999 100644 (file)
--- a/uip/popsbr.c
+++ b/uip/popsbr.c
@@ -6,6 +6,7 @@
  */
 
 #include "h/mh.h"
+#include "sbr/client.h"
 #include "sbr/error.h"
 #include "h/utils.h"
 #include "h/oauth.h"