diffcore-rename: favour identical basenames

diff --git a/ssh-upload.c b/ssh-upload.c
index 20b15eab57e1c4f7c4b306010d7d12bff2308141..20c35f03dd1fb468c7cecc71f91951657f229f5e 100644 (file)
--- a/ssh-upload.c
+++ b/ssh-upload.c
@@ -12,8 +12,6 @@
 #include "rsh.h"
 #include "refs.h"
 
-#include <string.h>
-
 static unsigned char local_version = 1;
 static unsigned char remote_version;
 
@@ -23,42 +21,40 @@ static int serve_object(int fd_in, int fd_out) {
        ssize_t size;
        unsigned char sha1[20];
        signed char remote;
-       int posn = 0;
-       do {
-               size = read(fd_in, sha1 + posn, 20 - posn);
-               if (size < 0) {
-                       perror("git-ssh-upload: read ");
-                       return -1;
-               }
-               if (!size)
-                       return -1;
-               posn += size;
-       } while (posn < 20);
-       
+
+       size = read_in_full(fd_in, sha1, 20);
+       if (size < 0) {
+               perror("git-ssh-upload: read ");
+               return -1;
+       }
+       if (!size)
+               return -1;
+
        if (verbose)
                fprintf(stderr, "Serving %s\n", sha1_to_hex(sha1));
 
        remote = 0;
-       
+
        if (!has_sha1_file(sha1)) {
                fprintf(stderr, "git-ssh-upload: could not find %s\n",
                        sha1_to_hex(sha1));
                remote = -1;
        }
-       
-       write(fd_out, &remote, 1);
-       
+
+       if (write_in_full(fd_out, &remote, 1) != 1)
+               return 0;
+
        if (remote < 0)
                return 0;
-       
+
        return write_sha1_to_fd(fd_out, sha1);
 }
 
 static int serve_version(int fd_in, int fd_out)
 {
-       if (read(fd_in, &remote_version, 1) < 1)
+       if (xread(fd_in, &remote_version, 1) < 1)
                return -1;
-       write(fd_out, &local_version, 1);
+       write_in_full(fd_out, &local_version, 1);
        return 0;
 }
 
@@ -69,7 +65,7 @@ static int serve_ref(int fd_in, int fd_out)
        int posn = 0;
        signed char remote = 0;
        do {
-               if (read(fd_in, ref + posn, 1) < 1)
+               if (posn >= PATH_MAX || xread(fd_in, ref + posn, 1) < 1)
                        return -1;
                posn++;
        } while (ref[posn - 1]);
@@ -79,19 +75,20 @@ static int serve_ref(int fd_in, int fd_out)
 
        if (get_ref_sha1(ref, sha1))
                remote = -1;
-       write(fd_out, &remote, 1);
+       if (write_in_full(fd_out, &remote, 1) != 1)
+               return 0;
        if (remote)
                return 0;
-       write(fd_out, sha1, 20);
+       write_in_full(fd_out, sha1, 20);
         return 0;
 }
 
 
 static void service(int fd_in, int fd_out) {
        char type;
-       int retval;
+       ssize_t retval;
        do {
-               retval = read(fd_in, &type, 1);
+               retval = xread(fd_in, &type, 1);
                if (retval < 1) {
                        if (retval < 0)
                                perror("git-ssh-upload: read ");