X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=blob.c;h=280f5241577ac029e9d5a7eb5bf895642b342fc8;hb=14242464811bff9e8d1af8eb33367a01480a18d0;hp=3d99b93f020d84c5410c2b1056f2d7446b647d1e;hpb=812666c8e66a21e668c0789d0422aa5a7db54961;p=git.git diff --git a/blob.c b/blob.c index 3d99b93f..280f5241 100644 --- a/blob.c +++ b/blob.c @@ -14,10 +14,37 @@ struct blob *lookup_blob(unsigned char *sha1) ret->object.type = blob_type; return ret; } - if (obj->parsed && obj->type != blob_type) { + if (obj->type != blob_type) { error("Object %s is a %s, not a blob", sha1_to_hex(sha1), obj->type); return NULL; } return (struct blob *) obj; } + +int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size) +{ + item->object.parsed = 1; + return 0; +} + +int parse_blob(struct blob *item) +{ + char type[20]; + void *buffer; + unsigned long size; + int ret; + + if (item->object.parsed) + return 0; + buffer = read_sha1_file(item->object.sha1, type, &size); + if (!buffer) + return error("Could not read %s", + sha1_to_hex(item->object.sha1)); + if (strcmp(type, blob_type)) + return error("Object %s not a blob", + sha1_to_hex(item->object.sha1)); + ret = parse_blob_buffer(item, buffer, size); + free(buffer); + return ret; +}