![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/fsck-cache.c b/fsck-cache.c
index ac348b7d5278e9d04e3a1cd417389379c32b014f..96b8eb161107cd3219975d93a44874a5455b702e 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
#include <sys/types.h>
#include <dirent.h>
-/*
- * 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 mark_needs_sha1(unsigned char *parent, const char * type, unsigned char *child)
-{
-}
+#include "commit.h"
+#include "tree.h"
+#include "blob.h"
+
+#define REACHABLE 0x0001
+
+static int show_unreachable = 0;
+static unsigned char head_sha1[20];
-static int mark_sha1_seen(unsigned char *sha1, char *tag)
+static void check_connectivity(void)
{
- return 0;
+ int i;
+
+ /* Look up all the requirements, warn about missing objects.. */
+ for (i = 0; i < nr_objs; i++) {
+ struct object *obj = objs[i];
+
+ if (show_unreachable && !(obj->flags & REACHABLE)) {
+ printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1));
+ continue;
+ }
+
+ if (!obj->parsed) {
+ printf("missing %s %s\n", obj->type,
+ sha1_to_hex(obj->sha1));
+ }
+ if (!obj->used) {
+ printf("dangling %s %s\n", obj->type,
+ sha1_to_hex(obj->sha1));
+ }
+ }
}
static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
{
- 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);
+ struct tree *item = lookup_tree(sha1);
+ if (parse_tree(item))
+ return -1;
+ if (item->has_full_path) {
+ fprintf(stderr, "warning: fsck-cache: tree %s "
+ "has full pathnames in it\n", sha1_to_hex(sha1));
}
return 0;
}
static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
{
- int parents;
- unsigned char tree_sha1[20];
- unsigned char parent_sha1[20];
-
- if (memcmp(data, "tree ", 5))
+ struct commit *commit = lookup_commit(sha1);
+ if (parse_commit(commit))
return -1;
- if (get_sha1_hex(data + 5, tree_sha1) < 0)
+ if (!commit->tree)
return -1;
- mark_needs_sha1(sha1, "tree", tree_sha1);
- data += 5 + 40 + 1; /* "tree " + <hex sha1> + '\n' */
- parents = 0;
- 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' */
- parents++;
- }
- if (!parents)
- printf("root: %s\n", sha1_to_hex(sha1));
+ if (!commit->parents)
+ printf("root %s\n", sha1_to_hex(sha1));
return 0;
}
-static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long size)
+static int fsck_entry(unsigned char *sha1, char *tag, void *data,
+ unsigned long size)
{
if (!strcmp(tag, "blob")) {
- /* Nothing to check */;
+ lookup_blob(sha1); /* Nothing to check; but notice it. */
} else if (!strcmp(tag, "tree")) {
if (fsck_tree(sha1, data, size) < 0)
return -1;
return -1;
} else
return -1;
- return mark_sha1_seen(sha1, tag);
+ return 0;
}
static int fsck_name(char *hex)
if (map) {
char type[100];
unsigned long size;
- void *buffer = NULL;
- if (!check_sha1_signature(sha1, map, mapsize))
- buffer = unpack_sha1_file(map, mapsize, type, &size);
+ void *buffer = unpack_sha1_file(map, mapsize, type, &size);
+ if (!buffer)
+ return -1;
+ if (check_sha1_signature(sha1, buffer, size, type) < 0)
+ printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
munmap(map, mapsize);
- if (buffer && !fsck_entry(sha1, type, buffer, size))
+ if (!fsck_entry(sha1, type, buffer, size))
return 0;
}
}
struct dirent *de;
if (!dir) {
- fprintf(stderr, "missing sha1 directory '%s'", path);
- return -1;
+ return error("missing sha1 directory '%s'", path);
}
while ((de = readdir(dir)) != NULL) {
int main(int argc, char **argv)
{
- int i;
+ int i, heads;
char *sha1_dir;
- if (argc != 1)
- usage("fsck-cache");
sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
for (i = 0; i < 256; i++) {
static char dir[4096];
sprintf(dir, "%s/%02x", sha1_dir, i);
fsck_dir(i, dir);
}
+
+ heads = 0;
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "--unreachable")) {
+ show_unreachable = 1;
+ continue;
+ }
+ if (!get_sha1_hex(argv[i], head_sha1)) {
+ struct object *obj = &lookup_commit(head_sha1)->object;
+ obj->used = 1;
+ mark_reachable(obj, REACHABLE);
+ heads++;
+ continue;
+ }
+ error("fsck-cache [[--unreachable] <head-sha1>*]");
+ }
+
+ if (!heads) {
+ if (show_unreachable) {
+ fprintf(stderr, "unable to do reachability without a head\n");
+ show_unreachable = 0;
+ }
+ fprintf(stderr, "expect dangling commits - potential heads - due to lack of head information\n");
+ }
+
+ check_connectivity();
return 0;
}