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 /* automatically set strip=1 for git-style diffs */
180 if (strip == -1 && patch.git &&
181 (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
182 (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
185 /* prefer the new name if not /dev/null for not git-style diffs */
186 if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
187 err = got_path_strip(&p->old, patch.new, strip);
190 } else if (*patch.old != '\0') {
191 err = got_path_strip(&p->old, patch.old, strip);
196 if (*patch.new != '\0') {
197 err = got_path_strip(&p->new, patch.new, strip);
202 if (p->old == NULL && p->new == NULL) {
203 err = got_error(GOT_ERR_PATCH_MALFORMED);
212 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
216 switch (imsg.hdr.type) {
217 case GOT_IMSG_PATCH_DONE:
219 case GOT_IMSG_PATCH_HUNK:
220 if (h != NULL && (h->old_nonl || h->new_nonl)) {
221 err = got_error(GOT_ERR_PATCH_MALFORMED);
225 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
226 if (datalen != sizeof(hdr)) {
227 err = got_error(GOT_ERR_PRIVSEP_LEN);
230 memcpy(&hdr, imsg.data, sizeof(hdr));
231 if ((h = calloc(1, sizeof(*h))) == NULL) {
232 err = got_error_from_errno("calloc");
235 h->old_from = hdr.oldfrom;
236 h->old_lines = hdr.oldlines;
237 h->new_from = hdr.newfrom;
238 h->new_lines = hdr.newlines;
239 STAILQ_INSERT_TAIL(&p->head, h, entries);
241 case GOT_IMSG_PATCH_LINE:
243 err = got_error(GOT_ERR_PRIVSEP_MSG);
246 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
248 /* at least one char */
249 if (datalen < 2 || t[datalen-1] != '\0') {
250 err = got_error(GOT_ERR_PRIVSEP_MSG);
253 if (*t != ' ' && *t != '-' && *t != '+' &&
255 err = got_error(GOT_ERR_PRIVSEP_MSG);
260 err = pushline(h, t);
261 else if (lastmode == '-')
263 else if (lastmode == '+')
266 err = got_error(GOT_ERR_PATCH_MALFORMED);
274 err = got_error(GOT_ERR_PRIVSEP_MSG);
287 * Copy data from orig starting at copypos until pos into tmp.
288 * If pos is -1, copy until EOF.
290 static const struct got_error *
291 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
296 if (fseek(orig, copypos, SEEK_SET) == -1)
297 return got_error_from_errno("fseek");
299 while (pos == -1 || copypos < pos) {
302 len = MIN(len, (size_t)pos - copypos);
303 r = fread(buf, 1, len, orig);
304 if (r != len && ferror(orig))
305 return got_error_from_errno("fread");
306 w = fwrite(buf, 1, r, tmp);
308 return got_error_from_errno("fwrite");
310 if (r != len && feof(orig)) {
313 return got_error(GOT_ERR_HUNK_FAILED);
319 static const struct got_error *
320 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, long *lineno)
322 const struct got_error *err = NULL;
324 char mode = *h->lines[0];
328 long match_lineno = -1;
331 linelen = getline(&line, &linesize, orig);
334 err = got_error_from_errno("getline");
335 else if (match == -1)
336 err = got_error(GOT_ERR_HUNK_FAILED);
339 if (line[linelen - 1] == '\n')
340 line[linelen - 1] = '\0';
343 if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
344 (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
345 (mode == '+' && *lineno == h->old_from)) {
346 match = ftello(orig);
348 err = got_error_from_errno("ftello");
352 match_lineno = (*lineno)-1;
355 if (*lineno >= h->old_from && match != -1)
361 *lineno = match_lineno;
362 if (fseek(orig, match, SEEK_SET) == -1)
363 err = got_error_from_errno("fseek");
370 static const struct got_error *
371 test_hunk(FILE *orig, struct got_patch_hunk *h)
373 const struct got_error *err = NULL;
375 size_t linesize = 0, i = 0;
378 for (i = 0; i < h->len; ++i) {
379 switch (*h->lines[i]) {
384 linelen = getline(&line, &linesize, orig);
387 err = got_error_from_errno("getline");
390 GOT_ERR_HUNK_FAILED);
393 if (line[linelen - 1] == '\n')
394 line[linelen - 1] = '\0';
395 if (strcmp(h->lines[i] + 1, line)) {
396 err = got_error(GOT_ERR_HUNK_FAILED);
408 static const struct got_error *
409 apply_hunk(FILE *tmp, struct got_patch_hunk *h, long *lineno)
413 for (i = 0; i < h->len; ++i) {
414 switch (*h->lines[i]) {
416 if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
417 return got_error_from_errno("fprintf");
424 if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
425 return got_error_from_errno("fprintf");
426 if (new != h->new_lines || !h->new_nonl) {
427 if (fprintf(tmp, "\n") < 0)
428 return got_error_from_errno(
437 static const struct got_error *
438 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
441 const struct got_error *err = NULL;
442 struct got_patch_hunk *h;
451 if (p->old == NULL) { /* create */
452 h = STAILQ_FIRST(&p->head);
453 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
454 return got_error(GOT_ERR_PATCH_MALFORMED);
457 return apply_hunk(tmp, h, &lineno);
460 if ((orig = fopen(path, "r")) == NULL) {
461 err = got_error_from_errno2("fopen", path);
465 if (fstat(fileno(orig), &sb) == -1) {
466 err = got_error_from_errno("fstat");
472 STAILQ_FOREACH(h, &p->head, entries) {
473 if (h->lines == NULL)
477 err = locate_hunk(orig, h, &pos, &lineno);
478 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
483 err = copy(tmp, orig, copypos, pos);
488 err = test_hunk(orig, h);
489 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
491 * try to apply the hunk again starting the search
492 * after the previous partial match.
494 if (fseek(orig, pos, SEEK_SET) == -1) {
495 err = got_error_from_errno("fseek");
498 linelen = getline(&line, &linesize, orig);
500 err = got_error_from_errno("getline");
509 if (lineno + 1 != h->old_from)
510 h->offset = lineno + 1 - h->old_from;
513 err = apply_hunk(tmp, h, &lineno);
517 copypos = ftello(orig);
519 err = got_error_from_errno("ftello");
524 if (p->new == NULL && sb.st_size != copypos) {
525 h = STAILQ_FIRST(&p->head);
526 h->err = got_error(GOT_ERR_HUNK_FAILED);
528 } else if (!nop && !feof(orig))
529 err = copy(tmp, orig, copypos, -1);
537 static const struct got_error *
538 report_progress(struct patch_args *pa, const char *old, const char *new,
539 unsigned char status, const struct got_error *orig_error)
541 const struct got_error *err;
542 struct got_patch_hunk *h;
544 err = pa->progress_cb(pa->progress_arg, old, new, status,
545 orig_error, 0, 0, 0, 0, 0, NULL);
549 STAILQ_FOREACH(h, pa->head, entries) {
550 if (h->offset == 0 && h->err == NULL)
553 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
554 h->old_from, h->old_lines, h->new_from, h->new_lines,
563 static const struct got_error *
564 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
567 return report_progress(arg, path, NULL, status, NULL);
570 static const struct got_error *
571 patch_add(void *arg, unsigned char status, const char *path)
573 return report_progress(arg, NULL, path, status, NULL);
576 static const struct got_error *
577 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
578 const char *old, const char *new, struct got_patch *p, int nop,
579 struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
581 const struct got_error *err = NULL;
582 struct got_pathlist_head oldpaths, newpaths;
583 struct got_pathlist_entry *pe;
584 int file_renamed = 0;
585 char *oldpath = NULL, *newpath = NULL;
586 char *tmppath = NULL, *template = NULL, *parent = NULL;;
588 mode_t mode = GOT_DEFAULT_FILE_MODE;
590 TAILQ_INIT(&oldpaths);
591 TAILQ_INIT(&newpaths);
593 err = got_pathlist_insert(&pe, &oldpaths, old, NULL);
596 err = got_pathlist_insert(&pe, &newpaths, new, NULL);
600 if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
602 err = got_error_from_errno("asprintf");
606 if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
608 err = got_error_from_errno("asprintf");
612 file_renamed = strcmp(oldpath, newpath);
614 if (asprintf(&template, "%s/got-patch",
615 got_worktree_get_root_path(worktree)) == -1) {
616 err = got_error_from_errno(template);
621 err = got_opentemp_named(&tmppath, &tmp, template);
624 err = patch_file(p, oldpath, tmp, nop, &mode);
631 if (p->old != NULL && p->new == NULL) {
632 err = got_worktree_schedule_delete(worktree, &oldpaths,
633 0, NULL, patch_delete, pa, repo, 0, 0);
637 if (fchmod(fileno(tmp), mode) == -1) {
638 err = got_error_from_errno2("chmod", tmppath);
642 if (rename(tmppath, newpath) == -1) {
643 if (errno != ENOENT) {
644 err = got_error_from_errno3("rename", tmppath,
649 err = got_path_dirname(&parent, newpath);
652 err = got_path_mkdir(parent);
655 if (rename(tmppath, newpath) == -1) {
656 err = got_error_from_errno3("rename", tmppath,
663 err = got_worktree_schedule_delete(worktree, &oldpaths,
664 0, NULL, patch_delete, pa, repo, 0, 0);
666 err = got_worktree_schedule_add(worktree, &newpaths,
667 patch_add, pa, repo, 1);
670 } else if (p->old == NULL) {
671 err = got_worktree_schedule_add(worktree, &newpaths,
672 patch_add, pa, repo, 1);
676 err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
679 got_pathlist_free(&oldpaths);
680 got_pathlist_free(&newpaths);
692 reverse_patch(struct got_patch *p)
694 struct got_patch_hunk *h;
698 STAILQ_FOREACH(h, &p->head, entries) {
700 h->old_from = h->new_from;
704 h->old_lines = h->new_lines;
708 h->old_nonl = h->new_nonl;
711 for (i = 0; i < h->len; ++i) {
712 if (*h->lines[i] == '+')
714 else if (*h->lines[i] == '-')
720 const struct got_error *
721 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
722 int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
723 void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
725 const struct got_error *err = NULL;
726 struct got_fileindex *fileindex = NULL;
727 char *oldpath, *newpath;
728 struct imsgbuf *ibuf;
729 int imsg_fds[2] = {-1, -1};
730 int done = 0, failed = 0;
733 ibuf = calloc(1, sizeof(*ibuf));
735 err = got_error_from_errno("calloc");
739 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
740 err = got_error_from_errno("socketpair");
746 err = got_error_from_errno("fork");
748 } else if (pid == 0) {
749 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
754 if (close(imsg_fds[1]) == -1) {
755 err = got_error_from_errno("close");
759 imsg_init(ibuf, imsg_fds[0]);
761 err = send_patch(ibuf, fd);
766 err = got_worktree_patch_prepare(&fileindex, worktree);
770 while (!done && err == NULL) {
772 struct patch_args pa;
774 pa.progress_cb = progress_cb;
775 pa.progress_arg = progress_arg;
778 err = recv_patch(ibuf, &done, &p, strip);
785 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
786 &newpath, worktree, repo, fileindex);
788 err = apply_patch(worktree, repo, oldpath, newpath,
789 &p, nop, &pa, cancel_cb, cancel_arg);
792 /* recoverable errors */
793 if (err->code == GOT_ERR_FILE_STATUS ||
794 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
795 err = report_progress(&pa, p.old, p.new,
796 GOT_STATUS_CANNOT_UPDATE, err);
797 else if (err->code == GOT_ERR_HUNK_FAILED)
798 err = report_progress(&pa, p.old, p.new,
799 GOT_STATUS_CANNOT_UPDATE, NULL);
812 got_worktree_patch_complete(fileindex);
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);