GIT 0.99.6

[git.git] / ssh-push.c

diff --git a/ssh-push.c b/ssh-push.c
index db69c88..5bd4569 100644 (file)
--- a/ssh-push.c
+++ b/ssh-push.c
@@ -4,16 +4,16 @@
 
 #include <string.h>
 
-unsigned char local_version = 1;
-unsigned char remote_version = 0;
+static unsigned char local_version = 1;
+static unsigned char remote_version = 0;
 
-int serve_object(int fd_in, int fd_out) {
+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) {
@@ -25,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;
@@ -41,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;
@@ -65,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];
@@ -76,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);
@@ -86,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 {
@@ -105,7 +96,7 @@ void service(int fd_in, int fd_out) {
        } while (1);
 }
 
-static const char *ssh_push_usage =
+static const char ssh_push_usage[] =
        "git-ssh-push [-c] [-t] [-a] [-w ref] commit-id url";
 
 int main(int argc, char **argv)
@@ -114,10 +105,12 @@ int main(int argc, char **argv)
         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++;