Gotweb

Blob

Date:: Sat Jan 12 20:00:42 2019 UTC
Message:: fix various issues in new update implementation
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2018 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_INDEX_ENTRY_MODE_SYMLINK;
58 	else
59 		entry->mode = GOT_INDEX_ENTRY_MODE_REGULAR_FILE;
60 	entry->mode |= ((sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO)) <<
61 	    GOT_INDEX_ENTRY_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_INDEX_ENTRY_F_PATH_LEN)
89 		len = GOT_INDEX_ENTRY_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_INDEX_ENTRY_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 	const size_t len = sizeof(hdr.signature) + sizeof(hdr.version) +
304 	    sizeof(hdr.nentries);
305 	uint8_t buf[len];
306 	struct got_fileindex_entry *entry;
307 
308 	SHA1Init(&ctx);
309 
310 	hdr.signature = htobe32(GOT_FILE_INDEX_SIGNATURE);
311 	hdr.version = htobe32(GOT_FILE_INDEX_VERSION);
312 	hdr.nentries = htobe32(fileindex->nentries);
313 
314 	memcpy(buf, &hdr, len);
315 	SHA1Update(&ctx, buf, len);
316 	n = fwrite(buf, 1, len, outfile);
317 	if (n != len)
318 		return got_ferror(outfile, GOT_ERR_IO);
319 
320 	RB_FOREACH(entry, got_fileindex_tree, &fileindex->entries) {
321 		entry->flags &= ~GOT_INDEX_ENTRY_F_INTENT_TO_ADD;
322 		err = write_fileindex_entry(&ctx, entry, outfile);
323 		if (err)
324 			return err;
325 	}
326 
327 	SHA1Final(sha1, &ctx);
328 	n = fwrite(sha1, 1, sizeof(sha1), outfile);
329 	if (n != sizeof(sha1))
330 		return got_ferror(outfile, GOT_ERR_IO);
331 
332 	return NULL;
333 }
334 
335 static const struct got_error *
336 read_fileindex_val64(uint64_t *val, SHA1_CTX *ctx, FILE *infile)
337 {
338 	size_t n;
339 
340 	n = fread(val, 1, sizeof(*val), infile);
341 	if (n != sizeof(*val))
342 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
343 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
344 	*val = be64toh(*val);
345 	return NULL;
346 }
347 
348 static const struct got_error *
349 read_fileindex_val32(uint32_t *val, SHA1_CTX *ctx, FILE *infile)
350 {
351 	size_t n;
352 
353 	n = fread(val, 1, sizeof(*val), infile);
354 	if (n != sizeof(*val))
355 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
356 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
357 	*val = be32toh(*val);
358 	return NULL;
359 }
360 
361 static const struct got_error *
362 read_fileindex_val16(uint16_t *val, SHA1_CTX *ctx, FILE *infile)
363 {
364 	size_t n;
365 
366 	n = fread(val, 1, sizeof(*val), infile);
367 	if (n != sizeof(*val))
368 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
369 	SHA1Update(ctx, (uint8_t *)val, sizeof(*val));
370 	*val = be16toh(*val);
371 	return NULL;
372 }
373 
374 static const struct got_error *
375 read_fileindex_path(char **path, SHA1_CTX *ctx, FILE *infile)
376 {
377 	const struct got_error *err = NULL;
378 	uint8_t buf[8];
379 	size_t n, len = 0, totlen = sizeof(buf);
380 
381 	*path = malloc(totlen);
382 	if (*path == NULL)
383 		return got_error_from_errno();
384 
385 	do {
386 		n = fread(buf, 1, sizeof(buf), infile);
387 		if (n != sizeof(buf))
388 			return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
389 		if (len + sizeof(buf) > totlen) {
390 			char *p = reallocarray(*path, totlen + sizeof(buf), 1);
391 			if (p == NULL) {
392 				err = got_error_from_errno();
393 				break;
394 			}
395 			totlen += sizeof(buf);
396 			*path = p;
397 		}
398 		SHA1Update(ctx, buf, sizeof(buf));
399 		memcpy(*path + len, buf, sizeof(buf));
400 		len += sizeof(buf);
401 	} while (memchr(buf, '\0', sizeof(buf)) == NULL);
402 
403 	if (err) {
404 		free(*path);
405 		*path = NULL;
406 	}
407 	return err;
408 }
409 
410 static const struct got_error *
411 read_fileindex_entry(struct got_fileindex_entry **entryp, SHA1_CTX *ctx,
412     FILE *infile)
413 {
414 	const struct got_error *err;
415 	struct got_fileindex_entry *entry;
416 	size_t n;
417 
418 	*entryp = NULL;
419 
420 	entry = calloc(1, sizeof(*entry));
421 	if (entry == NULL)
422 		return got_error_from_errno();
423 
424 	err = read_fileindex_val64(&entry->ctime_sec, ctx, infile);
425 	if (err)
426 		goto done;
427 	err = read_fileindex_val64(&entry->ctime_nsec, ctx, infile);
428 	if (err)
429 		goto done;
430 	err = read_fileindex_val64(&entry->mtime_sec, ctx, infile);
431 	if (err)
432 		goto done;
433 	err = read_fileindex_val64(&entry->mtime_nsec, ctx, infile);
434 	if (err)
435 		goto done;
436 
437 	err = read_fileindex_val32(&entry->uid, ctx, infile);
438 	if (err)
439 		goto done;
440 	err = read_fileindex_val32(&entry->gid, ctx, infile);
441 	if (err)
442 		goto done;
443 	err = read_fileindex_val32(&entry->size, ctx, infile);
444 	if (err)
445 		goto done;
446 
447 	err = read_fileindex_val16(&entry->mode, ctx, infile);
448 	if (err)
449 		goto done;
450 
451 	n = fread(entry->blob_sha1, 1, SHA1_DIGEST_LENGTH, infile);
452 	if (n != SHA1_DIGEST_LENGTH) {
453 		err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
454 		goto done;
455 	}
456 	SHA1Update(ctx, entry->blob_sha1, SHA1_DIGEST_LENGTH);
457 
458 	n = fread(entry->commit_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->commit_sha1, SHA1_DIGEST_LENGTH);
464 
465 	err = read_fileindex_val32(&entry->flags, ctx, infile);
466 	if (err)
467 		goto done;
468 
469 	err = read_fileindex_path(&entry->path, ctx, infile);
470 done:
471 	if (err)
472 		free(entry);
473 	else
474 		*entryp = entry;
475 	return err;
476 }
477 
478 const struct got_error *
479 got_fileindex_read(struct got_fileindex *fileindex, FILE *infile)
480 {
481 	const struct got_error *err = NULL;
482 	struct got_fileindex_hdr hdr;
483 	SHA1_CTX ctx;
484 	struct got_fileindex_entry *entry;
485 	uint8_t sha1_expected[SHA1_DIGEST_LENGTH];
486 	uint8_t sha1[SHA1_DIGEST_LENGTH];
487 	size_t n;
488 	const size_t len = sizeof(hdr.signature) + sizeof(hdr.version) +
489 	    sizeof(hdr.nentries);
490 	uint8_t buf[len];
491 	int i;
492 
493 	SHA1Init(&ctx);
494 
495 	n = fread(buf, 1, len, infile);
496 	if (n != len) {
497 		if (n == 0) /* EOF */
498 			return NULL;
499 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
500 	}
501 
502 	SHA1Update(&ctx, buf, len);
503 
504 	memcpy(&hdr, buf, len);
505 	hdr.signature = be32toh(hdr.signature);
506 	hdr.version = be32toh(hdr.version);
507 	hdr.nentries = be32toh(hdr.nentries);
508 
509 	if (hdr.signature != GOT_FILE_INDEX_SIGNATURE)
510 		return got_error(GOT_ERR_FILEIDX_SIG);
511 	if (hdr.version != GOT_FILE_INDEX_VERSION)
512 		return got_error(GOT_ERR_FILEIDX_VER);
513 
514 	for (i = 0; i < hdr.nentries; i++) {
515 		err = read_fileindex_entry(&entry, &ctx, infile);
516 		if (err)
517 			return err;
518 		err = add_entry(fileindex, entry);
519 		if (err)
520 			return err;
521 	}
522 
523 	n = fread(sha1_expected, 1, sizeof(sha1_expected), infile);
524 	if (n != sizeof(sha1_expected))
525 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
526 	SHA1Final(sha1, &ctx);
527 	if (memcmp(sha1, sha1_expected, SHA1_DIGEST_LENGTH) != 0)
528 		return got_error(GOT_ERR_FILEIDX_CSUM);
529 
530 	return NULL;
531 }
532 
533 static int
534 in_same_subdir(struct got_fileindex_entry *ie, const char *parent_path,
535     struct got_tree_entry *te)
536 {
537 	size_t parent_len = strlen(parent_path);
538 	char *ie_name;
539 
540 	if (!got_path_is_child(ie->path, parent_path, parent_len))
541 		return 0;
542 
543 	ie_name = ie->path + parent_len;
544 	while (ie_name[0] == '/')
545 		ie_name++;
546 
547 	return strchr(ie_name, '/') == NULL;
548 }
549 
550 static int
551 cmp_entries(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 (!in_same_subdir(ie, parent_path, te)) {
558 		if (parent_path[0])
559 			return strcmp(ie->path, parent_path);
560 		return strcmp(ie->path, te->name);
561 	}
562 
563 	ie_name = ie->path + parent_len;
564 	while (ie_name[0] == '/')
565 		ie_name++;
566 
567 	return strcmp(ie_name, te->name);
568 }
569 
570 static const struct got_error *
571 diff_fileindex_tree(struct got_fileindex *, struct got_fileindex_entry **,
572     struct got_tree_object *, const char *, struct got_repository *,
573     struct got_fileindex_diff_cb *, void *);
574 
575 struct got_fileindex_entry *
576 walk_fileindex(struct got_fileindex *fileindex, struct got_fileindex_entry *ie)
577 {
578 	struct got_fileindex_entry *next;
579 
580 	next = RB_NEXT(got_fileindex_tree, &fileindex->entries, ie);
581 
582 	/* Skip entries which were newly added by diff callbacks. */
583 	while (next && (next->flags & GOT_INDEX_ENTRY_F_INTENT_TO_ADD))
584 		next = RB_NEXT(got_fileindex_tree, &fileindex->entries, next);
585 
586 	return next;
587 }
588 
589 static const struct got_error *
590 walk_tree(struct got_tree_entry **next, struct got_fileindex *fileindex,
591     struct got_fileindex_entry **ie, struct got_tree_entry *te,
592     const char *path, struct got_repository *repo,
593     struct got_fileindex_diff_cb *cb, void *cb_arg)
594 {
595 	const struct got_error *err = NULL;
596 
597 	if (te && S_ISREG(te->mode)) {
598 		*next = SIMPLEQ_NEXT(te, entry);
599 		return NULL;
600 	}
601 
602 	while (te && S_ISDIR(te->mode)) {
603 		char *subpath;
604 		struct got_tree_object *subtree;
605 
606 		if (asprintf(&subpath, "%s%s%s", path,
607 		    path[0] == '\0' ? "" : "/", te->name) == -1)
608 			return got_error_from_errno();
609 
610 		err = got_object_open_as_tree(&subtree, repo, te->id);
611 		if (err) {
612 			free(subpath);
613 			return err;
614 		}
615 
616 		if (*ie == NULL || !in_same_subdir(*ie, path, te)) {
617 			err = cb->diff_new(cb_arg, te, path);
618 			if (err)
619 				return err;
620 		}
621 
622 		err = diff_fileindex_tree(fileindex, ie, subtree,
623 		    subpath, repo, cb, cb_arg);
624 		free(subpath);
625 		got_object_tree_close(subtree);
626 		if (err)
627 			return err;
628 		te = SIMPLEQ_NEXT(te, entry);
629 	}
630 
631 	*next = te;
632 	return NULL;
633 }
634 
635 static const struct got_error *
636 diff_fileindex_tree(struct got_fileindex *fileindex,
637     struct got_fileindex_entry **ie, struct got_tree_object *tree,
638     const char *path, struct got_repository *repo,
639     struct got_fileindex_diff_cb *cb, void *cb_arg)
640 {
641 	const struct got_error *err = NULL;
642 	struct got_tree_entry *te = NULL;
643 	size_t path_len = strlen(path);
644 	const struct got_tree_entries *entries;
645 	struct got_fileindex_entry *next;
646 
647 	entries = got_object_tree_get_entries(tree);
648 	te = SIMPLEQ_FIRST(&entries->head);
649 	do {
650 		if (te && *ie) {
651 			int cmp = cmp_entries(*ie, path, te);
652 			if (cmp == 0) {
653 				err = cb->diff_old_new(cb_arg, *ie, te,
654 				    path);
655 				if (err)
656 					break;
657 				*ie = walk_fileindex(fileindex, *ie);
658 				err = walk_tree(&te, fileindex, ie, te,
659 				    path, repo, cb, cb_arg);
660 			} else if (cmp < 0 ) {
661 				next = walk_fileindex(fileindex, *ie);
662 				err = cb->diff_old(cb_arg, *ie, path);
663 				if (err)
664 					break;
665 				*ie = next;
666 			} else {
667 				err = cb->diff_new(cb_arg, te, path);
668 				if (err)
669 					break;
670 				err = walk_tree(&te, fileindex, ie, te,
671 				    path, repo, cb, cb_arg);
672 			}
673 			if (err)
674 				break;
675 		} else if (*ie) {
676 			next = walk_fileindex(fileindex, *ie);
677 			err = cb->diff_old(cb_arg, *ie, path);
678 			if (err)
679 				break;
680 			*ie = next;
681 		} else if (te) {
682 			err = cb->diff_new(cb_arg, te, path);
683 			if (err)
684 				break;
685 			err = walk_tree(&te, fileindex, ie, te, path, repo, cb,
686 			    cb_arg);
687 			if (err)
688 				break;
689 		}
690 	} while ((*ie && got_path_is_child((*ie)->path, path, path_len)) || te);
691 
692 	return err;
693 }
694 
695 const struct got_error *
696 got_fileindex_diff_tree(struct got_fileindex *fileindex,
697     struct got_tree_object *tree, struct got_repository *repo,
698     struct got_fileindex_diff_cb *cb, void *cb_arg)
699 {
700 	struct got_fileindex_entry *min;
701 	min = RB_MIN(got_fileindex_tree, &fileindex->entries);
702 	return diff_fileindex_tree(fileindex, &min, tree, "", repo, cb, cb_arg);
703 }
704 
705 RB_GENERATE(got_fileindex_tree, got_fileindex_entry, entry, got_fileindex_cmp);