X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=object.c;h=5e72a7878488922cfeeb5dba385d72049253f7c3;hb=5aa7d94cd6376b2c9a7fa7bdc33fb306b940360a;hp=cfa2337641aabd692c659eabef347be11af9f517;hpb=b51ad4314078298194d23d46e2b4473ffd32a88a;p=git.git

diff --git a/object.c b/object.c
index cfa233764..5e72a7878 100644
--- a/object.c
+++ b/object.c
@@ -1,7 +1,10 @@
 #include "object.h"
+#include "blob.h"
+#include "tree.h"
+#include "commit.h"
 #include "cache.h"
-#include <stdlib.h>
-#include <string.h>
+#include "tag.h"
+#include "delta.h"
 
 struct object **objs;
 int nr_objs;
@@ -52,7 +55,7 @@ void created_object(unsigned char *sha1, struct object *obj)
 
 	if (obj_allocs == nr_objs) {
 		obj_allocs = alloc_nr(obj_allocs);
-		objs = realloc(objs, obj_allocs * sizeof(struct object *));
+		objs = xrealloc(objs, obj_allocs * sizeof(struct object *));
 	}
 
 	/* Insert it into the right place */
@@ -75,7 +78,7 @@ void add_ref(struct object *refer, struct object *target)
 	}
 
 	target->used = 1;
-	p = malloc(sizeof(*p));
+	p = xmalloc(sizeof(*p));
 	p->item = target;
 	p->next = NULL;
 	*pp = p;
@@ -94,3 +97,52 @@ void mark_reachable(struct object *obj, unsigned int mask)
 		p = p->next;
 	}
 }
+
+struct object *parse_object(unsigned char *sha1)
+{
+	unsigned long mapsize;
+	void *map = map_sha1_file(sha1, &mapsize);
+	if (map) {
+		int is_delta;
+		struct object *obj;
+		char type[100];
+		unsigned long size;
+		void *buffer = unpack_sha1_file(map, mapsize, type, &size);
+		munmap(map, mapsize);
+		if (!buffer)
+			return NULL;
+		is_delta = !strcmp(type, "delta");
+		if (!is_delta && check_sha1_signature(sha1, buffer, size, type) < 0)
+			printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
+		if (is_delta) {
+			struct delta *delta = lookup_delta(sha1);
+			parse_delta_buffer(delta, buffer, size);
+			obj = (struct object *) delta;
+		} else if (!strcmp(type, "blob")) {
+			struct blob *blob = lookup_blob(sha1);
+			parse_blob_buffer(blob, buffer, size);
+			obj = &blob->object;
+		} else if (!strcmp(type, "tree")) {
+			struct tree *tree = lookup_tree(sha1);
+			parse_tree_buffer(tree, buffer, size);
+			obj = &tree->object;
+		} else if (!strcmp(type, "commit")) {
+			struct commit *commit = lookup_commit(sha1);
+			parse_commit_buffer(commit, buffer, size);
+			if (!commit->buffer) {
+				commit->buffer = buffer;
+				buffer = NULL;
+			}
+			obj = &commit->object;
+		} else if (!strcmp(type, "tag")) {
+			struct tag *tag = lookup_tag(sha1);
+			parse_tag_buffer(tag, buffer, size);
+			obj = &tag->object;
+		} else {
+			obj = NULL;
+		}
+		free(buffer);
+		return obj;
+	}
+	return NULL;
+}