X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ssh-push.c;h=5bd4569974c3c6851feb006a838fe69769388673;hb=99977bd5fdeabbd0608a70e9411c243007ec4ea2;hp=12fb9fccbf3e39b4e141ebc0d2d371df395785cf;hpb=5569bf9bbedd63a00780fc5c110e0cfab3aa97b9;p=git.git

diff --git a/ssh-push.c b/ssh-push.c
index 12fb9fcc..5bd45699 100644
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -2,16 +2,18 @@
 #include "rsh.h"
 #include "refs.h"
 
-unsigned char local_version = 1;
-unsigned char remote_version = 0;
+#include <string.h>
 
-int serve_object(int fd_in, int fd_out) {
+static unsigned char local_version = 1;
+static unsigned char remote_version = 0;
+
+static int verbose = 0;
+
+static int serve_object(int fd_in, int fd_out) {
 	ssize_t size;
-	int posn = 0;
 	unsigned char sha1[20];
-	unsigned long objsize;
-	void *buf;
 	signed char remote;
+	int posn = 0;
 	do {
 		size = read(fd_in, sha1 + posn, 20 - posn);
 		if (size < 0) {
@@ -23,12 +25,12 @@ int serve_object(int fd_in, int fd_out) {
 		posn += size;
 	} while (posn < 20);
 	
-	/* fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1)); */
+	if (verbose)
+		fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1));
+
 	remote = 0;
 	
-	buf = map_sha1_file(sha1, &objsize);
-	
-	if (!buf) {
+	if (!has_sha1_file(sha1)) {
 		fprintf(stderr, "git-ssh-push: could not find %s\n", 
 			sha1_to_hex(sha1));
 		remote = -1;
@@ -39,23 +41,10 @@ int serve_object(int fd_in, int fd_out) {
 	if (remote < 0)
 		return 0;
 	
-	posn = 0;
-	do {
-		size = write(fd_out, buf + posn, objsize - posn);
-		if (size <= 0) {
-			if (!size) {
-				fprintf(stderr, "git-ssh-push: write closed");
-			} else {
-				perror("git-ssh-push: write ");
-			}
-			return -1;
-		}
-		posn += size;
-	} while (posn < objsize);
-	return 0;
+	return write_sha1_to_fd(fd_out, sha1);
 }
 
-int serve_version(int fd_in, int fd_out)
+static int serve_version(int fd_in, int fd_out)
 {
 	if (read(fd_in, &remote_version, 1) < 1)
 		return -1;
@@ -63,7 +52,7 @@ int serve_version(int fd_in, int fd_out)
 	return 0;
 }
 
-int serve_ref(int fd_in, int fd_out)
+static int serve_ref(int fd_in, int fd_out)
 {
 	char ref[PATH_MAX];
 	unsigned char sha1[20];
@@ -74,6 +63,10 @@ int serve_ref(int fd_in, int fd_out)
 			return -1;
 		posn++;
 	} while (ref[posn - 1]);
+
+	if (verbose)
+		fprintf(stderr, "Serving %s\n", ref);
+
 	if (get_ref_sha1(ref, sha1))
 		remote = -1;
 	write(fd_out, &remote, 1);
@@ -84,7 +77,7 @@ int serve_ref(int fd_in, int fd_out)
 }
 
 
-void service(int fd_in, int fd_out) {
+static void service(int fd_in, int fd_out) {
 	char type;
 	int retval;
 	do {
@@ -103,25 +96,35 @@ void service(int fd_in, int fd_out) {
 	} while (1);
 }
 
+static const char ssh_push_usage[] =
+	"git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
+
 int main(int argc, char **argv)
 {
 	int arg = 1;
         char *commit_id;
         char *url;
 	int fd_in, fd_out;
-	const char *prog = getenv("GIT_SSH_PULL") ? : "git-ssh-pull";
+	const char *prog;
+	unsigned char sha1[20];
+	char hex[41];
 
+	prog = getenv("GIT_SSH_PULL");
+	if (!prog) prog = "git-ssh-pull";
 	while (arg < argc && argv[arg][0] == '-') {
 		if (argv[arg][1] == 'w')
 			arg++;
                 arg++;
         }
-        if (argc < arg + 2) {
-		usage("git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url");
-                return 1;
-        }
+	if (argc < arg + 2)
+		usage(ssh_push_usage);
 	commit_id = argv[arg];
 	url = argv[arg + 1];
+	if (get_sha1(commit_id, sha1))
+		usage(ssh_push_usage);
+	memcpy(hex, sha1_to_hex(sha1), sizeof(hex));
+	argv[arg] = hex;
+
 	if (setup_connection(&fd_in, &fd_out, prog, url, arg, argv + 1))
 		return 1;