Update to latest madtty.

[apps/madmutt.git] / lib-sys / mutt_tunnel.c

diff --git a/lib-sys/mutt_tunnel.c b/lib-sys/mutt_tunnel.c
index a37fa11..8af79f8 100644 (file)
--- 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)
@@ -127,14 +122,14 @@ static int tunnel_socket_close (CONNECTION * conn)
   if (!WIFEXITED(status) || WEXITSTATUS(status)) {
     mutt_error(_("Tunnel to %s returned error %d (%s)"),
                conn->account.host, WEXITSTATUS(status),
-               NONULL(mutt_strsysexit(WEXITSTATUS(status))));
+               m_strsysexit(WEXITSTATUS(status)));
     mutt_sleep (2);
   }
   p_delete(&conn->sockdata);
   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;