X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-sys%2Fmutt_socket.c;h=b085c17d09d75d1e0aaedb547bd1b1001b897cac;hb=4282401a0bcdc285a228da4ad635cbf7baf71488;hp=e3874d15614311dfddf3dc4eebafeef5f1685e1f;hpb=ccf2b75a9ed50a79c4d8e5d6235c7313fcd3719a;p=apps%2Fmadmutt.git

diff --git a/lib-sys/mutt_socket.c b/lib-sys/mutt_socket.c
index e3874d1..b085c17 100644
--- a/lib-sys/mutt_socket.c
+++ b/lib-sys/mutt_socket.c
@@ -13,6 +13,16 @@
 # include "config.h"
 #endif
 
+#include <unistd.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <string.h>
+#include <errno.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
@@ -20,25 +30,15 @@
 
 #include "mutt.h"
 #include "globals.h"
+
+#include "unix.h"
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include "mutt_ssl.h"
-#endif
+#include "mutt_signal.h"
+#include "mutt_ssl.h"
 
 #include "mutt_idna.h"
 
-
-#include <unistd.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
-
 /* support for multiple socket connections */
 static CONNECTION *Connections = NULL;
 
@@ -71,7 +71,7 @@ int mutt_socket_close (CONNECTION * conn)
   return rc;
 }
 
-int mutt_socket_read (CONNECTION * conn, char *buf, size_t len)
+int mutt_socket_read (CONNECTION * conn, char *buf, ssize_t len)
 {
   int rc;
 
@@ -336,7 +336,7 @@ int raw_socket_close (CONNECTION * conn)
   return close (conn->fd);
 }
 
-int raw_socket_read (CONNECTION * conn, char *buf, size_t len)
+int raw_socket_read (CONNECTION * conn, char *buf, ssize_t len)
 {
   int rc;
 
@@ -349,7 +349,7 @@ int raw_socket_read (CONNECTION * conn, char *buf, size_t len)
   return rc;
 }
 
-int raw_socket_write (CONNECTION * conn, const char *buf, size_t count)
+int raw_socket_write (CONNECTION * conn, const char *buf, ssize_t count)
 {
   int rc;