From 356bece0a2725818191b12f6e991490d52baa1d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?utf8?q?=E6=98=8E?= Date: Wed, 21 Dec 2005 19:23:42 +0900 Subject: [PATCH] GIT: Support [address] in URLs Allow IPv6address/IPvFuture enclosed by [] in URLs, like: git push '[3ffe:ffff:...:1]:GIT/git' or git push 'ssh://[3ffe:ffff:...:1]/GIT/git' Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: Junio C Hamano --- connect.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/connect.c b/connect.c index 93f6f80d..6b6d6133 100644 --- a/connect.c +++ b/connect.c @@ -561,7 +561,8 @@ int git_connect(int fd[2], char *url, const char *prog) { char command[1024]; char *host, *path = url; - char *colon = NULL; + char *end; + int c; int pipefd[2][2]; pid_t pid; enum protocol protocol = PROTO_LOCAL; @@ -571,15 +572,30 @@ int git_connect(int fd[2], char *url, const char *prog) *host = '\0'; protocol = get_protocol(url); host += 3; - path = strchr(host, '/'); - } - else { + c = '/'; + } else { host = url; - if ((colon = strchr(host, ':'))) { + c = ':'; + } + + if (host[0] == '[') { + end = strchr(host + 1, ']'); + if (end) { + *end = 0; + end++; + host++; + } else + end = host; + } else + end = host; + + path = strchr(end, c); + if (c == ':') { + if (path) { protocol = PROTO_SSH; - *colon = '\0'; - path = colon + 1; - } + *path++ = '\0'; + } else + path = host; } if (!path || !*path) -- 2.11.0