X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ssh-upload.c;h=20c35f03dd1fb468c7cecc71f91951657f229f5e;hb=fcd056a6d23bafb13f991ffb673fb87c7100b8f2;hp=86b169bf4fb7712327b72d8e57e25248f9572954;hpb=93d26e4cb9cec2eb8abb4f37e6dda2c86fcceeac;p=git.git diff --git a/ssh-upload.c b/ssh-upload.c index 86b169bf4..20c35f03d 100644 --- a/ssh-upload.c +++ b/ssh-upload.c @@ -29,23 +29,24 @@ static int serve_object(int fd_in, int fd_out) { } 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); } @@ -53,7 +54,7 @@ static int serve_version(int fd_in, int fd_out) { 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; } @@ -74,17 +75,18 @@ 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 = xread(fd_in, &type, 1); if (retval < 1) {