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;
68 STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
72 struct got_patch_hunk_head head;
76 got_patch_progress_cb progress_cb;
78 struct got_patch_hunk_head *head;
81 static const struct got_error *
82 send_patch(struct imsgbuf *ibuf, int fd)
84 const struct got_error *err = NULL;
86 if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
88 err = got_error_from_errno(
89 "imsg_compose GOT_IMSG_PATCH_FILE");
94 if (imsg_flush(ibuf) == -1) {
95 err = got_error_from_errno("imsg_flush");
103 patch_free(struct got_patch *p)
105 struct got_patch_hunk *h;
108 while (!STAILQ_EMPTY(&p->head)) {
109 h = STAILQ_FIRST(&p->head);
110 STAILQ_REMOVE_HEAD(&p->head, entries);
112 for (i = 0; i < h->len; ++i)
122 static const struct got_error *
123 pushline(struct got_patch_hunk *h, const char *line)
128 if (h->len == h->cap) {
129 if ((newcap = h->cap * 1.5) == 0)
131 t = recallocarray(h->lines, h->cap, newcap,
132 sizeof(h->lines[0]));
134 return got_error_from_errno("recallocarray");
139 if ((t = strdup(line)) == NULL)
140 return got_error_from_errno("strdup");
142 h->lines[h->len++] = t;
146 static const struct got_error *
147 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
149 const struct got_error *err = NULL;
151 struct got_imsg_patch_hunk hdr;
152 struct got_imsg_patch patch;
153 struct got_patch_hunk *h = NULL;
156 memset(p, 0, sizeof(*p));
157 STAILQ_INIT(&p->head);
159 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
162 if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
166 if (imsg.hdr.type != GOT_IMSG_PATCH) {
167 err = got_error(GOT_ERR_PRIVSEP_MSG);
170 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
171 if (datalen != sizeof(patch)) {
172 err = got_error(GOT_ERR_PRIVSEP_LEN);
175 memcpy(&patch, imsg.data, sizeof(patch));
177 /* automatically set strip=1 for git-style diffs */
178 if (strip == -1 && patch.git &&
179 (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
180 (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
183 /* prefer the new name if not /dev/null for not git-style diffs */
184 if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
185 err = got_path_strip(&p->old, patch.new, strip);
188 } else if (*patch.old != '\0') {
189 err = got_path_strip(&p->old, patch.old, strip);
194 if (*patch.new != '\0') {
195 err = got_path_strip(&p->new, patch.new, strip);
200 if (p->old == NULL && p->new == NULL) {
201 err = got_error(GOT_ERR_PATCH_MALFORMED);
210 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
214 switch (imsg.hdr.type) {
215 case GOT_IMSG_PATCH_DONE:
217 case GOT_IMSG_PATCH_HUNK:
218 if (h != NULL && h->nonl) {
219 err = got_error(GOT_ERR_PATCH_MALFORMED);
222 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
223 if (datalen != sizeof(hdr)) {
224 err = got_error(GOT_ERR_PRIVSEP_LEN);
227 memcpy(&hdr, imsg.data, sizeof(hdr));
228 if ((h = calloc(1, sizeof(*h))) == NULL) {
229 err = got_error_from_errno("calloc");
232 h->old_from = hdr.oldfrom;
233 h->old_lines = hdr.oldlines;
234 h->new_from = hdr.newfrom;
235 h->new_lines = hdr.newlines;
236 STAILQ_INSERT_TAIL(&p->head, h, entries);
238 case GOT_IMSG_PATCH_LINE:
240 err = got_error(GOT_ERR_PRIVSEP_MSG);
243 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
245 /* at least one char */
246 if (datalen < 2 || t[datalen-1] != '\0') {
247 err = got_error(GOT_ERR_PRIVSEP_MSG);
250 if (*t != ' ' && *t != '-' && *t != '+' &&
252 err = got_error(GOT_ERR_PRIVSEP_MSG);
256 err = got_error(GOT_ERR_PATCH_MALFORMED);
260 err = pushline(h, t);
265 err = got_error(GOT_ERR_PRIVSEP_MSG);
278 * Copy data from orig starting at copypos until pos into tmp.
279 * If pos is -1, copy until EOF.
281 static const struct got_error *
282 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
287 if (fseek(orig, copypos, SEEK_SET) == -1)
288 return got_error_from_errno("fseek");
290 while (pos == -1 || copypos < pos) {
293 len = MIN(len, (size_t)pos - copypos);
294 r = fread(buf, 1, len, orig);
295 if (r != len && ferror(orig))
296 return got_error_from_errno("fread");
297 w = fwrite(buf, 1, r, tmp);
299 return got_error_from_errno("fwrite");
301 if (r != len && feof(orig)) {
304 return got_error(GOT_ERR_HUNK_FAILED);
310 static const struct got_error *
311 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, long *lineno)
313 const struct got_error *err = NULL;
315 char mode = *h->lines[0];
319 long match_lineno = -1;
322 linelen = getline(&line, &linesize, orig);
325 err = got_error_from_errno("getline");
326 else if (match == -1)
327 err = got_error(GOT_ERR_HUNK_FAILED);
330 if (line[linelen - 1] == '\n')
331 line[linelen - 1] = '\0';
334 if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
335 (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
336 (mode == '+' && *lineno == h->old_from)) {
337 match = ftello(orig);
339 err = got_error_from_errno("ftello");
343 match_lineno = (*lineno)-1;
346 if (*lineno >= h->old_from && match != -1)
352 *lineno = match_lineno;
353 if (fseek(orig, match, SEEK_SET) == -1)
354 err = got_error_from_errno("fseek");
361 static const struct got_error *
362 test_hunk(FILE *orig, struct got_patch_hunk *h)
364 const struct got_error *err = NULL;
366 size_t linesize = 0, i = 0;
369 for (i = 0; i < h->len; ++i) {
370 switch (*h->lines[i]) {
375 linelen = getline(&line, &linesize, orig);
378 err = got_error_from_errno("getline");
381 GOT_ERR_HUNK_FAILED);
384 if (line[linelen - 1] == '\n')
385 line[linelen - 1] = '\0';
386 if (strcmp(h->lines[i] + 1, line)) {
387 err = got_error(GOT_ERR_HUNK_FAILED);
399 static const struct got_error *
400 apply_hunk(FILE *tmp, struct got_patch_hunk *h, long *lineno)
404 for (i = 0; i < h->len; ++i) {
405 switch (*h->lines[i]) {
407 if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
408 return got_error_from_errno("fprintf");
414 if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
415 return got_error_from_errno("fprintf");
416 if (i != h->len - 1 || !h->nonl) {
417 if (fprintf(tmp, "\n") < 0)
418 return got_error_from_errno(
427 static const struct got_error *
428 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
431 const struct got_error *err = NULL;
432 struct got_patch_hunk *h;
441 if (p->old == NULL) { /* create */
442 h = STAILQ_FIRST(&p->head);
443 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
444 return got_error(GOT_ERR_PATCH_MALFORMED);
447 return apply_hunk(tmp, h, &lineno);
450 if ((orig = fopen(path, "r")) == NULL) {
451 err = got_error_from_errno2("fopen", path);
455 if (fstat(fileno(orig), &sb) == -1) {
456 err = got_error_from_errno("fstat");
462 STAILQ_FOREACH(h, &p->head, entries) {
463 if (h->lines == NULL)
467 err = locate_hunk(orig, h, &pos, &lineno);
468 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
473 err = copy(tmp, orig, copypos, pos);
478 err = test_hunk(orig, h);
479 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
481 * try to apply the hunk again starting the search
482 * after the previous partial match.
484 if (fseek(orig, pos, SEEK_SET) == -1) {
485 err = got_error_from_errno("fseek");
488 linelen = getline(&line, &linesize, orig);
490 err = got_error_from_errno("getline");
499 if (lineno + 1 != h->old_from)
500 h->offset = lineno + 1 - h->old_from;
503 err = apply_hunk(tmp, h, &lineno);
507 copypos = ftello(orig);
509 err = got_error_from_errno("ftello");
514 if (p->new == NULL && sb.st_size != copypos) {
515 h = STAILQ_FIRST(&p->head);
516 h->err = got_error(GOT_ERR_HUNK_FAILED);
518 } else if (!nop && !feof(orig))
519 err = copy(tmp, orig, copypos, -1);
527 static const struct got_error *
528 report_progress(struct patch_args *pa, const char *old, const char *new,
529 unsigned char status, const struct got_error *orig_error)
531 const struct got_error *err;
532 struct got_patch_hunk *h;
534 err = pa->progress_cb(pa->progress_arg, old, new, status,
535 orig_error, 0, 0, 0, 0, 0, NULL);
539 STAILQ_FOREACH(h, pa->head, entries) {
540 if (h->offset == 0 && h->err == NULL)
543 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
544 h->old_from, h->old_lines, h->new_from, h->new_lines,
553 static const struct got_error *
554 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
557 return report_progress(arg, path, NULL, status, NULL);
560 static const struct got_error *
561 patch_add(void *arg, unsigned char status, const char *path)
563 return report_progress(arg, NULL, path, status, NULL);
566 static const struct got_error *
567 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
568 const char *oldpath, const char *newpath, struct got_patch *p,
569 int nop, struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
571 const struct got_error *err = NULL;
572 struct got_pathlist_head oldpaths, newpaths;
573 struct got_pathlist_entry *pe;
574 int file_renamed = 0;
575 char *tmppath = NULL, *template = NULL, *parent = NULL;;
577 mode_t mode = GOT_DEFAULT_FILE_MODE;
579 TAILQ_INIT(&oldpaths);
580 TAILQ_INIT(&newpaths);
582 err = got_pathlist_insert(&pe, &oldpaths, oldpath, NULL);
585 err = got_pathlist_insert(&pe, &newpaths, newpath, NULL);
589 file_renamed = strcmp(oldpath, newpath);
591 if (asprintf(&template, "%s/got-patch",
592 got_worktree_get_root_path(worktree)) == -1) {
593 err = got_error_from_errno(template);
598 err = got_opentemp_named(&tmppath, &tmp, template);
601 err = patch_file(p, oldpath, tmp, nop, &mode);
608 if (p->old != NULL && p->new == NULL) {
609 err = got_worktree_schedule_delete(worktree, &oldpaths,
610 0, NULL, patch_delete, pa, repo, 0, 0);
614 if (fchmod(fileno(tmp), mode) == -1) {
615 err = got_error_from_errno2("chmod", newpath);
619 if (rename(tmppath, newpath) == -1) {
620 if (errno != ENOENT) {
621 err = got_error_from_errno3("rename", tmppath,
626 err = got_path_dirname(&parent, newpath);
629 err = got_path_mkdir(parent);
632 if (rename(tmppath, newpath) == -1) {
633 err = got_error_from_errno3("rename", tmppath,
640 err = got_worktree_schedule_delete(worktree, &oldpaths,
641 0, NULL, patch_delete, pa, repo, 0, 0);
643 err = got_worktree_schedule_add(worktree, &newpaths,
644 patch_add, pa, repo, 1);
647 } else if (p->old == NULL) {
648 err = got_worktree_schedule_add(worktree, &newpaths,
649 patch_add, pa, repo, 1);
653 err = report_progress(pa, oldpath, newpath, GOT_STATUS_MODIFY,
657 got_pathlist_free(&oldpaths);
658 got_pathlist_free(&newpaths);
667 const struct got_error *
668 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
669 int nop, int strip, got_patch_progress_cb progress_cb, void *progress_arg,
670 got_cancel_cb cancel_cb, void *cancel_arg)
672 const struct got_error *err = NULL;
673 struct got_fileindex *fileindex = NULL;
674 char *oldpath, *newpath;
675 struct imsgbuf *ibuf;
676 int imsg_fds[2] = {-1, -1};
677 int done = 0, failed = 0;
680 ibuf = calloc(1, sizeof(*ibuf));
682 err = got_error_from_errno("calloc");
686 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
687 err = got_error_from_errno("socketpair");
693 err = got_error_from_errno("fork");
695 } else if (pid == 0) {
696 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
701 if (close(imsg_fds[1]) == -1) {
702 err = got_error_from_errno("close");
706 imsg_init(ibuf, imsg_fds[0]);
708 err = send_patch(ibuf, fd);
713 err = got_worktree_patch_prepare(&fileindex, worktree);
717 while (!done && err == NULL) {
719 struct patch_args pa;
721 pa.progress_cb = progress_cb;
722 pa.progress_arg = progress_arg;
725 err = recv_patch(ibuf, &done, &p, strip);
729 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
730 &newpath, worktree, repo, fileindex);
732 err = apply_patch(worktree, repo, oldpath, newpath,
733 &p, nop, &pa, cancel_cb, cancel_arg);
736 /* recoverable errors */
737 if (err->code == GOT_ERR_FILE_STATUS ||
738 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
739 err = report_progress(&pa, p.old, p.new,
740 GOT_STATUS_CANNOT_UPDATE, err);
741 else if (err->code == GOT_ERR_HUNK_FAILED)
742 err = report_progress(&pa, p.old, p.new,
743 GOT_STATUS_CANNOT_UPDATE, NULL);
756 got_worktree_patch_complete(fileindex);
757 if (fd != -1 && close(fd) == -1 && err == NULL)
758 err = got_error_from_errno("close");
761 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
762 err = got_error_from_errno("close");
763 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
764 err = got_error_from_errno("close");
765 if (err == NULL && failed)
766 err = got_error(GOT_ERR_PATCH_FAILED);