diff --git a/object.c b/object.c
index ca4af8fa2dc0672b92310a3ebdd4d14bf070dd69..63e6e784d41ef5aa7bb387a96a85bf0f8e7248ab 100644 (file)
--- a/object.c
+++ b/object.c
#include "commit.h"
#include "cache.h"
#include "tag.h"
#include "commit.h"
#include "cache.h"
#include "tag.h"
-#include <stdlib.h>
-#include <string.h>
struct object **objs;
int nr_objs;
static int obj_allocs;
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;
{
int first = 0, last = nr_objs;
return -first-1;
}
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)
{
int pos = find_object(sha1);
if (pos >= 0)
return NULL;
}
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);
{
int pos = find_object(sha1);
}
}
}
}
-struct object *parse_object(unsigned char *sha1)
+struct object *lookup_object_type(const unsigned char *sha1, const char *type)
{
{
- unsigned long mapsize;
- void *map = map_sha1_file(sha1, &mapsize);
- if (map) {
- char type[100];
- unsigned long size;
- void *buffer = unpack_sha1_file(map, mapsize, type, &size);
- if (!buffer)
- return NULL;
+ if (!type) {
+ return lookup_unknown_object(sha1);
+ } else 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;
+ }
+}
+
+union any_object {
+ struct object object;
+ struct commit commit;
+ struct tree tree;
+ struct blob blob;
+ struct tag tag;
+};
+
+struct object *lookup_unknown_object(const unsigned char *sha1)
+{
+ struct object *obj = lookup_object(sha1);
+ if (!obj) {
+ union any_object *ret = xmalloc(sizeof(*ret));
+ memset(ret, 0, sizeof(*ret));
+ created_object(sha1, &ret->object);
+ ret->object.type = NULL;
+ return &ret->object;
+ }
+ return obj;
+}
+
+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 (check_sha1_signature(sha1, buffer, size, type) < 0)
printf("sha1 mismatch %s\n", sha1_to_hex(sha1));
- munmap(map, mapsize);
if (!strcmp(type, "blob")) {
if (!strcmp(type, "blob")) {
- struct blob *ret = lookup_blob(sha1);
- parse_blob(ret);
- return &ret->object;
+ struct blob *blob = lookup_blob(sha1);
+ parse_blob_buffer(blob, buffer, size);
+ obj = &blob->object;
} else if (!strcmp(type, "tree")) {
} else if (!strcmp(type, "tree")) {
- struct tree *ret = lookup_tree(sha1);
- parse_tree(ret);
- return &ret->object;
+ struct tree *tree = lookup_tree(sha1);
+ parse_tree_buffer(tree, buffer, size);
+ obj = &tree->object;
} else if (!strcmp(type, "commit")) {
} else if (!strcmp(type, "commit")) {
- struct commit *ret = lookup_commit(sha1);
- parse_commit(ret);
- return &ret->object;
+ 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")) {
} else if (!strcmp(type, "tag")) {
- struct tag *ret = lookup_tag(sha1);
- parse_tag(ret);
- return &ret->object;
+ struct tag *tag = lookup_tag(sha1);
+ parse_tag_buffer(tag, buffer, size);
+ obj = &tag->object;
} else {
} else {
- return NULL;
+ obj = NULL;
}
}
+ free(buffer);
+ return obj;
}
return NULL;
}
}
return NULL;
}
+
+struct object_list *object_list_insert(struct object *item,
+ struct object_list **list_p)
+{
+ struct object_list *new_list = xmalloc(sizeof(struct object_list));
+ new_list->item = item;
+ new_list->next = *list_p;
+ *list_p = new_list;
+ return new_list;
+}
+
+void object_list_append(struct object *item,
+ struct object_list **list_p)
+{
+ while (*list_p) {
+ list_p = &((*list_p)->next);
+ }
+ *list_p = xmalloc(sizeof(struct object_list));
+ (*list_p)->next = NULL;
+ (*list_p)->item = item;
+}
+
+unsigned object_list_length(struct object_list *list)
+{
+ unsigned ret = 0;
+ while (list) {
+ list = list->next;
+ ret++;
+ }
+ return ret;
+}
+
+int object_list_contains(struct object_list *list, struct object *obj)
+{
+ while (list) {
+ if (list->item == obj)
+ return 1;
+ list = list->next;
+ }
+ return 0;
+}