Refactor open_packed_git to return an error code.

diff --git a/sha1_file.c b/sha1_file.c
index 29c260cf65927792f6562f8896d6da20c9d06eb6..eec4f418bcd07db32bbbdb116c0a3b2aa00be438 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -552,7 +552,7 @@ void unuse_pack(struct pack_window **w_cursor)
        }
 }
 
-static void open_packed_git(struct packed_git *p)
+static int open_packed_git(struct packed_git *p)
 {
        struct stat st;
        struct pack_header hdr;
@@ -562,49 +562,50 @@ static void open_packed_git(struct packed_git *p)
 
        p->pack_fd = open(p->pack_name, O_RDONLY);
        if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
-               die("packfile %s cannot be opened", p->pack_name);
+               return -1;
 
        /* If we created the struct before we had the pack we lack size. */
        if (!p->pack_size) {
                if (!S_ISREG(st.st_mode))
-                       die("packfile %s not a regular file", p->pack_name);
+                       return error("packfile %s not a regular file", p->pack_name);
                p->pack_size = st.st_size;
        } else if (p->pack_size != st.st_size)
-               die("packfile %s size changed", p->pack_name);
+               return error("packfile %s size changed", p->pack_name);
 
        /* We leave these file descriptors open with sliding mmap;
         * there is no point keeping them open across exec(), though.
         */
        fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
        if (fd_flag < 0)
-               die("cannot determine file descriptor flags");
+               return error("cannot determine file descriptor flags");
        fd_flag |= FD_CLOEXEC;
        if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
-               die("cannot set FD_CLOEXEC");
+               return error("cannot set FD_CLOEXEC");
 
        /* Verify we recognize this pack file format. */
        if (read_in_full(p->pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
-               die("file %s is far too short to be a packfile", p->pack_name);
+               return error("file %s is far too short to be a packfile", p->pack_name);
        if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
-               die("file %s is not a GIT packfile", p->pack_name);
+               return error("file %s is not a GIT packfile", p->pack_name);
        if (!pack_version_ok(hdr.hdr_version))
-               die("packfile %s is version %u and not supported"
+               return error("packfile %s is version %u and not supported"
                        " (try upgrading GIT to a newer version)",
                        p->pack_name, ntohl(hdr.hdr_version));
 
        /* Verify the pack matches its index. */
        if (num_packed_objects(p) != ntohl(hdr.hdr_entries))
-               die("packfile %s claims to have %u objects"
+               return error("packfile %s claims to have %u objects"
                        " while index size indicates %u objects",
                        p->pack_name, ntohl(hdr.hdr_entries),
                        num_packed_objects(p));
        if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
-               die("end of packfile %s is unavailable", p->pack_name);
+               return error("end of packfile %s is unavailable", p->pack_name);
        if (read_in_full(p->pack_fd, sha1, sizeof(sha1)) != sizeof(sha1))
-               die("packfile %s signature is unavailable", p->pack_name);
+               return error("packfile %s signature is unavailable", p->pack_name);
        idx_sha1 = ((unsigned char *)p->index_base) + p->index_size - 40;
        if (hashcmp(sha1, idx_sha1))
-               die("packfile %s does not match index", p->pack_name);
+               return error("packfile %s does not match index", p->pack_name);
+       return 0;
 }
 
 static int in_window(struct pack_window *win, unsigned long offset)
@@ -627,8 +628,8 @@ unsigned char* use_pack(struct packed_git *p,
 {
        struct pack_window *win = *w_cursor;
 
-       if (p->pack_fd == -1)
-               open_packed_git(p);
+       if (p->pack_fd == -1 && open_packed_git(p))
+               die("packfile %s cannot be accessed", p->pack_name);
 
        /* Since packfiles end in a hash of their content and its
         * pointless to ask for an offset into the middle of that