X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fsck-cache.c;h=27c9ccdeb121bff4a071e9b621ddede099878428;hb=cd2fb81d1165cabf76e7f1c31386796e35dd1987;hp=3fbcd2c7e99fa5e27fa7edad0e2bd65d3b557fe7;hpb=458754a9fe2c2e889e38d1f4f53d5d457eba6faa;p=git.git diff --git a/fsck-cache.c b/fsck-cache.c index 3fbcd2c7..27c9ccde 100644 --- a/fsck-cache.c +++ b/fsck-cache.c @@ -3,7 +3,11 @@ #include #include -#include "revision.h" +#include "commit.h" +#include "tree.h" +#include "blob.h" + +#define REACHABLE 0x0001 static int show_unreachable = 0; static unsigned char head_sha1[20]; @@ -13,105 +17,115 @@ static void check_connectivity(void) int i; /* Look up all the requirements, warn about missing objects.. */ - for (i = 0; i < nr_revs; i++) { - struct revision *rev = revs[i]; + for (i = 0; i < nr_objs; i++) { + struct object *obj = objs[i]; - if (show_unreachable && !(rev->flags & REACHABLE)) { - printf("unreachable %s\n", sha1_to_hex(rev->sha1)); + if (show_unreachable && !(obj->flags & REACHABLE)) { + printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1)); continue; } - switch (rev->flags & (SEEN | USED)) { - case 0: - printf("bad %s\n", sha1_to_hex(rev->sha1)); - break; - case USED: - printf("missing %s\n", sha1_to_hex(rev->sha1)); - break; - case SEEN: - printf("dangling %s\n", sha1_to_hex(rev->sha1)); - break; + 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 void mark_needs_sha1(unsigned char *parent, const char * tag, unsigned char *child) +static int fsck_tree(unsigned char *sha1, void *data, unsigned long size) { - struct revision * child_rev = add_relationship(lookup_rev(parent), child); - child_rev->flags |= USED; + 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 mark_sha1_seen(unsigned char *sha1, char *tag) +static int fsck_commit(unsigned char *sha1, void *data, unsigned long size) { - struct revision *rev = lookup_rev(sha1); - - rev->flags |= SEEN; + struct commit *commit = lookup_commit(sha1); + if (parse_commit(commit)) + return -1; + if (!commit->tree) + return -1; + if (!commit->parents) + printf("root %s\n", sha1_to_hex(sha1)); + if (!commit->date) + printf("bad commit date in %s\n", sha1_to_hex(sha1)); return 0; } -static int fsck_tree(unsigned char *sha1, void *data, unsigned long size) +static int fsck_blob(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 blob *blob = lookup_blob(sha1); + blob->object.parsed = 1; return 0; } -static int fsck_commit(unsigned char *sha1, void *data, unsigned long size) +static int fsck_tag(unsigned char *sha1, void *data, unsigned long size) { - int parents; - unsigned char tree_sha1[20]; - unsigned char parent_sha1[20]; + int typelen, taglen; + unsigned char object[20]; + char object_hex[60]; + const char *type_line, *tag_line, *sig_line; - if (memcmp(data, "tree ", 5)) + if (size < 64) return -1; - if (get_sha1_hex(data + 5, tree_sha1) < 0) + if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object)) 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)); + + type_line = data + 48; + if (memcmp("\ntype ", type_line-1, 6)) + return -1; + + tag_line = strchr(type_line, '\n'); + if (!tag_line || memcmp("tag ", ++tag_line, 4)) + return -1; + + sig_line = strchr(tag_line, '\n'); + if (!sig_line) + return -1; + sig_line++; + + typelen = tag_line - type_line - strlen("type \n"); + if (typelen >= 20) + return -1; + taglen = sig_line - tag_line - strlen("tag \n"); + + strcpy(object_hex, sha1_to_hex(object)); + printf("tagged %.*s %s (%.*s) in %s\n", + typelen, type_line + 5, + object_hex, + taglen, tag_line + 4, + 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 */; + if (fsck_blob(sha1, data, size) < 0) + return -1; } 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 if (!strcmp(tag, "tag")) { + if (fsck_tag(sha1, data, size) < 0) + return -1; } else return -1; - return mark_sha1_seen(sha1, tag); + return 0; } static int fsck_name(char *hex) @@ -123,11 +137,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; } } @@ -186,7 +202,9 @@ int main(int argc, char **argv) continue; } if (!get_sha1_hex(argv[i], head_sha1)) { - mark_reachable(lookup_rev(head_sha1)); + struct object *obj = &lookup_commit(head_sha1)->object; + obj->used = 1; + mark_reachable(obj, REACHABLE); heads++; continue; }