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)
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);
222 switch (imsg.hdr.type) {
223 case GOT_IMSG_PATCH_DONE:
224 if (h != NULL && h->len == 0)
225 err = got_error(GOT_ERR_PATCH_MALFORMED);
227 case GOT_IMSG_PATCH_HUNK:
229 (h->len == 0 || h->old_nonl || h->new_nonl)) {
230 err = got_error(GOT_ERR_PATCH_MALFORMED);
234 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
235 if (datalen != sizeof(hdr)) {
236 err = got_error(GOT_ERR_PRIVSEP_LEN);
239 memcpy(&hdr, imsg.data, sizeof(hdr));
240 if ((h = calloc(1, sizeof(*h))) == NULL) {
241 err = got_error_from_errno("calloc");
244 h->old_from = hdr.oldfrom;
245 h->old_lines = hdr.oldlines;
246 h->new_from = hdr.newfrom;
247 h->new_lines = hdr.newlines;
248 STAILQ_INSERT_TAIL(&p->head, h, entries);
250 case GOT_IMSG_PATCH_LINE:
252 err = got_error(GOT_ERR_PRIVSEP_MSG);
255 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
257 /* at least one char */
258 if (datalen < 2 || t[datalen-1] != '\0') {
259 err = got_error(GOT_ERR_PRIVSEP_MSG);
262 if (*t != ' ' && *t != '-' && *t != '+' &&
264 err = got_error(GOT_ERR_PRIVSEP_MSG);
269 err = pushline(h, t);
270 else if (lastmode == '-')
272 else if (lastmode == '+')
275 err = got_error(GOT_ERR_PATCH_MALFORMED);
283 err = got_error(GOT_ERR_PRIVSEP_MSG);
296 * Copy data from orig starting at copypos until pos into tmp.
297 * If pos is -1, copy until EOF.
299 static const struct got_error *
300 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
305 if (fseeko(orig, copypos, SEEK_SET) == -1)
306 return got_error_from_errno("fseeko");
308 while (pos == -1 || copypos < pos) {
311 len = MIN(len, (size_t)pos - copypos);
312 r = fread(buf, 1, len, orig);
313 if (r != len && ferror(orig))
314 return got_error_from_errno("fread");
315 w = fwrite(buf, 1, r, tmp);
317 return got_error_from_errno("fwrite");
319 if (r != len && feof(orig)) {
322 return got_error(GOT_ERR_HUNK_FAILED);
328 static const struct got_error *
329 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, long *lineno)
331 const struct got_error *err = NULL;
333 char mode = *h->lines[0];
337 long match_lineno = -1;
340 linelen = getline(&line, &linesize, orig);
343 err = got_error_from_errno("getline");
344 else if (match == -1)
345 err = got_error(GOT_ERR_HUNK_FAILED);
348 if (line[linelen - 1] == '\n')
349 line[linelen - 1] = '\0';
352 if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
353 (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
354 (mode == '+' && *lineno == h->old_from)) {
355 match = ftello(orig);
357 err = got_error_from_errno("ftello");
361 match_lineno = (*lineno)-1;
364 if (*lineno >= h->old_from && match != -1)
370 *lineno = match_lineno;
371 if (fseeko(orig, match, SEEK_SET) == -1)
372 err = got_error_from_errno("fseeko");
379 static const struct got_error *
380 test_hunk(FILE *orig, struct got_patch_hunk *h)
382 const struct got_error *err = NULL;
384 size_t linesize = 0, i = 0;
387 for (i = 0; i < h->len; ++i) {
388 switch (*h->lines[i]) {
393 linelen = getline(&line, &linesize, orig);
396 err = got_error_from_errno("getline");
399 GOT_ERR_HUNK_FAILED);
402 if (line[linelen - 1] == '\n')
403 line[linelen - 1] = '\0';
404 if (strcmp(h->lines[i] + 1, line)) {
405 err = got_error(GOT_ERR_HUNK_FAILED);
417 static const struct got_error *
418 apply_hunk(FILE *tmp, struct got_patch_hunk *h, long *lineno)
422 for (i = 0; i < h->len; ++i) {
423 switch (*h->lines[i]) {
425 if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
426 return got_error_from_errno("fprintf");
433 if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
434 return got_error_from_errno("fprintf");
435 if (new != h->new_lines || !h->new_nonl) {
436 if (fprintf(tmp, "\n") < 0)
437 return got_error_from_errno(
446 static const struct got_error *
447 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
450 const struct got_error *err = NULL;
451 struct got_patch_hunk *h;
460 if (p->old == NULL) { /* create */
461 h = STAILQ_FIRST(&p->head);
462 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
463 return got_error(GOT_ERR_PATCH_MALFORMED);
466 return apply_hunk(tmp, h, &lineno);
469 if ((orig = fopen(path, "r")) == NULL) {
470 err = got_error_from_errno2("fopen", path);
474 if (fstat(fileno(orig), &sb) == -1) {
475 err = got_error_from_errno("fstat");
481 STAILQ_FOREACH(h, &p->head, entries) {
483 err = locate_hunk(orig, h, &pos, &lineno);
484 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
489 err = copy(tmp, orig, copypos, pos);
494 err = test_hunk(orig, h);
495 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
497 * try to apply the hunk again starting the search
498 * after the previous partial match.
500 if (fseeko(orig, pos, SEEK_SET) == -1) {
501 err = got_error_from_errno("fseeko");
504 linelen = getline(&line, &linesize, orig);
506 err = got_error_from_errno("getline");
515 if (lineno + 1 != h->old_from)
516 h->offset = lineno + 1 - h->old_from;
519 err = apply_hunk(tmp, h, &lineno);
523 copypos = ftello(orig);
525 err = got_error_from_errno("ftello");
530 if (p->new == NULL && sb.st_size != copypos) {
531 h = STAILQ_FIRST(&p->head);
532 h->err = got_error(GOT_ERR_HUNK_FAILED);
534 } else if (!nop && !feof(orig))
535 err = copy(tmp, orig, copypos, -1);
543 static const struct got_error *
544 report_progress(struct patch_args *pa, const char *old, const char *new,
545 unsigned char status, const struct got_error *orig_error)
547 const struct got_error *err;
548 struct got_patch_hunk *h;
550 err = pa->progress_cb(pa->progress_arg, old, new, status,
551 orig_error, 0, 0, 0, 0, 0, NULL);
555 STAILQ_FOREACH(h, pa->head, entries) {
556 if (h->offset == 0 && h->err == NULL)
559 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
560 h->old_from, h->old_lines, h->new_from, h->new_lines,
569 static const struct got_error *
570 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
573 return report_progress(arg, path, NULL, status, NULL);
576 static const struct got_error *
577 patch_add(void *arg, unsigned char status, const char *path)
579 return report_progress(arg, NULL, path, status, NULL);
582 static const struct got_error *
583 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
584 struct got_fileindex *fileindex, const char *old, const char *new,
585 struct got_patch *p, int nop, struct patch_args *pa,
586 got_cancel_cb cancel_cb, void *cancel_arg)
588 const struct got_error *err = NULL;
589 int file_renamed = 0;
590 char *oldpath = NULL, *newpath = NULL;
591 char *tmppath = NULL, *template = NULL, *parent = NULL;;
593 mode_t mode = GOT_DEFAULT_FILE_MODE;
595 if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
597 err = got_error_from_errno("asprintf");
601 if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
603 err = got_error_from_errno("asprintf");
607 file_renamed = strcmp(oldpath, newpath);
609 if (asprintf(&template, "%s/got-patch",
610 got_worktree_get_root_path(worktree)) == -1) {
611 err = got_error_from_errno(template);
616 err = got_opentemp_named(&tmppath, &tmp, template);
619 err = patch_file(p, oldpath, tmp, nop, &mode);
626 if (p->old != NULL && p->new == NULL) {
627 err = got_worktree_patch_schedule_rm(old, repo, worktree,
628 fileindex, patch_delete, pa);
632 if (fchmod(fileno(tmp), mode) == -1) {
633 err = got_error_from_errno2("chmod", tmppath);
637 if (rename(tmppath, newpath) == -1) {
638 if (errno != ENOENT) {
639 err = got_error_from_errno3("rename", tmppath,
644 err = got_path_dirname(&parent, newpath);
647 err = got_path_mkdir(parent);
650 if (rename(tmppath, newpath) == -1) {
651 err = got_error_from_errno3("rename", tmppath,
658 err = got_worktree_patch_schedule_rm(old, repo, worktree,
659 fileindex, patch_delete, pa);
661 err = got_worktree_patch_schedule_add(new, repo,
662 worktree, fileindex, patch_add,
666 } else if (p->old == NULL) {
667 err = got_worktree_patch_schedule_add(new, repo, worktree,
668 fileindex, patch_add, pa);
672 err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
686 reverse_patch(struct got_patch *p)
688 struct got_patch_hunk *h;
692 STAILQ_FOREACH(h, &p->head, entries) {
694 h->old_from = h->new_from;
698 h->old_lines = h->new_lines;
702 h->old_nonl = h->new_nonl;
705 for (i = 0; i < h->len; ++i) {
706 if (*h->lines[i] == '+')
708 else if (*h->lines[i] == '-')
714 const struct got_error *
715 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
716 int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
717 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
719 const struct got_error *err = NULL, *complete_err = NULL;
720 struct got_fileindex *fileindex = NULL;
721 char *fileindex_path = NULL;
722 char *oldpath, *newpath;
723 struct imsgbuf *ibuf;
724 int imsg_fds[2] = {-1, -1};
725 int done = 0, failed = 0;
728 ibuf = calloc(1, sizeof(*ibuf));
730 err = got_error_from_errno("calloc");
734 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
735 err = got_error_from_errno("socketpair");
741 err = got_error_from_errno("fork");
743 } else if (pid == 0) {
744 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
749 if (close(imsg_fds[1]) == -1) {
750 err = got_error_from_errno("close");
754 imsg_init(ibuf, imsg_fds[0]);
756 err = send_patch(ibuf, fd);
761 err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
766 while (!done && err == NULL) {
768 struct patch_args pa;
770 pa.progress_cb = progress_cb;
771 pa.progress_arg = progress_arg;
774 err = recv_patch(ibuf, &done, &p, strip);
781 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
782 &newpath, worktree, repo, fileindex);
784 err = apply_patch(worktree, repo, fileindex, oldpath,
785 newpath, &p, nop, &pa, cancel_cb, cancel_arg);
788 /* recoverable errors */
789 if (err->code == GOT_ERR_FILE_STATUS ||
790 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
791 err = report_progress(&pa, p.old, p.new,
792 GOT_STATUS_CANNOT_UPDATE, err);
793 else if (err->code == GOT_ERR_HUNK_FAILED)
794 err = report_progress(&pa, p.old, p.new,
795 GOT_STATUS_CANNOT_UPDATE, NULL);
807 if (fileindex != NULL)
808 complete_err = got_worktree_patch_complete(fileindex,
810 if (complete_err && err == NULL)
812 free(fileindex_path);
813 if (fd != -1 && close(fd) == -1 && err == NULL)
814 err = got_error_from_errno("close");
817 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
818 err = got_error_from_errno("close");
819 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
820 err = got_error_from_errno("close");
821 if (err == NULL && failed)
822 err = got_error(GOT_ERR_PATCH_FAILED);