X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_tunnel.c;h=34a578961bffa5ed7825e89cc89768f9a9d48ff3;hp=6cc092dc851f7f7bf804d2a335df11ad169e5ca2;hb=08b24cfbdc0c35af65891f5b2478dc0ee33feb7e;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index 6cc092d..34a5789 100644
--- 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,
@@ -59,7 +59,7 @@ static int tunnel_socket_open (CONNECTION * conn)
   int rc;
   int pin[2], pout[2];
 
-  tunnel = (TUNNEL_DATA *) safe_malloc (sizeof (TUNNEL_DATA));
+  tunnel = (TUNNEL_DATA *) mem_malloc (sizeof (TUNNEL_DATA));
   conn->sockdata = tunnel;
 
   mutt_message (_("Connecting with \"%s\"..."), Tunnel);
@@ -118,12 +118,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);
+  }
+  mem_free (&conn->sockdata);
   return 0;
 }