op public repos

Blob

Date:: Sun Jan 13 16:15:53 2019 UTC
Message:: happy new copyright year
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018, 2019 Stefan Sperling <stsp@openbsd.org>
3  *
4  * Permission to use, copy, modify, and distribute this software for any
5  * purpose with or without fee is hereby granted, provided that the above
6  * copyright notice and this permission notice appear in all copies.
7  *
8  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15  */
16 
17 #include <sys/queue.h>
18 #include <sys/tree.h>
19 #include <sys/stat.h>
20 
21 #include <stdio.h>
22 #include <stdlib.h>
23 #include <string.h>
24 #include <sha1.h>
25 #include <endian.h>
26 #include <limits.h>
27 
28 #include "got_error.h"
29 #include "got_object.h"
30 
31 #include "got_lib_path.h"
32 #include "got_lib_fileindex.h"
33 
34 struct got_fileindex {
35 	struct got_fileindex_tree entries;
36 	int nentries;
37 #define GOT_FILEIDX_MAX_ENTRIES INT_MAX
38 };
39 
40 const struct got_error *
41 got_fileindex_entry_update(struct got_fileindex_entry *entry,
42     const char *ondisk_path, uint8_t *blob_sha1, uint8_t *commit_sha1)
43 {
44 	struct stat sb;
45 
46 	if (lstat(ondisk_path, &sb) != 0)
47 		return got_error_from_errno();
48 
49 	entry->ctime_sec = sb.st_ctime;
50 	entry->ctime_nsec = sb.st_ctimensec;
51 	entry->mtime_sec = sb.st_mtime;
52 	entry->mtime_nsec = sb.st_mtimensec;
53 	entry->uid = sb.st_uid;
54 	entry->gid = sb.st_gid;
55 	entry->size = (sb.st_size & 0xffffffff);
56 	if (sb.st_mode & S_IFLNK)
57 		entry->mode = GOT_FILEIDX_MODE_SYMLINK;
58 	else
59 		entry->mode = GOT_FILEIDX_MODE_REGULAR_FILE;
60 	entry->mode |= ((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)) <<
61 	    GOT_FILEIDX_MODE_PERMS_SHIFT);
62 	memcpy(entry->blob_sha1, blob_sha1, SHA1_DIGEST_LENGTH);
63 	memcpy(entry->commit_sha1, commit_sha1, SHA1_DIGEST_LENGTH);
64 
65 	return NULL;
66 }
67 
68 const struct got_error *
69 got_fileindex_entry_alloc(struct got_fileindex_entry **entry,
70     const char *ondisk_path, const char *relpath, uint8_t *blob_sha1,
71     uint8_t *commit_sha1)
72 {
73 	size_t len;
74 
75 	*entry = calloc(1, sizeof(**entry));
76 	if (*entry == NULL)
77 		return got_error_from_errno();
78 
79 	(*entry)->path = strdup(relpath);
80 	if ((*entry)->path == NULL) {
81 		const struct got_error *err = got_error_from_errno();
82 		free(*entry);
83 		*entry = NULL;
84 		return err;
85 	}
86 
87 	len = strlen(relpath);
88 	if (len > GOT_FILEIDX_F_PATH_LEN)
89 		len = GOT_FILEIDX_F_PATH_LEN;
90 	(*entry)->flags |= len;
91 
92 	return got_fileindex_entry_update(*entry, ondisk_path, blob_sha1,
93 	    commit_sha1);
94 }
95 
96 void
97 got_fileindex_entry_free(struct got_fileindex_entry *entry)
98 {
99 	free(entry->path);
100 	free(entry);
101 }
102 
103 static const struct got_error *
104 add_entry(struct got_fileindex *fileindex, struct got_fileindex_entry *entry)
105 {
106 	if (fileindex->nentries >= GOT_FILEIDX_MAX_ENTRIES)
107 		return got_error(GOT_ERR_NO_SPACE);
108 
109 	RB_INSERT(got_fileindex_tree, &fileindex->entries, entry);
110 	fileindex->nentries++;
111 	return NULL;
112 }
113 
114 const struct got_error *
115 got_fileindex_entry_add(struct got_fileindex *fileindex,
116     struct got_fileindex_entry *entry)
117 {
118 	/* Flag this entry until it gets written out to disk. */
119 	entry->flags |= GOT_FILEIDX_F_INTENT_TO_ADD;
120 
121 	return add_entry(fileindex, entry);
122 }
123 
124 void
125 got_fileindex_entry_remove(struct got_fileindex *fileindex,
126     struct got_fileindex_entry *entry)
127 {
128 	RB_REMOVE(got_fileindex_tree, &fileindex->entries, entry);
129 	fileindex->nentries--;
130 }
131 
132 struct got_fileindex_entry *
133 got_fileindex_entry_get(struct got_fileindex *fileindex, const char *path)
134 {
135 	struct got_fileindex_entry key;
136 	memset(&key, 0, sizeof(key));
137 	key.path = (char *)path;
138 	return RB_FIND(got_fileindex_tree, &fileindex->entries, &key);
139 }
140 
141 const struct got_error *
142 got_fileindex_for_each_entry_safe(struct got_fileindex *fileindex,
143     got_fileindex_cb cb, void *cb_arg)
144 {
145 	const struct got_error *err;
146 	struct got_fileindex_entry *entry, *tmp;
147 
148 	RB_FOREACH_SAFE(entry, got_fileindex_tree, &fileindex->entries, tmp) {
149 		err = (*cb)(cb_arg, entry);
150 		if (err)
151 			return err;
152 	}
153 	return NULL;
154 }
155 
156 struct got_fileindex *
157 got_fileindex_alloc(void)
158 {
159 	struct got_fileindex *fileindex;
160 
161 	fileindex = calloc(1, sizeof(*fileindex));
162 	if (fileindex == NULL)
163 		return NULL;
164 
165 	RB_INIT(&fileindex->entries);
166 	return fileindex;
167 }
168 
169 void
170 got_fileindex_free(struct got_fileindex *fileindex)
171 {
172 	struct got_fileindex_entry *entry;
173 
174 	while ((entry = RB_MIN(got_fileindex_tree, &fileindex->entries))) {
175 		RB_REMOVE(got_fileindex_tree, &fileindex->entries, entry);
176 		got_fileindex_entry_free(entry);
177 	}
178 	free(fileindex);
179 }
180 
181 static const struct got_error *
182 write_fileindex_val64(SHA1_CTX *ctx, uint64_t val, FILE *outfile)
183 {
184 	size_t n;
185 
186 	val = htobe64(val);
187 	SHA1Update(ctx, (uint8_t *)&val, sizeof(val));
188 	n = fwrite(&val, 1, sizeof(val), outfile);
189 	if (n != sizeof(val))
190 		return got_ferror(outfile, GOT_ERR_IO);
191 	return NULL;
192 }
193 
194 static const struct got_error *
195 write_fileindex_val32(SHA1_CTX *ctx, uint32_t val, FILE *outfile)
196 {
197 	size_t n;
198 
199 	val = htobe32(val);
200 	SHA1Update(ctx, (uint8_t *)&val, sizeof(val));
201 	n = fwrite(&val, 1, sizeof(val), outfile);
202 	if (n != sizeof(val))
203 		return got_ferror(outfile, GOT_ERR_IO);
204 	return NULL;
205 }
206 
207 static const struct got_error *
208 write_fileindex_val16(SHA1_CTX *ctx, uint16_t val, FILE *outfile)
209 {
210 	size_t n;
211 
212 	val = htobe16(val);
213 	SHA1Update(ctx, (uint8_t *)&val, sizeof(val));
214 	n = fwrite(&val, 1, sizeof(val), outfile);
215 	if (n != sizeof(val))
216 		return got_ferror(outfile, GOT_ERR_IO);
217 	return NULL;
218 }
219 
220 static const struct got_error *
221 write_fileindex_path(SHA1_CTX *ctx, const char *path, FILE *outfile)
222 {
223 	size_t n, len, pad = 0;
224 	static const uint8_t zero[8] = { 0 };
225 
226 	len = strlen(path);
227 	while ((len + pad) % 8 != 0)
228 		pad++;
229 	if (pad == 0)
230 		pad = 8; /* NUL-terminate */
231 
232 	SHA1Update(ctx, path, len);
233 	n = fwrite(path, 1, len, outfile);
234 	if (n != len)
235 		return got_ferror(outfile, GOT_ERR_IO);
236 	SHA1Update(ctx, zero, pad);
237 	n = fwrite(zero, 1, pad, outfile);
238 	if (n != pad)
239 		return got_ferror(outfile, GOT_ERR_IO);
240 	return NULL;
241 }
242 
243 static const struct got_error *
244 write_fileindex_entry(SHA1_CTX *ctx, struct got_fileindex_entry *entry,
245     FILE *outfile)
246 {
247 	const struct got_error *err;
248 	size_t n;
249 
250 	err = write_fileindex_val64(ctx, entry->ctime_sec, outfile);
251 	if (err)
252 		return err;
253 	err = write_fileindex_val64(ctx, entry->ctime_nsec, outfile);
254 	if (err)
255 		return err;
256 	err = write_fileindex_val64(ctx, entry->mtime_sec, outfile);
257 	if (err)
258 		return err;
259 	err = write_fileindex_val64(ctx, entry->mtime_nsec, outfile);
260 	if (err)
261 		return err;
262 
263 	err = write_fileindex_val32(ctx, entry->uid, outfile);
264 	if (err)
265 		return err;
266 	err = write_fileindex_val32(ctx, entry->gid, outfile);
267 	if (err)
268 		return err;
269 	err = write_fileindex_val32(ctx, entry->size, outfile);
270 	if (err)
271 		return err;
272 
273 	err = write_fileindex_val16(ctx, entry->mode, outfile);
274 	if (err)
275 		return err;
276 
277 	SHA1Update(ctx, entry->blob_sha1, SHA1_DIGEST_LENGTH);
278 	n = fwrite(entry->blob_sha1, 1, SHA1_DIGEST_LENGTH, outfile);
279 	if (n != SHA1_DIGEST_LENGTH)
280 		return got_ferror(outfile, GOT_ERR_IO);
281 
282 	SHA1Update(ctx, entry->commit_sha1, SHA1_DIGEST_LENGTH);
283 	n = fwrite(entry->commit_sha1, 1, SHA1_DIGEST_LENGTH, outfile);
284 	if (n != SHA1_DIGEST_LENGTH)
285 		return got_ferror(outfile, GOT_ERR_IO);
286 
287 	err = write_fileindex_val32(ctx, entry->flags, outfile);
288 	if (err)
289 		return err;
290 
291 	err = write_fileindex_path(ctx, entry->path, outfile);
292 	return err;
293 }
294 
295 const struct got_error *
296 got_fileindex_write(struct got_fileindex *fileindex, FILE *outfile)
297 {
298 	const struct got_error *err = NULL;
299 	struct got_fileindex_hdr hdr;
300 	SHA1_CTX ctx;
301 	uint8_t sha1[SHA1_DIGEST_LENGTH];
302 	size_t n;
303 	struct got_fileindex_entry *entry;
304 
305 	SHA1Init(&ctx);
306 
307 	hdr.signature = htobe32(GOT_FILE_INDEX_SIGNATURE);
308 	hdr.version = htobe32(GOT_FILE_INDEX_VERSION);
309 	hdr.nentries = htobe32(fileindex->nentries);
310 
311 	SHA1Update(&ctx, (uint8_t *)&hdr.signature, sizeof(hdr.signature));
312 	SHA1Update(&ctx, (uint8_t *)&hdr.version, sizeof(hdr.version));
313 	SHA1Update(&ctx, (uint8_t *)&hdr.nentries, sizeof(hdr.nentries));
314 	n = fwrite(&hdr.signature, 1, sizeof(hdr.signature), outfile);
315 	if (n != sizeof(hdr.signature))
316 		return got_ferror(outfile, GOT_ERR_IO);
317 	n = fwrite(&hdr.version, 1, sizeof(hdr.version), outfile);
318 	if (n != sizeof(hdr.version))
319 		return got_ferror(outfile, GOT_ERR_IO);
320 	n = fwrite(&hdr.nentries, 1, sizeof(hdr.nentries), outfile);
321 	if (n != sizeof(hdr.nentries))
322 		return got_ferror(outfile, GOT_ERR_IO);
323 
324 	RB_FOREACH(entry, got_fileindex_tree, &fileindex->entries) {
325 		entry->flags &= ~GOT_FILEIDX_F_INTENT_TO_ADD;
326 		err = write_fileindex_entry(&ctx, entry, outfile);
327 		if (err)
328 			return err;
329 	}
330 
331 	SHA1Final(sha1, &ctx);
332 	n = fwrite(sha1, 1, sizeof(sha1), outfile);
333 	if (n != sizeof(sha1))
334 		return got_ferror(outfile, GOT_ERR_IO);
335 
336 	if (fflush(outfile) != 0)
337 		return got_error_from_errno();
338 
339 	return NULL;
340 }
341 
342 static const struct got_error *
343 read_fileindex_val64(uint64_t *val, SHA1_CTX *ctx, FILE *infile)
344 {
345 	size_t n;
346 
347 	n = fread(val, 1, sizeof(*val), infile);
348 	if (n != sizeof(*val))
349 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
350 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
351 	*val = be64toh(*val);
352 	return NULL;
353 }
354 
355 static const struct got_error *
356 read_fileindex_val32(uint32_t *val, SHA1_CTX *ctx, FILE *infile)
357 {
358 	size_t n;
359 
360 	n = fread(val, 1, sizeof(*val), infile);
361 	if (n != sizeof(*val))
362 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
363 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
364 	*val = be32toh(*val);
365 	return NULL;
366 }
367 
368 static const struct got_error *
369 read_fileindex_val16(uint16_t *val, SHA1_CTX *ctx, FILE *infile)
370 {
371 	size_t n;
372 
373 	n = fread(val, 1, sizeof(*val), infile);
374 	if (n != sizeof(*val))
375 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
376 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
377 	*val = be16toh(*val);
378 	return NULL;
379 }
380 
381 static const struct got_error *
382 read_fileindex_path(char **path, SHA1_CTX *ctx, FILE *infile)
383 {
384 	const struct got_error *err = NULL;
385 	uint8_t buf[8];
386 	size_t n, len = 0, totlen = sizeof(buf);
387 
388 	*path = malloc(totlen);
389 	if (*path == NULL)
390 		return got_error_from_errno();
391 
392 	do {
393 		n = fread(buf, 1, sizeof(buf), infile);
394 		if (n != sizeof(buf))
395 			return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
396 		if (len + sizeof(buf) > totlen) {
397 			char *p = reallocarray(*path, totlen + sizeof(buf), 1);
398 			if (p == NULL) {
399 				err = got_error_from_errno();
400 				break;
401 			}
402 			totlen += sizeof(buf);
403 			*path = p;
404 		}
405 		SHA1Update(ctx, buf, sizeof(buf));
406 		memcpy(*path + len, buf, sizeof(buf));
407 		len += sizeof(buf);
408 	} while (memchr(buf, '\0', sizeof(buf)) == NULL);
409 
410 	if (err) {
411 		free(*path);
412 		*path = NULL;
413 	}
414 	return err;
415 }
416 
417 static const struct got_error *
418 read_fileindex_entry(struct got_fileindex_entry **entryp, SHA1_CTX *ctx,
419     FILE *infile)
420 {
421 	const struct got_error *err;
422 	struct got_fileindex_entry *entry;
423 	size_t n;
424 
425 	*entryp = NULL;
426 
427 	entry = calloc(1, sizeof(*entry));
428 	if (entry == NULL)
429 		return got_error_from_errno();
430 
431 	err = read_fileindex_val64(&entry->ctime_sec, ctx, infile);
432 	if (err)
433 		goto done;
434 	err = read_fileindex_val64(&entry->ctime_nsec, ctx, infile);
435 	if (err)
436 		goto done;
437 	err = read_fileindex_val64(&entry->mtime_sec, ctx, infile);
438 	if (err)
439 		goto done;
440 	err = read_fileindex_val64(&entry->mtime_nsec, ctx, infile);
441 	if (err)
442 		goto done;
443 
444 	err = read_fileindex_val32(&entry->uid, ctx, infile);
445 	if (err)
446 		goto done;
447 	err = read_fileindex_val32(&entry->gid, ctx, infile);
448 	if (err)
449 		goto done;
450 	err = read_fileindex_val32(&entry->size, ctx, infile);
451 	if (err)
452 		goto done;
453 
454 	err = read_fileindex_val16(&entry->mode, ctx, infile);
455 	if (err)
456 		goto done;
457 
458 	n = fread(entry->blob_sha1, 1, SHA1_DIGEST_LENGTH, infile);
459 	if (n != SHA1_DIGEST_LENGTH) {
460 		err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
461 		goto done;
462 	}
463 	SHA1Update(ctx, entry->blob_sha1, SHA1_DIGEST_LENGTH);
464 
465 	n = fread(entry->commit_sha1, 1, SHA1_DIGEST_LENGTH, infile);
466 	if (n != SHA1_DIGEST_LENGTH) {
467 		err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
468 		goto done;
469 	}
470 	SHA1Update(ctx, entry->commit_sha1, SHA1_DIGEST_LENGTH);
471 
472 	err = read_fileindex_val32(&entry->flags, ctx, infile);
473 	if (err)
474 		goto done;
475 
476 	err = read_fileindex_path(&entry->path, ctx, infile);
477 done:
478 	if (err)
479 		free(entry);
480 	else
481 		*entryp = entry;
482 	return err;
483 }
484 
485 const struct got_error *
486 got_fileindex_read(struct got_fileindex *fileindex, FILE *infile)
487 {
488 	const struct got_error *err = NULL;
489 	struct got_fileindex_hdr hdr;
490 	SHA1_CTX ctx;
491 	struct got_fileindex_entry *entry;
492 	uint8_t sha1_expected[SHA1_DIGEST_LENGTH];
493 	uint8_t sha1[SHA1_DIGEST_LENGTH];
494 	size_t n;
495 	int i;
496 
497 	SHA1Init(&ctx);
498 
499 	n = fread(&hdr.signature, 1, sizeof(hdr.signature), infile);
500 	if (n != sizeof(hdr.signature)) {
501 		if (n == 0) /* EOF */
502 			return NULL;
503 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
504 	}
505 	n = fread(&hdr.version, 1, sizeof(hdr.version), infile);
506 	if (n != sizeof(hdr.version)) {
507 		if (n == 0) /* EOF */
508 			return NULL;
509 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
510 	}
511 	n = fread(&hdr.nentries, 1, sizeof(hdr.nentries), infile);
512 	if (n != sizeof(hdr.nentries)) {
513 		if (n == 0) /* EOF */
514 			return NULL;
515 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
516 	}
517 
518 	SHA1Update(&ctx, (uint8_t *)&hdr.signature, sizeof(hdr.signature));
519 	SHA1Update(&ctx, (uint8_t *)&hdr.version, sizeof(hdr.version));
520 	SHA1Update(&ctx, (uint8_t *)&hdr.nentries, sizeof(hdr.nentries));
521 
522 	hdr.signature = be32toh(hdr.signature);
523 	hdr.version = be32toh(hdr.version);
524 	hdr.nentries = be32toh(hdr.nentries);
525 
526 	if (hdr.signature != GOT_FILE_INDEX_SIGNATURE)
527 		return got_error(GOT_ERR_FILEIDX_SIG);
528 	if (hdr.version != GOT_FILE_INDEX_VERSION)
529 		return got_error(GOT_ERR_FILEIDX_VER);
530 
531 	for (i = 0; i < hdr.nentries; i++) {
532 		err = read_fileindex_entry(&entry, &ctx, infile);
533 		if (err)
534 			return err;
535 		err = add_entry(fileindex, entry);
536 		if (err)
537 			return err;
538 	}
539 
540 	n = fread(sha1_expected, 1, sizeof(sha1_expected), infile);
541 	if (n != sizeof(sha1_expected))
542 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
543 	SHA1Final(sha1, &ctx);
544 	if (memcmp(sha1, sha1_expected, SHA1_DIGEST_LENGTH) != 0)
545 		return got_error(GOT_ERR_FILEIDX_CSUM);
546 
547 	return NULL;
548 }
549 
550 static int
551 in_same_subdir(struct got_fileindex_entry *ie, const char *parent_path,
552     struct got_tree_entry *te)
553 {
554 	size_t parent_len = strlen(parent_path);
555 	char *ie_name;
556 
557 	if (!got_path_is_child(ie->path, parent_path, parent_len))
558 		return 0;
559 
560 	ie_name = ie->path + parent_len;
561 	while (ie_name[0] == '/')
562 		ie_name++;
563 
564 	return strchr(ie_name, '/') == NULL;
565 }
566 
567 /*
568  * Decide whether ie or te are equivalent, and if they aren't,
569  * then decide which should be processed first.
570  */
571 static int
572 cmp_entries(struct got_fileindex_entry *ie, const char *parent_path,
573     struct got_tree_entry *te)
574 {
575 	size_t parent_len = strlen(parent_path);
576 	int cmp;
577 
578 	if (!in_same_subdir(ie, parent_path, te)) {
579 		cmp = strncmp(ie->path, parent_path, parent_len);
580 		if (cmp == 0) {
581 			char *ie_name = ie->path + parent_len;
582 			while (ie_name[0] == '/')
583 				ie_name++;
584 			cmp = strcmp(ie_name, te->name);
585 		}
586 	} else {
587 		char *ie_name = ie->path + parent_len;
588 		while (ie_name[0] == '/')
589 			ie_name++;
590 		cmp = strcmp(ie_name, te->name);
591 	}
592 	return cmp;
593 
594 }
595 
596 static const struct got_error *
597 diff_fileindex_tree(struct got_fileindex *, struct got_fileindex_entry **,
598     struct got_tree_object *, const char *, struct got_repository *,
599     struct got_fileindex_diff_cb *, void *);
600 
601 struct got_fileindex_entry *
602 walk_fileindex(struct got_fileindex *fileindex, struct got_fileindex_entry *ie)
603 {
604 	struct got_fileindex_entry *next;
605 
606 	next = RB_NEXT(got_fileindex_tree, &fileindex->entries, ie);
607 
608 	/* Skip entries which were newly added by diff callbacks. */
609 	while (next && (next->flags & GOT_FILEIDX_F_INTENT_TO_ADD))
610 		next = RB_NEXT(got_fileindex_tree, &fileindex->entries, next);
611 
612 	return next;
613 }
614 
615 static const struct got_error *
616 walk_tree(struct got_tree_entry **next, struct got_fileindex *fileindex,
617     struct got_fileindex_entry **ie, struct got_tree_entry *te,
618     const char *path, struct got_repository *repo,
619     struct got_fileindex_diff_cb *cb, void *cb_arg)
620 {
621 	const struct got_error *err = NULL;
622 
623 	if (S_ISDIR(te->mode)) {
624 		char *subpath;
625 		struct got_tree_object *subtree;
626 
627 		if (asprintf(&subpath, "%s%s%s", path,
628 		    path[0] == '\0' ? "" : "/", te->name) == -1)
629 			return got_error_from_errno();
630 
631 		err = got_object_open_as_tree(&subtree, repo, te->id);
632 		if (err) {
633 			free(subpath);
634 			return err;
635 		}
636 
637 		err = diff_fileindex_tree(fileindex, ie, subtree,
638 		    subpath, repo, cb, cb_arg);
639 		free(subpath);
640 		got_object_tree_close(subtree);
641 		if (err)
642 			return err;
643 	}
644 
645 	*next = SIMPLEQ_NEXT(te, entry);
646 	return NULL;
647 }
648 
649 static const struct got_error *
650 diff_fileindex_tree(struct got_fileindex *fileindex,
651     struct got_fileindex_entry **ie, struct got_tree_object *tree,
652     const char *path, struct got_repository *repo,
653     struct got_fileindex_diff_cb *cb, void *cb_arg)
654 {
655 	const struct got_error *err = NULL;
656 	struct got_tree_entry *te = NULL;
657 	size_t path_len = strlen(path);
658 	const struct got_tree_entries *entries;
659 	struct got_fileindex_entry *next;
660 
661 	entries = got_object_tree_get_entries(tree);
662 	te = SIMPLEQ_FIRST(&entries->head);
663 	do {
664 		if (te && *ie) {
665 			int cmp = cmp_entries(*ie, path, te);
666 			if (cmp == 0) {
667 				err = cb->diff_old_new(cb_arg, *ie, te,
668 				    path);
669 				if (err)
670 					break;
671 				*ie = walk_fileindex(fileindex, *ie);
672 				err = walk_tree(&te, fileindex, ie, te,
673 				    path, repo, cb, cb_arg);
674 			} else if (cmp < 0 ) {
675 				next = walk_fileindex(fileindex, *ie);
676 				err = cb->diff_old(cb_arg, *ie, path);
677 				if (err)
678 					break;
679 				*ie = next;
680 			} else {
681 				err = cb->diff_new(cb_arg, te, path);
682 				if (err)
683 					break;
684 				err = walk_tree(&te, fileindex, ie, te,
685 				    path, repo, cb, cb_arg);
686 			}
687 			if (err)
688 				break;
689 		} else if (*ie) {
690 			next = walk_fileindex(fileindex, *ie);
691 			err = cb->diff_old(cb_arg, *ie, path);
692 			if (err)
693 				break;
694 			*ie = next;
695 		} else if (te) {
696 			err = cb->diff_new(cb_arg, te, path);
697 			if (err)
698 				break;
699 			err = walk_tree(&te, fileindex, ie, te, path, repo, cb,
700 			    cb_arg);
701 			if (err)
702 				break;
703 		}
704 	} while ((*ie && got_path_is_child((*ie)->path, path, path_len)) || te);
705 
706 	return err;
707 }
708 
709 const struct got_error *
710 got_fileindex_diff_tree(struct got_fileindex *fileindex,
711     struct got_tree_object *tree, struct got_repository *repo,
712     struct got_fileindex_diff_cb *cb, void *cb_arg)
713 {
714 	struct got_fileindex_entry *min;
715 	min = RB_MIN(got_fileindex_tree, &fileindex->entries);
716 	return diff_fileindex_tree(fileindex, &min, tree, "", repo, cb, cb_arg);
717 }
718 
719 RB_GENERATE(got_fileindex_tree, got_fileindex_entry, entry, got_fileindex_cmp);