multi-pack-index: read packfile list

diff --git a/midx.c b/midx.c
index c1ff5acf853911eb66760c74c7484841240e0ccd..f742d7ccd7078333286464fbb6f3a2a633c5db77 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -1,6 +1,8 @@
 #include "cache.h"
 #include "csum-file.h"
+#include "dir.h"
 #include "lockfile.h"
+#include "packfile.h"
 #include "object-store.h"
 #include "midx.h"
 
@@ -109,12 +111,41 @@ static size_t write_midx_header(struct hashfile *f,
        return MIDX_HEADER_SIZE;
 }
 
+struct pack_list {
+       struct packed_git **list;
+       uint32_t nr;
+       uint32_t alloc_list;
+};
+
+static void add_pack_to_midx(const char *full_path, size_t full_path_len,
+                            const char *file_name, void *data)
+{
+       struct pack_list *packs = (struct pack_list *)data;
+
+       if (ends_with(file_name, ".idx")) {
+               ALLOC_GROW(packs->list, packs->nr + 1, packs->alloc_list);
+
+               packs->list[packs->nr] = add_packed_git(full_path,
+                                                       full_path_len,
+                                                       0);
+               if (!packs->list[packs->nr]) {
+                       warning(_("failed to add packfile '%s'"),
+                               full_path);
+                       return;
+               }
+
+               packs->nr++;
+       }
+}
+
 int write_midx_file(const char *object_dir)
 {
        unsigned char num_chunks = 0;
        char *midx_name;
+       uint32_t i;
        struct hashfile *f = NULL;
        struct lock_file lk;
+       struct pack_list packs;
 
        midx_name = get_midx_filename(object_dir);
        if (safe_create_leading_directories(midx_name)) {
@@ -123,14 +154,29 @@ int write_midx_file(const char *object_dir)
                          midx_name);
        }
 
+       packs.nr = 0;
+       packs.alloc_list = 16;
+       packs.list = NULL;
+       ALLOC_ARRAY(packs.list, packs.alloc_list);
+
+       for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
+
        hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
        f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
        FREE_AND_NULL(midx_name);
 
-       write_midx_header(f, num_chunks, 0);
+       write_midx_header(f, num_chunks, packs.nr);
 
        finalize_hashfile(f, NULL, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
        commit_lock_file(&lk);
 
+       for (i = 0; i < packs.nr; i++) {
+               if (packs.list[i]) {
+                       close_pack(packs.list[i]);
+                       free(packs.list[i]);
+               }
+       }
+
+       free(packs.list);
        return 0;
 }