Re: [PATCH] git-imap-send: simplify tunnel construction

From

Bernhard Reiter <ockham@raz.or.at>

Date

Aug 18, 2014, 17:15 UTC

Message-ID

<53F234A5.7010704@raz.or.at>

In-Reply-To

<xmqq1tsdybq8.fsf@gitster.dls.corp.google.com>

Am 2014-08-18 um 19:00 schrieb Junio C Hamano:

> Bernhard Reiter <ockham@raz.or.at> writes:
> 
>> Signed-off-by: Bernhard Reiter <ockham@raz.or.at>
>> ---
>>  imap-send.c | 5 ++---
>>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> Oy.  Where is the patch?
> 
> Please avoid multipart/mixed on this list.
> 
> Thanks.

diff --git a/imap-send.c b/imap-send.c
index 524fbab..fb01a9c 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;