Got Mirror

Blob

Date:: Sun Jan 13 13:07:17 2019 UTC
Message:: fix leaks in add_dir_on_disk(), and ensure all parents get created
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/stat.h>
18 #include <sys/limits.h>
19 #include <sys/queue.h>
20 #include <sys/tree.h>
21 
22 #include <stddef.h>
23 #include <string.h>
24 #include <stdio.h>
25 #include <stdlib.h>
26 #include <fcntl.h>
27 #include <errno.h>
28 #include <unistd.h>
29 #include <sha1.h>
30 #include <zlib.h>
31 #include <fnmatch.h>
32 #include <libgen.h>
33 
34 #include "got_error.h"
35 #include "got_repository.h"
36 #include "got_reference.h"
37 #include "got_object.h"
38 #include "got_worktree.h"
39 #include "got_opentemp.h"
40 
41 #include "got_lib_worktree.h"
42 #include "got_lib_path.h"
43 #include "got_lib_sha1.h"
44 #include "got_lib_fileindex.h"
45 #include "got_lib_inflate.h"
46 #include "got_lib_delta.h"
47 #include "got_lib_object.h"
48 
49 #ifndef MIN
50 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
51 #endif
52 
53 static const struct got_error *
54 create_meta_file(const char *path_got, const char *name, const char *content)
55 {
56 	const struct got_error *err = NULL;
57 	char *path;
58 	int fd = -1;
59 
60 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
61 		err = got_error_from_errno();
62 		path = NULL;
63 		goto done;
64 	}
65 
66 	fd = open(path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
67 	    GOT_DEFAULT_FILE_MODE);
68 	if (fd == -1) {
69 		err = got_error_from_errno();
70 		goto done;
71 	}
72 
73 	if (content) {
74 		int len = dprintf(fd, "%s\n", content);
75 		if (len != strlen(content) + 1) {
76 			err = got_error_from_errno();
77 			goto done;
78 		}
79 	}
80 
81 done:
82 	if (fd != -1 && close(fd) == -1 && err == NULL)
83 		err = got_error_from_errno();
84 	free(path);
85 	return err;
86 }
87 
88 static const struct got_error *
89 update_meta_file(const char *path_got, const char *name, const char *content)
90 {
91 	const struct got_error *err = NULL;
92 	FILE *tmpfile = NULL;
93 	char *tmppath = NULL;
94 	char *path = NULL;
95 
96 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
97 		err = got_error_from_errno();
98 		path = NULL;
99 		goto done;
100 	}
101 
102 	err = got_opentemp_named(&tmppath, &tmpfile, path);
103 	if (err)
104 		goto done;
105 
106 	if (content) {
107 		int len = fprintf(tmpfile, "%s\n", content);
108 		if (len != strlen(content) + 1) {
109 			err = got_error_from_errno();
110 			goto done;
111 		}
112 	}
113 
114 	if (rename(tmppath, path) != 0) {
115 		err = got_error_from_errno();
116 		goto done;
117 	}
118 
119 done:
120 	free(tmppath);
121 	fclose(tmpfile);
122 	return err;
123 }
124 
125 static const struct got_error *
126 read_meta_file(char **content, const char *path_got, const char *name)
127 {
128 	const struct got_error *err = NULL;
129 	char *path;
130 	int fd = -1;
131 	ssize_t n;
132 	struct stat sb;
133 
134 	*content = NULL;
135 
136 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
137 		err = got_error_from_errno();
138 		path = NULL;
139 		goto done;
140 	}
141 
142 	fd = open(path, O_RDONLY | O_NOFOLLOW);
143 	if (fd == -1) {
144 		err = got_error_from_errno();
145 		goto done;
146 	}
147 	if (flock(fd, LOCK_SH | LOCK_NB) == -1) {
148 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
149 		    : got_error_from_errno());
150 		goto done;
151 	}
152 
153 	stat(path, &sb);
154 	*content = calloc(1, sb.st_size);
155 	if (*content == NULL) {
156 		err = got_error_from_errno();
157 		goto done;
158 	}
159 
160 	n = read(fd, *content, sb.st_size);
161 	if (n != sb.st_size) {
162 		err = (n == -1 ? got_error_from_errno() :
163 		    got_error(GOT_ERR_WORKTREE_META));
164 		goto done;
165 	}
166 	if ((*content)[sb.st_size - 1] != '\n') {
167 		err = got_error(GOT_ERR_WORKTREE_META);
168 		goto done;
169 	}
170 	(*content)[sb.st_size - 1] = '\0';
171 
172 done:
173 	if (fd != -1 && close(fd) == -1 && err == NULL)
174 		err = got_error_from_errno();
175 	free(path);
176 	if (err) {
177 		free(*content);
178 		*content = NULL;
179 	}
180 	return err;
181 }
182 
183 const struct got_error *
184 got_worktree_init(const char *path, struct got_reference *head_ref,
185     const char *prefix, struct got_repository *repo)
186 {
187 	const struct got_error *err = NULL;
188 	struct got_object_id *commit_id = NULL;
189 	int obj_type;
190 	char *path_got = NULL;
191 	char *refstr = NULL;
192 	char *formatstr = NULL;
193 	char *absprefix = NULL;
194 	char *basestr = NULL;
195 
196 	err = got_ref_resolve(&commit_id, repo, head_ref);
197 	if (err)
198 		return err;
199 	err = got_object_get_type(&obj_type, repo, commit_id);
200 	if (err)
201 		return err;
202 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
203 		return got_error(GOT_ERR_OBJ_TYPE);
204 
205 	if (!got_path_is_absolute(prefix)) {
206 		if (asprintf(&absprefix, "/%s", prefix) == -1)
207 			return got_error_from_errno();
208 	}
209 
210 	/* Create top-level directory (may already exist). */
211 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
212 		err = got_error_from_errno();
213 		goto done;
214 	}
215 
216 	/* Create .got directory (may already exist). */
217 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
218 		err = got_error_from_errno();
219 		goto done;
220 	}
221 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
222 		err = got_error_from_errno();
223 		goto done;
224 	}
225 
226 	/* Create an empty lock file. */
227 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
228 	if (err)
229 		goto done;
230 
231 	/* Create an empty file index. */
232 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
233 	if (err)
234 		goto done;
235 
236 	/* Write the HEAD reference. */
237 	refstr = got_ref_to_str(head_ref);
238 	if (refstr == NULL) {
239 		err = got_error_from_errno();
240 		goto done;
241 	}
242 	err = create_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
243 	if (err)
244 		goto done;
245 
246 	/* Record our base commit. */
247 	err = got_object_id_str(&basestr, commit_id);
248 	if (err)
249 		goto done;
250 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
251 	if (err)
252 		goto done;
253 
254 	/* Store path to repository. */
255 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
256 	    got_repo_get_path(repo));
257 	if (err)
258 		goto done;
259 
260 	/* Store in-repository path prefix. */
261 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
262 	    absprefix ? absprefix : prefix);
263 	if (err)
264 		goto done;
265 
266 	/* Stamp work tree with format file. */
267 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
268 		err = got_error_from_errno();
269 		goto done;
270 	}
271 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
272 	if (err)
273 		goto done;
274 
275 done:
276 	free(commit_id);
277 	free(path_got);
278 	free(formatstr);
279 	free(refstr);
280 	free(absprefix);
281 	free(basestr);
282 	return err;
283 }
284 
285 const struct got_error *
286 got_worktree_open(struct got_worktree **worktree, const char *path)
287 {
288 	const struct got_error *err = NULL;
289 	char *path_got;
290 	char *formatstr = NULL;
291 	char *path_lock = NULL;
292 	char *base_commit_id_str = NULL;
293 	char *head_ref_str = NULL;
294 	int version, fd = -1;
295 	const char *errstr;
296 	struct got_repository *repo = NULL;
297 
298 	*worktree = NULL;
299 
300 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
301 		err = got_error_from_errno();
302 		path_got = NULL;
303 		goto done;
304 	}
305 
306 	if (asprintf(&path_lock, "%s/%s", path_got, GOT_WORKTREE_LOCK) == -1) {
307 		err = got_error_from_errno();
308 		path_lock = NULL;
309 		goto done;
310 	}
311 
312 	fd = open(path_lock, O_RDWR | O_EXLOCK | O_NONBLOCK);
313 	if (fd == -1) {
314 		err = (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
315 		    : got_error_from_errno());
316 		goto done;
317 	}
318 
319 	err = read_meta_file(&formatstr, path_got, GOT_WORKTREE_FORMAT);
320 	if (err)
321 		goto done;
322 
323 	version = strtonum(formatstr, 1, INT_MAX, &errstr);
324 	if (errstr) {
325 		err = got_error(GOT_ERR_WORKTREE_META);
326 		goto done;
327 	}
328 	if (version != GOT_WORKTREE_FORMAT_VERSION) {
329 		err = got_error(GOT_ERR_WORKTREE_VERS);
330 		goto done;
331 	}
332 
333 	*worktree = calloc(1, sizeof(**worktree));
334 	if (*worktree == NULL) {
335 		err = got_error_from_errno();
336 		goto done;
337 	}
338 	(*worktree)->lockfd = -1;
339 
340 	(*worktree)->root_path = strdup(path);
341 	if ((*worktree)->root_path == NULL) {
342 		err = got_error_from_errno();
343 		goto done;
344 	}
345 	err = read_meta_file(&(*worktree)->repo_path, path_got,
346 	    GOT_WORKTREE_REPOSITORY);
347 	if (err)
348 		goto done;
349 
350 	err = read_meta_file(&(*worktree)->path_prefix, path_got,
351 	    GOT_WORKTREE_PATH_PREFIX);
352 	if (err)
353 		goto done;
354 
355 	err = read_meta_file(&base_commit_id_str, path_got,
356 	    GOT_WORKTREE_BASE_COMMIT);
357 	if (err)
358 		goto done;
359 
360 	err = got_repo_open(&repo, (*worktree)->repo_path);
361 	if (err)
362 		goto done;
363 
364 	err = got_object_resolve_id_str(&(*worktree)->base_commit_id, repo,
365 	    base_commit_id_str);
366 	if (err)
367 		goto done;
368 
369 	err = read_meta_file(&head_ref_str, path_got, GOT_WORKTREE_HEAD_REF);
370 	if (err)
371 		goto done;
372 
373 	err = got_ref_open(&(*worktree)->head_ref, repo, head_ref_str);
374 done:
375 	if (repo)
376 		got_repo_close(repo);
377 	free(path_got);
378 	free(path_lock);
379 	free(head_ref_str);
380 	free(base_commit_id_str);
381 	if (err) {
382 		if (fd != -1)
383 			close(fd);
384 		if (*worktree != NULL)
385 			got_worktree_close(*worktree);
386 		*worktree = NULL;
387 	} else
388 		(*worktree)->lockfd = fd;
389 
390 	return err;
391 }
392 
393 void
394 got_worktree_close(struct got_worktree *worktree)
395 {
396 	free(worktree->root_path);
397 	free(worktree->repo_path);
398 	free(worktree->path_prefix);
399 	free(worktree->base_commit_id);
400 	if (worktree->head_ref)
401 		got_ref_close(worktree->head_ref);
402 	if (worktree->lockfd != -1)
403 		close(worktree->lockfd);
404 	free(worktree);
405 }
406 
407 const char *
408 got_worktree_get_repo_path(struct got_worktree *worktree)
409 {
410 	return worktree->repo_path;
411 }
412 
413 const char *
414 got_worktree_get_path_prefix(struct got_worktree *worktree)
415 {
416 	return worktree->path_prefix;
417 }
418 
419 const struct got_error *
420 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
421     const char *path_prefix)
422 {
423 	char *absprefix = NULL;
424 
425 	if (!got_path_is_absolute(path_prefix)) {
426 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
427 			return got_error_from_errno();
428 	}
429 	*match = (strcmp(absprefix ? absprefix : path_prefix,
430 	    worktree->path_prefix) == 0);
431 	free(absprefix);
432 	return NULL;
433 }
434 
435 char *
436 got_worktree_get_head_ref_name(struct got_worktree *worktree)
437 {
438 	return got_ref_to_str(worktree->head_ref);
439 }
440 
441 struct got_reference *
442 got_worktree_get_head_ref(struct got_worktree *worktree)
443 {
444 	return got_ref_dup(worktree->head_ref);
445 }
446 
447 const struct got_object_id *
448 got_worktree_get_base_commit_id(struct got_worktree *worktree)
449 {
450 	return worktree->base_commit_id;
451 }
452 
453 const struct got_error *
454 got_worktree_set_base_commit_id(struct got_worktree *worktree,
455     struct got_repository *repo, struct got_object_id *commit_id)
456 {
457 	const struct got_error *err;
458 	struct got_object *obj = NULL;
459 	char *id_str = NULL;
460 	char *path_got = NULL;
461 
462 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
463 	    GOT_WORKTREE_GOT_DIR) == -1) {
464 		err = got_error_from_errno();
465 		path_got = NULL;
466 		goto done;
467 	}
468 
469 	err = got_object_open(&obj, repo, commit_id);
470 	if (err)
471 		return err;
472 
473 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
474 		err = got_error(GOT_ERR_OBJ_TYPE);
475 		goto done;
476 	}
477 
478 	/* Record our base commit. */
479 	err = got_object_id_str(&id_str, commit_id);
480 	if (err)
481 		goto done;
482 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
483 	if (err)
484 		goto done;
485 
486 	free(worktree->base_commit_id);
487 	worktree->base_commit_id = got_object_id_dup(commit_id);
488 	if (worktree->base_commit_id == NULL) {
489 		err = got_error_from_errno();
490 		goto done;
491 	}
492 done:
493 	if (obj)
494 		got_object_close(obj);
495 	free(id_str);
496 	free(path_got);
497 	return err;
498 }
499 
500 static const struct got_error *
501 lock_worktree(struct got_worktree *worktree, int operation)
502 {
503 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
504 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
505 		    : got_error_from_errno());
506 	return NULL;
507 }
508 
509 static const struct got_error *
510 make_parent_dirs(const char *abspath)
511 {
512 	const struct got_error *err = NULL;
513 
514 	char *parent = dirname(abspath);
515 	if (parent == NULL)
516 		return NULL;
517 
518 	if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1) {
519 		if (errno == ENOENT) {
520 			err = make_parent_dirs(parent);
521 			if (err)
522 				return err;
523 			if (mkdir(parent, GOT_DEFAULT_DIR_MODE) == -1)
524 				return got_error_from_errno();
525 		} else
526 			err = got_error_from_errno();
527 	}
528 
529 	return err;
530 }
531 
532 static const struct got_error *
533 add_dir_on_disk(struct got_worktree *worktree, const char *path)
534 {
535 	const struct got_error *err = NULL;
536 	char *abspath;
537 
538 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
539 		return got_error_from_errno();
540 
541 	/* XXX queue work rather than editing disk directly? */
542 	if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1) {
543 		struct stat sb;
544 
545 		if (errno == EEXIST) {
546 			if (lstat(abspath, &sb) == -1) {
547 				err = got_error_from_errno();
548 				goto done;
549 			}
550 
551 			if (!S_ISDIR(sb.st_mode)) {
552 				/* TODO directory is obstructed; do something */
553 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
554 				goto done;
555 			}
556 
557 			return NULL;
558 		} else if (errno == ENOENT) {
559 			err = make_parent_dirs(abspath);
560 			if (err)
561 				goto done;
562 			if (mkdir(abspath, GOT_DEFAULT_DIR_MODE) == -1)
563 				err = got_error_from_errno();
564 		} else
565 			err = got_error_from_errno();
566 	}
567 
568 done:
569 	free(abspath);
570 	return err;
571 }
572 
573 static const struct got_error *
574 install_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
575    struct got_fileindex_entry *entry, const char *path,
576    struct got_blob_object *blob,
577    struct got_repository *repo, got_worktree_checkout_cb progress_cb,
578    void *progress_arg)
579 {
580 	const struct got_error *err = NULL;
581 	char *ondisk_path;
582 	int fd = -1;
583 	size_t len, hdrlen;
584 	int update = 0;
585 	char *tmppath = NULL;
586 
587 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
588 		return got_error_from_errno();
589 
590 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
591 	    GOT_DEFAULT_FILE_MODE);
592 	if (fd == -1) {
593 		if (errno == ENOENT) {
594 			char *parent = dirname(path);
595 			if (parent == NULL)
596 				return got_error_from_errno();
597 			err = add_dir_on_disk(worktree, parent);
598 			if (err)
599 				return err;
600 			fd = open(ondisk_path,
601 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW,
602 			    GOT_DEFAULT_FILE_MODE);
603 			if (fd == -1)
604 				return got_error_from_errno();
605 		} else if (errno == EEXIST) {
606 			struct stat sb;
607 			if (lstat(ondisk_path, &sb) == -1) {
608 				err = got_error_from_errno();
609 				goto done;
610 			} else if (!S_ISREG(sb.st_mode)) {
611 				/* TODO file is obstructed; do something */
612 				err = got_error(GOT_ERR_FILE_OBSTRUCTED);
613 				goto done;
614 			} else {
615 				err = got_opentemp_named_fd(&tmppath, &fd,
616 				    ondisk_path);
617 				if (err)
618 					goto done;
619 				update = 1;
620 			}
621 		} else
622 			return got_error_from_errno();
623 	}
624 
625 	(*progress_cb)(progress_arg,
626 	    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
627 
628 	hdrlen = got_object_blob_get_hdrlen(blob);
629 	do {
630 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
631 		err = got_object_blob_read_block(&len, blob);
632 		if (err)
633 			break;
634 		if (len > 0) {
635 			/* Skip blob object header first time around. */
636 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
637 			if (outlen == -1) {
638 				err = got_error_from_errno();
639 				goto done;
640 			} else if (outlen != len - hdrlen) {
641 				err = got_error(GOT_ERR_IO);
642 				goto done;
643 			}
644 			hdrlen = 0;
645 		}
646 	} while (len != 0);
647 
648 	fsync(fd);
649 
650 	if (update) {
651 		if (rename(tmppath, ondisk_path) != 0) {
652 			err = got_error_from_errno();
653 			goto done;
654 		}
655 	}
656 
657 	if (entry == NULL)
658 		entry = got_fileindex_entry_get(fileindex, path);
659 	if (entry)
660 		err = got_fileindex_entry_update(entry, ondisk_path,
661 		    blob->id.sha1, worktree->base_commit_id->sha1);
662 	else {
663 		err = got_fileindex_entry_alloc(&entry, ondisk_path,
664 		    path, blob->id.sha1, worktree->base_commit_id->sha1);
665 		if (err)
666 			goto done;
667 		err = got_fileindex_entry_add(fileindex, entry);
668 	}
669 	if (err)
670 		goto done;
671 done:
672 	if (fd != -1)
673 		close(fd);
674 	free(ondisk_path);
675 	free(tmppath);
676 	return err;
677 }
678 
679 static const struct got_error *
680 update_blob(struct got_worktree *worktree,
681     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
682     struct got_tree_entry *te, const char *path,
683     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
684     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
685 {
686 	const struct got_error *err = NULL;
687 	struct got_blob_object *blob = NULL;
688 
689 	if (ie) {
690 		if (memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
691 		    SHA1_DIGEST_LENGTH) == 0) {
692 			(*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
693 			    path);
694 			return NULL;
695 		}
696 		if (memcmp(ie->blob_sha1,
697 		    te->id->sha1, SHA1_DIGEST_LENGTH) == 0)
698 			return NULL;
699 	}
700 
701 	err = got_object_open_as_blob(&blob, repo, te->id, 8192);
702 	if (err)
703 		return err;
704 
705 	err = install_blob(worktree, fileindex, ie, path, blob, repo,
706 	    progress_cb, progress_arg);
707 	got_object_blob_close(blob);
708 	return err;
709 }
710 
711 static const struct got_error *
712 remove_ondisk_file(const char *root_path, const char *path)
713 {
714 	const struct got_error *err = NULL;
715 	char *ondisk_path = NULL;
716 
717 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
718 		return got_error_from_errno();
719 
720 	if (unlink(ondisk_path) == -1) {
721 		if (errno != ENOENT)
722 			err = got_error_from_errno();
723 	} else {
724 		char *parent = dirname(ondisk_path);
725 		while (parent && strcmp(parent, root_path) != 0) {
726 			if (rmdir(parent) == -1) {
727 				if (errno != ENOTEMPTY)
728 					err = got_error_from_errno();
729 				break;
730 			}
731 			parent = dirname(parent);
732 		}
733 	}
734 	free(ondisk_path);
735 	return err;
736 }
737 
738 struct diff_cb_arg {
739     struct got_fileindex *fileindex;
740     struct got_worktree *worktree;
741     struct got_repository *repo;
742     got_worktree_checkout_cb progress_cb;
743     void *progress_arg;
744     got_worktree_cancel_cb cancel_cb;
745     void *cancel_arg;
746 };
747 
748 static const struct got_error *
749 diff_old_new(void *arg, struct got_fileindex_entry *ie,
750     struct got_tree_entry *te, const char *parent_path)
751 {
752 	struct diff_cb_arg *a = arg;
753 
754 	return update_blob(a->worktree, a->fileindex, ie, te,
755 	    ie->path, a->repo, a->progress_cb, a->progress_arg,
756 	    a->cancel_cb, a->cancel_arg);
757 }
758 
759 static const struct got_error *
760 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
761 {
762 	const struct got_error *err;
763 	struct diff_cb_arg *a = arg;
764 
765 	(*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE, ie->path);
766 
767 	err = remove_ondisk_file(a->worktree->root_path, ie->path);
768 	if (err)
769 		return err;
770 	got_fileindex_entry_remove(a->fileindex, ie);
771 	return NULL;
772 }
773 
774 static const struct got_error *
775 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
776 {
777 	struct diff_cb_arg *a = arg;
778 	const struct got_error *err;
779 	char *path;
780 
781 	if (asprintf(&path, "%s%s%s", parent_path,
782 	    parent_path[0] ? "/" : "", te->name)
783 	    == -1)
784 		return got_error_from_errno();
785 
786 	if (S_ISDIR(te->mode))
787 		err = add_dir_on_disk(a->worktree, path);
788 	else
789 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
790 		    a->repo, a->progress_cb, a->progress_arg,
791 		    a->cancel_cb, a->cancel_arg);
792 
793 	free(path);
794 	return err;
795 }
796 
797 const struct got_error *
798 got_worktree_checkout_files(struct got_worktree *worktree,
799     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
800     void *progress_arg, got_worktree_cancel_cb cancel_cb, void *cancel_arg)
801 {
802 	const struct got_error *err = NULL, *unlockerr, *checkout_err = NULL;
803 	struct got_commit_object *commit = NULL;
804 	struct got_object_id *tree_id = NULL;
805 	struct got_tree_object *tree = NULL;
806 	char *fileindex_path = NULL, *new_fileindex_path = NULL;
807 	struct got_fileindex *fileindex = NULL;
808 	FILE *index = NULL, *new_index = NULL;
809 	struct got_fileindex_diff_cb diff_cb;
810 	struct diff_cb_arg arg;
811 
812 	err = lock_worktree(worktree, LOCK_EX);
813 	if (err)
814 		return err;
815 
816 	fileindex = got_fileindex_alloc();
817 	if (fileindex == NULL) {
818 		err = got_error_from_errno();
819 		goto done;
820 	}
821 
822 	if (asprintf(&fileindex_path, "%s/%s/%s", worktree->root_path,
823 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
824 		err = got_error_from_errno();
825 		fileindex_path = NULL;
826 		goto done;
827 	}
828 
829 	/*
830 	 * Read the file index.
831 	 * Checking out files is supposed to be an idempotent operation.
832 	 * If the on-disk file index is incomplete we will try to complete it.
833 	 */
834 	index = fopen(fileindex_path, "rb");
835 	if (index == NULL) {
836 		if (errno != ENOENT) {
837 			err = got_error_from_errno();
838 			goto done;
839 		}
840 	} else {
841 		err = got_fileindex_read(fileindex, index);
842 		fclose(index);
843 		if (err)
844 			goto done;
845 	}
846 
847 	err = got_opentemp_named(&new_fileindex_path, &new_index,
848 	    fileindex_path);
849 	if (err)
850 		goto done;
851 
852 	err = got_object_open_as_commit(&commit, repo,
853 	   worktree->base_commit_id);
854 	if (err)
855 		goto done;
856 
857 	err = got_object_id_by_path(&tree_id, repo,
858 	    worktree->base_commit_id, worktree->path_prefix);
859 	if (err)
860 		goto done;
861 
862 	err = got_object_open_as_tree(&tree, repo, tree_id);
863 	if (err)
864 		goto done;
865 
866 	diff_cb.diff_old_new = diff_old_new;
867 	diff_cb.diff_old = diff_old;
868 	diff_cb.diff_new = diff_new;
869 	arg.fileindex = fileindex;
870 	arg.worktree = worktree;
871 	arg.repo = repo;
872 	arg.progress_cb = progress_cb;
873 	arg.progress_arg = progress_arg;
874 	arg.cancel_cb = cancel_cb;
875 	arg.cancel_arg = cancel_arg;
876 	checkout_err = got_fileindex_diff_tree(fileindex, tree, repo,
877 	    &diff_cb, &arg);
878 
879 	/* Try to sync the fileindex back to disk in any case. */
880 	err = got_fileindex_write(fileindex, new_index);
881 	if (err)
882 		goto done;
883 
884 	if (rename(new_fileindex_path, fileindex_path) != 0) {
885 		err = got_error_from_errno();
886 		goto done;
887 	}
888 
889 	free(new_fileindex_path);
890 	new_fileindex_path = NULL;
891 
892 done:
893 	if (tree)
894 		got_object_tree_close(tree);
895 	if (commit)
896 		got_object_commit_close(commit);
897 	if (new_fileindex_path)
898 		unlink(new_fileindex_path);
899 	if (new_index)
900 		fclose(new_index);
901 	free(new_fileindex_path);
902 	free(fileindex_path);
903 	got_fileindex_free(fileindex);
904 	if (checkout_err)
905 		err = checkout_err;
906 	unlockerr = lock_worktree(worktree, LOCK_SH);
907 	if (unlockerr && err == NULL)
908 		err = unlockerr;
909 	return err;
910 }