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/queue.h>
25 #include <sys/socket.h>
39 #include "got_error.h"
40 #include "got_object.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"
48 #include "got_lib_delta.h"
49 #include "got_lib_object.h"
50 #include "got_lib_privsep.h"
52 #define MIN(a, b) ((a) < (b) ? (a) : (b))
54 struct got_patch_hunk {
55 STAILQ_ENTRY(got_patch_hunk) entries;
56 const struct got_error *err;
69 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
73 struct got_patch_hunk_head head;
77 got_patch_progress_cb progress_cb;
79 struct got_patch_hunk_head *head;
82 static const struct got_error *
83 send_patch(struct imsgbuf *ibuf, int fd)
85 const struct got_error *err = NULL;
87 if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
89 err = got_error_from_errno(
90 "imsg_compose GOT_IMSG_PATCH_FILE");
95 if (imsg_flush(ibuf) == -1) {
96 err = got_error_from_errno("imsg_flush");
104 patch_free(struct got_patch *p)
106 struct got_patch_hunk *h;
109 while (!STAILQ_EMPTY(&p->head)) {
110 h = STAILQ_FIRST(&p->head);
111 STAILQ_REMOVE_HEAD(&p->head, entries);
113 for (i = 0; i < h->len; ++i)
122 memset(p, 0, sizeof(*p));
123 STAILQ_INIT(&p->head);
126 static const struct got_error *
127 pushline(struct got_patch_hunk *h, const char *line)
132 if (h->len == h->cap) {
133 if ((newcap = h->cap * 1.5) == 0)
135 t = recallocarray(h->lines, h->cap, newcap,
136 sizeof(h->lines[0]));
138 return got_error_from_errno("recallocarray");
143 if ((t = strdup(line)) == NULL)
144 return got_error_from_errno("strdup");
146 h->lines[h->len++] = t;
150 static const struct got_error *
151 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
153 const struct got_error *err = NULL;
155 struct got_imsg_patch_hunk hdr;
156 struct got_imsg_patch patch;
157 struct got_patch_hunk *h = NULL;
161 memset(p, 0, sizeof(*p));
162 STAILQ_INIT(&p->head);
164 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
167 if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
171 if (imsg.hdr.type != GOT_IMSG_PATCH) {
172 err = got_error(GOT_ERR_PRIVSEP_MSG);
175 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
176 if (datalen != sizeof(patch)) {
177 err = got_error(GOT_ERR_PRIVSEP_LEN);
180 memcpy(&patch, imsg.data, sizeof(patch));
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);
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)))
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);
199 } else if (*patch.old != '\0') {
200 err = got_path_strip(&p->old, patch.old, strip);
205 if (*patch.new != '\0') {
206 err = got_path_strip(&p->new, patch.new, strip);
211 if (p->old == NULL && p->new == NULL) {
212 err = got_error(GOT_ERR_PATCH_MALFORMED);
221 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
227 switch (imsg.hdr.type) {
228 case GOT_IMSG_PATCH_DONE:
229 if (h != NULL && h->len == 0)
230 err = got_error(GOT_ERR_PATCH_MALFORMED);
232 case GOT_IMSG_PATCH_HUNK:
234 (h->len == 0 || h->old_nonl || h->new_nonl)) {
235 err = got_error(GOT_ERR_PATCH_MALFORMED);
239 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
240 if (datalen != sizeof(hdr)) {
241 err = got_error(GOT_ERR_PRIVSEP_LEN);
244 memcpy(&hdr, imsg.data, sizeof(hdr));
245 if ((h = calloc(1, sizeof(*h))) == NULL) {
246 err = got_error_from_errno("calloc");
249 h->old_from = hdr.oldfrom;
250 h->old_lines = hdr.oldlines;
251 h->new_from = hdr.newfrom;
252 h->new_lines = hdr.newlines;
253 STAILQ_INSERT_TAIL(&p->head, h, entries);
255 case GOT_IMSG_PATCH_LINE:
257 err = got_error(GOT_ERR_PRIVSEP_MSG);
260 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
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, long *lineno)
339 const struct got_error *err = NULL;
341 char mode = *h->lines[0];
345 long 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, long *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);
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);
694 reverse_patch(struct got_patch *p)
696 struct got_patch_hunk *h;
700 STAILQ_FOREACH(h, &p->head, entries) {
702 h->old_from = h->new_from;
706 h->old_lines = h->new_lines;
710 h->old_nonl = h->new_nonl;
713 for (i = 0; i < h->len; ++i) {
714 if (*h->lines[i] == '+')
716 else if (*h->lines[i] == '-')
722 const struct got_error *
723 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
724 int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
725 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
727 const struct got_error *err = NULL, *complete_err = NULL;
728 struct got_fileindex *fileindex = NULL;
729 char *fileindex_path = NULL;
730 char *oldpath, *newpath;
731 struct imsgbuf *ibuf;
732 int imsg_fds[2] = {-1, -1};
733 int done = 0, failed = 0;
736 ibuf = calloc(1, sizeof(*ibuf));
738 err = got_error_from_errno("calloc");
742 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
743 err = got_error_from_errno("socketpair");
749 err = got_error_from_errno("fork");
751 } else if (pid == 0) {
752 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
757 if (close(imsg_fds[1]) == -1) {
758 err = got_error_from_errno("close");
762 imsg_init(ibuf, imsg_fds[0]);
764 err = send_patch(ibuf, fd);
769 err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
774 while (!done && err == NULL) {
776 struct patch_args pa;
778 pa.progress_cb = progress_cb;
779 pa.progress_arg = progress_arg;
782 err = recv_patch(ibuf, &done, &p, strip);
789 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
790 &newpath, worktree, repo, fileindex);
792 err = apply_patch(worktree, repo, fileindex, oldpath,
793 newpath, &p, nop, &pa, cancel_cb, cancel_arg);
796 /* recoverable errors */
797 if (err->code == GOT_ERR_FILE_STATUS ||
798 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
799 err = report_progress(&pa, p.old, p.new,
800 GOT_STATUS_CANNOT_UPDATE, err);
801 else if (err->code == GOT_ERR_HUNK_FAILED)
802 err = report_progress(&pa, p.old, p.new,
803 GOT_STATUS_CANNOT_UPDATE, NULL);
815 if (fileindex != NULL)
816 complete_err = got_worktree_patch_complete(fileindex,
818 if (complete_err && err == NULL)
820 free(fileindex_path);
821 if (fd != -1 && close(fd) == -1 && err == NULL)
822 err = got_error_from_errno("close");
825 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
826 err = got_error_from_errno("close");
827 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
828 err = got_error_from_errno("close");
829 if (err == NULL && failed)
830 err = got_error(GOT_ERR_PATCH_FAILED);