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)
120 static const struct got_error *
121 pushline(struct got_patch_hunk *h, const char *line)
126 if (h->len == h->cap) {
127 if ((newcap = h->cap * 1.5) == 0)
129 t = recallocarray(h->lines, h->cap, newcap,
130 sizeof(h->lines[0]));
132 return got_error_from_errno("recallocarray");
137 if ((t = strdup(line)) == NULL)
138 return got_error_from_errno("strdup");
140 h->lines[h->len++] = t;
144 static const struct got_error *
145 recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
147 const struct got_error *err = NULL;
149 struct got_imsg_patch_hunk hdr;
150 struct got_imsg_patch patch;
151 struct got_patch_hunk *h = NULL;
155 memset(p, 0, sizeof(*p));
156 STAILQ_INIT(&p->head);
158 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
161 if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
165 if (imsg.hdr.type != GOT_IMSG_PATCH) {
166 err = got_error(GOT_ERR_PRIVSEP_MSG);
169 datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
170 if (datalen != sizeof(patch)) {
171 err = got_error(GOT_ERR_PRIVSEP_LEN);
174 memcpy(&patch, imsg.data, sizeof(patch));
176 /* automatically set strip=1 for git-style diffs */
177 if (strip == -1 && patch.git &&
178 (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
179 (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
182 /* prefer the new name if not /dev/null for not git-style diffs */
183 if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
184 err = got_path_strip(&p->old, patch.new, strip);
187 } else if (*patch.old != '\0') {
188 err = got_path_strip(&p->old, patch.old, strip);
193 if (*patch.new != '\0') {
194 err = got_path_strip(&p->new, patch.new, strip);
199 if (p->old == NULL && p->new == NULL) {
200 err = got_error(GOT_ERR_PATCH_MALFORMED);
209 err = got_privsep_recv_imsg(&imsg, ibuf, 0);
213 switch (imsg.hdr.type) {
214 case GOT_IMSG_PATCH_DONE:
216 case GOT_IMSG_PATCH_HUNK:
217 if (h != NULL && (h->old_nonl || h->new_nonl)) {
218 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);
257 err = pushline(h, t);
258 else if (lastmode == '-')
260 else if (lastmode == '+')
263 err = got_error(GOT_ERR_PATCH_MALFORMED);
271 err = got_error(GOT_ERR_PRIVSEP_MSG);
284 * Copy data from orig starting at copypos until pos into tmp.
285 * If pos is -1, copy until EOF.
287 static const struct got_error *
288 copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
293 if (fseek(orig, copypos, SEEK_SET) == -1)
294 return got_error_from_errno("fseek");
296 while (pos == -1 || copypos < pos) {
299 len = MIN(len, (size_t)pos - copypos);
300 r = fread(buf, 1, len, orig);
301 if (r != len && ferror(orig))
302 return got_error_from_errno("fread");
303 w = fwrite(buf, 1, r, tmp);
305 return got_error_from_errno("fwrite");
307 if (r != len && feof(orig)) {
310 return got_error(GOT_ERR_HUNK_FAILED);
316 static const struct got_error *
317 locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, long *lineno)
319 const struct got_error *err = NULL;
321 char mode = *h->lines[0];
325 long match_lineno = -1;
328 linelen = getline(&line, &linesize, orig);
331 err = got_error_from_errno("getline");
332 else if (match == -1)
333 err = got_error(GOT_ERR_HUNK_FAILED);
336 if (line[linelen - 1] == '\n')
337 line[linelen - 1] = '\0';
340 if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
341 (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
342 (mode == '+' && *lineno == h->old_from)) {
343 match = ftello(orig);
345 err = got_error_from_errno("ftello");
349 match_lineno = (*lineno)-1;
352 if (*lineno >= h->old_from && match != -1)
358 *lineno = match_lineno;
359 if (fseek(orig, match, SEEK_SET) == -1)
360 err = got_error_from_errno("fseek");
367 static const struct got_error *
368 test_hunk(FILE *orig, struct got_patch_hunk *h)
370 const struct got_error *err = NULL;
372 size_t linesize = 0, i = 0;
375 for (i = 0; i < h->len; ++i) {
376 switch (*h->lines[i]) {
381 linelen = getline(&line, &linesize, orig);
384 err = got_error_from_errno("getline");
387 GOT_ERR_HUNK_FAILED);
390 if (line[linelen - 1] == '\n')
391 line[linelen - 1] = '\0';
392 if (strcmp(h->lines[i] + 1, line)) {
393 err = got_error(GOT_ERR_HUNK_FAILED);
405 static const struct got_error *
406 apply_hunk(FILE *tmp, struct got_patch_hunk *h, long *lineno)
410 for (i = 0; i < h->len; ++i) {
411 switch (*h->lines[i]) {
413 if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
414 return got_error_from_errno("fprintf");
421 if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
422 return got_error_from_errno("fprintf");
423 if (new != h->new_lines || !h->new_nonl) {
424 if (fprintf(tmp, "\n") < 0)
425 return got_error_from_errno(
434 static const struct got_error *
435 patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
438 const struct got_error *err = NULL;
439 struct got_patch_hunk *h;
448 if (p->old == NULL) { /* create */
449 h = STAILQ_FIRST(&p->head);
450 if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
451 return got_error(GOT_ERR_PATCH_MALFORMED);
454 return apply_hunk(tmp, h, &lineno);
457 if ((orig = fopen(path, "r")) == NULL) {
458 err = got_error_from_errno2("fopen", path);
462 if (fstat(fileno(orig), &sb) == -1) {
463 err = got_error_from_errno("fstat");
469 STAILQ_FOREACH(h, &p->head, entries) {
470 if (h->lines == NULL)
474 err = locate_hunk(orig, h, &pos, &lineno);
475 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
480 err = copy(tmp, orig, copypos, pos);
485 err = test_hunk(orig, h);
486 if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
488 * try to apply the hunk again starting the search
489 * after the previous partial match.
491 if (fseek(orig, pos, SEEK_SET) == -1) {
492 err = got_error_from_errno("fseek");
495 linelen = getline(&line, &linesize, orig);
497 err = got_error_from_errno("getline");
506 if (lineno + 1 != h->old_from)
507 h->offset = lineno + 1 - h->old_from;
510 err = apply_hunk(tmp, h, &lineno);
514 copypos = ftello(orig);
516 err = got_error_from_errno("ftello");
521 if (p->new == NULL && sb.st_size != copypos) {
522 h = STAILQ_FIRST(&p->head);
523 h->err = got_error(GOT_ERR_HUNK_FAILED);
525 } else if (!nop && !feof(orig))
526 err = copy(tmp, orig, copypos, -1);
534 static const struct got_error *
535 report_progress(struct patch_args *pa, const char *old, const char *new,
536 unsigned char status, const struct got_error *orig_error)
538 const struct got_error *err;
539 struct got_patch_hunk *h;
541 err = pa->progress_cb(pa->progress_arg, old, new, status,
542 orig_error, 0, 0, 0, 0, 0, NULL);
546 STAILQ_FOREACH(h, pa->head, entries) {
547 if (h->offset == 0 && h->err == NULL)
550 err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
551 h->old_from, h->old_lines, h->new_from, h->new_lines,
560 static const struct got_error *
561 patch_delete(void *arg, unsigned char status, unsigned char staged_status,
564 return report_progress(arg, path, NULL, status, NULL);
567 static const struct got_error *
568 patch_add(void *arg, unsigned char status, const char *path)
570 return report_progress(arg, NULL, path, status, NULL);
573 static const struct got_error *
574 apply_patch(struct got_worktree *worktree, struct got_repository *repo,
575 const char *old, const char *new, struct got_patch *p, int nop,
576 struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
578 const struct got_error *err = NULL;
579 struct got_pathlist_head oldpaths, newpaths;
580 struct got_pathlist_entry *pe;
581 int file_renamed = 0;
582 char *oldpath = NULL, *newpath = NULL;
583 char *tmppath = NULL, *template = NULL, *parent = NULL;;
585 mode_t mode = GOT_DEFAULT_FILE_MODE;
587 TAILQ_INIT(&oldpaths);
588 TAILQ_INIT(&newpaths);
590 err = got_pathlist_insert(&pe, &oldpaths, old, NULL);
593 err = got_pathlist_insert(&pe, &newpaths, new, NULL);
597 if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
599 err = got_error_from_errno("asprintf");
603 if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
605 err = got_error_from_errno("asprintf");
609 file_renamed = strcmp(oldpath, newpath);
611 if (asprintf(&template, "%s/got-patch",
612 got_worktree_get_root_path(worktree)) == -1) {
613 err = got_error_from_errno(template);
618 err = got_opentemp_named(&tmppath, &tmp, template);
621 err = patch_file(p, oldpath, tmp, nop, &mode);
628 if (p->old != NULL && p->new == NULL) {
629 err = got_worktree_schedule_delete(worktree, &oldpaths,
630 0, NULL, patch_delete, pa, repo, 0, 0);
634 if (fchmod(fileno(tmp), mode) == -1) {
635 err = got_error_from_errno2("chmod", newpath);
639 if (rename(tmppath, newpath) == -1) {
640 if (errno != ENOENT) {
641 err = got_error_from_errno3("rename", tmppath,
646 err = got_path_dirname(&parent, newpath);
649 err = got_path_mkdir(parent);
652 if (rename(tmppath, newpath) == -1) {
653 err = got_error_from_errno3("rename", tmppath,
660 err = got_worktree_schedule_delete(worktree, &oldpaths,
661 0, NULL, patch_delete, pa, repo, 0, 0);
663 err = got_worktree_schedule_add(worktree, &newpaths,
664 patch_add, pa, repo, 1);
667 } else if (p->old == NULL) {
668 err = got_worktree_schedule_add(worktree, &newpaths,
669 patch_add, pa, repo, 1);
673 err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
676 got_pathlist_free(&oldpaths);
677 got_pathlist_free(&newpaths);
688 const struct got_error *
689 got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
690 int nop, int strip, got_patch_progress_cb progress_cb, void *progress_arg,
691 got_cancel_cb cancel_cb, void *cancel_arg)
693 const struct got_error *err = NULL;
694 struct got_fileindex *fileindex = NULL;
695 char *oldpath, *newpath;
696 struct imsgbuf *ibuf;
697 int imsg_fds[2] = {-1, -1};
698 int done = 0, failed = 0;
701 ibuf = calloc(1, sizeof(*ibuf));
703 err = got_error_from_errno("calloc");
707 if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
708 err = got_error_from_errno("socketpair");
714 err = got_error_from_errno("fork");
716 } else if (pid == 0) {
717 got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
722 if (close(imsg_fds[1]) == -1) {
723 err = got_error_from_errno("close");
727 imsg_init(ibuf, imsg_fds[0]);
729 err = send_patch(ibuf, fd);
734 err = got_worktree_patch_prepare(&fileindex, worktree);
738 while (!done && err == NULL) {
740 struct patch_args pa;
742 pa.progress_cb = progress_cb;
743 pa.progress_arg = progress_arg;
746 err = recv_patch(ibuf, &done, &p, strip);
750 err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
751 &newpath, worktree, repo, fileindex);
753 err = apply_patch(worktree, repo, oldpath, newpath,
754 &p, nop, &pa, cancel_cb, cancel_arg);
757 /* recoverable errors */
758 if (err->code == GOT_ERR_FILE_STATUS ||
759 (err->code == GOT_ERR_ERRNO && errno == ENOENT))
760 err = report_progress(&pa, p.old, p.new,
761 GOT_STATUS_CANNOT_UPDATE, err);
762 else if (err->code == GOT_ERR_HUNK_FAILED)
763 err = report_progress(&pa, p.old, p.new,
764 GOT_STATUS_CANNOT_UPDATE, NULL);
777 got_worktree_patch_complete(fileindex);
778 if (fd != -1 && close(fd) == -1 && err == NULL)
779 err = got_error_from_errno("close");
782 if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
783 err = got_error_from_errno("close");
784 if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
785 err = got_error_from_errno("close");
786 if (err == NULL && failed)
787 err = got_error(GOT_ERR_PATCH_FAILED);