X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fsck-cache.c;h=96b8eb161107cd3219975d93a44874a5455b702e;hb=65bb49144d26a10837582a99e66041035319ff91;hp=bb5cf196af7f06a3aea6fcfc5941565110c94b27;hpb=91af81a98ea5c5594c67a63abc933250e05c13c6;p=git.git diff --git a/fsck-cache.c b/fsck-cache.c index bb5cf196..96b8eb16 100644 --- a/fsck-cache.c +++ b/fsck-cache.c @@ -3,171 +3,68 @@ #include #include -struct needs { - unsigned char parent[20]; - unsigned char needs[20]; - char tag[10]; -}; +#include "commit.h" +#include "tree.h" +#include "blob.h" -struct seen { - unsigned char sha1[20]; - char tag[10]; - unsigned needed; -}; - -static struct needs *needs; -static struct seen *seen; - -static int nr_seen, alloc_seen, nr_needs, alloc_needs; - -/* - * These two functions build up a graph in memory about - * what objects we've referenced, and found, and types.. - */ -static int compare_seen(const void *s1, const void *s2) -{ - return memcmp(s1, s2, 20); -} - -static int lookup_seen(unsigned char *sha1, char *tag) -{ - int first = 0, last = nr_seen; - - while (last > first) { - int next = (last + first) / 2; - struct seen *s = seen + next; - int cmp = memcmp(sha1, s->sha1, 20); +#define REACHABLE 0x0001 - if (cmp < 0) { - last = next; - continue; - } - if (cmp > 0) { - first = next+1; - continue; - } - if (strcmp(tag, s->tag)) - break; - s->needed++; - return 1; - } - return 0; -} +static int show_unreachable = 0; +static unsigned char head_sha1[20]; static void check_connectivity(void) { int i; - /* Sort the "seen" tags for quicker lookup */ - qsort(seen, nr_seen, sizeof(struct seen), compare_seen); - /* Look up all the requirements, warn about missing objects.. */ - for (i = 0; i < nr_needs; i++) { - struct needs *n = needs + i; - char hex[60]; - - if (lookup_seen(n->needs, n->tag)) - continue; - strcpy(hex, sha1_to_hex(n->parent)); - printf("missing %s: %s referenced by %s\n", n->tag, sha1_to_hex(n->needs), hex); - } - - /* Tell the user about things not referenced.. */ - for (i = 0; i < nr_seen; i++) { - struct seen *s = seen + i; + for (i = 0; i < nr_objs; i++) { + struct object *obj = objs[i]; - if (s->needed) + if (show_unreachable && !(obj->flags & REACHABLE)) { + printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1)); continue; - printf("unreferenced %s: %s\n", s->tag, sha1_to_hex(s->sha1)); - } -} - -static void mark_needs_sha1(unsigned char *parent, const char * tag, unsigned char *child) -{ - struct needs *n; - - if (nr_needs == alloc_needs) { - alloc_needs = alloc_nr(alloc_needs); - needs = realloc(needs, alloc_needs*sizeof(struct needs)); - } - n = needs + nr_needs; - nr_needs++; - memcpy(n->parent, parent, 20); - memcpy(n->needs, child, 20); - strncpy(n->tag, tag, sizeof(n->tag)); -} - -static int mark_sha1_seen(unsigned char *sha1, char *tag) -{ - struct seen *s; + } - if (nr_seen == alloc_seen) { - alloc_seen = alloc_nr(alloc_seen); - seen = realloc(seen, alloc_seen*sizeof(struct seen)); + 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)); + } } - s = seen + nr_seen; - memset(s, 0, sizeof(*s)); - nr_seen++; - memcpy(s->sha1, sha1, 20); - strncpy(s->tag, tag, sizeof(s->tag)); - - return 0; } static int fsck_tree(unsigned char *sha1, void *data, unsigned long size) { - int warn_old_tree = 1; - - while (size) { - int len = 1+strlen(data); - unsigned char *file_sha1 = data + len; - char *path = strchr(data, ' '); - unsigned int mode; - if (size < len + 20 || !path || sscanf(data, "%o", &mode) != 1) - return -1; - - /* Warn about trees that don't do the recursive thing.. */ - if (warn_old_tree && strchr(path, '/')) { - fprintf(stderr, "warning: fsck-cache: tree %s has full pathnames in it\n", sha1_to_hex(sha1)); - warn_old_tree = 0; - } - - data += len + 20; - size -= len + 20; - mark_needs_sha1(sha1, S_ISDIR(mode) ? "tree" : "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 " + + '\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 " + + '\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; @@ -176,7 +73,7 @@ static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long return -1; } else return -1; - return mark_sha1_seen(sha1, tag); + return 0; } static int fsck_name(char *hex) @@ -188,11 +85,13 @@ 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; } } @@ -205,8 +104,7 @@ static int fsck_dir(int i, char *path) 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) { @@ -235,17 +133,40 @@ static int fsck_dir(int i, char *path) 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] *]"); + } + + 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; }