X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=tag.c;h=4041af2572a4427a03bc8955137b7d2211f9d770;hb=a7ca65405c364e674cf4359b07ae959d4ece01ab;hp=f079d83a9de5c3d6d98b2a29339ec1ef3a25f333;hpb=2636f6143751a064e366cb7763d0705b296726e3;p=git.git diff --git a/tag.c b/tag.c index f079d83a..4041af25 100644 --- a/tag.c +++ b/tag.c @@ -3,7 +3,7 @@ const char *tag_type = "tag"; -struct tag *lookup_tag(unsigned char *sha1) +struct tag *lookup_tag(const unsigned char *sha1) { struct object *obj = lookup_object(sha1); if (!obj) { @@ -13,6 +13,8 @@ struct tag *lookup_tag(unsigned char *sha1) ret->object.type = tag_type; return ret; } + if (!obj->type) + obj->type = tag_type; if (obj->type != tag_type) { error("Object %s is a %s, not a tree", sha1_to_hex(sha1), obj->type); @@ -21,32 +23,24 @@ struct tag *lookup_tag(unsigned char *sha1) return (struct tag *) obj; } -int parse_tag(struct tag *item) +int parse_tag_buffer(struct tag *item, void *data, unsigned long size) { - char type[20]; - void *data, *bufptr; - unsigned long size; - if (item->object.parsed) - return 0; - item->object.parsed = 1; - data = bufptr = read_sha1_file(item->object.sha1, type, &size); - if (!data) - return error("Could not read %s", - sha1_to_hex(item->object.sha1)); - if (strcmp(type, tag_type)) - return error("Object %s not a tag", - sha1_to_hex(item->object.sha1)); - int typelen, taglen; unsigned char object[20]; const char *type_line, *tag_line, *sig_line; + if (item->object.parsed) + return 0; + item->object.parsed = 1; + if (size < 64) return -1; if (memcmp("object ", data, 7) || get_sha1_hex(data + 7, object)) return -1; item->tagged = parse_object(object); + if (item->tagged) + add_ref(&item->object, item->tagged); type_line = data + 48; if (memcmp("\ntype ", type_line-1, 6)) @@ -71,3 +65,26 @@ int parse_tag(struct tag *item) return 0; } + +int parse_tag(struct tag *item) +{ + char type[20]; + void *data; + unsigned long size; + int ret; + + if (item->object.parsed) + return 0; + data = read_sha1_file(item->object.sha1, type, &size); + if (!data) + return error("Could not read %s", + sha1_to_hex(item->object.sha1)); + if (strcmp(type, tag_type)) { + free(data); + return error("Object %s not a tag", + sha1_to_hex(item->object.sha1)); + } + ret = parse_tag_buffer(item, data, size); + free(data); + return ret; +}