op public repos

Blob

Date:: Wed Jun 15 21:21:27 2022 UTC
Message:: style: remove double semicolon
Actions:: History | Blame | Raw File
1 /*
2  * Copyright (c) 2022 Omar Polo <op@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  * Apply patches.
17  *
18  * Things that we may want to support:
19  *     + support indented patches?
20  *     + support other kinds of patches?
21  */
22 
23 #include <sys/types.h>
24 #include <sys/queue.h>
25 #include <sys/socket.h>
26 #include <sys/stat.h>
27 #include <sys/uio.h>
28 
29 #include <errno.h>
30 #include <limits.h>
31 #include <sha1.h>
32 #include <stdint.h>
33 #include <stdio.h>
34 #include <stdlib.h>
35 #include <string.h>
36 #include <unistd.h>
37 #include <imsg.h>
38 
39 #include "got_error.h"
40 #include "got_object.h"
41 #include "got_path.h"
42 #include "got_reference.h"
43 #include "got_cancel.h"
44 #include "got_worktree.h"
45 #include "got_opentemp.h"
46 #include "got_patch.h"
47 
48 #include "got_lib_delta.h"
49 #include "got_lib_object.h"
50 #include "got_lib_privsep.h"
51 
52 #define MIN(a, b) ((a) < (b) ? (a) : (b))
53 
54 struct got_patch_hunk {
55 	STAILQ_ENTRY(got_patch_hunk) entries;
56 	const struct got_error *err;
57 	int	offset;
58 	int	old_nonl;
59 	int	new_nonl;
60 	int	old_from;
61 	int	old_lines;
62 	int	new_from;
63 	int	new_lines;
64 	size_t	len;
65 	size_t	cap;
66 	char	**lines;
67 };
68 
69 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
70 struct got_patch {
71 	char	*old;
72 	char	*new;
73 	struct got_patch_hunk_head head;
74 };
75 
76 struct patch_args {
77 	got_patch_progress_cb progress_cb;
78 	void	*progress_arg;
79 	struct got_patch_hunk_head *head;
80 };
81 
82 static const struct got_error *
83 send_patch(struct imsgbuf *ibuf, int fd)
84 {
85 	const struct got_error *err = NULL;
86 
87 	if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
88 	    NULL, 0) == -1) {
89 		err = got_error_from_errno(
90 		    "imsg_compose GOT_IMSG_PATCH_FILE");
91 		close(fd);
92 		return err;
93 	}
94 
95 	if (imsg_flush(ibuf) == -1) {
96 		err = got_error_from_errno("imsg_flush");
97 		imsg_clear(ibuf);
98 	}
99 
100 	return err;
101 }
102 
103 static void
104 patch_free(struct got_patch *p)
105 {
106 	struct got_patch_hunk *h;
107 	size_t i;
108 
109 	while (!STAILQ_EMPTY(&p->head)) {
110 		h = STAILQ_FIRST(&p->head);
111 		STAILQ_REMOVE_HEAD(&p->head, entries);
112 
113 		for (i = 0; i < h->len; ++i)
114 			free(h->lines[i]);
115 		free(h->lines);
116 		free(h);
117 	}
118 
119 	free(p->new);
120 	free(p->old);
121 
122 	memset(p, 0, sizeof(*p));
123 	STAILQ_INIT(&p->head);
124 }
125 
126 static const struct got_error *
127 pushline(struct got_patch_hunk *h, const char *line)
128 {
129 	void 	*t;
130 	size_t	 newcap;
131 
132 	if (h->len == h->cap) {
133 		if ((newcap = h->cap * 1.5) == 0)
134 			newcap = 16;
135 		t = recallocarray(h->lines, h->cap, newcap,
136 		    sizeof(h->lines[0]));
137 		if (t == NULL)
138 			return got_error_from_errno("recallocarray");
139 		h->lines = t;
140 		h->cap = newcap;
141 	}
142 
143 	if ((t = strdup(line)) == NULL)
144 		return got_error_from_errno("strdup");
145 
146 	h->lines[h->len++] = t;
147 	return NULL;
148 }
149 
150 static const struct got_error *
151 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
152 {
153 	const struct got_error *err = NULL;
154 	struct imsg imsg;
155 	struct got_imsg_patch_hunk hdr;
156 	struct got_imsg_patch patch;
157 	struct got_patch_hunk *h = NULL;
158 	size_t datalen;
159 	int lastmode = -1;
160 
161 	memset(p, 0, sizeof(*p));
162 	STAILQ_INIT(&p->head);
163 
164 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
165 	if (err)
166 		return err;
167 	if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
168 		*done = 1;
169 		goto done;
170 	}
171 	if (imsg.hdr.type != GOT_IMSG_PATCH) {
172 		err = got_error(GOT_ERR_PRIVSEP_MSG);
173 		goto done;
174 	}
175 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
176 	if (datalen != sizeof(patch)) {
177 		err = got_error(GOT_ERR_PRIVSEP_LEN);
178 		goto done;
179 	}
180 	memcpy(&patch, imsg.data, sizeof(patch));
181 
182 	if (patch.old[sizeof(patch.old)-1] != '\0' ||
183 	    patch.new[sizeof(patch.new)-1] != '\0') {
184 		err = got_error(GOT_ERR_PRIVSEP_LEN);
185 		goto done;
186 	}
187 
188 	/* automatically set strip=1 for git-style diffs */
189 	if (strip == -1 && patch.git &&
190 	    (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
191 	    (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
192 		strip = 1;
193 
194 	/* prefer the new name if not /dev/null for not git-style diffs */
195 	if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
196 		err = got_path_strip(&p->old, patch.new, strip);
197 		if (err)
198 			goto done;
199 	} else if (*patch.old != '\0') {
200 		err = got_path_strip(&p->old, patch.old, strip);
201 		if (err)
202 			goto done;
203 	}
204 
205 	if (*patch.new != '\0') {
206 		err = got_path_strip(&p->new, patch.new, strip);
207 		if (err)
208 			goto done;
209 	}
210 
211 	if (p->old == NULL && p->new == NULL) {
212 		err = got_error(GOT_ERR_PATCH_MALFORMED);
213 		goto done;
214 	}
215 
216 	imsg_free(&imsg);
217 
218 	for (;;) {
219 		char *t;
220 
221 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
222 		if (err) {
223 			patch_free(p);
224 			return err;
225 		}
226 
227 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
228 		switch (imsg.hdr.type) {
229 		case GOT_IMSG_PATCH_DONE:
230 			if (h != NULL && h->len == 0)
231 				err = got_error(GOT_ERR_PATCH_MALFORMED);
232 			goto done;
233 		case GOT_IMSG_PATCH_HUNK:
234 			if (h != NULL &&
235 			    (h->len == 0 || h->old_nonl || h->new_nonl)) {
236 				err = got_error(GOT_ERR_PATCH_MALFORMED);
237 				goto done;
238 			}
239 			lastmode = -1;
240 			if (datalen != sizeof(hdr)) {
241 				err = got_error(GOT_ERR_PRIVSEP_LEN);
242 				goto done;
243 			}
244 			memcpy(&hdr, imsg.data, sizeof(hdr));
245 			if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
246 				err = got_error(GOT_ERR_PRIVSEP_LEN);
247 				goto done;
248 			}
249 			if ((h = calloc(1, sizeof(*h))) == NULL) {
250 				err = got_error_from_errno("calloc");
251 				goto done;
252 			}
253 			h->old_from = hdr.oldfrom;
254 			h->old_lines = hdr.oldlines;
255 			h->new_from = hdr.newfrom;
256 			h->new_lines = hdr.newlines;
257 			STAILQ_INSERT_TAIL(&p->head, h, entries);
258 			break;
259 		case GOT_IMSG_PATCH_LINE:
260 			if (h == NULL) {
261 				err = got_error(GOT_ERR_PRIVSEP_MSG);
262 				goto done;
263 			}
264 			t = imsg.data;
265 			/* at least one char */
266 			if (datalen < 2 || t[datalen-1] != '\0') {
267 				err = got_error(GOT_ERR_PRIVSEP_MSG);
268 				goto done;
269 			}
270 			if (*t != ' ' && *t != '-' && *t != '+' &&
271 			    *t != '\\') {
272 				err = got_error(GOT_ERR_PRIVSEP_MSG);
273 				goto done;
274 			}
275 
276 			if (*t != '\\')
277 				err = pushline(h, t);
278 			else if (lastmode == '-')
279 				h->old_nonl = 1;
280 			else if (lastmode == '+')
281 				h->new_nonl = 1;
282 			else
283 				err = got_error(GOT_ERR_PATCH_MALFORMED);
284 
285 			if (err)
286 				goto done;
287 
288 			lastmode = *t;
289 			break;
290 		default:
291 			err = got_error(GOT_ERR_PRIVSEP_MSG);
292 			goto done;
293 		}
294 
295 		imsg_free(&imsg);
296 	}
297 
298 done:
299 	if (err)
300 		patch_free(p);
301 
302 	imsg_free(&imsg);
303 	return err;
304 }
305 
306 /*
307  * Copy data from orig starting at copypos until pos into tmp.
308  * If pos is -1, copy until EOF.
309  */
310 static const struct got_error *
311 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
312 {
313 	char buf[BUFSIZ];
314 	size_t len, r, w;
315 
316 	if (fseeko(orig, copypos, SEEK_SET) == -1)
317 		return got_error_from_errno("fseeko");
318 
319 	while (pos == -1 || copypos < pos) {
320 		len = sizeof(buf);
321 		if (pos > 0)
322 			len = MIN(len, (size_t)pos - copypos);
323 		r = fread(buf, 1, len, orig);
324 		if (r != len && ferror(orig))
325 			return got_error_from_errno("fread");
326 		w = fwrite(buf, 1, r, tmp);
327 		if (w != r)
328 			return got_error_from_errno("fwrite");
329 		copypos += len;
330 		if (r != len && feof(orig)) {
331 			if (pos == -1)
332 				return NULL;
333 			return got_error(GOT_ERR_HUNK_FAILED);
334 		}
335 	}
336 	return NULL;
337 }
338 
339 static const struct got_error *
340 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
341 {
342 	const struct got_error *err = NULL;
343 	char *line = NULL;
344 	char mode = *h->lines[0];
345 	size_t linesize = 0;
346 	ssize_t linelen;
347 	off_t match = -1;
348 	int match_lineno = -1;
349 
350 	for (;;) {
351 		linelen = getline(&line, &linesize, orig);
352 		if (linelen == -1) {
353 			if (ferror(orig))
354 				err = got_error_from_errno("getline");
355 			else if (match == -1)
356 				err = got_error(GOT_ERR_HUNK_FAILED);
357 			break;
358 		}
359 		if (line[linelen - 1] == '\n')
360 			line[linelen - 1] = '\0';
361 		(*lineno)++;
362 
363 		if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
364 		    (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
365 		    (mode == '+' && *lineno == h->old_from)) {
366 			match = ftello(orig);
367 			if (match == -1) {
368 				err = got_error_from_errno("ftello");
369 				break;
370 			}
371 			match -= linelen;
372 			match_lineno = (*lineno)-1;
373 		}
374 
375 		if (*lineno >= h->old_from && match != -1)
376 			break;
377 	}
378 
379 	if (err == NULL) {
380 		*pos = match;
381 		*lineno = match_lineno;
382 		if (fseeko(orig, match, SEEK_SET) == -1)
383 			err = got_error_from_errno("fseeko");
384 	}
385 
386 	free(line);
387 	return err;
388 }
389 
390 static const struct got_error *
391 test_hunk(FILE *orig, struct got_patch_hunk *h)
392 {
393 	const struct got_error *err = NULL;
394 	char *line = NULL;
395 	size_t linesize = 0, i = 0;
396 	ssize_t linelen;
397 
398 	for (i = 0; i < h->len; ++i) {
399 		switch (*h->lines[i]) {
400 		case '+':
401 			continue;
402 		case ' ':
403 		case '-':
404 			linelen = getline(&line, &linesize, orig);
405 			if (linelen == -1) {
406 				if (ferror(orig))
407 					err = got_error_from_errno("getline");
408 				else
409 					err = got_error(
410 					    GOT_ERR_HUNK_FAILED);
411 				goto done;
412 			}
413 			if (line[linelen - 1] == '\n')
414 				line[linelen - 1] = '\0';
415 			if (strcmp(h->lines[i] + 1, line)) {
416 				err = got_error(GOT_ERR_HUNK_FAILED);
417 				goto done;
418 			}
419 			break;
420 		}
421 	}
422 
423 done:
424 	free(line);
425 	return err;
426 }
427 
428 static const struct got_error *
429 apply_hunk(FILE *tmp, struct got_patch_hunk *h, int *lineno)
430 {
431 	size_t i, new = 0;
432 
433 	for (i = 0; i < h->len; ++i) {
434 		switch (*h->lines[i]) {
435 		case ' ':
436 			if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
437 				return got_error_from_errno("fprintf");
438 			/* fallthrough */
439 		case '-':
440 			(*lineno)++;
441 			break;
442 		case '+':
443 			new++;
444 			if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
445 				return got_error_from_errno("fprintf");
446 			if (new != h->new_lines || !h->new_nonl) {
447 				if (fprintf(tmp, "\n") < 0)
448 					return got_error_from_errno(
449 					    "fprintf");
450 			}
451 			break;
452 		}
453 	}
454 	return NULL;
455 }
456 
457 static const struct got_error *
458 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
459     mode_t *mode)
460 {
461 	const struct got_error *err = NULL;
462 	struct got_patch_hunk *h;
463 	struct stat sb;
464 	int lineno = 0;
465 	FILE *orig;
466 	off_t copypos, pos;
467 	char *line = NULL;
468 	size_t linesize = 0;
469 	ssize_t linelen;
470 
471 	if (p->old == NULL) {				/* create */
472 		h = STAILQ_FIRST(&p->head);
473 		if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
474 			return got_error(GOT_ERR_PATCH_MALFORMED);
475 		if (nop)
476 			return NULL;
477 		return apply_hunk(tmp, h, &lineno);
478 	}
479 
480 	if ((orig = fopen(path, "r")) == NULL) {
481 		err = got_error_from_errno2("fopen", path);
482 		goto done;
483 	}
484 
485 	if (fstat(fileno(orig), &sb) == -1) {
486 		err = got_error_from_errno("fstat");
487 		goto done;
488 	}
489 	*mode = sb.st_mode;
490 
491 	copypos = 0;
492 	STAILQ_FOREACH(h, &p->head, entries) {
493 	tryagain:
494 		err = locate_hunk(orig, h, &pos, &lineno);
495 		if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
496 			h->err = err;
497 		if (err != NULL)
498 			goto done;
499 		if (!nop)
500 			err = copy(tmp, orig, copypos, pos);
501 		if (err != NULL)
502 			goto done;
503 		copypos = pos;
504 
505 		err = test_hunk(orig, h);
506 		if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
507 			/*
508 			 * try to apply the hunk again starting the search
509 			 * after the previous partial match.
510 			 */
511 			if (fseeko(orig, pos, SEEK_SET) == -1) {
512 				err = got_error_from_errno("fseeko");
513 				goto done;
514 			}
515 			linelen = getline(&line, &linesize, orig);
516 			if (linelen == -1) {
517 				err = got_error_from_errno("getline");
518 				goto done;
519 			}
520 			lineno++;
521 			goto tryagain;
522 		}
523 		if (err != NULL)
524 			goto done;
525 
526 		if (lineno + 1 != h->old_from)
527 			h->offset = lineno + 1 - h->old_from;
528 
529 		if (!nop)
530 			err = apply_hunk(tmp, h, &lineno);
531 		if (err != NULL)
532 			goto done;
533 
534 		copypos = ftello(orig);
535 		if (copypos == -1) {
536 			err = got_error_from_errno("ftello");
537 			goto done;
538 		}
539 	}
540 
541 	if (p->new == NULL && sb.st_size != copypos) {
542 		h = STAILQ_FIRST(&p->head);
543 		h->err = got_error(GOT_ERR_HUNK_FAILED);
544 		err = h->err;
545 	} else if (!nop && !feof(orig))
546 		err = copy(tmp, orig, copypos, -1);
547 
548 done:
549 	if (orig != NULL && fclose(orig) == EOF && err == NULL)
550 		err = got_error_from_errno("fclose");
551 	return err;
552 }
553 
554 static const struct got_error *
555 report_progress(struct patch_args *pa, const char *old, const char *new,
556     unsigned char status, const struct got_error *orig_error)
557 {
558 	const struct got_error *err;
559 	struct got_patch_hunk *h;
560 
561 	err = pa->progress_cb(pa->progress_arg, old, new, status,
562 	    orig_error, 0, 0, 0, 0, 0, NULL);
563 	if (err)
564 		return err;
565 
566 	STAILQ_FOREACH(h, pa->head, entries) {
567 		if (h->offset == 0 && h->err == NULL)
568 			continue;
569 
570 		err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
571 		    h->old_from, h->old_lines, h->new_from, h->new_lines,
572 		    h->offset, h->err);
573 		if (err)
574 			return err;
575 	}
576 
577 	return NULL;
578 }
579 
580 static const struct got_error *
581 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
582     const char *path)
583 {
584 	return report_progress(arg, path, NULL, status, NULL);
585 }
586 
587 static const struct got_error *
588 patch_add(void *arg, unsigned char status, const char *path)
589 {
590 	return report_progress(arg, NULL, path, status, NULL);
591 }
592 
593 static const struct got_error *
594 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
595     struct got_fileindex *fileindex, const char *old, const char *new,
596     struct got_patch *p, int nop, struct patch_args *pa,
597     got_cancel_cb cancel_cb, void *cancel_arg)
598 {
599 	const struct got_error *err = NULL;
600 	int file_renamed = 0;
601 	char *oldpath = NULL, *newpath = NULL;
602 	char *tmppath = NULL, *template = NULL, *parent = NULL;
603 	FILE *tmp = NULL;
604 	mode_t mode = GOT_DEFAULT_FILE_MODE;
605 
606 	if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
607 	    old) == -1) {
608 		err = got_error_from_errno("asprintf");
609 		goto done;
610 	}
611 
612 	if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
613 	    new) == -1) {
614 		err = got_error_from_errno("asprintf");
615 		goto done;
616 	}
617 
618 	file_renamed = strcmp(oldpath, newpath);
619 
620 	if (asprintf(&template, "%s/got-patch",
621 	    got_worktree_get_root_path(worktree)) == -1) {
622 		err = got_error_from_errno(template);
623 		goto done;
624 	}
625 
626 	if (!nop)
627 		err = got_opentemp_named(&tmppath, &tmp, template);
628 	if (err)
629 		goto done;
630 	err = patch_file(p, oldpath, tmp, nop, &mode);
631 	if (err)
632 		goto done;
633 
634 	if (nop)
635 		goto done;
636 
637 	if (p->old != NULL && p->new == NULL) {
638 		err = got_worktree_patch_schedule_rm(old, repo, worktree,
639 		    fileindex, patch_delete, pa);
640 		goto done;
641 	}
642 
643 	if (fchmod(fileno(tmp), mode) == -1) {
644 		err = got_error_from_errno2("chmod", tmppath);
645 		goto done;
646 	}
647 
648 	if (rename(tmppath, newpath) == -1) {
649 		if (errno != ENOENT) {
650 			err = got_error_from_errno3("rename", tmppath,
651 			    newpath);
652 			goto done;
653 		}
654 
655 		err = got_path_dirname(&parent, newpath);
656 		if (err != NULL)
657 			goto done;
658 		err = got_path_mkdir(parent);
659 		if (err != NULL)
660 			goto done;
661 		if (rename(tmppath, newpath) == -1) {
662 			err = got_error_from_errno3("rename", tmppath,
663 			    newpath);
664 			goto done;
665 		}
666 	}
667 
668 	if (file_renamed) {
669 		err = got_worktree_patch_schedule_rm(old, repo, worktree,
670 		    fileindex, patch_delete, pa);
671 		if (err == NULL)
672 			err = got_worktree_patch_schedule_add(new, repo,
673 			    worktree, fileindex, patch_add,
674 			    pa);
675 		if (err)
676 			unlink(newpath);
677 	} else if (p->old == NULL) {
678 		err = got_worktree_patch_schedule_add(new, repo, worktree,
679 		    fileindex, patch_add, pa);
680 		if (err)
681 			unlink(newpath);
682 	} else
683 		err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
684 
685 done:
686 	free(parent);
687 	free(template);
688 	if (tmppath != NULL)
689 		unlink(tmppath);
690 	if (tmp != NULL && fclose(tmp) == EOF && err == NULL)
691 		err = got_error_from_errno("fclose");
692 	free(tmppath);
693 	free(oldpath);
694 	free(newpath);
695 	return err;
696 }
697 
698 static void
699 reverse_patch(struct got_patch *p)
700 {
701 	struct got_patch_hunk *h;
702 	size_t i;
703 	int tmp;
704 
705 	STAILQ_FOREACH(h, &p->head, entries) {
706 		tmp = h->old_from;
707 		h->old_from = h->new_from;
708 		h->new_from = tmp;
709 
710 		tmp = h->old_lines;
711 		h->old_lines = h->new_lines;
712 		h->new_lines = tmp;
713 
714 		tmp = h->old_nonl;
715 		h->old_nonl = h->new_nonl;
716 		h->new_nonl = tmp;
717 
718 		for (i = 0; i < h->len; ++i) {
719 			if (*h->lines[i] == '+')
720 				*h->lines[i] = '-';
721 			else if (*h->lines[i] == '-')
722 				*h->lines[i] = '+';
723 		}
724 	}
725 }
726 
727 const struct got_error *
728 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
729     int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
730     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
731 {
732 	const struct got_error *err = NULL, *complete_err = NULL;
733 	struct got_fileindex *fileindex = NULL;
734 	char *fileindex_path = NULL;
735 	char *oldpath, *newpath;
736 	struct imsgbuf *ibuf;
737 	int imsg_fds[2] = {-1, -1};
738 	int done = 0, failed = 0;
739 	pid_t pid;
740 
741 	ibuf = calloc(1, sizeof(*ibuf));
742 	if (ibuf == NULL) {
743 		err = got_error_from_errno("calloc");
744 		goto done;
745 	}
746 
747 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
748 		err = got_error_from_errno("socketpair");
749 		goto done;
750 	}
751 
752 	pid = fork();
753 	if (pid == -1) {
754 		err = got_error_from_errno("fork");
755 		goto done;
756 	} else if (pid == 0) {
757 		got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
758 		    NULL);
759 		/* not reached */
760 	}
761 
762 	if (close(imsg_fds[1]) == -1) {
763 		err = got_error_from_errno("close");
764 		goto done;
765 	}
766 	imsg_fds[1] = -1;
767 	imsg_init(ibuf, imsg_fds[0]);
768 
769 	err = send_patch(ibuf, fd);
770 	fd = -1;
771 	if (err)
772 		goto done;
773 
774 	err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
775 	    worktree);
776 	if (err)
777 		goto done;
778 
779 	while (!done && err == NULL) {
780 		struct got_patch p;
781 		struct patch_args pa;
782 
783 		pa.progress_cb = progress_cb;
784 		pa.progress_arg = progress_arg;
785 		pa.head = &p.head;
786 
787 		err = recv_patch(ibuf, &done, &p, strip);
788 		if (err || done)
789 			break;
790 
791 		if (reverse)
792 			reverse_patch(&p);
793 
794 		err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
795 		    &newpath, worktree, repo, fileindex);
796 		if (err == NULL)
797 			err = apply_patch(worktree, repo, fileindex, oldpath,
798 			    newpath, &p, nop, &pa, cancel_cb, cancel_arg);
799 		if (err != NULL) {
800 			failed = 1;
801 			/* recoverable errors */
802 			if (err->code == GOT_ERR_FILE_STATUS ||
803 			    (err->code == GOT_ERR_ERRNO && errno == ENOENT))
804 				err = report_progress(&pa, p.old, p.new,
805 				    GOT_STATUS_CANNOT_UPDATE, err);
806 			else if (err->code == GOT_ERR_HUNK_FAILED)
807 				err = report_progress(&pa, p.old, p.new,
808 				    GOT_STATUS_CANNOT_UPDATE, NULL);
809 		}
810 
811 		free(oldpath);
812 		free(newpath);
813 		patch_free(&p);
814 
815 		if (err)
816 			break;
817 	}
818 
819 done:
820 	if (fileindex != NULL)
821 		complete_err = got_worktree_patch_complete(fileindex,
822 		    fileindex_path);
823 	if (complete_err && err == NULL)
824 		err = complete_err;
825 	free(fileindex_path);
826 	if (fd != -1 && close(fd) == -1 && err == NULL)
827 		err = got_error_from_errno("close");
828 	if (ibuf != NULL)
829 		imsg_clear(ibuf);
830 	if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
831 		err = got_error_from_errno("close");
832 	if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
833 		err = got_error_from_errno("close");
834 	if (err == NULL && failed)
835 		err = got_error(GOT_ERR_PATCH_FAILED);
836 	return err;
837 }