[PATCH] Fix broken diff-cache output on added files
[alt-git.git] / tree.c
blobe988aed6a85d15568dcb93b69035b97a24e30cc9
1 #include "tree.h"
2 #include "blob.h"
3 #include "cache.h"
4 #include <stdlib.h>
6 const char *tree_type = "tree";
8 static int read_one_entry(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
10 int len = strlen(pathname);
11 unsigned int size = cache_entry_size(baselen + len);
12 struct cache_entry *ce = malloc(size);
14 memset(ce, 0, size);
16 ce->ce_mode = create_ce_mode(mode);
17 ce->ce_flags = create_ce_flags(baselen + len, stage);
18 memcpy(ce->name, base, baselen);
19 memcpy(ce->name + baselen, pathname, len+1);
20 memcpy(ce->sha1, sha1, 20);
21 return add_cache_entry(ce, 1);
24 static int read_tree_recursive(void *buffer, unsigned long size,
25 const char *base, int baselen, int stage)
27 while (size) {
28 int len = strlen(buffer)+1;
29 unsigned char *sha1 = buffer + len;
30 char *path = strchr(buffer, ' ')+1;
31 unsigned int mode;
33 if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
34 return -1;
36 buffer = sha1 + 20;
37 size -= len + 20;
39 if (S_ISDIR(mode)) {
40 int retval;
41 int pathlen = strlen(path);
42 char *newbase = malloc(baselen + 1 + pathlen);
43 void *eltbuf;
44 char elttype[20];
45 unsigned long eltsize;
47 eltbuf = read_sha1_file(sha1, elttype, &eltsize);
48 if (!eltbuf || strcmp(elttype, "tree"))
49 return -1;
50 memcpy(newbase, base, baselen);
51 memcpy(newbase + baselen, path, pathlen);
52 newbase[baselen + pathlen] = '/';
53 retval = read_tree_recursive(eltbuf, eltsize,
54 newbase,
55 baselen + pathlen + 1, stage);
56 free(eltbuf);
57 free(newbase);
58 if (retval)
59 return -1;
60 continue;
62 if (read_one_entry(sha1, base, baselen, path, mode, stage) < 0)
63 return -1;
65 return 0;
68 int read_tree(void *buffer, unsigned long size, int stage)
70 return read_tree_recursive(buffer, size, "", 0, stage);
73 struct tree *lookup_tree(unsigned char *sha1)
75 struct object *obj = lookup_object(sha1);
76 if (!obj) {
77 struct tree *ret = malloc(sizeof(struct tree));
78 memset(ret, 0, sizeof(struct tree));
79 created_object(sha1, &ret->object);
80 return ret;
82 if (obj->parsed && obj->type != tree_type) {
83 error("Object %s is a %s, not a tree",
84 sha1_to_hex(sha1), obj->type);
85 return NULL;
87 return (struct tree *) obj;
90 int parse_tree(struct tree *item)
92 char type[20];
93 void *buffer, *bufptr;
94 unsigned long size;
95 if (item->object.parsed)
96 return 0;
97 item->object.parsed = 1;
98 item->object.type = tree_type;
99 buffer = bufptr = read_sha1_file(item->object.sha1, type, &size);
100 if (!buffer)
101 return error("Could not read %s",
102 sha1_to_hex(item->object.sha1));
103 if (strcmp(type, tree_type))
104 return error("Object %s not a tree",
105 sha1_to_hex(item->object.sha1));
106 while (size) {
107 struct object *obj;
108 int len = 1+strlen(bufptr);
109 unsigned char *file_sha1 = bufptr + len;
110 char *path = strchr(bufptr, ' ');
111 unsigned int mode;
112 if (size < len + 20 || !path ||
113 sscanf(bufptr, "%o", &mode) != 1)
114 return -1;
116 /* Warn about trees that don't do the recursive thing.. */
117 if (strchr(path, '/')) {
118 item->has_full_path = 1;
121 bufptr += len + 20;
122 size -= len + 20;
124 if (S_ISDIR(mode)) {
125 obj = &lookup_tree(file_sha1)->object;
126 } else {
127 obj = &lookup_blob(file_sha1)->object;
129 add_ref(&item->object, obj);
131 return 0;