RelNotes draft for 1.5.3 update.

[git.git] / builtin-bundle.c

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 2d0e106c08ce7b67a43c2cda1ebc9765eacfb3d9..1b650069c929744c43f95e62ca49f8a542a70111 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -44,38 +44,21 @@ struct bundle_header {
        struct ref_list references;
 };
 
-/* this function returns the length of the string */
-static int read_string(int fd, char *buffer, int size)
-{
-       int i;
-       for (i = 0; i < size - 1; i++) {
-               ssize_t count = xread(fd, buffer + i, 1);
-               if (count < 0)
-                       return error("Read error: %s", strerror(errno));
-               if (count == 0) {
-                       i--;
-                       break;
-               }
-               if (buffer[i] == '\n')
-                       break;
-       }
-       buffer[i + 1] = '\0';
-       return i + 1;
-}
-
 /* returns an fd */
 static int read_header(const char *path, struct bundle_header *header) {
        char buffer[1024];
-       int fd = open(path, O_RDONLY);
+       int fd;
+       long fpos;
+       FILE *ffd = fopen(path, "rb");
 
-       if (fd < 0)
+       if (!ffd)
                return error("could not open '%s'", path);
-       if (read_string(fd, buffer, sizeof(buffer)) < 0 ||
+       if (!fgets(buffer, sizeof(buffer), ffd) ||
                        strcmp(buffer, bundle_signature)) {
-               close(fd);
+               fclose(ffd);
                return error("'%s' does not look like a v2 bundle file", path);
        }
-       while (read_string(fd, buffer, sizeof(buffer)) > 0
+       while (fgets(buffer, sizeof(buffer), ffd)
                        && buffer[0] != '\n') {
                int is_prereq = buffer[0] == '-';
                int offset = is_prereq ? 1 : 0;
@@ -97,6 +80,12 @@ static int read_header(const char *path, struct bundle_header *header) {
                add_to_ref_list(sha1, isspace(delim) ?
                                buffer + 41 + offset : "", list);
        }
+       fpos = ftell(ffd);
+       fclose(ffd);
+       fd = open(path, O_RDONLY);
+       if (fd < 0)
+               return error("could not open '%s'", path);
+       lseek(fd, fpos, SEEK_SET);
        return fd;
 }
 
@@ -200,22 +189,22 @@ static int list_heads(struct bundle_header *header, int argc, const char **argv)
 static int create_bundle(struct bundle_header *header, const char *path,
                int argc, const char **argv)
 {
+       static struct lock_file lock;
        int bundle_fd = -1;
+       int bundle_to_stdout;
        const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
        const char **argv_pack = xmalloc(5 * sizeof(const char *));
        int i, ref_count = 0;
        char buffer[1024];
        struct rev_info revs;
        struct child_process rls;
+       FILE *rls_fout;
 
-       /*
-        * NEEDSWORK: this should use something like lock-file
-        * to create temporary that is cleaned up upon error.
-        */
-       bundle_fd = (!strcmp(path, "-") ? 1 :
-                       open(path, O_CREAT | O_EXCL | O_WRONLY, 0666));
-       if (bundle_fd < 0)
-               return error("Could not create '%s': %s", path, strerror(errno));
+       bundle_to_stdout = !strcmp(path, "-");
+       if (bundle_to_stdout)
+               bundle_fd = 1;
+       else
+               bundle_fd = hold_lock_file_for_update(&lock, path, 1);
 
        /* write signature */
        write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
@@ -236,10 +225,11 @@ static int create_bundle(struct bundle_header *header, const char *path,
        rls.git_cmd = 1;
        if (start_command(&rls))
                return -1;
-       while ((i = read_string(rls.out, buffer, sizeof(buffer))) > 0) {
+       rls_fout = fdopen(rls.out, "r");
+       while (fgets(buffer, sizeof(buffer), rls_fout)) {
                unsigned char sha1[20];
                if (buffer[0] == '-') {
-                       write_or_die(bundle_fd, buffer, i);
+                       write_or_die(bundle_fd, buffer, strlen(buffer));
                        if (!get_sha1_hex(buffer + 1, sha1)) {
                                struct object *object = parse_object(sha1);
                                object->flags |= UNINTERESTING;
@@ -250,6 +240,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
                        object->flags |= SHOWN;
                }
        }
+       fclose(rls_fout);
        if (finish_command(&rls))
                return error("rev-list died");
 
@@ -349,6 +340,9 @@ static int create_bundle(struct bundle_header *header, const char *path,
        }
        if (finish_command(&rls))
                return error ("pack-objects died");
+       close(bundle_fd);
+       if (!bundle_to_stdout)
+               commit_lock_file(&lock);
        return 0;
 }