X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-sys%2Fmutt_tunnel.c;h=8af79f8dcbe39aa8a2b7afe14722335b979da046;hp=d82ec6353f2a39e7bc54c6b47faf55790d8e31f8;hb=7db27b8f24670fd40cf24755f2782a104ad24594;hpb=06797b065bbd5d88bf473c4b9f8525dcb9990bb7

diff --git a/lib-sys/mutt_tunnel.c b/lib-sys/mutt_tunnel.c
index d82ec63..8af79f8 100644
--- a/lib-sys/mutt_tunnel.c
+++ b/lib-sys/mutt_tunnel.c
@@ -8,25 +8,20 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+
+#include <lib-ui/lib-ui.h>
 
 #include "mutt.h"
+
+#include "exit.h"
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
-
-
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <fcntl.h>
-#include <errno.h>
+#include "mutt_signal.h"
 
 /* -- data types -- */
 typedef struct {
@@ -38,9 +33,9 @@ typedef struct {
 /* forward declarations */
 static int tunnel_socket_open (CONNECTION *);
 static int tunnel_socket_close (CONNECTION *);
-static int tunnel_socket_read (CONNECTION * conn, char *buf, size_t len);
+static int tunnel_socket_read (CONNECTION * conn, char *buf, ssize_t len);
 static int tunnel_socket_write (CONNECTION * conn, const char *buf,
-                                size_t len);
+                                ssize_t len);
 
 /* -- public functions -- */
 int mutt_tunnel_socket_setup (CONNECTION * conn)
@@ -134,7 +129,7 @@ static int tunnel_socket_close (CONNECTION * conn)
   return 0;
 }
 
-static int tunnel_socket_read (CONNECTION * conn, char *buf, size_t len)
+static int tunnel_socket_read (CONNECTION * conn, char *buf, ssize_t len)
 {
   TUNNEL_DATA *tunnel = (TUNNEL_DATA *) conn->sockdata;
   int rc;
@@ -150,7 +145,7 @@ static int tunnel_socket_read (CONNECTION * conn, char *buf, size_t len)
 }
 
 static int tunnel_socket_write (CONNECTION * conn, const char *buf,
-                                size_t len)
+                                ssize_t len)
 {
   TUNNEL_DATA *tunnel = (TUNNEL_DATA *) conn->sockdata;
   int rc;