Got Mirror

Blob

Date:: Tue Jan 30 15:22:59 2024 UTC
Message:: plug some fd leaks in the fdopen{,dir} error paths There's also a memory leak fixed. ok stsp@
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 <errno.h>
22 #include <dirent.h>
23 #include <fcntl.h>
24 #include <stdio.h>
25 #include <stdlib.h>
26 #include <stdint.h>
27 #include <string.h>
28 #include <sha1.h>
29 #include <sha2.h>
30 #include <endian.h>
31 #include <limits.h>
32 #include <unistd.h>
33 #include <uuid.h>
34 
35 #include "got_error.h"
36 #include "got_object.h"
37 #include "got_path.h"
38 
39 #include "got_lib_hash.h"
40 #include "got_lib_fileindex.h"
41 #include "got_lib_worktree.h"
42 
43 /* got_fileindex_entry flags */
44 #define GOT_FILEIDX_F_PATH_LEN		0x00000fff
45 #define GOT_FILEIDX_F_STAGE		0x0000f000
46 #define GOT_FILEIDX_F_STAGE_SHIFT	12
47 #define GOT_FILEIDX_F_NOT_FLUSHED	0x00010000
48 #define GOT_FILEIDX_F_NO_BLOB		0x00020000
49 #define GOT_FILEIDX_F_NO_COMMIT		0x00040000
50 #define GOT_FILEIDX_F_NO_FILE_ON_DISK	0x00080000
51 #define GOT_FILEIDX_F_REMOVE_ON_FLUSH	0x00100000
52 #define GOT_FILEIDX_F_SKIPPED		0x00200000
53 
54 struct got_fileindex {
55 	struct got_fileindex_tree entries;
56 	int nentries; /* Does not include entries marked for removal. */
57 #define GOT_FILEIDX_MAX_ENTRIES INT32_MAX
58 };
59 
60 mode_t
61 got_fileindex_entry_perms_get(struct got_fileindex_entry *ie)
62 {
63 	return ((ie->mode & GOT_FILEIDX_MODE_PERMS) >>
64 	    GOT_FILEIDX_MODE_PERMS_SHIFT);
65 }
66 
67 static void
68 fileindex_entry_perms_set(struct got_fileindex_entry *ie, mode_t mode)
69 {
70 	ie->mode &= ~GOT_FILEIDX_MODE_PERMS;
71 	ie->mode |= ((mode << GOT_FILEIDX_MODE_PERMS_SHIFT) &
72 	    GOT_FILEIDX_MODE_PERMS);
73 }
74 
75 mode_t
76 got_fileindex_perms_to_st(struct got_fileindex_entry *ie)
77 {
78 	mode_t perms = got_fileindex_entry_perms_get(ie);
79 	int type = got_fileindex_entry_filetype_get(ie);
80 	uint32_t ftype;
81 
82 	if (type == GOT_FILEIDX_MODE_REGULAR_FILE ||
83 	    type == GOT_FILEIDX_MODE_BAD_SYMLINK)
84 		ftype = S_IFREG;
85 	else
86 		ftype = S_IFLNK;
87 
88 	return (ftype | (perms & (S_IRWXU | S_IRWXG | S_IRWXO)));
89 }
90 
91 const struct got_error *
92 got_fileindex_entry_update(struct got_fileindex_entry *ie,
93     int wt_fd, const char *ondisk_path, uint8_t *blob_sha1,
94     uint8_t *commit_sha1, int update_timestamps)
95 {
96 	struct stat sb;
97 
98 	if (fstatat(wt_fd, ondisk_path, &sb, AT_SYMLINK_NOFOLLOW) != 0) {
99 		if (!((ie->flags & GOT_FILEIDX_F_NO_FILE_ON_DISK) &&
100 		    errno == ENOENT))
101 			return got_error_from_errno2("fstatat", ondisk_path);
102 		sb.st_mode = GOT_DEFAULT_FILE_MODE;
103 	} else {
104 		if (sb.st_mode & S_IFDIR)
105 			return got_error_set_errno(EISDIR, ondisk_path);
106 		ie->flags &= ~GOT_FILEIDX_F_NO_FILE_ON_DISK;
107 	}
108 
109 	if ((ie->flags & GOT_FILEIDX_F_NO_FILE_ON_DISK) == 0) {
110 		if (update_timestamps) {
111 			ie->ctime_sec = sb.st_ctim.tv_sec;
112 			ie->ctime_nsec = sb.st_ctim.tv_nsec;
113 			ie->mtime_sec = sb.st_mtim.tv_sec;
114 			ie->mtime_nsec = sb.st_mtim.tv_nsec;
115 		}
116 		ie->uid = sb.st_uid;
117 		ie->gid = sb.st_gid;
118 		ie->size = (sb.st_size & 0xffffffff);
119 		if (S_ISLNK(sb.st_mode)) {
120 			got_fileindex_entry_filetype_set(ie,
121 			    GOT_FILEIDX_MODE_SYMLINK);
122 			fileindex_entry_perms_set(ie, 0);
123 		} else {
124 			got_fileindex_entry_filetype_set(ie,
125 			    GOT_FILEIDX_MODE_REGULAR_FILE);
126 			fileindex_entry_perms_set(ie,
127 			    sb.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO));
128 		}
129 	}
130 
131 	if (blob_sha1) {
132 		memmove(ie->blob_sha1, blob_sha1, SHA1_DIGEST_LENGTH);
133 		ie->flags &= ~GOT_FILEIDX_F_NO_BLOB;
134 	} else
135 		ie->flags |= GOT_FILEIDX_F_NO_BLOB;
136 
137 	if (commit_sha1) {
138 		memcpy(ie->commit_sha1, commit_sha1, SHA1_DIGEST_LENGTH);
139 		ie->flags &= ~GOT_FILEIDX_F_NO_COMMIT;
140 	} else
141 		ie->flags |= GOT_FILEIDX_F_NO_COMMIT;
142 
143 	return NULL;
144 }
145 
146 void
147 got_fileindex_entry_mark_deleted_from_disk(struct got_fileindex_entry *ie)
148 {
149 	ie->flags |= GOT_FILEIDX_F_NO_FILE_ON_DISK;
150 }
151 
152 void
153 got_fileindex_entry_mark_skipped(struct got_fileindex_entry *ie)
154 {
155 	ie->flags |= GOT_FILEIDX_F_SKIPPED;
156 }
157 
158 const struct got_error *
159 got_fileindex_entry_alloc(struct got_fileindex_entry **ie,
160     const char *relpath)
161 {
162 	size_t len;
163 
164 	*ie = calloc(1, sizeof(**ie));
165 	if (*ie == NULL)
166 		return got_error_from_errno("calloc");
167 
168 	(*ie)->path = strdup(relpath);
169 	if ((*ie)->path == NULL) {
170 		const struct got_error *err = got_error_from_errno("strdup");
171 		free(*ie);
172 		*ie = NULL;
173 		return err;
174 	}
175 
176 	len = strlen(relpath);
177 	if (len > GOT_FILEIDX_F_PATH_LEN)
178 		len = GOT_FILEIDX_F_PATH_LEN;
179 	(*ie)->flags |= len;
180 
181 	return NULL;
182 }
183 
184 void
185 got_fileindex_entry_free(struct got_fileindex_entry *ie)
186 {
187 	free(ie->path);
188 	free(ie);
189 }
190 
191 size_t
192 got_fileindex_entry_path_len(const struct got_fileindex_entry *ie)
193 {
194 	return (size_t)(ie->flags & GOT_FILEIDX_F_PATH_LEN);
195 }
196 
197 uint32_t
198 got_fileindex_entry_stage_get(const struct got_fileindex_entry *ie)
199 {
200 	return ((ie->flags & GOT_FILEIDX_F_STAGE) >> GOT_FILEIDX_F_STAGE_SHIFT);
201 }
202 
203 void
204 got_fileindex_entry_stage_set(struct got_fileindex_entry *ie, uint32_t stage)
205 {
206 	ie->flags &= ~GOT_FILEIDX_F_STAGE;
207 	ie->flags |= ((stage << GOT_FILEIDX_F_STAGE_SHIFT) &
208 	    GOT_FILEIDX_F_STAGE);
209 }
210 
211 int
212 got_fileindex_entry_filetype_get(struct got_fileindex_entry *ie)
213 {
214 	return (ie->mode & GOT_FILEIDX_MODE_FILE_TYPE_ONDISK);
215 }
216 
217 void
218 got_fileindex_entry_filetype_set(struct got_fileindex_entry *ie, int type)
219 {
220 	ie->mode &= ~GOT_FILEIDX_MODE_FILE_TYPE_ONDISK;
221 	ie->mode |= (type & GOT_FILEIDX_MODE_FILE_TYPE_ONDISK);
222 }
223 
224 void
225 got_fileindex_entry_staged_filetype_set(struct got_fileindex_entry *ie,
226     int type)
227 {
228 	ie->mode &= ~GOT_FILEIDX_MODE_FILE_TYPE_STAGED;
229 	ie->mode |= ((type << GOT_FILEIDX_MODE_FILE_TYPE_STAGED_SHIFT) &
230 	    GOT_FILEIDX_MODE_FILE_TYPE_STAGED);
231 }
232 
233 int
234 got_fileindex_entry_staged_filetype_get(struct got_fileindex_entry *ie)
235 {
236 	return (ie->mode & GOT_FILEIDX_MODE_FILE_TYPE_STAGED) >>
237 	    GOT_FILEIDX_MODE_FILE_TYPE_STAGED_SHIFT;
238 }
239 
240 int
241 got_fileindex_entry_has_blob(struct got_fileindex_entry *ie)
242 {
243 	return (ie->flags & GOT_FILEIDX_F_NO_BLOB) == 0;
244 }
245 
246 int
247 got_fileindex_entry_has_commit(struct got_fileindex_entry *ie)
248 {
249 	return (ie->flags & GOT_FILEIDX_F_NO_COMMIT) == 0;
250 }
251 
252 int
253 got_fileindex_entry_has_file_on_disk(struct got_fileindex_entry *ie)
254 {
255 	return (ie->flags & GOT_FILEIDX_F_NO_FILE_ON_DISK) == 0;
256 }
257 
258 int
259 got_fileindex_entry_was_skipped(struct got_fileindex_entry *ie)
260 {
261 	return (ie->flags & GOT_FILEIDX_F_SKIPPED) != 0;
262 }
263 
264 static const struct got_error *
265 add_entry(struct got_fileindex *fileindex, struct got_fileindex_entry *ie)
266 {
267 	if (fileindex->nentries >= GOT_FILEIDX_MAX_ENTRIES)
268 		return got_error(GOT_ERR_NO_SPACE);
269 
270 	if (RB_INSERT(got_fileindex_tree, &fileindex->entries, ie) != NULL)
271 		return got_error_path(ie->path, GOT_ERR_FILEIDX_DUP_ENTRY);
272 
273 	fileindex->nentries++;
274 	return NULL;
275 }
276 
277 const struct got_error *
278 got_fileindex_entry_add(struct got_fileindex *fileindex,
279     struct got_fileindex_entry *ie)
280 {
281 	/* Flag this entry until it gets written out to disk. */
282 	ie->flags |= GOT_FILEIDX_F_NOT_FLUSHED;
283 
284 	return add_entry(fileindex, ie);
285 }
286 
287 void
288 got_fileindex_entry_remove(struct got_fileindex *fileindex,
289     struct got_fileindex_entry *ie)
290 {
291 	/*
292 	 * Removing an entry from the RB tree immediately breaks
293 	 * in-progress iterations over file index entries.
294 	 * So flag this entry for removal and remove it once the index
295 	 * is written out to disk. Meanwhile, pretend this entry no longer
296 	 * exists if we get queried for it again before then.
297 	 */
298 	ie->flags |= GOT_FILEIDX_F_REMOVE_ON_FLUSH;
299 	fileindex->nentries--;
300 }
301 
302 struct got_fileindex_entry *
303 got_fileindex_entry_get(struct got_fileindex *fileindex, const char *path,
304     size_t path_len)
305 {
306 	struct got_fileindex_entry *ie;
307 	struct got_fileindex_entry key;
308 	memset(&key, 0, sizeof(key));
309 	key.path = (char *)path;
310 	key.flags = (path_len & GOT_FILEIDX_F_PATH_LEN);
311 	ie = RB_FIND(got_fileindex_tree, &fileindex->entries, &key);
312 	if (ie && (ie->flags & GOT_FILEIDX_F_REMOVE_ON_FLUSH))
313 		return NULL;
314 	return ie;
315 }
316 
317 const struct got_error *
318 got_fileindex_for_each_entry_safe(struct got_fileindex *fileindex,
319     got_fileindex_cb cb, void *cb_arg)
320 {
321 	const struct got_error *err;
322 	struct got_fileindex_entry *ie, *tmp;
323 
324 	RB_FOREACH_SAFE(ie, got_fileindex_tree, &fileindex->entries, tmp) {
325 		if (ie->flags & GOT_FILEIDX_F_REMOVE_ON_FLUSH)
326 			continue;
327 		err = (*cb)(cb_arg, ie);
328 		if (err)
329 			return err;
330 	}
331 	return NULL;
332 }
333 
334 struct got_fileindex *
335 got_fileindex_alloc(void)
336 {
337 	struct got_fileindex *fileindex;
338 
339 	fileindex = calloc(1, sizeof(*fileindex));
340 	if (fileindex == NULL)
341 		return NULL;
342 
343 	RB_INIT(&fileindex->entries);
344 	return fileindex;
345 }
346 
347 void
348 got_fileindex_free(struct got_fileindex *fileindex)
349 {
350 	struct got_fileindex_entry *ie;
351 
352 	while ((ie = RB_MIN(got_fileindex_tree, &fileindex->entries))) {
353 		RB_REMOVE(got_fileindex_tree, &fileindex->entries, ie);
354 		got_fileindex_entry_free(ie);
355 	}
356 	free(fileindex);
357 }
358 
359 static const struct got_error *
360 write_fileindex_val64(struct got_hash *ctx, uint64_t val, FILE *outfile)
361 {
362 	size_t n;
363 
364 	val = htobe64(val);
365 	got_hash_update(ctx, &val, sizeof(val));
366 	n = fwrite(&val, 1, sizeof(val), outfile);
367 	if (n != sizeof(val))
368 		return got_ferror(outfile, GOT_ERR_IO);
369 	return NULL;
370 }
371 
372 static const struct got_error *
373 write_fileindex_val32(struct got_hash *ctx, uint32_t val, FILE *outfile)
374 {
375 	size_t n;
376 
377 	val = htobe32(val);
378 	got_hash_update(ctx, &val, sizeof(val));
379 	n = fwrite(&val, 1, sizeof(val), outfile);
380 	if (n != sizeof(val))
381 		return got_ferror(outfile, GOT_ERR_IO);
382 	return NULL;
383 }
384 
385 static const struct got_error *
386 write_fileindex_val16(struct got_hash *ctx, uint16_t val, FILE *outfile)
387 {
388 	size_t n;
389 
390 	val = htobe16(val);
391 	got_hash_update(ctx, &val, sizeof(val));
392 	n = fwrite(&val, 1, sizeof(val), outfile);
393 	if (n != sizeof(val))
394 		return got_ferror(outfile, GOT_ERR_IO);
395 	return NULL;
396 }
397 
398 static const struct got_error *
399 write_fileindex_path(struct got_hash *ctx, const char *path, FILE *outfile)
400 {
401 	size_t n, len, pad = 0;
402 	static const uint8_t zero[8] = { 0 };
403 
404 	len = strlen(path);
405 	while ((len + pad) % 8 != 0)
406 		pad++;
407 	if (pad == 0)
408 		pad = 8; /* NUL-terminate */
409 
410 	got_hash_update(ctx, path, len);
411 	n = fwrite(path, 1, len, outfile);
412 	if (n != len)
413 		return got_ferror(outfile, GOT_ERR_IO);
414 	got_hash_update(ctx, zero, pad);
415 	n = fwrite(zero, 1, pad, outfile);
416 	if (n != pad)
417 		return got_ferror(outfile, GOT_ERR_IO);
418 	return NULL;
419 }
420 
421 static const struct got_error *
422 write_fileindex_entry(struct got_hash *ctx, struct got_fileindex_entry *ie,
423     FILE *outfile)
424 {
425 	const struct got_error *err;
426 	size_t n;
427 	uint32_t stage;
428 
429 	err = write_fileindex_val64(ctx, ie->ctime_sec, outfile);
430 	if (err)
431 		return err;
432 	err = write_fileindex_val64(ctx, ie->ctime_nsec, outfile);
433 	if (err)
434 		return err;
435 	err = write_fileindex_val64(ctx, ie->mtime_sec, outfile);
436 	if (err)
437 		return err;
438 	err = write_fileindex_val64(ctx, ie->mtime_nsec, outfile);
439 	if (err)
440 		return err;
441 
442 	err = write_fileindex_val32(ctx, ie->uid, outfile);
443 	if (err)
444 		return err;
445 	err = write_fileindex_val32(ctx, ie->gid, outfile);
446 	if (err)
447 		return err;
448 	err = write_fileindex_val32(ctx, ie->size, outfile);
449 	if (err)
450 		return err;
451 
452 	err = write_fileindex_val16(ctx, ie->mode, outfile);
453 	if (err)
454 		return err;
455 
456 	got_hash_update(ctx, ie->blob_sha1, SHA1_DIGEST_LENGTH);
457 	n = fwrite(ie->blob_sha1, 1, SHA1_DIGEST_LENGTH, outfile);
458 	if (n != SHA1_DIGEST_LENGTH)
459 		return got_ferror(outfile, GOT_ERR_IO);
460 
461 	got_hash_update(ctx, ie->commit_sha1, SHA1_DIGEST_LENGTH);
462 	n = fwrite(ie->commit_sha1, 1, SHA1_DIGEST_LENGTH, outfile);
463 	if (n != SHA1_DIGEST_LENGTH)
464 		return got_ferror(outfile, GOT_ERR_IO);
465 
466 	err = write_fileindex_val32(ctx, ie->flags, outfile);
467 	if (err)
468 		return err;
469 
470 	err = write_fileindex_path(ctx, ie->path, outfile);
471 	if (err)
472 		return err;
473 
474 	stage = got_fileindex_entry_stage_get(ie);
475 	if (stage == GOT_FILEIDX_STAGE_MODIFY ||
476 	    stage == GOT_FILEIDX_STAGE_ADD) {
477 		got_hash_update(ctx, ie->staged_blob_sha1, SHA1_DIGEST_LENGTH);
478 		n = fwrite(ie->staged_blob_sha1, 1, SHA1_DIGEST_LENGTH,
479 		    outfile);
480 		if (n != SHA1_DIGEST_LENGTH)
481 			return got_ferror(outfile, GOT_ERR_IO);
482 	}
483 
484 	return NULL;
485 }
486 
487 const struct got_error *
488 got_fileindex_write(struct got_fileindex *fileindex, FILE *outfile)
489 {
490 	const struct got_error *err = NULL;
491 	struct got_fileindex_hdr hdr;
492 	struct got_hash ctx;
493 	uint8_t hash[GOT_HASH_DIGEST_MAXLEN];
494 	size_t n;
495 	struct got_fileindex_entry *ie, *tmp;
496 
497 	got_hash_init(&ctx, GOT_HASH_SHA1);
498 
499 	hdr.signature = htobe32(GOT_FILE_INDEX_SIGNATURE);
500 	hdr.version = htobe32(GOT_FILE_INDEX_VERSION);
501 	hdr.nentries = htobe32(fileindex->nentries);
502 
503 	got_hash_update(&ctx, &hdr.signature, sizeof(hdr.signature));
504 	got_hash_update(&ctx, &hdr.version, sizeof(hdr.version));
505 	got_hash_update(&ctx, &hdr.nentries, sizeof(hdr.nentries));
506 	n = fwrite(&hdr.signature, 1, sizeof(hdr.signature), outfile);
507 	if (n != sizeof(hdr.signature))
508 		return got_ferror(outfile, GOT_ERR_IO);
509 	n = fwrite(&hdr.version, 1, sizeof(hdr.version), outfile);
510 	if (n != sizeof(hdr.version))
511 		return got_ferror(outfile, GOT_ERR_IO);
512 	n = fwrite(&hdr.nentries, 1, sizeof(hdr.nentries), outfile);
513 	if (n != sizeof(hdr.nentries))
514 		return got_ferror(outfile, GOT_ERR_IO);
515 
516 	RB_FOREACH_SAFE(ie, got_fileindex_tree, &fileindex->entries, tmp) {
517 		ie->flags &= ~GOT_FILEIDX_F_NOT_FLUSHED;
518 		ie->flags &= ~GOT_FILEIDX_F_SKIPPED;
519 		if (ie->flags & GOT_FILEIDX_F_REMOVE_ON_FLUSH) {
520 			RB_REMOVE(got_fileindex_tree, &fileindex->entries, ie);
521 			got_fileindex_entry_free(ie);
522 			continue;
523 		}
524 		err = write_fileindex_entry(&ctx, ie, outfile);
525 		if (err)
526 			return err;
527 	}
528 
529 	got_hash_final(&ctx, hash);
530 	n = fwrite(hash, 1, SHA1_DIGEST_LENGTH, outfile);
531 	if (n != SHA1_DIGEST_LENGTH)
532 		return got_ferror(outfile, GOT_ERR_IO);
533 
534 	if (fflush(outfile) != 0)
535 		return got_error_from_errno("fflush");
536 
537 	return NULL;
538 }
539 
540 static const struct got_error *
541 read_fileindex_val64(uint64_t *val, struct got_hash *ctx, FILE *infile)
542 {
543 	size_t n;
544 
545 	n = fread(val, 1, sizeof(*val), infile);
546 	if (n != sizeof(*val))
547 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
548 	got_hash_update(ctx, val, sizeof(*val));
549 	*val = be64toh(*val);
550 	return NULL;
551 }
552 
553 static const struct got_error *
554 read_fileindex_val32(uint32_t *val, struct got_hash *ctx, FILE *infile)
555 {
556 	size_t n;
557 
558 	n = fread(val, 1, sizeof(*val), infile);
559 	if (n != sizeof(*val))
560 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
561 	got_hash_update(ctx, val, sizeof(*val));
562 	*val = be32toh(*val);
563 	return NULL;
564 }
565 
566 static const struct got_error *
567 read_fileindex_val16(uint16_t *val, struct got_hash *ctx, FILE *infile)
568 {
569 	size_t n;
570 
571 	n = fread(val, 1, sizeof(*val), infile);
572 	if (n != sizeof(*val))
573 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
574 	got_hash_update(ctx, val, sizeof(*val));
575 	*val = be16toh(*val);
576 	return NULL;
577 }
578 
579 static const struct got_error *
580 read_fileindex_path(char **path, struct got_hash *ctx, FILE *infile)
581 {
582 	const size_t chunk_size = 8;
583 	char p[PATH_MAX];
584 	size_t n, len = 0;
585 
586 	do {
587 		if (len + chunk_size > sizeof(p))
588 			return got_error(GOT_ERR_FILEIDX_BAD);
589 
590 		n = fread(&p[len], 1, chunk_size, infile);
591 		if (n != chunk_size)
592 			return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
593 
594 		got_hash_update(ctx, &p[len], chunk_size);
595 		len += chunk_size;
596 	} while (memchr(&p[len - chunk_size], '\0', chunk_size) == NULL);
597 
598 	*path = strdup(p);
599 	if (*path == NULL)
600 		return got_error_from_errno("strdup");
601 	return NULL;
602 }
603 
604 static const struct got_error *
605 read_fileindex_entry(struct got_fileindex_entry **iep, struct got_hash *ctx,
606     FILE *infile, uint32_t version)
607 {
608 	const struct got_error *err;
609 	struct got_fileindex_entry *ie;
610 	size_t n;
611 
612 	*iep = NULL;
613 
614 	ie = calloc(1, sizeof(*ie));
615 	if (ie == NULL)
616 		return got_error_from_errno("calloc");
617 
618 	err = read_fileindex_val64(&ie->ctime_sec, ctx, infile);
619 	if (err)
620 		goto done;
621 	err = read_fileindex_val64(&ie->ctime_nsec, ctx, infile);
622 	if (err)
623 		goto done;
624 	err = read_fileindex_val64(&ie->mtime_sec, ctx, infile);
625 	if (err)
626 		goto done;
627 	err = read_fileindex_val64(&ie->mtime_nsec, ctx, infile);
628 	if (err)
629 		goto done;
630 
631 	err = read_fileindex_val32(&ie->uid, ctx, infile);
632 	if (err)
633 		goto done;
634 	err = read_fileindex_val32(&ie->gid, ctx, infile);
635 	if (err)
636 		goto done;
637 	err = read_fileindex_val32(&ie->size, ctx, infile);
638 	if (err)
639 		goto done;
640 
641 	err = read_fileindex_val16(&ie->mode, ctx, infile);
642 	if (err)
643 		goto done;
644 
645 	n = fread(ie->blob_sha1, 1, SHA1_DIGEST_LENGTH, infile);
646 	if (n != SHA1_DIGEST_LENGTH) {
647 		err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
648 		goto done;
649 	}
650 	got_hash_update(ctx, ie->blob_sha1, SHA1_DIGEST_LENGTH);
651 
652 	n = fread(ie->commit_sha1, 1, SHA1_DIGEST_LENGTH, infile);
653 	if (n != SHA1_DIGEST_LENGTH) {
654 		err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
655 		goto done;
656 	}
657 	got_hash_update(ctx, ie->commit_sha1, SHA1_DIGEST_LENGTH);
658 
659 	err = read_fileindex_val32(&ie->flags, ctx, infile);
660 	if (err)
661 		goto done;
662 
663 	err = read_fileindex_path(&ie->path, ctx, infile);
664 	if (err)
665 		goto done;
666 
667 	if (version >= 2) {
668 		uint32_t stage = got_fileindex_entry_stage_get(ie);
669 		if (stage == GOT_FILEIDX_STAGE_MODIFY ||
670 		    stage == GOT_FILEIDX_STAGE_ADD) {
671 			n = fread(ie->staged_blob_sha1, 1, SHA1_DIGEST_LENGTH,
672 			    infile);
673 			if (n != SHA1_DIGEST_LENGTH) {
674 				err = got_ferror(infile, GOT_ERR_FILEIDX_BAD);
675 				goto done;
676 			}
677 			got_hash_update(ctx, ie->staged_blob_sha1,
678 			    SHA1_DIGEST_LENGTH);
679 		}
680 	} else {
681 		/* GOT_FILE_INDEX_VERSION 1 does not support staging. */
682 		ie->flags &= ~GOT_FILEIDX_F_STAGE;
683 	}
684 
685 done:
686 	if (err)
687 		got_fileindex_entry_free(ie);
688 	else
689 		*iep = ie;
690 	return err;
691 }
692 
693 const struct got_error *
694 got_fileindex_read(struct got_fileindex *fileindex, FILE *infile)
695 {
696 	const struct got_error *err = NULL;
697 	struct got_fileindex_hdr hdr;
698 	struct got_hash ctx;
699 	struct got_fileindex_entry *ie;
700 	uint8_t sha1_expected[SHA1_DIGEST_LENGTH];
701 	uint8_t sha1[SHA1_DIGEST_LENGTH];
702 	size_t n;
703 	int i;
704 
705 	got_hash_init(&ctx, GOT_HASH_SHA1);
706 
707 	n = fread(&hdr.signature, 1, sizeof(hdr.signature), infile);
708 	if (n != sizeof(hdr.signature)) {
709 		if (n == 0) /* EOF */
710 			return NULL;
711 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
712 	}
713 	n = fread(&hdr.version, 1, sizeof(hdr.version), infile);
714 	if (n != sizeof(hdr.version)) {
715 		if (n == 0) /* EOF */
716 			return NULL;
717 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
718 	}
719 	n = fread(&hdr.nentries, 1, sizeof(hdr.nentries), infile);
720 	if (n != sizeof(hdr.nentries)) {
721 		if (n == 0) /* EOF */
722 			return NULL;
723 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
724 	}
725 
726 	got_hash_update(&ctx, &hdr.signature, sizeof(hdr.signature));
727 	got_hash_update(&ctx, &hdr.version, sizeof(hdr.version));
728 	got_hash_update(&ctx, &hdr.nentries, sizeof(hdr.nentries));
729 
730 	hdr.signature = be32toh(hdr.signature);
731 	hdr.version = be32toh(hdr.version);
732 	hdr.nentries = be32toh(hdr.nentries);
733 
734 	if (hdr.signature != GOT_FILE_INDEX_SIGNATURE)
735 		return got_error(GOT_ERR_FILEIDX_SIG);
736 	if (hdr.version > GOT_FILE_INDEX_VERSION)
737 		return got_error(GOT_ERR_FILEIDX_VER);
738 
739 	for (i = 0; i < hdr.nentries; i++) {
740 		err = read_fileindex_entry(&ie, &ctx, infile, hdr.version);
741 		if (err)
742 			return err;
743 		err = add_entry(fileindex, ie);
744 		if (err) {
745 			got_fileindex_entry_free(ie);
746 			return err;
747 		}
748 	}
749 
750 	n = fread(sha1_expected, 1, sizeof(sha1_expected), infile);
751 	if (n != sizeof(sha1_expected))
752 		return got_ferror(infile, GOT_ERR_FILEIDX_BAD);
753 	got_hash_final(&ctx, sha1);
754 	if (memcmp(sha1, sha1_expected, SHA1_DIGEST_LENGTH) != 0)
755 		return got_error(GOT_ERR_FILEIDX_CSUM);
756 
757 	return NULL;
758 }
759 
760 static struct got_fileindex_entry *
761 walk_fileindex(struct got_fileindex *fileindex, struct got_fileindex_entry *ie)
762 {
763 	struct got_fileindex_entry *next;
764 
765 	next = RB_NEXT(got_fileindex_tree, &fileindex->entries, ie);
766 
767 	/* Skip entries which were added or removed by diff callbacks. */
768 	while (next && (next->flags & (GOT_FILEIDX_F_NOT_FLUSHED |
769 	    GOT_FILEIDX_F_REMOVE_ON_FLUSH)))
770 		next = RB_NEXT(got_fileindex_tree, &fileindex->entries, next);
771 
772 	return next;
773 }
774 
775 static const struct got_error *
776 diff_fileindex_tree(struct got_fileindex *, struct got_fileindex_entry **ie,
777     struct got_tree_object *tree, const char *, const char *,
778     struct got_repository *, struct got_fileindex_diff_tree_cb *, void *);
779 
780 static const struct got_error *
781 walk_tree(struct got_tree_entry **next, struct got_fileindex *fileindex,
782     struct got_fileindex_entry **ie, struct got_tree_object *tree, int *tidx,
783     const char *path, const char *entry_name, struct got_repository *repo,
784     struct got_fileindex_diff_tree_cb *cb, void *cb_arg)
785 {
786 	const struct got_error *err = NULL;
787 	struct got_tree_entry *te = got_object_tree_get_entry(tree, *tidx);
788 
789 	if (!got_object_tree_entry_is_submodule(te) &&
790 	    S_ISDIR(got_tree_entry_get_mode(te))) {
791 		char *subpath;
792 		struct got_tree_object *subtree;
793 
794 		if (asprintf(&subpath, "%s%s%s", path,
795 		    path[0] == '\0' ? "" : "/",
796 		    got_tree_entry_get_name(te)) == -1)
797 			return got_error_from_errno("asprintf");
798 
799 		err = got_object_open_as_tree(&subtree, repo,
800 		    got_tree_entry_get_id(te));
801 		if (err) {
802 			free(subpath);
803 			return err;
804 		}
805 
806 		err = diff_fileindex_tree(fileindex, ie, subtree, subpath,
807 		    entry_name, repo, cb, cb_arg);
808 		free(subpath);
809 		got_object_tree_close(subtree);
810 		if (err)
811 			return err;
812 	}
813 
814 	(*tidx)++;
815 	*next = got_object_tree_get_entry(tree, *tidx);
816 	return NULL;
817 }
818 
819 static const struct got_error *
820 diff_fileindex_tree(struct got_fileindex *fileindex,
821     struct got_fileindex_entry **ie, struct got_tree_object *tree,
822     const char *path, const char *entry_name, struct got_repository *repo,
823     struct got_fileindex_diff_tree_cb *cb, void *cb_arg)
824 {
825 	const struct got_error *err = NULL;
826 	struct got_tree_entry *te = NULL;
827 	size_t path_len = strlen(path);
828 	struct got_fileindex_entry *next;
829 	int tidx = 0;
830 
831 	te = got_object_tree_get_entry(tree, tidx);
832 	while ((*ie && got_path_is_child((*ie)->path, path, path_len)) || te) {
833 		if (te && *ie) {
834 			char *te_path;
835 			const char *te_name = got_tree_entry_get_name(te);
836 			int cmp;
837 			if (asprintf(&te_path, "%s/%s", path, te_name) == -1) {
838 				err = got_error_from_errno("asprintf");
839 				break;
840 			}
841 			cmp = got_path_cmp((*ie)->path, te_path,
842 			    got_fileindex_entry_path_len(*ie), strlen(te_path));
843 			free(te_path);
844 			if (cmp == 0) {
845 				if (got_path_is_child((*ie)->path, path,
846 				    path_len) &&
847 				    !got_object_tree_entry_is_submodule(te) &&
848 				    (entry_name == NULL ||
849 				    strcmp(te_name, entry_name) == 0)) {
850 					err = cb->diff_old_new(cb_arg, *ie, te,
851 					    path);
852 					if (err || entry_name)
853 						break;
854 				}
855 				*ie = walk_fileindex(fileindex, *ie);
856 				err = walk_tree(&te, fileindex, ie, tree, &tidx,
857 				    path, entry_name, repo, cb, cb_arg);
858 			} else if (cmp < 0) {
859 				next = walk_fileindex(fileindex, *ie);
860 				if (got_path_is_child((*ie)->path, path,
861 				    path_len) && entry_name == NULL) {
862 					err = cb->diff_old(cb_arg, *ie, path);
863 					if (err || entry_name)
864 						break;
865 				}
866 				*ie = next;
867 			} else {
868 				if ((entry_name == NULL ||
869 				    strcmp(te_name, entry_name) == 0)) {
870 					err = cb->diff_new(cb_arg, te, path);
871 					if (err || entry_name)
872 						break;
873 				}
874 				err = walk_tree(&te, fileindex, ie, tree, &tidx,
875 				    path, entry_name, repo, cb, cb_arg);
876 			}
877 			if (err)
878 				break;
879 		} else if (*ie) {
880 			next = walk_fileindex(fileindex, *ie);
881 			if (got_path_is_child((*ie)->path, path, path_len) &&
882 			    (entry_name == NULL ||
883 			    (te && strcmp(got_tree_entry_get_name(te),
884 			    entry_name) == 0))) {
885 				err = cb->diff_old(cb_arg, *ie, path);
886 				if (err || entry_name)
887 					break;
888 			}
889 			*ie = next;
890 		} else if (te) {
891 			if (!got_object_tree_entry_is_submodule(te) &&
892 			    (entry_name == NULL ||
893 			    strcmp(got_tree_entry_get_name(te), entry_name)
894 			    == 0)) {
895 				err = cb->diff_new(cb_arg, te, path);
896 				if (err || entry_name)
897 					break;
898 			}
899 			err = walk_tree(&te, fileindex, ie, tree, &tidx, path,
900 			    entry_name, repo, cb, cb_arg);
901 			if (err)
902 				break;
903 		}
904 	}
905 
906 	return err;
907 }
908 
909 const struct got_error *
910 got_fileindex_diff_tree(struct got_fileindex *fileindex,
911     struct got_tree_object *tree, const char *path, const char *entry_name,
912     struct got_repository *repo,
913     struct got_fileindex_diff_tree_cb *cb, void *cb_arg)
914 {
915 	struct got_fileindex_entry *ie;
916 	ie = RB_MIN(got_fileindex_tree, &fileindex->entries);
917 	while (ie && !got_path_is_child(ie->path, path, strlen(path)))
918 		ie = walk_fileindex(fileindex, ie);
919 	return diff_fileindex_tree(fileindex, &ie, tree, path, entry_name, repo,
920 	    cb, cb_arg);
921 }
922 
923 static const struct got_error *
924 diff_fileindex_dir(struct got_fileindex *, struct got_fileindex_entry **,
925     struct got_pathlist_head *, int, const char *, const char *,
926     struct got_repository *, struct got_fileindex_diff_dir_cb *, void *);
927 
928 static const struct got_error *
929 read_dirlist(struct got_pathlist_head *dirlist, DIR *dir, const char *path)
930 {
931 	const struct got_error *err = NULL;
932 	struct got_pathlist_entry *new = NULL;
933 	struct dirent *dep = NULL;
934 	struct dirent *de = NULL;
935 
936 	for (;;) {
937 		de = malloc(sizeof(struct dirent) + NAME_MAX + 1);
938 		if (de == NULL) {
939 			err = got_error_from_errno("malloc");
940 			break;
941 		}
942 
943 		if (readdir_r(dir, de, &dep) != 0) {
944 			err = got_error_from_errno("readdir_r");
945 			free(de);
946 			break;
947 		}
948 		if (dep == NULL) {
949 			free(de);
950 			break;
951 		}
952 
953 		if (strcmp(de->d_name, ".") == 0 ||
954 		    strcmp(de->d_name, "..") == 0 ||
955 		    (path[0] == '\0' &&
956 		    strcmp(de->d_name, GOT_WORKTREE_GOT_DIR) == 0) ||
957 		    (path[0] == '\0' &&
958 		    strcmp(de->d_name, GOT_WORKTREE_CVG_DIR) == 0)) {
959 			free(de);
960 			continue;
961 		}
962 
963 		err = got_pathlist_insert(&new, dirlist, de->d_name, de);
964 		if (err) {
965 			free(de);
966 			break;
967 		}
968 		if (new == NULL) {
969 			err = got_error(GOT_ERR_DIR_DUP_ENTRY);
970 			free(de);
971 			break;
972 		}
973 	}
974 
975 	return err;
976 }
977 
978 static int
979 have_tracked_file_in_dir(struct got_fileindex *fileindex, const char *path)
980 {
981 	struct got_fileindex_entry *ie;
982 	size_t path_len = strlen(path);
983 	int cmp;
984 
985 	ie = RB_ROOT(&fileindex->entries);
986 	while (ie) {
987 		if (got_path_is_child(ie->path, path, path_len))
988 			return 1;
989 		cmp = got_path_cmp(path, ie->path, path_len,
990 		    got_fileindex_entry_path_len(ie));
991 		if (cmp < 0)
992 			ie = RB_LEFT(ie, entry);
993 		else if (cmp > 0)
994 			ie = RB_RIGHT(ie, entry);
995 		else
996 			break;
997 	}
998 
999 	return 0;
1000 }
1001 
1002 static const struct got_error *
1003 walk_dir(struct got_pathlist_entry **next, struct got_fileindex *fileindex,
1004     struct got_fileindex_entry **ie, struct got_pathlist_entry *dle, int fd,
1005     const char *path, const char *rootpath, struct got_repository *repo,
1006     int ignore, struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
1007 {
1008 	const struct got_error *err = NULL;
1009 	struct dirent *de = dle->data;
1010 	DIR *subdir = NULL;
1011 	int subdirfd = -1;
1012 
1013 	*next = NULL;
1014 
1015 	/* Must traverse ignored directories if they contain tracked files. */
1016 	if (de->d_type == DT_DIR && ignore &&
1017 	    have_tracked_file_in_dir(fileindex, path))
1018 		ignore = 0;
1019 
1020 	if (de->d_type == DT_DIR && !ignore) {
1021 		char *subpath;
1022 		char *subdirpath;
1023 		struct got_pathlist_head subdirlist;
1024 
1025 		TAILQ_INIT(&subdirlist);
1026 
1027 		if (asprintf(&subpath, "%s%s%s", path,
1028 		    path[0] == '\0' ? "" : "/", de->d_name) == -1)
1029 			return got_error_from_errno("asprintf");
1030 
1031 		if (asprintf(&subdirpath, "%s/%s", rootpath, subpath) == -1) {
1032 			free(subpath);
1033 			return got_error_from_errno("asprintf");
1034 		}
1035 
1036 		subdirfd = openat(fd, de->d_name,
1037 		    O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
1038 		if (subdirfd == -1) {
1039 			if (errno == EACCES) {
1040 				*next = TAILQ_NEXT(dle, entry);
1041 				return NULL;
1042 			}
1043 			err = got_error_from_errno2("openat", subdirpath);
1044 			free(subpath);
1045 			free(subdirpath);
1046 			return err;
1047 		}
1048 
1049 		subdir = fdopendir(subdirfd);
1050 		if (subdir == NULL) {
1051 			err = got_error_from_errno2("fdopendir", path);
1052 			close(subdirfd);
1053 			free(subpath);
1054 			free(subdirpath);
1055 			return err;
1056 		}
1057 		subdirfd = -1;
1058 		err = read_dirlist(&subdirlist, subdir, subdirpath);
1059 		if (err) {
1060 			free(subpath);
1061 			free(subdirpath);
1062 			closedir(subdir);
1063 			return err;
1064 		}
1065 		err = diff_fileindex_dir(fileindex, ie, &subdirlist,
1066 		    dirfd(subdir), rootpath, subpath, repo, cb, cb_arg);
1067 		if (subdir && closedir(subdir) == -1 && err == NULL)
1068 			err = got_error_from_errno2("closedir", subdirpath);
1069 		free(subpath);
1070 		free(subdirpath);
1071 		got_pathlist_free(&subdirlist, GOT_PATHLIST_FREE_DATA);
1072 		if (err)
1073 			return err;
1074 	}
1075 
1076 	*next = TAILQ_NEXT(dle, entry);
1077 	return NULL;
1078 }
1079 
1080 static const struct got_error *
1081 dirent_type_fixup(struct dirent *de, const char *rootpath, const char *path)
1082 {
1083 	const struct got_error *err;
1084 	char *dir_path;
1085 	int type;
1086 
1087 	if (de->d_type != DT_UNKNOWN)
1088 		return NULL;
1089 
1090 	/* DT_UNKNOWN occurs on NFS mounts without "readdir plus" RPC. */
1091 	if (asprintf(&dir_path, "%s/%s", rootpath, path) == -1)
1092 		return got_error_from_errno("asprintf");
1093 	err = got_path_dirent_type(&type, dir_path, de);
1094 	free(dir_path);
1095 	if (err)
1096 		return err;
1097 
1098 	de->d_type = type;
1099 	return NULL;
1100 }
1101 
1102 static const struct got_error *
1103 diff_fileindex_dir(struct got_fileindex *fileindex,
1104     struct got_fileindex_entry **ie, struct got_pathlist_head *dirlist,
1105     int dirfd, const char *rootpath, const char *path,
1106     struct got_repository *repo,
1107     struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
1108 {
1109 	const struct got_error *err = NULL;
1110 	struct dirent *de = NULL;
1111 	size_t path_len = strlen(path);
1112 	struct got_pathlist_entry *dle;
1113 	int ignore;
1114 
1115 	if (cb->diff_traverse) {
1116 		err = cb->diff_traverse(cb_arg, path, dirfd);
1117 		if (err)
1118 			return err;
1119 	}
1120 
1121 	dle = TAILQ_FIRST(dirlist);
1122 	while ((*ie && got_path_is_child((*ie)->path, path, path_len)) || dle) {
1123 		if (dle && *ie) {
1124 			char *de_path;
1125 			int cmp;
1126 			de = dle->data;
1127 			err = dirent_type_fixup(de, rootpath, path);
1128 			if (err)
1129 				break;
1130 			if (asprintf(&de_path, "%s/%s", path,
1131 			    de->d_name) == -1) {
1132 				err = got_error_from_errno("asprintf");
1133 				break;
1134 			}
1135 			cmp = got_path_cmp((*ie)->path, de_path,
1136 			    got_fileindex_entry_path_len(*ie),
1137 			    strlen(path) + 1 + de->d_namlen);
1138 			free(de_path);
1139 			if (cmp == 0) {
1140 				err = cb->diff_old_new(cb_arg, *ie, de, path,
1141 				    dirfd);
1142 				if (err)
1143 					break;
1144 				*ie = walk_fileindex(fileindex, *ie);
1145 				err = walk_dir(&dle, fileindex, ie, dle, dirfd,
1146 				    path, rootpath, repo, 0, cb, cb_arg);
1147 			} else if (cmp < 0 ) {
1148 				err = cb->diff_old(cb_arg, *ie, path);
1149 				if (err)
1150 					break;
1151 				*ie = walk_fileindex(fileindex, *ie);
1152 			} else {
1153 				err = cb->diff_new(&ignore, cb_arg, de, path,
1154 				    dirfd);
1155 				if (err)
1156 					break;
1157 				err = walk_dir(&dle, fileindex, ie, dle, dirfd,
1158 				    path, rootpath, repo, ignore, cb, cb_arg);
1159 			}
1160 			if (err)
1161 				break;
1162 		} else if (*ie) {
1163 			err = cb->diff_old(cb_arg, *ie, path);
1164 			if (err)
1165 				break;
1166 			*ie = walk_fileindex(fileindex, *ie);
1167 		} else if (dle) {
1168 			de = dle->data;
1169 			err = dirent_type_fixup(de, rootpath, path);
1170 			if (err)
1171 				break;
1172 			err = cb->diff_new(&ignore, cb_arg, de, path, dirfd);
1173 			if (err)
1174 				break;
1175 			err = walk_dir(&dle, fileindex, ie, dle, dirfd, path,
1176 			    rootpath, repo, ignore, cb, cb_arg);
1177 			if (err)
1178 				break;
1179 		}
1180 	}
1181 
1182 	return err;
1183 }
1184 
1185 const struct got_error *
1186 got_fileindex_diff_dir(struct got_fileindex *fileindex, int fd,
1187     const char *rootpath, const char *path, struct got_repository *repo,
1188     struct got_fileindex_diff_dir_cb *cb, void *cb_arg)
1189 {
1190 	const struct got_error *err;
1191 	struct got_fileindex_entry *ie;
1192 	struct got_pathlist_head dirlist;
1193 	int fd2;
1194 	DIR *dir;
1195 
1196 	TAILQ_INIT(&dirlist);
1197 
1198 	/*
1199 	 * Duplicate the file descriptor so we can call closedir() below
1200 	 * without closing the file descriptor passed in by our caller.
1201 	 */
1202 	fd2 = dup(fd);
1203 	if (fd2 == -1)
1204 		return got_error_from_errno2("dup", path);
1205 	if (lseek(fd2, 0, SEEK_SET) == -1) {
1206 		err = got_error_from_errno2("lseek", path);
1207 		close(fd2);
1208 		return err;
1209 	}
1210 	dir = fdopendir(fd2);
1211 	if (dir == NULL) {
1212 		err = got_error_from_errno2("fdopendir", path);
1213 		close(fd2);
1214 		return err;
1215 	}
1216 	err = read_dirlist(&dirlist, dir, path);
1217 	if (err) {
1218 		closedir(dir);
1219 		return err;
1220 	}
1221 
1222 	ie = RB_MIN(got_fileindex_tree, &fileindex->entries);
1223 	while (ie && !got_path_is_child(ie->path, path, strlen(path)))
1224 		ie = walk_fileindex(fileindex, ie);
1225 	err = diff_fileindex_dir(fileindex, &ie, &dirlist, dirfd(dir),
1226 	    rootpath, path, repo, cb, cb_arg);
1227 
1228 	if (closedir(dir) == -1 && err == NULL)
1229 		err = got_error_from_errno2("closedir", path);
1230 	got_pathlist_free(&dirlist, GOT_PATHLIST_FREE_DATA);
1231 	return err;
1232 }
1233 
1234 struct got_object_id *
1235 got_fileindex_entry_get_staged_blob_id(struct got_object_id *id,
1236     struct got_fileindex_entry *ie)
1237 {
1238 	memset(id, 0, sizeof(*id));
1239 	memcpy(id->sha1, ie->staged_blob_sha1, sizeof(ie->staged_blob_sha1));
1240 	return id;
1241 }
1242 
1243 struct got_object_id *
1244 got_fileindex_entry_get_blob_id(struct got_object_id *id,
1245     struct got_fileindex_entry *ie)
1246 {
1247 	memset(id, 0, sizeof(*id));
1248 	memcpy(id->sha1, ie->blob_sha1, sizeof(ie->blob_sha1));
1249 	return id;
1250 }
1251 
1252 struct got_object_id *
1253 got_fileindex_entry_get_commit_id(struct got_object_id *id,
1254     struct got_fileindex_entry *ie)
1255 {
1256 	memset(id, 0, sizeof(*id));
1257 	memcpy(id->sha1, ie->commit_sha1, sizeof(ie->commit_sha1));
1258 	return id;
1259 }
1260 
1261 RB_GENERATE(got_fileindex_tree, got_fileindex_entry, entry, got_fileindex_cmp);