indent is a fool

[apps/madmutt.git] / mutt_tunnel.c

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index d306902..92fcea5 100644 (file)
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -1,7 +1,7 @@
 /*
  * Copyright notice from original mutt:
  * Copyright (C) 2000 Manoj Kasichainula <manoj@io.com>
- * Copyright (C) 2001 Brendan Cully <brendan@kublai.com>
+ * Copyright (C) 2001,2005 Brendan Cully <brendan@kublai.com>
  *
  * This file is part of mutt-ng, see http://www.muttng.org/.
  * It's licensed under the GNU General Public License,
@@ -12,10 +12,15 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
 
+
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -55,7 +60,7 @@ static int tunnel_socket_open (CONNECTION * conn)
   int rc;
   int pin[2], pout[2];
 
-  tunnel = (TUNNEL_DATA *) safe_malloc (sizeof (TUNNEL_DATA));
+  tunnel = p_new(TUNNEL_DATA, 1);
   conn->sockdata = tunnel;
 
   mutt_message (_("Connecting with \"%s\"..."), Tunnel);
@@ -114,12 +119,18 @@ static int tunnel_socket_open (CONNECTION * conn)
 static int tunnel_socket_close (CONNECTION * conn)
 {
   TUNNEL_DATA *tunnel = (TUNNEL_DATA *) conn->sockdata;
+  int status;
 
   close (tunnel->readfd);
   close (tunnel->writefd);
-  waitpid (tunnel->pid, NULL, 0);
-  FREE (&conn->sockdata);
-
+  waitpid (tunnel->pid, &status, 0);
+  if (!WIFEXITED(status) || WEXITSTATUS(status)) {
+    mutt_error(_("Tunnel to %s returned error %d (%s)"),
+               conn->account.host, WEXITSTATUS(status),
+               NONULL(mutt_strsysexit(WEXITSTATUS(status))));
+    mutt_sleep (2);
+  }
+  p_delete(&conn->sockdata);
   return 0;
 }