X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=connect.c;h=b508be3ed8530fbc82d15ec2846e8b3c8dba9a1e;hb=ab6625e06a647c4be555cadc63dfa8f0d4a7f48e;hp=941bf296b0d5a8ded60cea0ed61770dc909d2d88;hpb=013e7c7ff498aae82d799f80da37fbd395545456;p=git.git

diff --git a/connect.c b/connect.c
index 941bf296..b508be3e 100644
--- a/connect.c
+++ b/connect.c
@@ -1,6 +1,26 @@
 #include "cache.h"
+#include "pkt-line.h"
+#include "quote.h"
 #include <sys/wait.h>
 
+int get_ack(int fd, unsigned char *result_sha1)
+{
+	static char line[1000];
+	int len = packet_read_line(fd, line, sizeof(line));
+
+	if (!len)
+		die("git-fetch-pack: expected ACK/NAK, got EOF");
+	if (line[len-1] == '\n')
+		line[--len] = 0;
+	if (!strcmp(line, "NAK"))
+		return 0;
+	if (!strncmp(line, "ACK ", 3)) {
+		if (!get_sha1_hex(line+4, result_sha1))
+			return 1;
+	}
+	die("git-fetch_pack: expected ACK/NAK, got '%s'", line);
+}
+
 int path_match(const char *path, int nr, char **match)
 {
 	int i;
@@ -23,32 +43,6 @@ int path_match(const char *path, int nr, char **match)
 }
 
 /*
- * First, make it shell-safe.  We do this by just disallowing any
- * special characters. Somebody who cares can do escaping and let
- * through the rest. But since we're doing to feed this to ssh as
- * a command line, we're going to be pretty damn anal for now.
- */
-static char *shell_safe(char *url)
-{
-	char *n = url;
-	unsigned char c;
-	static const char flags[256] = {
-		['0'...'9'] = 1,
-		['a'...'z'] = 1,
-		['A'...'Z'] = 1,
-		['.'] = 1, ['/'] = 1,
-		['-'] = 1, ['+'] = 1,
-		[':'] = 1
-	};
-
-	while ((c = *n++) != 0) {
-		if (flags[c] != 1)
-			die("I don't like '%c'. Sue me.", c);
-	}
-	return url;
-}
-
-/*
  * Yeah, yeah, fixme. Need to pass in the heads etc.
  */
 int git_connect(int fd[2], char *url, const char *prog)
@@ -59,7 +53,6 @@ int git_connect(int fd[2], char *url, const char *prog)
 	int pipefd[2][2];
 	pid_t pid;
 
-	url = shell_safe(url);
 	host = NULL;
 	path = url;
 	colon = strchr(url, ':');
@@ -68,11 +61,12 @@ int git_connect(int fd[2], char *url, const char *prog)
 		host = url;
 		path = colon+1;
 	}
-	snprintf(command, sizeof(command), "%s %s", prog, path);
 	if (pipe(pipefd[0]) < 0 || pipe(pipefd[1]) < 0)
 		die("unable to create pipe pair for communication");
 	pid = fork();
 	if (!pid) {
+		snprintf(command, sizeof(command), "%s %s", prog,
+			 sq_quote(path));
 		dup2(pipefd[1][0], 0);
 		dup2(pipefd[0][1], 1);
 		close(pipefd[0][0]);