summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reiter <ockham@raz.or.at>2014-08-13 19:30:43 +0200
committerJunio C Hamano <gitster@pobox.com>2014-08-18 10:12:16 -0700
commitf9dc5d65ca31cb79893e1296efe37727bf58f3f3 (patch)
tree722b82bf758d1f322a8fc6559b45e9afb2ab2e16
parent6c4ab27f2378ce67940b4496365043119d7ffff2 (diff)
downloadgit-f9dc5d65ca31cb79893e1296efe37727bf58f3f3.tar.gz
git-imap-send: simplify tunnel construction
Signed-off-by: Bernhard Reiter <ockham@raz.or.at> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--imap-send.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/imap-send.c b/imap-send.c
index 524fbabc96..fb01a9c9a5 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -961,17 +961,16 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc)
/* open connection to IMAP server */
if (srvc->tunnel) {
- const char *argv[] = { srvc->tunnel, NULL };
struct child_process tunnel = {NULL};
imap_info("Starting tunnel '%s'... ", srvc->tunnel);
- tunnel.argv = argv;
+ argv_array_push(&tunnel.args, srvc->tunnel);
tunnel.use_shell = 1;
tunnel.in = -1;
tunnel.out = -1;
if (start_command(&tunnel))
- die("cannot start proxy %s", argv[0]);
+ die("cannot start proxy %s", srvc->tunnel);
imap->buf.sock.fd[0] = tunnel.out;
imap->buf.sock.fd[1] = tunnel.in;