[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.

diff --git a/ssh-push.c b/ssh-push.c
index b67a95b9ab15ecd8bb0332a7d8ef5757b5efa60c..aac70af514e0dc5507fa4997ebad54352c973215 100644 (file)
--- 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;
-       char sha1[20];
-       unsigned long objsize;
-       void *buf;
+       unsigned char sha1[20];
        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,24 +96,34 @@ 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";
+       unsigned char sha1[20];
+       char hex[41];
+
        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 (setup_connection(&fd_in, &fd_out, "git-ssh-pull", url, arg, argv + 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;
 
        service(fd_in, fd_out);