git-bundle: avoid fork() in verify_bundle()

[git.git] / http-fetch.c

diff --git a/http-fetch.c b/http-fetch.c
index 396552da022a1dca9c43738be4d87c664f31a06c..9f790a08e5d2760524ab7a34e98071062b3ed42f 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -71,7 +71,7 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
        int posn = 0;
        struct object_request *obj_req = (struct object_request *)data;
        do {
        int posn = 0;
        struct object_request *obj_req = (struct object_request *)data;
        do {

-               ssize_t retval = write(obj_req->local,
+               ssize_t retval = xwrite(obj_req->local,

                                       (char *) ptr + posn, size - posn);
                if (retval < 0)
                        return posn;
                                       (char *) ptr + posn, size - posn);
                if (retval < 0)
                        return posn;


@@ -175,7 +175,7 @@ static void start_object_request(struct object_request *obj_req)
        prevlocal = open(prevfile, O_RDONLY);
        if (prevlocal != -1) {
                do {
        prevlocal = open(prevfile, O_RDONLY);
        if (prevlocal != -1) {
                do {

-                       prev_read = read(prevlocal, prev_buf, PREV_BUF_SIZE);
+                       prev_read = xread(prevlocal, prev_buf, PREV_BUF_SIZE);

                        if (prev_read>0) {
                                if (fwrite_sha1_file(prev_buf,
                                                     1,
                        if (prev_read>0) {
                                if (fwrite_sha1_file(prev_buf,
                                                     1,


@@ -809,6 +809,7 @@ static int fetch_pack(struct alt_base *repo, unsigned char *sha1)
                return error("Unable to start request");
        }
 
                return error("Unable to start request");
        }
 

+       target->pack_size = ftell(packfile);

        fclose(packfile);
 
        ret = move_temp_to_file(tmpfile, filename);
        fclose(packfile);
 
        ret = move_temp_to_file(tmpfile, filename);


@@ -1002,7 +1003,6 @@ int main(int argc, const char **argv)
        int arg = 1;
        int rc = 0;
 
        int arg = 1;
        int rc = 0;
 

-       setup_ident();

        setup_git_directory();
        git_config(git_default_config);
 
        setup_git_directory();
        git_config(git_default_config);
 


@@ -1069,7 +1069,7 @@ int main(int argc, const char **argv)
                fprintf(stderr,
 "Some loose object were found to be corrupt, but they might be just\n"
 "a false '404 Not Found' error message sent with incorrect HTTP\n"
                fprintf(stderr,
 "Some loose object were found to be corrupt, but they might be just\n"
 "a false '404 Not Found' error message sent with incorrect HTTP\n"

-"status code.  Suggest running git fsck-objects.\n");
+"status code.  Suggest running git-fsck.\n");

        }
        return rc;
 }
        }
        return rc;
 }