X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=connect.c;h=6b6d6133a0ad943c3b6018541a656a66833b85d2;hb=c06818e20a88f58294de0a948a437c7c32c382fe;hp=a4d6d356fd3dd3a4169b94a56f71cf5ccc0cbd89;hpb=e814bc4d159f62941fafe135c3008b3ff103444d;p=git.git

diff --git a/connect.c b/connect.c
index a4d6d356..6b6d6133 100644
--- a/connect.c
+++ b/connect.c
@@ -427,7 +427,7 @@ static int git_tcp_connect(int fd[2], const char *prog, char *host, char *path)
 		memset(&sa, 0, sizeof sa);
 		sa.sin_family = he->h_addrtype;
 		sa.sin_port = htons(nport);
-		memcpy(&sa.sin_addr, ap, he->h_length);
+		memcpy(&sa.sin_addr, *ap, he->h_length);
 
 		if (connect(sockfd, (struct sockaddr *)&sa, sizeof sa) < 0) {
 			close(sockfd);
@@ -455,6 +455,10 @@ static int rhost_len;
 static int git_proxy_command_options(const char *var, const char *value)
 {
 	if (!strcmp(var, "core.gitproxy")) {
+		const char *for_pos;
+		int matchlen = -1;
+		int hostlen;
+
 		if (git_proxy_command)
 			return 0;
 		/* [core]
@@ -463,10 +467,7 @@ static int git_proxy_command_options(const char *var, const char *value)
 		 * gitproxy = netcatter-2 for sample.xz
 		 * gitproxy = netcatter-default
 		 */
-		const char *for_pos = strstr(value, " for ");
-		int matchlen = -1;
-		int hostlen;
-
+		for_pos = strstr(value, " for ");
 		if (!for_pos)
 			/* matches everybody */
 			matchlen = strlen(value);
@@ -560,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;
@@ -570,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)