2 * Copyright (c) 2022 Omar Polo <op@openbsd.org>
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.
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.
18 * Things that we may want to support:
19 * + support indented patches?
20 * + support other kinds of patches?
23 #include <sys/types.h>
24 #include <sys/socket.h>
36 #include "got_error.h"
37 #include "got_object.h"
39 #include "got_reference.h"
40 #include "got_cancel.h"
41 #include "got_worktree.h"
42 #include "got_opentemp.h"
43 #include "got_patch.h"
45 #include "got_lib_delta.h"
46 #include "got_lib_object.h"
47 #include "got_lib_privsep.h"
49 #define MIN(a, b) ((a) < (b) ? (a) : (b))
51 struct got_patch_hunk {
52 STAILQ_ENTRY(got_patch_hunk) entries;
53 const struct got_error *err;
66 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
70 struct got_patch_hunk_head head;
74 got_patch_progress_cb progress_cb;
76 struct got_patch_hunk_head *head;
79 static const struct got_error *
80 send_patch(struct imsgbuf *ibuf, int fd)
82 const struct got_error *err = NULL;
84 if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
86 err = got_error_from_errno(
87 "imsg_compose GOT_IMSG_PATCH_FILE");
92 if (imsg_flush(ibuf) == -1) {
93 err = got_error_from_errno("imsg_flush");
101 patch_free(struct got_patch *p)
103 struct got_patch_hunk *h;
106 while (!STAILQ_EMPTY(&p->head)) {
107 h = STAILQ_FIRST(&p->head);
108 STAILQ_REMOVE_HEAD(&p->head, entries);
110 for (i = 0; i < h->len; ++i)
119 memset(p, 0, sizeof(*p));
120 STAILQ_INIT(&p->head);
123 static const struct got_error *
124 pushline(struct got_patch_hunk *h, const char *line)
129 if (h->len == h->cap) {
130 if ((newcap = h->cap * 1.5) == 0)
132 t = recallocarray(h->lines, h->cap, newcap,
133 sizeof(h->lines[0]));
135 return got_error_from_errno("recallocarray");
140 if ((t = strdup(line)) == NULL)
141 return got_error_from_errno("strdup");
143 h->lines[h->len++] = t;
147 static const struct got_error *
148 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
150 const struct got_error *err = NULL;
152 struct got_imsg_patch_hunk hdr;
153 struct got_imsg_patch patch;
154 struct got_patch_hunk *h = NULL;
158 memset(p, 0, sizeof(*p));
159 STAILQ_INIT(&p->head);
161 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
164 if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
168 if (imsg.hdr.type != GOT_IMSG_PATCH) {
169 err = got_error(GOT_ERR_PRIVSEP_MSG);
172 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
173 if (datalen != sizeof(patch)) {
174 err = got_error(GOT_ERR_PRIVSEP_LEN);
177 memcpy(&patch, imsg.data, sizeof(patch));
179 if (patch.old[sizeof(patch.old)-1] != '\0' ||
180 patch.new[sizeof(patch.new)-1] != '\0') {
181 err = got_error(GOT_ERR_PRIVSEP_LEN);
185 /* automatically set strip=1 for git-style diffs */
186 if (strip == -1 && patch.git &&
187 (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
188 (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
191 /* prefer the new name if not /dev/null for not git-style diffs */
192 if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
193 err = got_path_strip(&p->old, patch.new, strip);
196 } else if (*patch.old != '\0') {
197 err = got_path_strip(&p->old, patch.old, strip);
202 if (*patch.new != '\0') {
203 err = got_path_strip(&p->new, patch.new, strip);
208 if (p->old == NULL && p->new == NULL) {
209 err = got_error(GOT_ERR_PATCH_MALFORMED);
218 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
224 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
225 switch (imsg.hdr.type) {
226 case GOT_IMSG_PATCH_DONE:
227 if (h != NULL && h->len == 0)
228 err = got_error(GOT_ERR_PATCH_MALFORMED);
230 case GOT_IMSG_PATCH_HUNK:
232 (h->len == 0 || h->old_nonl || h->new_nonl)) {
233 err = got_error(GOT_ERR_PATCH_MALFORMED);
237 if (datalen != sizeof(hdr)) {
238 err = got_error(GOT_ERR_PRIVSEP_LEN);
241 memcpy(&hdr, imsg.data, sizeof(hdr));
242 if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
243 err = got_error(GOT_ERR_PRIVSEP_LEN);
246 if ((h = calloc(1, sizeof(*h))) == NULL) {
247 err = got_error_from_errno("calloc");
250 h->old_from = hdr.oldfrom;
251 h->old_lines = hdr.oldlines;
252 h->new_from = hdr.newfrom;
253 h->new_lines = hdr.newlines;
254 STAILQ_INSERT_TAIL(&p->head, h, entries);
256 case GOT_IMSG_PATCH_LINE:
258 err = got_error(GOT_ERR_PRIVSEP_MSG);
262 /* at least one char */
263 if (datalen < 2 || t[datalen-1] != '\0') {
264 err = got_error(GOT_ERR_PRIVSEP_MSG);
267 if (*t != ' ' && *t != '-' && *t != '+' &&
269 err = got_error(GOT_ERR_PRIVSEP_MSG);
274 err = pushline(h, t);
275 else if (lastmode == '-')
277 else if (lastmode == '+')
280 err = got_error(GOT_ERR_PATCH_MALFORMED);
288 err = got_error(GOT_ERR_PRIVSEP_MSG);
304 * Copy data from orig starting at copypos until pos into tmp.
305 * If pos is -1, copy until EOF.
307 static const struct got_error *
308 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
313 if (fseeko(orig, copypos, SEEK_SET) == -1)
314 return got_error_from_errno("fseeko");
316 while (pos == -1 || copypos < pos) {
319 len = MIN(len, (size_t)pos - copypos);
320 r = fread(buf, 1, len, orig);
321 if (r != len && ferror(orig))
322 return got_error_from_errno("fread");
323 w = fwrite(buf, 1, r, tmp);
325 return got_error_from_errno("fwrite");
327 if (r != len && feof(orig)) {
330 return got_error(GOT_ERR_HUNK_FAILED);
336 static const struct got_error *
337 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
339 const struct got_error *err = NULL;
341 char mode = *h->lines[0];
345 int match_lineno = -1;
348 linelen = getline(&line, &linesize, orig);
351 err = got_error_from_errno("getline");
352 else if (match == -1)
353 err = got_error(GOT_ERR_HUNK_FAILED);
356 if (line[linelen - 1] == '\n')
357 line[linelen - 1] = '\0';
360 if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
361 (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
362 (mode == '+' && *lineno == h->old_from)) {
363 match = ftello(orig);
365 err = got_error_from_errno("ftello");
369 match_lineno = (*lineno)-1;
372 if (*lineno >= h->old_from && match != -1)
378 *lineno = match_lineno;
379 if (fseeko(orig, match, SEEK_SET) == -1)
380 err = got_error_from_errno("fseeko");
387 static const struct got_error *
388 test_hunk(FILE *orig, struct got_patch_hunk *h)
390 const struct got_error *err = NULL;
392 size_t linesize = 0, i = 0;
395 for (i = 0; i < h->len; ++i) {
396 switch (*h->lines[i]) {
401 linelen = getline(&line, &linesize, orig);
404 err = got_error_from_errno("getline");
407 GOT_ERR_HUNK_FAILED);
410 if (line[linelen - 1] == '\n')
411 line[linelen - 1] = '\0';
412 if (strcmp(h->lines[i] + 1, line)) {
413 err = got_error(GOT_ERR_HUNK_FAILED);
425 static const struct got_error *
426 apply_hunk(FILE *tmp, struct got_patch_hunk *h, int *lineno)
430 for (i = 0; i < h->len; ++i) {
431 switch (*h->lines[i]) {
433 if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
434 return got_error_from_errno("fprintf");
441 if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
442 return got_error_from_errno("fprintf");
443 if (new != h->new_lines || !h->new_nonl) {
444 if (fprintf(tmp, "\n") < 0)
445 return got_error_from_errno(
454 static const struct got_error *
455 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
458 const struct got_error *err = NULL;
459 struct got_patch_hunk *h;
468 if (p->old == NULL) { /* create */
469 h = STAILQ_FIRST(&p->head);
470 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
471 return got_error(GOT_ERR_PATCH_MALFORMED);
474 return apply_hunk(tmp, h, &lineno);
477 if ((orig = fopen(path, "r")) == NULL) {
478 err = got_error_from_errno2("fopen", path);
482 if (fstat(fileno(orig), &sb) == -1) {
483 err = got_error_from_errno("fstat");
489 STAILQ_FOREACH(h, &p->head, entries) {
491 err = locate_hunk(orig, h, &pos, &lineno);
492 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
497 err = copy(tmp, orig, copypos, pos);
502 err = test_hunk(orig, h);
503 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
505 * try to apply the hunk again starting the search
506 * after the previous partial match.
508 if (fseeko(orig, pos, SEEK_SET) == -1) {
509 err = got_error_from_errno("fseeko");
512 linelen = getline(&line, &linesize, orig);
514 err = got_error_from_errno("getline");
523 if (lineno + 1 != h->old_from)
524 h->offset = lineno + 1 - h->old_from;
527 err = apply_hunk(tmp, h, &lineno);
531 copypos = ftello(orig);
533 err = got_error_from_errno("ftello");
538 if (p->new == NULL && sb.st_size != copypos) {
539 h = STAILQ_FIRST(&p->head);
540 h->err = got_error(GOT_ERR_HUNK_FAILED);
542 } else if (!nop && !feof(orig))
543 err = copy(tmp, orig, copypos, -1);
546 if (orig != NULL && fclose(orig) == EOF && err == NULL)
547 err = got_error_from_errno("fclose");
551 static const struct got_error *
552 report_progress(struct patch_args *pa, const char *old, const char *new,
553 unsigned char status, const struct got_error *orig_error)
555 const struct got_error *err;
556 struct got_patch_hunk *h;
558 err = pa->progress_cb(pa->progress_arg, old, new, status,
559 orig_error, 0, 0, 0, 0, 0, NULL);
563 STAILQ_FOREACH(h, pa->head, entries) {
564 if (h->offset == 0 && h->err == NULL)
567 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
568 h->old_from, h->old_lines, h->new_from, h->new_lines,
577 static const struct got_error *
578 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
581 return report_progress(arg, path, NULL, status, NULL);
584 static const struct got_error *
585 patch_add(void *arg, unsigned char status, const char *path)
587 return report_progress(arg, NULL, path, status, NULL);
590 static const struct got_error *
591 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
592 struct got_fileindex *fileindex, const char *old, const char *new,
593 struct got_patch *p, int nop, struct patch_args *pa,
594 got_cancel_cb cancel_cb, void *cancel_arg)
596 const struct got_error *err = NULL;
597 int file_renamed = 0;
598 char *oldpath = NULL, *newpath = NULL;
599 char *tmppath = NULL, *template = NULL, *parent = NULL;
601 mode_t mode = GOT_DEFAULT_FILE_MODE;
603 if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
605 err = got_error_from_errno("asprintf");
609 if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
611 err = got_error_from_errno("asprintf");
615 file_renamed = strcmp(oldpath, newpath);
617 if (asprintf(&template, "%s/got-patch",
618 got_worktree_get_root_path(worktree)) == -1) {
619 err = got_error_from_errno(template);
624 err = got_opentemp_named(&tmppath, &tmp, template);
627 err = patch_file(p, oldpath, tmp, nop, &mode);
634 if (p->old != NULL && p->new == NULL) {
635 err = got_worktree_patch_schedule_rm(old, repo, worktree,
636 fileindex, patch_delete, pa);
640 if (fchmod(fileno(tmp), mode) == -1) {
641 err = got_error_from_errno2("chmod", tmppath);
645 if (rename(tmppath, newpath) == -1) {
646 if (errno != ENOENT) {
647 err = got_error_from_errno3("rename", tmppath,
652 err = got_path_dirname(&parent, newpath);
655 err = got_path_mkdir(parent);
658 if (rename(tmppath, newpath) == -1) {
659 err = got_error_from_errno3("rename", tmppath,
666 err = got_worktree_patch_schedule_rm(old, repo, worktree,
667 fileindex, patch_delete, pa);
669 err = got_worktree_patch_schedule_add(new, repo,
670 worktree, fileindex, patch_add,
674 } else if (p->old == NULL) {
675 err = got_worktree_patch_schedule_add(new, repo, worktree,
676 fileindex, patch_add, pa);
680 err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
687 if (tmp != NULL && fclose(tmp) == EOF && err == NULL)
688 err = got_error_from_errno("fclose");
696 reverse_patch(struct got_patch *p)
698 struct got_patch_hunk *h;
702 STAILQ_FOREACH(h, &p->head, entries) {
704 h->old_from = h->new_from;
708 h->old_lines = h->new_lines;
712 h->old_nonl = h->new_nonl;
715 for (i = 0; i < h->len; ++i) {
716 if (*h->lines[i] == '+')
718 else if (*h->lines[i] == '-')
724 const struct got_error *
725 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
726 int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
727 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
729 const struct got_error *err = NULL, *complete_err = NULL;
730 struct got_fileindex *fileindex = NULL;
731 char *fileindex_path = NULL;
732 char *oldpath, *newpath;
733 struct imsgbuf *ibuf;
734 int imsg_fds[2] = {-1, -1};
735 int done = 0, failed = 0;
738 ibuf = calloc(1, sizeof(*ibuf));
740 err = got_error_from_errno("calloc");
744 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
745 err = got_error_from_errno("socketpair");
751 err = got_error_from_errno("fork");
753 } else if (pid == 0) {
754 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
759 if (close(imsg_fds[1]) == -1) {
760 err = got_error_from_errno("close");
764 imsg_init(ibuf, imsg_fds[0]);
766 err = send_patch(ibuf, fd);
771 err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
776 while (!done && err == NULL) {
778 struct patch_args pa;
780 pa.progress_cb = progress_cb;
781 pa.progress_arg = progress_arg;
784 err = recv_patch(ibuf, &done, &p, strip);
791 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
792 &newpath, worktree, repo, fileindex);
794 err = apply_patch(worktree, repo, fileindex, oldpath,
795 newpath, &p, nop, &pa, cancel_cb, cancel_arg);
798 /* recoverable errors */
799 if (err->code == GOT_ERR_FILE_STATUS ||
800 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
801 err = report_progress(&pa, p.old, p.new,
802 GOT_STATUS_CANNOT_UPDATE, err);
803 else if (err->code == GOT_ERR_HUNK_FAILED)
804 err = report_progress(&pa, p.old, p.new,
805 GOT_STATUS_CANNOT_UPDATE, NULL);
817 if (fileindex != NULL)
818 complete_err = got_worktree_patch_complete(fileindex,
820 if (complete_err && err == NULL)
822 free(fileindex_path);
823 if (fd != -1 && close(fd) == -1 && err == NULL)
824 err = got_error_from_errno("close");
827 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
828 err = got_error_from_errno("close");
829 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
830 err = got_error_from_errno("close");
831 if (err == NULL && failed)
832 err = got_error(GOT_ERR_PATCH_FAILED);