Game of Trees Repos

Blob

Date:: Thu Apr 25 14:57:52 2024 UTC
Message:: got patch: fix applying on empty files if we've reached EOF without finding a match is fine if and only if the target file is empty, so add this exception. reported by naddy, ok stsp
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 #include "got_compat.h"
23 
24 #include <sys/types.h>
25 #include <sys/queue.h>
26 #include <sys/socket.h>
27 #include <sys/stat.h>
28 #include <sys/uio.h>
29 
30 #include <ctype.h>
31 #include <errno.h>
32 #include <limits.h>
33 #include <stdint.h>
34 #include <stdio.h>
35 #include <stdlib.h>
36 #include <string.h>
37 #include <unistd.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_repository.h"
46 #include "got_opentemp.h"
47 #include "got_patch.h"
48 #include "got_diff.h"
49 
50 #include "got_lib_delta.h"
51 #include "got_lib_diff.h"
52 #include "got_lib_object.h"
53 #include "got_lib_privsep.h"
54 #include "got_lib_hash.h"
55 
56 #ifndef MIN
57 #define MIN(a, b) ((a) < (b) ? (a) : (b))
58 #endif
59 
60 struct got_patch_line {
61 	char	 mode;
62 	char	*line;
63 	size_t	 len;
64 };
65 
66 struct got_patch_hunk {
67 	STAILQ_ENTRY(got_patch_hunk) entries;
68 	const struct got_error *err;
69 	int	ws_mangled;
70 	int	offset;
71 	int	old_nonl;
72 	int	new_nonl;
73 	int	old_from;
74 	int	old_lines;
75 	int	new_from;
76 	int	new_lines;
77 	size_t	len;
78 	size_t	cap;
79 	struct got_patch_line *lines;
80 };
81 
82 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
83 struct got_patch {
84 	int	 xbit;
85 	char	*old;
86 	char	*new;
87 	char	 cid[41];
88 	char	 blob[41];
89 	struct got_patch_hunk_head head;
90 };
91 
92 struct patch_args {
93 	got_patch_progress_cb progress_cb;
94 	void	*progress_arg;
95 	struct got_patch_hunk_head *head;
96 };
97 
98 static mode_t
99 apply_umask(mode_t mode)
100 {
101 	mode_t um;
102 
103 	um = umask(000);
104 	umask(um);
105 	return mode & ~um;
106 }
107 
108 static const struct got_error *
109 send_patch(struct imsgbuf *ibuf, int fd)
110 {
111 	const struct got_error *err = NULL;
112 
113 	if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
114 	    NULL, 0) == -1) {
115 		err = got_error_from_errno(
116 		    "imsg_compose GOT_IMSG_PATCH_FILE");
117 		close(fd);
118 		return err;
119 	}
120 
121 	return got_privsep_flush_imsg(ibuf);
122 }
123 
124 static void
125 patch_free(struct got_patch *p)
126 {
127 	struct got_patch_hunk *h;
128 	size_t i;
129 
130 	while (!STAILQ_EMPTY(&p->head)) {
131 		h = STAILQ_FIRST(&p->head);
132 		STAILQ_REMOVE_HEAD(&p->head, entries);
133 
134 		for (i = 0; i < h->len; ++i)
135 			free(h->lines[i].line);
136 		free(h->lines);
137 		free(h);
138 	}
139 
140 	free(p->new);
141 	free(p->old);
142 
143 	memset(p, 0, sizeof(*p));
144 	STAILQ_INIT(&p->head);
145 }
146 
147 static const struct got_error *
148 pushline(struct got_patch_hunk *h, const char *line, size_t len)
149 {
150 	void 	*t;
151 	size_t	 newcap;
152 
153 	if (h->len == h->cap) {
154 		if ((newcap = h->cap * 1.5) == 0)
155 			newcap = 16;
156 		t = recallocarray(h->lines, h->cap, newcap,
157 		    sizeof(h->lines[0]));
158 		if (t == NULL)
159 			return got_error_from_errno("recallocarray");
160 		h->lines = t;
161 		h->cap = newcap;
162 	}
163 
164 	if ((t = malloc(len - 1)) == NULL)
165 		return got_error_from_errno("malloc");
166 	memcpy(t, line + 1, len - 1);	/* skip the line type */
167 
168 	h->lines[h->len].mode = *line;
169 	h->lines[h->len].line = t;
170 	h->lines[h->len].len = len - 2;	/* line type and trailing NUL */
171 	h->len++;
172 	return NULL;
173 }
174 
175 static const struct got_error *
176 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
177 {
178 	const struct got_error *err = NULL;
179 	struct imsg imsg;
180 	struct got_imsg_patch_hunk hdr;
181 	struct got_imsg_patch patch;
182 	struct got_patch_hunk *h = NULL;
183 	size_t datalen;
184 	int lastmode = -1;
185 
186 	memset(p, 0, sizeof(*p));
187 	STAILQ_INIT(&p->head);
188 
189 	err = got_privsep_recv_imsg(&imsg, ibuf, 0);
190 	if (err)
191 		return err;
192 	if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
193 		*done = 1;
194 		goto done;
195 	}
196 	if (imsg.hdr.type != GOT_IMSG_PATCH) {
197 		err = got_error(GOT_ERR_PRIVSEP_MSG);
198 		goto done;
199 	}
200 	datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
201 	if (datalen != sizeof(patch)) {
202 		err = got_error(GOT_ERR_PRIVSEP_LEN);
203 		goto done;
204 	}
205 	memcpy(&patch, imsg.data, sizeof(patch));
206 
207 	if (patch.old[sizeof(patch.old)-1] != '\0' ||
208 	    patch.new[sizeof(patch.new)-1] != '\0' ||
209 	    patch.cid[sizeof(patch.cid)-1] != '\0' ||
210 	    patch.blob[sizeof(patch.blob)-1] != '\0') {
211 		err = got_error(GOT_ERR_PRIVSEP_LEN);
212 		goto done;
213 	}
214 
215 	if (*patch.cid != '\0')
216 		strlcpy(p->cid, patch.cid, sizeof(p->cid));
217 
218 	if (*patch.blob != '\0')
219 		strlcpy(p->blob, patch.blob, sizeof(p->blob));
220 
221 	p->xbit = patch.xbit;
222 
223 	/* automatically set strip=1 for git-style diffs */
224 	if (strip == -1 && patch.git &&
225 	    (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
226 	    (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
227 		strip = 1;
228 
229 	/* prefer the new name if not /dev/null for not git-style diffs */
230 	if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
231 		err = got_path_strip(&p->old, patch.new, strip);
232 		if (err)
233 			goto done;
234 	} else if (*patch.old != '\0') {
235 		err = got_path_strip(&p->old, patch.old, strip);
236 		if (err)
237 			goto done;
238 	}
239 
240 	if (*patch.new != '\0') {
241 		err = got_path_strip(&p->new, patch.new, strip);
242 		if (err)
243 			goto done;
244 	}
245 
246 	if (p->old == NULL && p->new == NULL) {
247 		err = got_error(GOT_ERR_PATCH_MALFORMED);
248 		goto done;
249 	}
250 
251 	imsg_free(&imsg);
252 
253 	for (;;) {
254 		char *t;
255 
256 		err = got_privsep_recv_imsg(&imsg, ibuf, 0);
257 		if (err) {
258 			patch_free(p);
259 			return err;
260 		}
261 
262 		datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
263 		switch (imsg.hdr.type) {
264 		case GOT_IMSG_PATCH_DONE:
265 			if (h != NULL && h->len == 0)
266 				err = got_error(GOT_ERR_PATCH_MALFORMED);
267 			goto done;
268 		case GOT_IMSG_PATCH_HUNK:
269 			if (h != NULL &&
270 			    (h->len == 0 || h->old_nonl || h->new_nonl)) {
271 				err = got_error(GOT_ERR_PATCH_MALFORMED);
272 				goto done;
273 			}
274 			lastmode = -1;
275 			if (datalen != sizeof(hdr)) {
276 				err = got_error(GOT_ERR_PRIVSEP_LEN);
277 				goto done;
278 			}
279 			memcpy(&hdr, imsg.data, sizeof(hdr));
280 			if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
281 				err = got_error(GOT_ERR_PRIVSEP_LEN);
282 				goto done;
283 			}
284 			if ((h = calloc(1, sizeof(*h))) == NULL) {
285 				err = got_error_from_errno("calloc");
286 				goto done;
287 			}
288 			h->old_from = hdr.oldfrom;
289 			h->old_lines = hdr.oldlines;
290 			h->new_from = hdr.newfrom;
291 			h->new_lines = hdr.newlines;
292 			STAILQ_INSERT_TAIL(&p->head, h, entries);
293 			break;
294 		case GOT_IMSG_PATCH_LINE:
295 			if (h == NULL) {
296 				err = got_error(GOT_ERR_PRIVSEP_MSG);
297 				goto done;
298 			}
299 			t = imsg.data;
300 			/* at least one char */
301 			if (datalen < 2 || t[datalen-1] != '\0') {
302 				err = got_error(GOT_ERR_PRIVSEP_MSG);
303 				goto done;
304 			}
305 			if (*t != ' ' && *t != '-' && *t != '+' &&
306 			    *t != '\\') {
307 				err = got_error(GOT_ERR_PRIVSEP_MSG);
308 				goto done;
309 			}
310 
311 			if (*t != '\\')
312 				err = pushline(h, t, datalen);
313 			else if (lastmode == '-')
314 				h->old_nonl = 1;
315 			else if (lastmode == '+')
316 				h->new_nonl = 1;
317 			else
318 				err = got_error(GOT_ERR_PATCH_MALFORMED);
319 
320 			if (err)
321 				goto done;
322 
323 			lastmode = *t;
324 			break;
325 		default:
326 			err = got_error(GOT_ERR_PRIVSEP_MSG);
327 			goto done;
328 		}
329 
330 		imsg_free(&imsg);
331 	}
332 
333 done:
334 	if (err)
335 		patch_free(p);
336 
337 	imsg_free(&imsg);
338 	return err;
339 }
340 
341 static void
342 reverse_patch(struct got_patch *p)
343 {
344 	struct got_patch_hunk *h;
345 	size_t i;
346 	int tmp;
347 
348 	STAILQ_FOREACH(h, &p->head, entries) {
349 		tmp = h->old_from;
350 		h->old_from = h->new_from;
351 		h->new_from = tmp;
352 
353 		tmp = h->old_lines;
354 		h->old_lines = h->new_lines;
355 		h->new_lines = tmp;
356 
357 		tmp = h->old_nonl;
358 		h->old_nonl = h->new_nonl;
359 		h->new_nonl = tmp;
360 
361 		for (i = 0; i < h->len; ++i) {
362 			if (h->lines[i].mode == '+')
363 				h->lines[i].mode = '-';
364 			else if (h->lines[i].mode == '-')
365 				h->lines[i].mode = '+';
366 		}
367 	}
368 }
369 
370 /*
371  * Copy data from orig starting at copypos until pos into tmp.
372  * If pos is -1, copy until EOF.
373  */
374 static const struct got_error *
375 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
376 {
377 	char buf[BUFSIZ];
378 	size_t len, r, w;
379 
380 	if (fseeko(orig, copypos, SEEK_SET) == -1)
381 		return got_error_from_errno("fseeko");
382 
383 	while (pos == -1 || copypos < pos) {
384 		len = sizeof(buf);
385 		if (pos > 0)
386 			len = MIN(len, (size_t)pos - copypos);
387 		r = fread(buf, 1, len, orig);
388 		if (r != len && ferror(orig))
389 			return got_error_from_errno("fread");
390 		w = fwrite(buf, 1, r, tmp);
391 		if (w != r)
392 			return got_error_from_errno("fwrite");
393 		copypos += len;
394 		if (r != len && feof(orig)) {
395 			if (pos == -1)
396 				return NULL;
397 			return got_error(GOT_ERR_HUNK_FAILED);
398 		}
399 	}
400 	return NULL;
401 }
402 
403 static int lines_eq(struct got_patch_line *, const char *, size_t, int *);
404 
405 static const struct got_error *
406 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
407 {
408 	const struct got_error *err = NULL;
409 	struct got_patch_line *l = &h->lines[0];
410 	char *line = NULL;
411 	char mode = l->mode;
412 	size_t linesize = 0;
413 	ssize_t linelen;
414 	off_t match = -1;
415 	int mangled = 0, match_lineno = -1;
416 
417 	for (;;) {
418 		(*lineno)++;
419 		linelen = getline(&line, &linesize, orig);
420 		if (linelen == -1) {
421 			if (ferror(orig))
422 				err = got_error_from_errno("getline");
423 			/* An EOF is fine iff the target file is empty. */
424 			if (feof(orig) && match == -1 && h->old_lines != 0)
425 				err = got_error(GOT_ERR_HUNK_FAILED);
426 			match = 0;
427 			match_lineno = (*lineno)-1;
428 			break;
429 		}
430 
431 		if ((mode == ' ' && lines_eq(l, line, linelen, &mangled)) ||
432 		    (mode == '-' && lines_eq(l, line, linelen, &mangled)) ||
433 		    (mode == '+' && *lineno == h->old_from)) {
434 			match = ftello(orig);
435 			if (match == -1) {
436 				err = got_error_from_errno("ftello");
437 				break;
438 			}
439 			match -= linelen;
440 			match_lineno = (*lineno)-1;
441 		}
442 
443 		if (*lineno >= h->old_from && match != -1) {
444 			if (mangled)
445 				h->ws_mangled = 1;
446 			break;
447 		}
448 	}
449 
450 	if (err == NULL) {
451 		*pos = match;
452 		*lineno = match_lineno;
453 		if (fseeko(orig, match, SEEK_SET) == -1)
454 			err = got_error_from_errno("fseeko");
455 	}
456 
457 	free(line);
458 	return err;
459 }
460 
461 static int
462 lines_eq(struct got_patch_line *l, const char *b, size_t len, int *mangled)
463 {
464 	char *a = l->line;
465 	size_t i, j;
466 
467 	if (len > 00 && b[len - 1] == '\n')
468 		len--;
469 
470 	*mangled = 0;
471 	if (l->len == len && !memcmp(a, b, len))
472 		return 1;
473 
474 	*mangled = 1;
475 
476 	i = j = 0;
477 	for (;;) {
478 		while (i < l->len &&
479 		    (a[i] == '\t' || a[i] == ' ' || a[i] == '\f'))
480 			i++;
481 		while (j < len &&
482 		    (b[j] == '\t' || b[j] == ' ' || b[j] == '\f'))
483 			j++;
484 		if (i == l->len || j == len || a[i] != b[j])
485 			break;
486 		i++, j++;
487 	}
488 
489 	return (i == l->len && j == len);
490 }
491 
492 static const struct got_error *
493 test_hunk(FILE *orig, struct got_patch_hunk *h)
494 {
495 	const struct got_error *err = NULL;
496 	char *line = NULL;
497 	size_t linesize = 0, i = 0;
498 	ssize_t linelen;
499 	int mangled;
500 
501 	for (i = 0; i < h->len; ++i) {
502 		switch (h->lines[i].mode) {
503 		case '+':
504 			continue;
505 		case ' ':
506 		case '-':
507 			linelen = getline(&line, &linesize, orig);
508 			if (linelen == -1) {
509 				if (ferror(orig))
510 					err = got_error_from_errno("getline");
511 				else
512 					err = got_error(
513 					    GOT_ERR_HUNK_FAILED);
514 				goto done;
515 			}
516 			if (!lines_eq(&h->lines[i], line, linelen, &mangled)) {
517 				err = got_error(GOT_ERR_HUNK_FAILED);
518 				goto done;
519 			}
520 			if (mangled)
521 				h->ws_mangled = 1;
522 			break;
523 		}
524 	}
525 
526 done:
527 	free(line);
528 	return err;
529 }
530 
531 static const struct got_error *
532 apply_hunk(FILE *orig, FILE *tmp, struct got_patch_hunk *h, int *lineno,
533     off_t from)
534 {
535 	const struct got_error *err = NULL;
536 	const char *t;
537 	size_t linesize = 0, i, new = 0;
538 	char *line = NULL;
539 	char mode;
540 	size_t l;
541 	ssize_t linelen;
542 
543 	if (orig != NULL && fseeko(orig, from, SEEK_SET) == -1)
544 		return got_error_from_errno("fseeko");
545 
546 	for (i = 0; i < h->len; ++i) {
547 		switch (mode = h->lines[i].mode) {
548 		case '-':
549 		case ' ':
550 			(*lineno)++;
551 			if (orig != NULL) {
552 				linelen = getline(&line, &linesize, orig);
553 				if (linelen == -1) {
554 					err = got_error_from_errno("getline");
555 					goto done;
556 				}
557 				if (line[linelen - 1] == '\n')
558 					line[linelen - 1] = '\0';
559 				t = line;
560 				l = linelen - 1;
561 			} else {
562 				t = h->lines[i].line;
563 				l = h->lines[i].len;
564 			}
565 			if (mode == '-')
566 				continue;
567 			if (fwrite(t, 1, l, tmp) != l ||
568 			    fputc('\n', tmp) == EOF) {
569 				err = got_error_from_errno("fprintf");
570 				goto done;
571 			}
572 			break;
573 		case '+':
574 			new++;
575 			t = h->lines[i].line;
576 			l = h->lines[i].len;
577 			if (fwrite(t, 1, l, tmp) != l) {
578 				err = got_error_from_errno("fprintf");
579 				goto done;
580 			}
581 			if (new != h->new_lines || !h->new_nonl) {
582 				if (fprintf(tmp, "\n") < 0) {
583 					err = got_error_from_errno("fprintf");
584 					goto done;
585 				}
586 			}
587 			break;
588 		}
589 	}
590 
591 done:
592 	free(line);
593 	return err;
594 }
595 
596 static const struct got_error *
597 patch_file(struct got_patch *p, FILE *orig, FILE *tmp)
598 {
599 	const struct got_error *err = NULL;
600 	struct got_patch_hunk *h;
601 	struct stat sb;
602 	int lineno = 0;
603 	off_t copypos, pos;
604 	char *line = NULL;
605 	size_t linesize = 0;
606 	ssize_t linelen;
607 
608 	if (p->old == NULL) {				/* create */
609 		h = STAILQ_FIRST(&p->head);
610 		if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
611 			return got_error(GOT_ERR_PATCH_MALFORMED);
612 		return apply_hunk(orig, tmp, h, &lineno, 0);
613 	}
614 
615 	/* When deleting binary files there are no hunks to apply. */
616 	if (p->new == NULL && STAILQ_EMPTY(&p->head))
617 		return NULL;
618 
619 	if (fstat(fileno(orig), &sb) == -1)
620 		return got_error_from_errno("fstat");
621 
622 	copypos = 0;
623 	STAILQ_FOREACH(h, &p->head, entries) {
624 	tryagain:
625 		err = locate_hunk(orig, h, &pos, &lineno);
626 		if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
627 			h->err = err;
628 		if (err != NULL)
629 			return err;
630 		err = copy(tmp, orig, copypos, pos);
631 		if (err != NULL)
632 			return err;
633 		copypos = pos;
634 
635 		err = test_hunk(orig, h);
636 		if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
637 			/*
638 			 * try to apply the hunk again starting the search
639 			 * after the previous partial match.
640 			 */
641 			if (fseeko(orig, pos, SEEK_SET) == -1)
642 				return got_error_from_errno("fseeko");
643 			linelen = getline(&line, &linesize, orig);
644 			if (linelen == -1)
645 				return got_error_from_errno("getline");
646 			lineno++;
647 			goto tryagain;
648 		}
649 		if (err != NULL)
650 			return err;
651 
652 		if (lineno + 1 != h->old_from)
653 			h->offset = lineno + 1 - h->old_from;
654 
655 		err = apply_hunk(orig, tmp, h, &lineno, pos);
656 		if (err != NULL)
657 			return err;
658 
659 		copypos = ftello(orig);
660 		if (copypos == -1)
661 			return got_error_from_errno("ftello");
662 	}
663 
664 	if (p->new == NULL && sb.st_size != copypos) {
665 		h = STAILQ_FIRST(&p->head);
666 		h->err = got_error(GOT_ERR_HUNK_FAILED);
667 		err = h->err;
668 	} else if (!feof(orig))
669 		err = copy(tmp, orig, copypos, -1);
670 
671 	return err;
672 }
673 
674 static const struct got_error *
675 report_progress(struct patch_args *pa, const char *old, const char *new,
676     unsigned char status, const struct got_error *orig_error)
677 {
678 	const struct got_error *err;
679 	struct got_patch_hunk *h;
680 
681 	err = pa->progress_cb(pa->progress_arg, old, new, status,
682 	    orig_error, 0, 0, 0, 0, 0, 0, NULL);
683 	if (err)
684 		return err;
685 
686 	STAILQ_FOREACH(h, pa->head, entries) {
687 		if (h->offset == 0 && !h->ws_mangled && h->err == NULL)
688 			continue;
689 
690 		err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
691 		    h->old_from, h->old_lines, h->new_from, h->new_lines,
692 		    h->offset, h->ws_mangled, h->err);
693 		if (err)
694 			return err;
695 	}
696 
697 	return NULL;
698 }
699 
700 static const struct got_error *
701 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
702     const char *path)
703 {
704 	return report_progress(arg, path, NULL, status, NULL);
705 }
706 
707 static const struct got_error *
708 patch_add(void *arg, unsigned char status, const char *path)
709 {
710 	return report_progress(arg, NULL, path, status, NULL);
711 }
712 
713 static const struct got_error *
714 open_blob(char **path, FILE **fp, const char *blobid,
715     struct got_repository *repo)
716 {
717 	const struct got_error *err = NULL;
718 	struct got_blob_object *blob = NULL;
719 	struct got_object_id id, *idptr, *matched_id = NULL;
720 	int fd = -1;
721 
722 	*fp = NULL;
723 	*path = NULL;
724 
725 	if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
726 		err = got_repo_match_object_id(&matched_id, NULL, blobid,
727 		    GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
728 		    repo);
729 		if (err)
730 			return err;
731 		idptr = matched_id;
732 	} else {
733 		if (!got_parse_object_id(&id, blobid, GOT_HASH_SHA1))
734 			return got_error(GOT_ERR_BAD_OBJ_ID_STR);
735 		idptr = &id;
736 	}
737 
738 	fd = got_opentempfd();
739 	if (fd == -1) {
740 		err = got_error_from_errno("got_opentempfd");
741 		goto done;
742 	}
743 
744 	err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
745 	if (err)
746 		goto done;
747 
748 	err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob",
749 	    "");
750 	if (err)
751 		goto done;
752 
753 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
754 	if (err)
755 		goto done;
756 
757 done:
758 	if (fd != -1 && close(fd) == -1 && err == NULL)
759 		err = got_error_from_errno("close");
760 	if (blob)
761 		got_object_blob_close(blob);
762 	if (matched_id != NULL)
763 		free(matched_id);
764 	if (err) {
765 		if (*fp != NULL)
766 			fclose(*fp);
767 		if (*path != NULL)
768 			unlink(*path);
769 		free(*path);
770 		*fp = NULL;
771 		*path = NULL;
772 	}
773 	return err;
774 }
775 
776 static const struct got_error *
777 prepare_merge(int *do_merge, char **apath, FILE **afile,
778     struct got_worktree *worktree, struct got_repository *repo,
779     struct got_patch *p, struct got_object_id *commit_id,
780     struct got_tree_object *tree, const char *path)
781 {
782 	const struct got_error *err = NULL;
783 
784 	*do_merge = 0;
785 	*apath = NULL;
786 	*afile = NULL;
787 
788 	/* don't run the diff3 merge on creations/deletions */
789 	if (p->old == NULL || p->new == NULL)
790 		return NULL;
791 
792 	if (commit_id) {
793 		struct got_object_id *id;
794 
795 		err = got_object_tree_find_path(&id, NULL, repo, tree, path);
796 		if (err)
797 			return err;
798 		got_sha1_digest_to_str(id->sha1, p->blob, sizeof(p->blob));
799 		got_sha1_digest_to_str(commit_id->sha1, p->cid, sizeof(p->cid));
800 		free(id);
801 		err = open_blob(apath, afile, p->blob, repo);
802 		*do_merge = err == NULL;
803 	} else if (*p->blob != '\0') {
804 		err = open_blob(apath, afile, p->blob, repo);
805 		/*
806 		 * ignore failures to open this blob, we might have
807 		 * parsed gibberish.
808 		 */
809 		if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
810 		    err->code != GOT_ERR_NO_OBJ)
811 			return err;
812 		*do_merge = err == NULL;
813 		err = NULL;
814 	}
815 
816 	return err;
817 }
818 
819 static const struct got_error *
820 apply_patch(int *overlapcnt, struct got_worktree *worktree,
821     struct got_repository *repo, struct got_fileindex *fileindex,
822     const char *old, const char *new, struct got_patch *p, int nop,
823     int reverse, struct got_object_id *commit_id,
824     struct got_tree_object *tree, struct patch_args *pa,
825     got_cancel_cb cancel_cb, void *cancel_arg)
826 {
827 	const struct got_error *err = NULL;
828 	struct stat sb;
829 	int do_merge = 0, file_renamed = 0;
830 	char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
831 	char *oldpath = NULL, *newpath = NULL;
832 	char *tmppath = NULL, *template = NULL;
833 	char *apath = NULL, *mergepath = NULL;
834 	FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
835 	int outfd;
836 	mode_t mode = GOT_DEFAULT_FILE_MODE;
837 
838 	*overlapcnt = 0;
839 
840 	err = prepare_merge(&do_merge, &apath, &afile, worktree, repo, p,
841 	    commit_id, tree, old);
842 	if (err)
843 		return err;
844 
845 	if (reverse && !do_merge)
846 		reverse_patch(p);
847 
848 	if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
849 	    old) == -1) {
850 		err = got_error_from_errno("asprintf");
851 		goto done;
852 	}
853 
854 	if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
855 	    new) == -1) {
856 		err = got_error_from_errno("asprintf");
857 		goto done;
858 	}
859 
860 	file_renamed = strcmp(oldpath, newpath);
861 
862 	if (asprintf(&template, "%s/got-patch",
863 	    got_worktree_get_root_path(worktree)) == -1) {
864 		err = got_error_from_errno(template);
865 		goto done;
866 	}
867 
868 	if (p->old != NULL) {
869 		if ((oldfile = fopen(oldpath, "r")) == NULL) {
870 			err = got_error_from_errno2("open", oldpath);
871 			goto done;
872 		}
873 		if (fstat(fileno(oldfile), &sb) == -1) {
874 			err = got_error_from_errno2("fstat", oldpath);
875 			goto done;
876 		}
877 		mode = sb.st_mode;
878 	} else if (p->xbit)
879 		mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
880 
881 	err = got_opentemp_named(&tmppath, &tmpfile, template, "");
882 	if (err)
883 		goto done;
884 	outfd = fileno(tmpfile);
885 	err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile);
886 	if (err)
887 		goto done;
888 
889 	if (do_merge) {
890 		const char *type, *id;
891 
892 		if (fseeko(afile, 0, SEEK_SET) == -1 ||
893 		    fseeko(oldfile, 0, SEEK_SET) == -1 ||
894 		    fseeko(tmpfile, 0, SEEK_SET) == -1) {
895 			err = got_error_from_errno("fseeko");
896 			goto done;
897 		}
898 
899 		if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
900 			err = got_error_from_errno("asprintf");
901 			oldlabel = NULL;
902 			goto done;
903 		}
904 
905 		if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
906 			err = got_error_from_errno("asprintf");
907 			newlabel = NULL;
908 			goto done;
909 		}
910 
911 		if (*p->cid != '\0') {
912 			type = "commit";
913 			id = p->cid;
914 		} else {
915 			type = "blob";
916 			id = p->blob;
917 		}
918 
919 		if (asprintf(&anclabel, "%s %s", type, id) == -1) {
920 			err = got_error_from_errno("asprintf");
921 			anclabel = NULL;
922 			goto done;
923 		}
924 
925 		if (reverse) {
926 			char *s;
927 			FILE *t;
928 
929 			s = anclabel;
930 			anclabel = newlabel;
931 			newlabel = s;
932 
933 			t = afile;
934 			afile = tmpfile;
935 			tmpfile = t;
936 		}
937 
938 		err = got_opentemp_named(&mergepath, &mergefile, template, "");
939 		if (err)
940 			goto done;
941 		outfd = fileno(mergefile);
942 
943 		err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
944 		    oldfile, oldlabel, anclabel, newlabel,
945 		    GOT_DIFF_ALGORITHM_PATIENCE);
946 		if (err)
947 			goto done;
948 	}
949 
950 	if (nop)
951 		goto done;
952 
953 	if (p->old != NULL && p->new == NULL) {
954 		err = got_worktree_patch_schedule_rm(old, repo, worktree,
955 		    fileindex, patch_delete, pa);
956 		goto done;
957 	}
958 
959 	if (fchmod(outfd, apply_umask(mode)) == -1) {
960 		err = got_error_from_errno2("chmod", tmppath);
961 		goto done;
962 	}
963 
964 	if (mergepath) {
965 		err = got_path_move_file(mergepath, newpath);
966 		if (err)
967 			goto done;
968 		free(mergepath);
969 		mergepath = NULL;
970 	} else {
971 		err = got_path_move_file(tmppath, newpath);
972 		if (err)
973 			goto done;
974 		free(tmppath);
975 		tmppath = NULL;
976 	}
977 
978 	if (file_renamed) {
979 		err = got_worktree_patch_schedule_rm(old, repo, worktree,
980 		    fileindex, patch_delete, pa);
981 		if (err == NULL)
982 			err = got_worktree_patch_schedule_add(new, repo,
983 			    worktree, fileindex, patch_add,
984 			    pa);
985 		if (err)
986 			unlink(newpath);
987 	} else if (p->old == NULL) {
988 		err = got_worktree_patch_schedule_add(new, repo, worktree,
989 		    fileindex, patch_add, pa);
990 		if (err)
991 			unlink(newpath);
992 	} else if (*overlapcnt != 0)
993 		err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
994 	else if (do_merge)
995 		err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
996 	else
997 		err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
998 
999 done:
1000 	free(template);
1001 
1002 	if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1003 		err = got_error_from_errno("unlink");
1004 	if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
1005 		err = got_error_from_errno("fclose");
1006 	free(tmppath);
1007 
1008 	free(oldpath);
1009 	if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
1010 		err = got_error_from_errno("fclose");
1011 
1012 	if (apath != NULL && unlink(apath) == -1 && err == NULL)
1013 		err = got_error_from_errno("unlink");
1014 	if (afile != NULL && fclose(afile) == EOF && err == NULL)
1015 		err = got_error_from_errno("fclose");
1016 	free(apath);
1017 
1018 	if (mergepath != NULL && unlink(mergepath) == -1 && err == NULL)
1019 		err = got_error_from_errno("unlink");
1020 	if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
1021 		err = got_error_from_errno("fclose");
1022 	free(mergepath);
1023 
1024 	free(newpath);
1025 	free(oldlabel);
1026 	free(newlabel);
1027 	free(anclabel);
1028 	return err;
1029 }
1030 
1031 const struct got_error *
1032 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
1033     int nop, int strip, int reverse, struct got_object_id *commit_id,
1034     got_patch_progress_cb progress_cb, void *progress_arg,
1035     got_cancel_cb cancel_cb, void *cancel_arg)
1036 {
1037 	const struct got_error *err = NULL, *complete_err = NULL;
1038 	struct got_fileindex *fileindex = NULL;
1039 	struct got_commit_object *commit = NULL;
1040 	struct got_tree_object *tree = NULL;
1041 	char *fileindex_path = NULL;
1042 	char *oldpath, *newpath;
1043 	struct imsgbuf *ibuf;
1044 	int imsg_fds[2] = {-1, -1};
1045 	int overlapcnt, done = 0, failed = 0;
1046 	pid_t pid;
1047 
1048 	ibuf = calloc(1, sizeof(*ibuf));
1049 	if (ibuf == NULL) {
1050 		err = got_error_from_errno("calloc");
1051 		goto done;
1052 	}
1053 
1054 	if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
1055 		err = got_error_from_errno("socketpair");
1056 		goto done;
1057 	}
1058 
1059 	pid = fork();
1060 	if (pid == -1) {
1061 		err = got_error_from_errno("fork");
1062 		goto done;
1063 	} else if (pid == 0) {
1064 		got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
1065 		    NULL);
1066 		/* not reached */
1067 	}
1068 
1069 	if (close(imsg_fds[1]) == -1) {
1070 		err = got_error_from_errno("close");
1071 		goto done;
1072 	}
1073 	imsg_fds[1] = -1;
1074 	imsg_init(ibuf, imsg_fds[0]);
1075 
1076 	err = send_patch(ibuf, fd);
1077 	fd = -1;
1078 	if (err)
1079 		goto done;
1080 
1081 	err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
1082 	    worktree);
1083 	if (err)
1084 		goto done;
1085 
1086 	if (commit_id) {
1087 		err = got_object_open_as_commit(&commit, repo, commit_id);
1088 		if (err)
1089 			goto done;
1090 
1091 		err = got_object_open_as_tree(&tree, repo, commit->tree_id);
1092 		if (err)
1093 			goto done;
1094 	}
1095 
1096 	while (!done && err == NULL) {
1097 		struct got_patch p;
1098 		struct patch_args pa;
1099 
1100 		pa.progress_cb = progress_cb;
1101 		pa.progress_arg = progress_arg;
1102 		pa.head = &p.head;
1103 
1104 		err = recv_patch(ibuf, &done, &p, strip);
1105 		if (err || done)
1106 			break;
1107 
1108 		err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
1109 		    &newpath, worktree, repo, fileindex);
1110 		if (err == NULL)
1111 			err = apply_patch(&overlapcnt, worktree, repo,
1112 			    fileindex, oldpath, newpath, &p, nop, reverse,
1113 			    commit_id, tree, &pa, cancel_cb, cancel_arg);
1114 		if (err != NULL) {
1115 			failed = 1;
1116 			/* recoverable errors */
1117 			if (err->code == GOT_ERR_FILE_STATUS ||
1118 			    (err->code == GOT_ERR_ERRNO && errno == ENOENT))
1119 				err = report_progress(&pa, p.old, p.new,
1120 				    GOT_STATUS_CANNOT_UPDATE, err);
1121 			else if (err->code == GOT_ERR_HUNK_FAILED)
1122 				err = report_progress(&pa, p.old, p.new,
1123 				    GOT_STATUS_CANNOT_UPDATE, NULL);
1124 		}
1125 		if (overlapcnt != 0)
1126 			failed = 1;
1127 
1128 		free(oldpath);
1129 		free(newpath);
1130 		patch_free(&p);
1131 
1132 		if (err)
1133 			break;
1134 	}
1135 
1136 done:
1137 	if (fileindex != NULL)
1138 		complete_err = got_worktree_patch_complete(fileindex,
1139 		    fileindex_path);
1140 	if (complete_err && err == NULL)
1141 		err = complete_err;
1142 	free(fileindex_path);
1143 	if (tree)
1144 		got_object_tree_close(tree);
1145 	if (commit)
1146 		got_object_commit_close(commit);
1147 	if (fd != -1 && close(fd) == -1 && err == NULL)
1148 		err = got_error_from_errno("close");
1149 	if (ibuf != NULL)
1150 		imsg_clear(ibuf);
1151 	if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
1152 		err = got_error_from_errno("close");
1153 	if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
1154 		err = got_error_from_errno("close");
1155 	if (err == NULL && failed)
1156 		err = got_error(GOT_ERR_PATCH_FAILED);
1157 	return err;
1158 }