git-tag-script updates.

diff --git a/object.c b/object.c
index cfa2337641aabd692c659eabef347be11af9f517..c410e97c8f378bd6c680efa48c82c3d3f7907103 100644 (file)
--- a/object.c
+++ b/object.c
@@ -1,13 +1,15 @@
 #include "object.h"
+#include "blob.h"
+#include "tree.h"
+#include "commit.h"
 #include "cache.h"
-#include <stdlib.h>
-#include <string.h>
+#include "tag.h"
 
 struct object **objs;
 int nr_objs;
 static int obj_allocs;
 
-static int find_object(unsigned char *sha1)
+static int find_object(const unsigned char *sha1)
 {
        int first = 0, last = nr_objs;
 
@@ -28,7 +30,7 @@ static int find_object(unsigned char *sha1)
         return -first-1;
 }
 
-struct object *lookup_object(unsigned char *sha1)
+struct object *lookup_object(const unsigned char *sha1)
 {
        int pos = find_object(sha1);
        if (pos >= 0)
@@ -36,7 +38,7 @@ struct object *lookup_object(unsigned char *sha1)
        return NULL;
 }
 
-void created_object(unsigned char *sha1, struct object *obj)
+void created_object(const unsigned char *sha1, struct object *obj)
 {
        int pos = find_object(sha1);
 
@@ -52,7 +54,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 +77,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 +96,57 @@ void mark_reachable(struct object *obj, unsigned int mask)
                p = p->next;
        }
 }
+
+struct object *lookup_object_type(const unsigned char *sha1, const char *type)
+{
+       if (!strcmp(type, blob_type)) {
+               return &lookup_blob(sha1)->object;
+       } else if (!strcmp(type, tree_type)) {
+               return &lookup_tree(sha1)->object;
+       } else if (!strcmp(type, commit_type)) {
+               return &lookup_commit(sha1)->object;
+       } else if (!strcmp(type, tag_type)) {
+               return &lookup_tag(sha1)->object;
+       } else {
+               error("Unknown type %s", type);
+               return NULL;
+       }
+}
+
+struct object *parse_object(const unsigned char *sha1)
+{
+       unsigned long size;
+       char type[20];
+       void *buffer = read_sha1_file(sha1, type, &size);
+       if (buffer) {
+               struct object *obj;
+               if (check_sha1_signature(sha1, buffer, size, type) < 0)
+                       printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
+               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;
+}