X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=ssh-pull.c;h=f1d8e706d3154fa1908a93d9b60936cb1a939557;hb=89bc8c785e20258efba3b2b5ffc26098fa0b8bc8;hp=26356dd7d84ea1bc9f7320b18562ed4117d4fac0;hpb=6da4016aea2dc5bf311fea160bd8ef96ca82b999;p=git.git

diff --git a/ssh-pull.c b/ssh-pull.c
index 26356dd7..f1d8e706 100644
--- a/ssh-pull.c
+++ b/ssh-pull.c
@@ -10,20 +10,49 @@ static int fd_out;
 static unsigned char remote_version = 0;
 static unsigned char local_version = 1;
 
+static ssize_t force_write(int fd, void *buffer, size_t length)
+{
+	ssize_t ret = 0;
+	while (ret < length) {
+		ssize_t size = write(fd, buffer + ret, length - ret);
+		if (size < 0) {
+			return size;
+		}
+		if (size == 0) {
+			return ret;
+		}
+		ret += size;
+	}
+	return ret;
+}
+
+void prefetch(unsigned char *sha1)
+{
+	char type = 'o';
+	force_write(fd_out, &type, 1);
+	force_write(fd_out, sha1, 20);
+	//memcpy(requested + 20 * prefetches++, sha1, 20);
+}
+
+static char conn_buf[4096];
+static size_t conn_buf_posn = 0;
+
 int fetch(unsigned char *sha1)
 {
 	int ret;
 	signed char remote;
-	char type = 'o';
-	if (has_sha1_file(sha1))
-		return 0;
-	write(fd_out, &type, 1);
-	write(fd_out, sha1, 20);
-	if (read(fd_in, &remote, 1) < 1)
-		return -1;
+
+	if (conn_buf_posn) {
+		remote = conn_buf[0];
+		memmove(conn_buf, conn_buf + 1, --conn_buf_posn);
+	} else {
+		if (read(fd_in, &remote, 1) < 1)
+			return -1;
+	}
+	//fprintf(stderr, "Got %d\n", remote);
 	if (remote < 0)
 		return remote;
-	ret = write_sha1_from_fd(sha1, fd_in);
+	ret = write_sha1_from_fd(sha1, fd_in, conn_buf, 4096, &conn_buf_posn);
 	if (!ret)
 		pull_say("got %s\n", sha1_to_hex(sha1));
 	return ret;
@@ -58,7 +87,10 @@ int main(int argc, char **argv)
 	char *commit_id;
 	char *url;
 	int arg = 1;
-	const char *prog = getenv("GIT_SSH_PUSH") ? : "git-ssh-push";
+	const char *prog;
+
+	prog = getenv("GIT_SSH_PUSH");
+	if (!prog) prog = "git-ssh-push";
 
 	while (arg < argc && argv[arg][0] == '-') {
 		if (argv[arg][1] == 't') {