/*
+ * 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
# 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>
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);
/* Don't let the subprocess think it can use the controlling tty */
setsid ();
- execl (EXECSHELL, "sh", "-c", Tunnel, NULL);
+ execl ("/bin/sh", "sh", "-c", Tunnel, NULL);
_exit (127);
}
mutt_unblock_signals_system (1);
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;
}