1 files changed, 150 insertions, 112 deletions

diff --git a/pack-check.c b/pack-check.c
index 511f29424a..63a595c45c 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -1,143 +1,181 @@
 #include "cache.h"
 #include "pack.h"
+#include "pack-revindex.h"
+#include "progress.h"
 
-static int verify_packfile(struct packed_git *p)
+struct idx_entry {
+	off_t                offset;
+	const unsigned char *sha1;
+	unsigned int nr;
+};
+
+static int compare_entries(const void *e1, const void *e2)
 {
-	unsigned long index_size = p->index_size;
-	void *index_base = p->index_base;
-	SHA_CTX ctx;
-	unsigned char sha1[20];
-	unsigned long pack_size = p->pack_size;
-	void *pack_base;
-	struct pack_header *hdr;
-	int nr_objects, err, i;
-
-	/* Header consistency check */
-	hdr = p->pack_base;
-	if (hdr->hdr_signature != htonl(PACK_SIGNATURE))
-		return error("Packfile %s signature mismatch", p->pack_name);
-	if (hdr->hdr_version != htonl(PACK_VERSION))
-		return error("Packfile version %d different from ours %d",
-			     ntohl(hdr->hdr_version), PACK_VERSION);
-	nr_objects = ntohl(hdr->hdr_entries);
-	if (num_packed_objects(p) != nr_objects)
-		return error("Packfile claims to have %d objects, "
-			     "while idx size expects %d", nr_objects,
-			     num_packed_objects(p));
-
-	SHA1_Init(&ctx);
-	pack_base = p->pack_base;
-	SHA1_Update(&ctx, pack_base, pack_size - 20);
-	SHA1_Final(sha1, &ctx);
-	if (memcmp(sha1, index_base + index_size - 40, 20))
-		return error("Packfile %s SHA1 mismatch with idx",
-			     p->pack_name);
-	if (memcmp(sha1, pack_base + pack_size - 20, 20))
-		return error("Packfile %s SHA1 mismatch with itself",
-			     p->pack_name);
+	const struct idx_entry *entry1 = e1;
+	const struct idx_entry *entry2 = e2;
+	if (entry1->offset < entry2->offset)
+		return -1;
+	if (entry1->offset > entry2->offset)
+		return 1;
+	return 0;
+}
+
+int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
+		   off_t offset, off_t len, unsigned int nr)
+{
+	const uint32_t *index_crc;
+	uint32_t data_crc = crc32(0, NULL, 0);
+
+	do {
+		unsigned long avail;
+		void *data = use_pack(p, w_curs, offset, &avail);
+		if (avail > len)
+			avail = len;
+		data_crc = crc32(data_crc, data, avail);
+		offset += avail;
+		len -= avail;
+	} while (len);
+
+	index_crc = p->index_data;
+	index_crc += 2 + 256 + p->num_objects * (20/4) + nr;
+
+	return data_crc != ntohl(*index_crc);
+}
+
+static int verify_packfile(struct packed_git *p,
+			   struct pack_window **w_curs,
+			   verify_fn fn,
+			   struct progress *progress, uint32_t base_count)
+
+{
+	off_t index_size = p->index_size;
+	const unsigned char *index_base = p->index_data;
+	git_SHA_CTX ctx;
+	unsigned char sha1[20], *pack_sig;
+	off_t offset = 0, pack_sig_ofs = 0;
+	uint32_t nr_objects, i;
+	int err = 0;
+	struct idx_entry *entries;
+
+	/* Note that the pack header checks are actually performed by
+	 * use_pack when it first opens the pack file.  If anything
+	 * goes wrong during those checks then the call will die out
+	 * immediately.
+	 */
+
+	git_SHA1_Init(&ctx);
+	do {
+		unsigned long remaining;
+		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
+		offset += remaining;
+		if (!pack_sig_ofs)
+			pack_sig_ofs = p->pack_size - 20;
+		if (offset > pack_sig_ofs)
+			remaining -= (unsigned int)(offset - pack_sig_ofs);
+		git_SHA1_Update(&ctx, in, remaining);
+	} while (offset < pack_sig_ofs);
+	git_SHA1_Final(sha1, &ctx);
+	pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
+	if (hashcmp(sha1, pack_sig))
+		err = error("%s SHA1 checksum mismatch",
+			    p->pack_name);
+	if (hashcmp(index_base + index_size - 40, pack_sig))
+		err = error("%s SHA1 does not match its index",
+			    p->pack_name);
+	unuse_pack(w_curs);
 
 	/* Make sure everything reachable from idx is valid.  Since we
 	 * have verified that nr_objects matches between idx and pack,
 	 * we do not do scan-streaming check on the pack file.
 	 */
-	for (i = err = 0; i < nr_objects; i++) {
-		unsigned char sha1[20];
-		struct pack_entry e;
+	nr_objects = p->num_objects;
+	entries = xmalloc((nr_objects + 1) * sizeof(*entries));
+	entries[nr_objects].offset = pack_sig_ofs;
+	/* first sort entries by pack offset, since unpacking them is more efficient that way */
+	for (i = 0; i < nr_objects; i++) {
+		entries[i].sha1 = nth_packed_object_sha1(p, i);
+		if (!entries[i].sha1)
+			die("internal error pack-check nth-packed-object");
+		entries[i].offset = nth_packed_object_offset(p, i);
+		entries[i].nr = i;
+	}
+	qsort(entries, nr_objects, sizeof(*entries), compare_entries);
+
+	for (i = 0; i < nr_objects; i++) {
 		void *data;
-		char type[20];
+		enum object_type type;
 		unsigned long size;
 
-		if (nth_packed_object_sha1(p, i, sha1))
-			die("internal error pack-check nth-packed-object");
-		if (!find_pack_entry_one(sha1, &e, p))
-			die("internal error pack-check find-pack-entry-one");
-		data = unpack_entry_gently(&e, type, &size);
-		if (!data) {
-			err = error("cannot unpack %s from %s",
-				    sha1_to_hex(sha1), p->pack_name);
-			continue;
+		if (p->index_version > 1) {
+			off_t offset = entries[i].offset;
+			off_t len = entries[i+1].offset - offset;
+			unsigned int nr = entries[i].nr;
+			if (check_pack_crc(p, w_curs, offset, len, nr))
+				err = error("index CRC mismatch for object %s "
+					    "from %s at offset %"PRIuMAX"",
+					    sha1_to_hex(entries[i].sha1),
+					    p->pack_name, (uintmax_t)offset);
 		}
-		if (check_sha1_signature(sha1, data, size, type)) {
+		data = unpack_entry(p, entries[i].offset, &type, &size);
+		if (!data)
+			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
+				    sha1_to_hex(entries[i].sha1), p->pack_name,
+				    (uintmax_t)entries[i].offset);
+		else if (check_sha1_signature(entries[i].sha1, data, size, typename(type)))
 			err = error("packed %s from %s is corrupt",
-				    sha1_to_hex(sha1), p->pack_name);
-			free(data);
-			continue;
+				    sha1_to_hex(entries[i].sha1), p->pack_name);
+		else if (fn) {
+			int eaten = 0;
+			fn(entries[i].sha1, type, size, data, &eaten);
+			if (eaten)
+				data = NULL;
 		}
+		if (((base_count + i) & 1023) == 0)
+			display_progress(progress, base_count + i);
 		free(data);
+
 	}
+	display_progress(progress, base_count + i);
+	free(entries);
 
 	return err;
 }
 
-
-static void show_pack_info(struct packed_git *p)
+int verify_pack_index(struct packed_git *p)
 {
-	struct pack_header *hdr;
-	int nr_objects, i;
-
-	hdr = p->pack_base;
-	nr_objects = ntohl(hdr->hdr_entries);
-
-	for (i = 0; i < nr_objects; i++) {
-		unsigned char sha1[20], base_sha1[20];
-		struct pack_entry e;
-		char type[20];
-		unsigned long size;
-		unsigned long store_size;
-		int delta_chain_length;
+	off_t index_size;
+	const unsigned char *index_base;
+	git_SHA_CTX ctx;
+	unsigned char sha1[20];
+	int err = 0;
 
-		if (nth_packed_object_sha1(p, i, sha1))
-			die("internal error pack-check nth-packed-object");
-		if (!find_pack_entry_one(sha1, &e, p))
-			die("internal error pack-check find-pack-entry-one");
-
-		packed_object_info_detail(&e, type, &size, &store_size,
-					  &delta_chain_length,
-					  base_sha1);
-		printf("%s ", sha1_to_hex(sha1));
-		if (!delta_chain_length)
-			printf("%-6s %lu %u\n", type, size, e.offset);
-		else
-			printf("%-6s %lu %u %d %s\n", type, size, e.offset,
-			       delta_chain_length, sha1_to_hex(base_sha1));
-	}
+	if (open_pack_index(p))
+		return error("packfile %s index not opened", p->pack_name);
+	index_size = p->index_size;
+	index_base = p->index_data;
 
+	/* Verify SHA1 sum of the index file */
+	git_SHA1_Init(&ctx);
+	git_SHA1_Update(&ctx, index_base, (unsigned int)(index_size - 20));
+	git_SHA1_Final(sha1, &ctx);
+	if (hashcmp(sha1, index_base + index_size - 20))
+		err = error("Packfile index for %s SHA1 mismatch",
+			    p->pack_name);
+	return err;
 }
 
-int verify_pack(struct packed_git *p, int verbose)
+int verify_pack(struct packed_git *p, verify_fn fn,
+		struct progress *progress, uint32_t base_count)
 {
-	unsigned long index_size = p->index_size;
-	void *index_base = p->index_base;
-	SHA_CTX ctx;
-	unsigned char sha1[20];
-	int ret;
+	int err = 0;
+	struct pack_window *w_curs = NULL;
 
-	ret = 0;
-	/* Verify SHA1 sum of the index file */
-	SHA1_Init(&ctx);
-	SHA1_Update(&ctx, index_base, index_size - 20);
-	SHA1_Final(sha1, &ctx);
-	if (memcmp(sha1, index_base + index_size - 20, 20))
-		ret = error("Packfile index for %s SHA1 mismatch",
-			    p->pack_name);
+	err |= verify_pack_index(p);
+	if (!p->index_data)
+		return -1;
 
-	if (!ret) {
-		/* Verify pack file */
-		use_packed_git(p);
-		ret = verify_packfile(p);
-		unuse_packed_git(p);
-	}
+	err |= verify_packfile(p, &w_curs, fn, progress, base_count);
+	unuse_pack(&w_curs);
 
-	if (verbose) {
-		if (ret)
-			printf("%s: bad\n", p->pack_name);
-		else {
-			use_packed_git(p);
-			show_pack_info(p);
-			unuse_packed_git(p);
-			printf("%s: ok\n", p->pack_name);
-		}
-	}
-
-	return ret;
+	return err;
 }