Rocco Rutte:

[apps/madmutt.git] / mutt_tunnel.c

diff --git a/mutt_tunnel.c b/mutt_tunnel.c
index 4a012f0..db5f50e 100644 (file)
--- a/mutt_tunnel.c
+++ b/mutt_tunnel.c
@@ -1,20 +1,11 @@
 /*
+ * 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 program is free software; you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -25,6 +16,10 @@
 #include "mutt_socket.h"
 #include "mutt_tunnel.h"
 
+#include "lib/mem.h"
+#include "lib/intl.h"
+#include "lib/str.h"
+
 #include <netinet/in.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -123,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);
+  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);
+  }
   FREE (&conn->sockdata);
-
   return 0;
 }