summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-09 00:11:14 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-09 00:11:14 (GMT)
commit1ea34e365b1ea233be332245bc34a8df415a7d61 (patch)
treec084af1ee14b234a73d47e2bb3fbf3617837e16d
parent94261677654d493f6a6219c78aae986a146f92d4 (diff)
downloadgit-1ea34e365b1ea233be332245bc34a8df415a7d61.zip
git-1ea34e365b1ea233be332245bc34a8df415a7d61.tar.gz
git-1ea34e365b1ea233be332245bc34a8df415a7d61.tar.bz2
Make fsck-cache start parsing the object types, and checking their
internal format. This doesn't yet check the reachability information, but we're getting there.. Slowly.
-rw-r--r--fsck-cache.c53
1 files changed, 42 insertions, 11 deletions
diff --git a/fsck-cache.c b/fsck-cache.c
index 81fd25a..0a97566 100644
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -4,33 +4,64 @@
#include <dirent.h>
/*
- * These three functions should build up a graph in memory about
+ * These two functions should build up a graph in memory about
* what objects we've referenced, and found, and types..
*
* Right now we don't do that kind of reachability checking. Yet.
*/
-static void fsck_tree(void *data, unsigned long size)
+static void mark_needs_sha1(unsigned char *parent, const char * type, unsigned char *child)
{
}
-static void fsck_commit(void *data, unsigned long size)
+static int mark_sha1_seen(unsigned char *sha1, char *tag)
{
+ return 0;
}
-static int mark_sha1_seen(unsigned char *sha1, char *tag)
+static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
{
- return 0;
+ while (size) {
+ int len = 1+strlen(data);
+ unsigned char *file_sha1 = data + len;
+ char *path = strchr(data, ' ');
+ if (size < len + 20 || !path)
+ return -1;
+ data += len + 20;
+ size -= len + 20;
+ mark_needs_sha1(sha1, "blob", file_sha1);
+ }
+}
+
+static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
+{
+ unsigned char tree_sha1[20];
+ unsigned char parent_sha1[20];
+
+ if (memcmp(data, "tree ", 5))
+ return -1;
+ if (get_sha1_hex(data + 5, tree_sha1) < 0)
+ return -1;
+ mark_needs_sha1(sha1, "tree", tree_sha1);
+ data += 5 + 40 + 1; /* "tree " + <hex sha1> + '\n' */
+ while (!memcmp(data, "parent ", 7)) {
+ if (get_sha1_hex(data + 7, parent_sha1) < 0)
+ return -1;
+ mark_needs_sha1(sha1, "commit", parent_sha1);
+ data += 7 + 40 + 1; /* "parent " + <hex sha1> + '\n' */
+ }
}
static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long size)
{
- if (!strcmp(tag, "blob"))
+ if (!strcmp(tag, "blob")) {
/* Nothing to check */;
- else if (!strcmp(tag, "tree"))
- fsck_tree(data, size);
- else if (!strcmp(tag, "commit"))
- fsck_commit(data, size);
- else
+ } else if (!strcmp(tag, "tree")) {
+ if (fsck_tree(sha1, data, size) < 0)
+ return -1;
+ } else if (!strcmp(tag, "commit")) {
+ if (fsck_commit(sha1, data, size) < 0)
+ return -1;
+ } else
return -1;
return mark_sha1_seen(sha1, tag);
}