aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tree.c20
-rw-r--r--tree.h12
2 files changed, 29 insertions, 3 deletions
diff --git a/tree.c b/tree.c
index e988aed6a..79b962585 100644
--- a/tree.c
+++ b/tree.c
@@ -92,6 +92,7 @@ int parse_tree(struct tree *item)
char type[20];
void *buffer, *bufptr;
unsigned long size;
+ struct tree_entry_list **list_p;
if (item->object.parsed)
return 0;
item->object.parsed = 1;
@@ -103,8 +104,10 @@ int parse_tree(struct tree *item)
if (strcmp(type, tree_type))
return error("Object %s not a tree",
sha1_to_hex(item->object.sha1));
+ list_p = &item->entries;
while (size) {
struct object *obj;
+ struct tree_entry_list *entry;
int len = 1+strlen(bufptr);
unsigned char *file_sha1 = bufptr + len;
char *path = strchr(bufptr, ' ');
@@ -113,6 +116,12 @@ int parse_tree(struct tree *item)
sscanf(bufptr, "%o", &mode) != 1)
return -1;
+ entry = malloc(sizeof(struct tree_entry_list));
+ entry->name = strdup(path + 1);
+ entry->directory = S_ISDIR(mode);
+ entry->executable = mode & S_IXUSR;
+ entry->next = NULL;
+
/* Warn about trees that don't do the recursive thing.. */
if (strchr(path, '/')) {
item->has_full_path = 1;
@@ -121,12 +130,17 @@ int parse_tree(struct tree *item)
bufptr += len + 20;
size -= len + 20;
- if (S_ISDIR(mode)) {
- obj = &lookup_tree(file_sha1)->object;
+ if (entry->directory) {
+ entry->item.tree = lookup_tree(file_sha1);
+ obj = &entry->item.tree->object;
} else {
- obj = &lookup_blob(file_sha1)->object;
+ entry->item.blob = lookup_blob(file_sha1);
+ obj = &entry->item.blob->object;
}
add_ref(&item->object, obj);
+
+ *list_p = entry;
+ list_p = &entry->next;
}
return 0;
}
diff --git a/tree.h b/tree.h
index 4d5496de3..19b190565 100644
--- a/tree.h
+++ b/tree.h
@@ -5,9 +5,21 @@
extern const char *tree_type;
+struct tree_entry_list {
+ struct tree_entry_list *next;
+ unsigned directory : 1;
+ unsigned executable : 1;
+ char *name;
+ union {
+ struct tree *tree;
+ struct blob *blob;
+ } item;
+};
+
struct tree {
struct object object;
unsigned has_full_path : 1;
+ struct tree_entry_list *entries;
};
struct tree *lookup_tree(unsigned char *sha1);