2 e9ce266e 2022-03-07 op * Copyright (c) 2022 Omar Polo <op@openbsd.org>
4 e9ce266e 2022-03-07 op * Permission to use, copy, modify, and distribute this software for any
5 e9ce266e 2022-03-07 op * purpose with or without fee is hereby granted, provided that the above
6 e9ce266e 2022-03-07 op * copyright notice and this permission notice appear in all copies.
8 e9ce266e 2022-03-07 op * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 e9ce266e 2022-03-07 op * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 e9ce266e 2022-03-07 op * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 e9ce266e 2022-03-07 op * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 e9ce266e 2022-03-07 op * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 e9ce266e 2022-03-07 op * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 e9ce266e 2022-03-07 op * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 e9ce266e 2022-03-07 op * Apply patches.
18 e9ce266e 2022-03-07 op * Things that we may want to support:
19 e9ce266e 2022-03-07 op * + support indented patches?
20 e9ce266e 2022-03-07 op * + support other kinds of patches?
23 e9ce266e 2022-03-07 op #include <sys/types.h>
24 e9ce266e 2022-03-07 op #include <sys/queue.h>
25 e9ce266e 2022-03-07 op #include <sys/socket.h>
26 5b67f96e 2022-03-13 op #include <sys/stat.h>
27 e9ce266e 2022-03-07 op #include <sys/uio.h>
29 dbda770b 2022-03-13 op #include <errno.h>
30 e9ce266e 2022-03-07 op #include <limits.h>
31 e9ce266e 2022-03-07 op #include <sha1.h>
32 e9ce266e 2022-03-07 op #include <stdint.h>
33 e9ce266e 2022-03-07 op #include <stdio.h>
34 e9ce266e 2022-03-07 op #include <stdlib.h>
35 e9ce266e 2022-03-07 op #include <string.h>
36 e9ce266e 2022-03-07 op #include <unistd.h>
37 e9ce266e 2022-03-07 op #include <imsg.h>
39 e9ce266e 2022-03-07 op #include "got_error.h"
40 e9ce266e 2022-03-07 op #include "got_object.h"
41 e9ce266e 2022-03-07 op #include "got_path.h"
42 e9ce266e 2022-03-07 op #include "got_reference.h"
43 e9ce266e 2022-03-07 op #include "got_cancel.h"
44 e9ce266e 2022-03-07 op #include "got_worktree.h"
45 55e9459f 2022-06-19 op #include "got_repository.h"
46 e9ce266e 2022-03-07 op #include "got_opentemp.h"
47 e9ce266e 2022-03-07 op #include "got_patch.h"
49 e9ce266e 2022-03-07 op #include "got_lib_delta.h"
50 55e9459f 2022-06-19 op #include "got_lib_diff.h"
51 e9ce266e 2022-03-07 op #include "got_lib_object.h"
52 e9ce266e 2022-03-07 op #include "got_lib_privsep.h"
53 55e9459f 2022-06-19 op #include "got_lib_sha1.h"
55 e9ce266e 2022-03-07 op #define MIN(a, b) ((a) < (b) ? (a) : (b))
57 e9ce266e 2022-03-07 op struct got_patch_hunk {
58 e9ce266e 2022-03-07 op STAILQ_ENTRY(got_patch_hunk) entries;
59 60aa1fa0 2022-03-17 op const struct got_error *err;
64 35095610 2022-06-14 op int old_lines;
66 35095610 2022-06-14 op int new_lines;
72 60aa1fa0 2022-03-17 op STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
73 e9ce266e 2022-03-07 op struct got_patch {
77 55e9459f 2022-06-19 op char blob[41];
78 60aa1fa0 2022-03-17 op struct got_patch_hunk_head head;
81 b22138f5 2022-03-16 op struct patch_args {
82 b22138f5 2022-03-16 op got_patch_progress_cb progress_cb;
83 b22138f5 2022-03-16 op void *progress_arg;
84 60aa1fa0 2022-03-17 op struct got_patch_hunk_head *head;
87 e9ce266e 2022-03-07 op static const struct got_error *
88 e9ce266e 2022-03-07 op send_patch(struct imsgbuf *ibuf, int fd)
90 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
92 e9ce266e 2022-03-07 op if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
93 e9ce266e 2022-03-07 op NULL, 0) == -1) {
94 e9ce266e 2022-03-07 op err = got_error_from_errno(
95 e9ce266e 2022-03-07 op "imsg_compose GOT_IMSG_PATCH_FILE");
100 e9ce266e 2022-03-07 op if (imsg_flush(ibuf) == -1) {
101 e9ce266e 2022-03-07 op err = got_error_from_errno("imsg_flush");
102 e9ce266e 2022-03-07 op imsg_clear(ibuf);
109 e9ce266e 2022-03-07 op patch_free(struct got_patch *p)
111 e9ce266e 2022-03-07 op struct got_patch_hunk *h;
114 e9ce266e 2022-03-07 op while (!STAILQ_EMPTY(&p->head)) {
115 e9ce266e 2022-03-07 op h = STAILQ_FIRST(&p->head);
116 e9ce266e 2022-03-07 op STAILQ_REMOVE_HEAD(&p->head, entries);
118 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i)
119 e9ce266e 2022-03-07 op free(h->lines[i]);
120 e9ce266e 2022-03-07 op free(h->lines);
124 e9ce266e 2022-03-07 op free(p->new);
125 e9ce266e 2022-03-07 op free(p->old);
127 0e07a2a1 2022-06-13 op memset(p, 0, sizeof(*p));
128 0e07a2a1 2022-06-13 op STAILQ_INIT(&p->head);
131 e9ce266e 2022-03-07 op static const struct got_error *
132 e9ce266e 2022-03-07 op pushline(struct got_patch_hunk *h, const char *line)
135 e9ce266e 2022-03-07 op size_t newcap;
137 e9ce266e 2022-03-07 op if (h->len == h->cap) {
138 e9ce266e 2022-03-07 op if ((newcap = h->cap * 1.5) == 0)
140 e9ce266e 2022-03-07 op t = recallocarray(h->lines, h->cap, newcap,
141 e9ce266e 2022-03-07 op sizeof(h->lines[0]));
142 e9ce266e 2022-03-07 op if (t == NULL)
143 e9ce266e 2022-03-07 op return got_error_from_errno("recallocarray");
144 e9ce266e 2022-03-07 op h->lines = t;
145 e9ce266e 2022-03-07 op h->cap = newcap;
148 e9ce266e 2022-03-07 op if ((t = strdup(line)) == NULL)
149 e9ce266e 2022-03-07 op return got_error_from_errno("strdup");
151 e9ce266e 2022-03-07 op h->lines[h->len++] = t;
155 e9ce266e 2022-03-07 op static const struct got_error *
156 9d6cabd5 2022-04-07 op recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
158 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
159 e9ce266e 2022-03-07 op struct imsg imsg;
160 e9ce266e 2022-03-07 op struct got_imsg_patch_hunk hdr;
161 e9ce266e 2022-03-07 op struct got_imsg_patch patch;
162 e9ce266e 2022-03-07 op struct got_patch_hunk *h = NULL;
163 e9ce266e 2022-03-07 op size_t datalen;
164 b2832778 2022-04-23 op int lastmode = -1;
166 e9ce266e 2022-03-07 op memset(p, 0, sizeof(*p));
167 e9ce266e 2022-03-07 op STAILQ_INIT(&p->head);
169 e9ce266e 2022-03-07 op err = got_privsep_recv_imsg(&imsg, ibuf, 0);
172 e9ce266e 2022-03-07 op if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
176 e9ce266e 2022-03-07 op if (imsg.hdr.type != GOT_IMSG_PATCH) {
177 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
180 e9ce266e 2022-03-07 op datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
181 e9ce266e 2022-03-07 op if (datalen != sizeof(patch)) {
182 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_LEN);
185 e9ce266e 2022-03-07 op memcpy(&patch, imsg.data, sizeof(patch));
187 99b94ad7 2022-06-13 op if (patch.old[sizeof(patch.old)-1] != '\0' ||
188 55e9459f 2022-06-19 op patch.new[sizeof(patch.new)-1] != '\0' ||
189 d8b5af43 2022-06-19 op patch.cid[sizeof(patch.cid)-1] != '\0' ||
190 55e9459f 2022-06-19 op patch.blob[sizeof(patch.blob)-1] != '\0') {
191 99b94ad7 2022-06-13 op err = got_error(GOT_ERR_PRIVSEP_LEN);
195 497a5915 2022-06-27 op if (*patch.cid != '\0')
196 d8b5af43 2022-06-19 op strlcpy(p->cid, patch.cid, sizeof(p->cid));
198 497a5915 2022-06-27 op if (*patch.blob != '\0')
199 d8b5af43 2022-06-19 op strlcpy(p->blob, patch.blob, sizeof(p->blob));
201 9d6cabd5 2022-04-07 op /* automatically set strip=1 for git-style diffs */
202 9d6cabd5 2022-04-07 op if (strip == -1 && patch.git &&
203 9d6cabd5 2022-04-07 op (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
204 9d6cabd5 2022-04-07 op (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
207 9d6cabd5 2022-04-07 op /* prefer the new name if not /dev/null for not git-style diffs */
208 9d6cabd5 2022-04-07 op if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
209 9d6cabd5 2022-04-07 op err = got_path_strip(&p->old, patch.new, strip);
212 9d6cabd5 2022-04-07 op } else if (*patch.old != '\0') {
213 9d6cabd5 2022-04-07 op err = got_path_strip(&p->old, patch.old, strip);
218 9d6cabd5 2022-04-07 op if (*patch.new != '\0') {
219 9d6cabd5 2022-04-07 op err = got_path_strip(&p->new, patch.new, strip);
224 b95c53df 2022-03-12 op if (p->old == NULL && p->new == NULL) {
225 b95c53df 2022-03-12 op err = got_error(GOT_ERR_PATCH_MALFORMED);
229 e9ce266e 2022-03-07 op imsg_free(&imsg);
234 e9ce266e 2022-03-07 op err = got_privsep_recv_imsg(&imsg, ibuf, 0);
236 0e07a2a1 2022-06-13 op patch_free(p);
240 2399b53d 2022-06-14 op datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
241 e9ce266e 2022-03-07 op switch (imsg.hdr.type) {
242 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_DONE:
243 be33dff7 2022-05-13 op if (h != NULL && h->len == 0)
244 be33dff7 2022-05-13 op err = got_error(GOT_ERR_PATCH_MALFORMED);
246 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_HUNK:
247 be33dff7 2022-05-13 op if (h != NULL &&
248 be33dff7 2022-05-13 op (h->len == 0 || h->old_nonl || h->new_nonl)) {
249 b3c57ab2 2022-03-22 op err = got_error(GOT_ERR_PATCH_MALFORMED);
252 b2832778 2022-04-23 op lastmode = -1;
253 e9ce266e 2022-03-07 op if (datalen != sizeof(hdr)) {
254 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_LEN);
257 e9ce266e 2022-03-07 op memcpy(&hdr, imsg.data, sizeof(hdr));
258 5b7126c5 2022-06-14 op if (hdr.oldfrom < 0 || hdr.newfrom < 0) {
259 5b7126c5 2022-06-14 op err = got_error(GOT_ERR_PRIVSEP_LEN);
262 5b7126c5 2022-06-14 op if ((h = calloc(1, sizeof(*h))) == NULL) {
263 5b7126c5 2022-06-14 op err = got_error_from_errno("calloc");
266 e9ce266e 2022-03-07 op h->old_from = hdr.oldfrom;
267 e9ce266e 2022-03-07 op h->old_lines = hdr.oldlines;
268 e9ce266e 2022-03-07 op h->new_from = hdr.newfrom;
269 e9ce266e 2022-03-07 op h->new_lines = hdr.newlines;
270 e9ce266e 2022-03-07 op STAILQ_INSERT_TAIL(&p->head, h, entries);
272 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_LINE:
273 e9ce266e 2022-03-07 op if (h == NULL) {
274 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
277 e9ce266e 2022-03-07 op t = imsg.data;
278 b3c57ab2 2022-03-22 op /* at least one char */
279 e9ce266e 2022-03-07 op if (datalen < 2 || t[datalen-1] != '\0') {
280 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
283 b3c57ab2 2022-03-22 op if (*t != ' ' && *t != '-' && *t != '+' &&
284 b3c57ab2 2022-03-22 op *t != '\\') {
285 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
289 b2832778 2022-04-23 op if (*t != '\\')
290 b3c57ab2 2022-03-22 op err = pushline(h, t);
291 b2832778 2022-04-23 op else if (lastmode == '-')
292 b2832778 2022-04-23 op h->old_nonl = 1;
293 b2832778 2022-04-23 op else if (lastmode == '+')
294 b2832778 2022-04-23 op h->new_nonl = 1;
296 b2832778 2022-04-23 op err = got_error(GOT_ERR_PATCH_MALFORMED);
301 b2832778 2022-04-23 op lastmode = *t;
304 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
308 e9ce266e 2022-03-07 op imsg_free(&imsg);
313 0e07a2a1 2022-06-13 op patch_free(p);
315 e9ce266e 2022-03-07 op imsg_free(&imsg);
320 e9ce266e 2022-03-07 op * Copy data from orig starting at copypos until pos into tmp.
321 e9ce266e 2022-03-07 op * If pos is -1, copy until EOF.
323 e9ce266e 2022-03-07 op static const struct got_error *
324 e9ce266e 2022-03-07 op copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
326 e9ce266e 2022-03-07 op char buf[BUFSIZ];
327 e9ce266e 2022-03-07 op size_t len, r, w;
329 e45f7eba 2022-05-14 naddy if (fseeko(orig, copypos, SEEK_SET) == -1)
330 e45f7eba 2022-05-14 naddy return got_error_from_errno("fseeko");
332 e9ce266e 2022-03-07 op while (pos == -1 || copypos < pos) {
333 e9ce266e 2022-03-07 op len = sizeof(buf);
335 e9ce266e 2022-03-07 op len = MIN(len, (size_t)pos - copypos);
336 e9ce266e 2022-03-07 op r = fread(buf, 1, len, orig);
337 e9ce266e 2022-03-07 op if (r != len && ferror(orig))
338 e9ce266e 2022-03-07 op return got_error_from_errno("fread");
339 e9ce266e 2022-03-07 op w = fwrite(buf, 1, r, tmp);
341 e9ce266e 2022-03-07 op return got_error_from_errno("fwrite");
342 e9ce266e 2022-03-07 op copypos += len;
343 e9ce266e 2022-03-07 op if (r != len && feof(orig)) {
344 e9ce266e 2022-03-07 op if (pos == -1)
346 60aa1fa0 2022-03-17 op return got_error(GOT_ERR_HUNK_FAILED);
352 e9ce266e 2022-03-07 op static const struct got_error *
353 35095610 2022-06-14 op locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, int *lineno)
355 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
356 e9ce266e 2022-03-07 op char *line = NULL;
357 e9ce266e 2022-03-07 op char mode = *h->lines[0];
358 e9ce266e 2022-03-07 op size_t linesize = 0;
359 e9ce266e 2022-03-07 op ssize_t linelen;
360 e9ce266e 2022-03-07 op off_t match = -1;
361 35095610 2022-06-14 op int match_lineno = -1;
364 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
365 e9ce266e 2022-03-07 op if (linelen == -1) {
366 e9ce266e 2022-03-07 op if (ferror(orig))
367 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
368 e9ce266e 2022-03-07 op else if (match == -1)
369 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_HUNK_FAILED);
372 b3c57ab2 2022-03-22 op if (line[linelen - 1] == '\n')
373 b3c57ab2 2022-03-22 op line[linelen - 1] = '\0';
376 46ebad13 2022-03-17 op if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
377 46ebad13 2022-03-17 op (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
378 e9ce266e 2022-03-07 op (mode == '+' && *lineno == h->old_from)) {
379 e9ce266e 2022-03-07 op match = ftello(orig);
380 e9ce266e 2022-03-07 op if (match == -1) {
381 e9ce266e 2022-03-07 op err = got_error_from_errno("ftello");
384 e9ce266e 2022-03-07 op match -= linelen;
385 e9ce266e 2022-03-07 op match_lineno = (*lineno)-1;
388 e9ce266e 2022-03-07 op if (*lineno >= h->old_from && match != -1)
392 e9ce266e 2022-03-07 op if (err == NULL) {
393 33df9995 2022-03-11 op *pos = match;
394 e9ce266e 2022-03-07 op *lineno = match_lineno;
395 e45f7eba 2022-05-14 naddy if (fseeko(orig, match, SEEK_SET) == -1)
396 e45f7eba 2022-05-14 naddy err = got_error_from_errno("fseeko");
403 e9ce266e 2022-03-07 op static const struct got_error *
404 e9ce266e 2022-03-07 op test_hunk(FILE *orig, struct got_patch_hunk *h)
406 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
407 e9ce266e 2022-03-07 op char *line = NULL;
408 e9ce266e 2022-03-07 op size_t linesize = 0, i = 0;
409 e9ce266e 2022-03-07 op ssize_t linelen;
411 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i) {
412 e9ce266e 2022-03-07 op switch (*h->lines[i]) {
417 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
418 e9ce266e 2022-03-07 op if (linelen == -1) {
419 e9ce266e 2022-03-07 op if (ferror(orig))
420 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
422 e9ce266e 2022-03-07 op err = got_error(
423 60aa1fa0 2022-03-17 op GOT_ERR_HUNK_FAILED);
426 b3c57ab2 2022-03-22 op if (line[linelen - 1] == '\n')
427 b3c57ab2 2022-03-22 op line[linelen - 1] = '\0';
428 46ebad13 2022-03-17 op if (strcmp(h->lines[i] + 1, line)) {
429 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_HUNK_FAILED);
441 e9ce266e 2022-03-07 op static const struct got_error *
442 35095610 2022-06-14 op apply_hunk(FILE *tmp, struct got_patch_hunk *h, int *lineno)
444 b2832778 2022-04-23 op size_t i, new = 0;
446 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i) {
447 e9ce266e 2022-03-07 op switch (*h->lines[i]) {
449 b3c57ab2 2022-03-22 op if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
450 e9ce266e 2022-03-07 op return got_error_from_errno("fprintf");
451 e9ce266e 2022-03-07 op /* fallthrough */
457 46ebad13 2022-03-17 op if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
458 e9ce266e 2022-03-07 op return got_error_from_errno("fprintf");
459 b2832778 2022-04-23 op if (new != h->new_lines || !h->new_nonl) {
460 b3c57ab2 2022-03-22 op if (fprintf(tmp, "\n") < 0)
461 b3c57ab2 2022-03-22 op return got_error_from_errno(
470 6e96b326 2022-03-12 op static const struct got_error *
471 05737d49 2022-06-19 op patch_file(struct got_patch *p, FILE *orig, FILE *tmp, mode_t *mode)
473 6e96b326 2022-03-12 op const struct got_error *err = NULL;
474 6e96b326 2022-03-12 op struct got_patch_hunk *h;
475 2be5e1a2 2022-03-16 op struct stat sb;
476 35095610 2022-06-14 op int lineno = 0;
477 6e96b326 2022-03-12 op off_t copypos, pos;
478 6e96b326 2022-03-12 op char *line = NULL;
479 6e96b326 2022-03-12 op size_t linesize = 0;
480 6e96b326 2022-03-12 op ssize_t linelen;
482 e9ce266e 2022-03-07 op if (p->old == NULL) { /* create */
483 e9ce266e 2022-03-07 op h = STAILQ_FIRST(&p->head);
484 6e96b326 2022-03-12 op if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
485 6e96b326 2022-03-12 op return got_error(GOT_ERR_PATCH_MALFORMED);
486 4027dbc2 2022-03-22 op return apply_hunk(tmp, h, &lineno);
489 827bcd6c 2022-06-19 op if (fstat(fileno(orig), &sb) == -1)
490 827bcd6c 2022-06-19 op return got_error_from_errno("fstat");
491 2be5e1a2 2022-03-16 op *mode = sb.st_mode;
494 e9ce266e 2022-03-07 op STAILQ_FOREACH(h, &p->head, entries) {
496 33df9995 2022-03-11 op err = locate_hunk(orig, h, &pos, &lineno);
497 60aa1fa0 2022-03-17 op if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
498 60aa1fa0 2022-03-17 op h->err = err;
499 e9ce266e 2022-03-07 op if (err != NULL)
501 05737d49 2022-06-19 op err = copy(tmp, orig, copypos, pos);
502 e9ce266e 2022-03-07 op if (err != NULL)
504 e9ce266e 2022-03-07 op copypos = pos;
506 e9ce266e 2022-03-07 op err = test_hunk(orig, h);
507 60aa1fa0 2022-03-17 op if (err != NULL && err->code == GOT_ERR_HUNK_FAILED) {
509 e9ce266e 2022-03-07 op * try to apply the hunk again starting the search
510 e9ce266e 2022-03-07 op * after the previous partial match.
512 827bcd6c 2022-06-19 op if (fseeko(orig, pos, SEEK_SET) == -1)
513 827bcd6c 2022-06-19 op return got_error_from_errno("fseeko");
514 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
515 827bcd6c 2022-06-19 op if (linelen == -1)
516 827bcd6c 2022-06-19 op return got_error_from_errno("getline");
518 e9ce266e 2022-03-07 op goto tryagain;
520 e9ce266e 2022-03-07 op if (err != NULL)
523 60aa1fa0 2022-03-17 op if (lineno + 1 != h->old_from)
524 60aa1fa0 2022-03-17 op h->offset = lineno + 1 - h->old_from;
526 05737d49 2022-06-19 op err = apply_hunk(tmp, h, &lineno);
527 e9ce266e 2022-03-07 op if (err != NULL)
530 e9ce266e 2022-03-07 op copypos = ftello(orig);
531 827bcd6c 2022-06-19 op if (copypos == -1)
532 827bcd6c 2022-06-19 op return got_error_from_errno("ftello");
535 60aa1fa0 2022-03-17 op if (p->new == NULL && sb.st_size != copypos) {
536 60aa1fa0 2022-03-17 op h = STAILQ_FIRST(&p->head);
537 60aa1fa0 2022-03-17 op h->err = got_error(GOT_ERR_HUNK_FAILED);
538 60aa1fa0 2022-03-17 op err = h->err;
539 05737d49 2022-06-19 op } else if (!feof(orig))
540 e9ce266e 2022-03-07 op err = copy(tmp, orig, copypos, -1);
545 dbda770b 2022-03-13 op static const struct got_error *
546 60aa1fa0 2022-03-17 op report_progress(struct patch_args *pa, const char *old, const char *new,
547 60aa1fa0 2022-03-17 op unsigned char status, const struct got_error *orig_error)
549 60aa1fa0 2022-03-17 op const struct got_error *err;
550 60aa1fa0 2022-03-17 op struct got_patch_hunk *h;
552 60aa1fa0 2022-03-17 op err = pa->progress_cb(pa->progress_arg, old, new, status,
553 60aa1fa0 2022-03-17 op orig_error, 0, 0, 0, 0, 0, NULL);
557 60aa1fa0 2022-03-17 op STAILQ_FOREACH(h, pa->head, entries) {
558 60aa1fa0 2022-03-17 op if (h->offset == 0 && h->err == NULL)
561 60aa1fa0 2022-03-17 op err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
562 60aa1fa0 2022-03-17 op h->old_from, h->old_lines, h->new_from, h->new_lines,
563 60aa1fa0 2022-03-17 op h->offset, h->err);
571 60aa1fa0 2022-03-17 op static const struct got_error *
572 b22138f5 2022-03-16 op patch_delete(void *arg, unsigned char status, unsigned char staged_status,
573 b22138f5 2022-03-16 op const char *path)
575 60aa1fa0 2022-03-17 op return report_progress(arg, path, NULL, status, NULL);
578 b22138f5 2022-03-16 op static const struct got_error *
579 b22138f5 2022-03-16 op patch_add(void *arg, unsigned char status, const char *path)
581 60aa1fa0 2022-03-17 op return report_progress(arg, NULL, path, status, NULL);
584 b22138f5 2022-03-16 op static const struct got_error *
585 55e9459f 2022-06-19 op open_blob(char **path, FILE **fp, const char *blobid,
586 55e9459f 2022-06-19 op struct got_repository *repo)
588 6e96b326 2022-03-12 op const struct got_error *err = NULL;
589 55e9459f 2022-06-19 op struct got_blob_object *blob = NULL;
590 db0dfdd7 2022-06-27 op struct got_object_id id, *idptr, *matched_id = NULL;
591 eb81bc23 2022-06-28 tracey int fd = -1;
594 55e9459f 2022-06-19 op *path = NULL;
596 db0dfdd7 2022-06-27 op if (strlen(blobid) != SHA1_DIGEST_STRING_LENGTH - 1) {
597 db0dfdd7 2022-06-27 op err = got_repo_match_object_id(&matched_id, NULL, blobid,
598 db0dfdd7 2022-06-27 op GOT_OBJ_TYPE_BLOB, NULL /* do not resolve tags */,
602 db0dfdd7 2022-06-27 op idptr = matched_id;
604 db0dfdd7 2022-06-27 op if (!got_parse_sha1_digest(id.sha1, blobid))
605 db0dfdd7 2022-06-27 op return got_error(GOT_ERR_BAD_OBJ_ID_STR);
609 eb81bc23 2022-06-28 tracey fd = got_opentempfd();
610 eb81bc23 2022-06-28 tracey if (fd == -1) {
611 eb81bc23 2022-06-28 tracey err = got_error_from_errno("got_opentempfd");
612 eb81bc23 2022-06-28 tracey goto done;
615 eb81bc23 2022-06-28 tracey err = got_object_open_as_blob(&blob, repo, idptr, 8192, fd);
619 55e9459f 2022-06-19 op err = got_opentemp_named(path, fp, GOT_TMPDIR_STR "/got-patch-blob");
623 55e9459f 2022-06-19 op err = got_object_blob_dump_to_file(NULL, NULL, NULL, *fp, blob);
628 eb81bc23 2022-06-28 tracey if (fd != -1 && close(fd) == -1 && err == NULL)
629 eb81bc23 2022-06-28 tracey err = got_error_from_errno("close");
631 55e9459f 2022-06-19 op got_object_blob_close(blob);
632 db0dfdd7 2022-06-27 op if (matched_id != NULL)
633 db0dfdd7 2022-06-27 op free(matched_id);
635 55e9459f 2022-06-19 op if (*fp != NULL)
637 55e9459f 2022-06-19 op if (*path != NULL)
638 55e9459f 2022-06-19 op unlink(*path);
641 55e9459f 2022-06-19 op *path = NULL;
646 55e9459f 2022-06-19 op static const struct got_error *
647 55e9459f 2022-06-19 op apply_patch(int *overlapcnt, struct got_worktree *worktree,
648 55e9459f 2022-06-19 op struct got_repository *repo, struct got_fileindex *fileindex,
649 55e9459f 2022-06-19 op const char *old, const char *new, struct got_patch *p, int nop,
650 55e9459f 2022-06-19 op struct patch_args *pa, got_cancel_cb cancel_cb, void *cancel_arg)
652 55e9459f 2022-06-19 op const struct got_error *err = NULL;
653 55e9459f 2022-06-19 op int do_merge = 0, file_renamed = 0;
654 d8b5af43 2022-06-19 op char *oldlabel = NULL, *newlabel = NULL, *anclabel = NULL;
655 ed3bff83 2022-04-23 op char *oldpath = NULL, *newpath = NULL;
656 1b1b91ab 2022-06-15 op char *tmppath = NULL, *template = NULL, *parent = NULL;
657 55e9459f 2022-06-19 op char *apath = NULL, *mergepath = NULL;
658 55e9459f 2022-06-19 op FILE *oldfile = NULL, *tmpfile = NULL, *afile = NULL, *mergefile = NULL;
660 55e9459f 2022-06-19 op const char *outpath;
661 2be5e1a2 2022-03-16 op mode_t mode = GOT_DEFAULT_FILE_MODE;
663 55e9459f 2022-06-19 op *overlapcnt = 0;
665 55e9459f 2022-06-19 op /* don't run the diff3 merge on creations/deletions */
666 55e9459f 2022-06-19 op if (*p->blob != '\0' && p->old != NULL && p->new != NULL) {
667 55e9459f 2022-06-19 op err = open_blob(&apath, &afile, p->blob, repo);
669 dbc68eed 2022-06-21 op * ignore failures to open this blob, we might have
670 dbc68eed 2022-06-21 op * parsed gibberish.
672 db0dfdd7 2022-06-27 op if (err && !(err->code == GOT_ERR_ERRNO && errno == ENOENT) &&
673 db0dfdd7 2022-06-27 op err->code != GOT_ERR_NO_OBJ)
675 55e9459f 2022-06-19 op else if (err == NULL)
676 55e9459f 2022-06-19 op do_merge = 1;
680 ed3bff83 2022-04-23 op if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
681 ed3bff83 2022-04-23 op old) == -1) {
682 ed3bff83 2022-04-23 op err = got_error_from_errno("asprintf");
686 ed3bff83 2022-04-23 op if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
687 ed3bff83 2022-04-23 op new) == -1) {
688 ed3bff83 2022-04-23 op err = got_error_from_errno("asprintf");
692 78f5ac24 2022-03-19 op file_renamed = strcmp(oldpath, newpath);
694 6e96b326 2022-03-12 op if (asprintf(&template, "%s/got-patch",
695 6e96b326 2022-03-12 op got_worktree_get_root_path(worktree)) == -1) {
696 6e96b326 2022-03-12 op err = got_error_from_errno(template);
700 827bcd6c 2022-06-19 op if (p->old != NULL && (oldfile = fopen(oldpath, "r")) == NULL) {
701 827bcd6c 2022-06-19 op err = got_error_from_errno2("open", oldpath);
705 55e9459f 2022-06-19 op err = got_opentemp_named(&tmppath, &tmpfile, template);
708 55e9459f 2022-06-19 op outpath = tmppath;
709 55e9459f 2022-06-19 op outfd = fileno(tmpfile);
710 55e9459f 2022-06-19 op err = patch_file(p, afile != NULL ? afile : oldfile, tmpfile, &mode);
714 55e9459f 2022-06-19 op if (do_merge) {
715 497a5915 2022-06-27 op const char *type, *id;
717 55e9459f 2022-06-19 op if (fseeko(afile, 0, SEEK_SET) == -1 ||
718 55e9459f 2022-06-19 op fseeko(oldfile, 0, SEEK_SET) == -1 ||
719 55e9459f 2022-06-19 op fseeko(tmpfile, 0, SEEK_SET) == -1) {
720 55e9459f 2022-06-19 op err = got_error_from_errno("fseeko");
724 55e9459f 2022-06-19 op if (asprintf(&oldlabel, "--- %s", p->old) == -1) {
725 55e9459f 2022-06-19 op err = got_error_from_errno("asprintf");
726 55e9459f 2022-06-19 op oldlabel = NULL;
730 55e9459f 2022-06-19 op if (asprintf(&newlabel, "+++ %s", p->new) == -1) {
731 55e9459f 2022-06-19 op err = got_error_from_errno("asprintf");
732 55e9459f 2022-06-19 op newlabel = NULL;
736 497a5915 2022-06-27 op if (*p->cid != '\0') {
737 497a5915 2022-06-27 op type = "commit";
740 497a5915 2022-06-27 op type = "blob";
741 497a5915 2022-06-27 op id = p->blob;
744 497a5915 2022-06-27 op if (asprintf(&anclabel, "%s %s", type, id) == -1) {
745 d8b5af43 2022-06-19 op err = got_error_from_errno("asprintf");
746 d8b5af43 2022-06-19 op anclabel = NULL;
750 55e9459f 2022-06-19 op err = got_opentemp_named(&mergepath, &mergefile, template);
753 55e9459f 2022-06-19 op outpath = mergepath;
754 55e9459f 2022-06-19 op outfd = fileno(mergefile);
756 55e9459f 2022-06-19 op err = got_merge_diff3(overlapcnt, outfd, tmpfile, afile,
757 d8b5af43 2022-06-19 op oldfile, oldlabel, anclabel, newlabel,
758 55e9459f 2022-06-19 op GOT_DIFF_ALGORITHM_PATIENCE);
766 5b67f96e 2022-03-13 op if (p->old != NULL && p->new == NULL) {
767 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_rm(old, repo, worktree,
768 f2dd7807 2022-05-17 op fileindex, patch_delete, pa);
772 55e9459f 2022-06-19 op if (fchmod(outfd, mode) == -1) {
773 41a37a44 2022-04-23 op err = got_error_from_errno2("chmod", tmppath);
777 55e9459f 2022-06-19 op if (rename(outpath, newpath) == -1) {
778 95d68340 2022-03-16 op if (errno != ENOENT) {
779 55e9459f 2022-06-19 op err = got_error_from_errno3("rename", outpath,
784 95d68340 2022-03-16 op err = got_path_dirname(&parent, newpath);
785 95d68340 2022-03-16 op if (err != NULL)
787 95d68340 2022-03-16 op err = got_path_mkdir(parent);
788 95d68340 2022-03-16 op if (err != NULL)
790 55e9459f 2022-06-19 op if (rename(outpath, newpath) == -1) {
791 55e9459f 2022-06-19 op err = got_error_from_errno3("rename", outpath,
797 6e96b326 2022-03-12 op if (file_renamed) {
798 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_rm(old, repo, worktree,
799 f2dd7807 2022-05-17 op fileindex, patch_delete, pa);
800 6e96b326 2022-03-12 op if (err == NULL)
801 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_add(new, repo,
802 f2dd7807 2022-05-17 op worktree, fileindex, patch_add,
805 78f5ac24 2022-03-19 op unlink(newpath);
806 78f5ac24 2022-03-19 op } else if (p->old == NULL) {
807 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_add(new, repo, worktree,
808 f2dd7807 2022-05-17 op fileindex, patch_add, pa);
810 78f5ac24 2022-03-19 op unlink(newpath);
811 55e9459f 2022-06-19 op } else if (*overlapcnt != 0)
812 55e9459f 2022-06-19 op err = report_progress(pa, old, new, GOT_STATUS_CONFLICT, NULL);
813 9802c41c 2022-06-21 op else if (do_merge)
814 9802c41c 2022-06-21 op err = report_progress(pa, old, new, GOT_STATUS_MERGE, NULL);
816 ed3bff83 2022-04-23 op err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
819 95d68340 2022-03-16 op free(parent);
820 6f5cb1bd 2022-03-08 op free(template);
822 e9ce266e 2022-03-07 op if (tmppath != NULL)
823 e9ce266e 2022-03-07 op unlink(tmppath);
824 55e9459f 2022-06-19 op if (tmpfile != NULL && fclose(tmpfile) == EOF && err == NULL)
825 06c44edc 2022-06-15 stsp err = got_error_from_errno("fclose");
826 e9ce266e 2022-03-07 op free(tmppath);
828 ed3bff83 2022-04-23 op free(oldpath);
829 827bcd6c 2022-06-19 op if (oldfile != NULL && fclose(oldfile) == EOF && err == NULL)
830 827bcd6c 2022-06-19 op err = got_error_from_errno("fclose");
832 55e9459f 2022-06-19 op if (apath != NULL)
833 55e9459f 2022-06-19 op unlink(apath);
834 55e9459f 2022-06-19 op if (afile != NULL && fclose(afile) == EOF && err == NULL)
835 55e9459f 2022-06-19 op err = got_error_from_errno("fclose");
838 55e9459f 2022-06-19 op if (mergepath != NULL)
839 55e9459f 2022-06-19 op unlink(mergepath);
840 55e9459f 2022-06-19 op if (mergefile != NULL && fclose(mergefile) == EOF && err == NULL)
841 55e9459f 2022-06-19 op err = got_error_from_errno("fclose");
842 55e9459f 2022-06-19 op free(mergepath);
844 ed3bff83 2022-04-23 op free(newpath);
845 55e9459f 2022-06-19 op free(oldlabel);
846 55e9459f 2022-06-19 op free(newlabel);
847 d8b5af43 2022-06-19 op free(anclabel);
852 bad961bf 2022-04-23 op reverse_patch(struct got_patch *p)
854 bad961bf 2022-04-23 op struct got_patch_hunk *h;
858 bad961bf 2022-04-23 op STAILQ_FOREACH(h, &p->head, entries) {
859 bad961bf 2022-04-23 op tmp = h->old_from;
860 bad961bf 2022-04-23 op h->old_from = h->new_from;
861 bad961bf 2022-04-23 op h->new_from = tmp;
863 bad961bf 2022-04-23 op tmp = h->old_lines;
864 bad961bf 2022-04-23 op h->old_lines = h->new_lines;
865 bad961bf 2022-04-23 op h->new_lines = tmp;
867 bad961bf 2022-04-23 op tmp = h->old_nonl;
868 bad961bf 2022-04-23 op h->old_nonl = h->new_nonl;
869 bad961bf 2022-04-23 op h->new_nonl = tmp;
871 bad961bf 2022-04-23 op for (i = 0; i < h->len; ++i) {
872 bad961bf 2022-04-23 op if (*h->lines[i] == '+')
873 bad961bf 2022-04-23 op *h->lines[i] = '-';
874 bad961bf 2022-04-23 op else if (*h->lines[i] == '-')
875 bad961bf 2022-04-23 op *h->lines[i] = '+';
880 e9ce266e 2022-03-07 op const struct got_error *
881 e9ce266e 2022-03-07 op got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
882 bad961bf 2022-04-23 op int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
883 bad961bf 2022-04-23 op void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
885 4bcdc895 2022-05-17 op const struct got_error *err = NULL, *complete_err = NULL;
886 78f5ac24 2022-03-19 op struct got_fileindex *fileindex = NULL;
887 f2dd7807 2022-05-17 op char *fileindex_path = NULL;
888 60aa1fa0 2022-03-17 op char *oldpath, *newpath;
889 e9ce266e 2022-03-07 op struct imsgbuf *ibuf;
890 e9ce266e 2022-03-07 op int imsg_fds[2] = {-1, -1};
891 55e9459f 2022-06-19 op int overlapcnt, done = 0, failed = 0;
894 e9ce266e 2022-03-07 op ibuf = calloc(1, sizeof(*ibuf));
895 e9ce266e 2022-03-07 op if (ibuf == NULL) {
896 e9ce266e 2022-03-07 op err = got_error_from_errno("calloc");
900 e9ce266e 2022-03-07 op if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
901 e9ce266e 2022-03-07 op err = got_error_from_errno("socketpair");
905 e9ce266e 2022-03-07 op pid = fork();
906 e9ce266e 2022-03-07 op if (pid == -1) {
907 e9ce266e 2022-03-07 op err = got_error_from_errno("fork");
909 e9ce266e 2022-03-07 op } else if (pid == 0) {
910 e9ce266e 2022-03-07 op got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
912 e9ce266e 2022-03-07 op /* not reached */
915 e9ce266e 2022-03-07 op if (close(imsg_fds[1]) == -1) {
916 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
919 e9ce266e 2022-03-07 op imsg_fds[1] = -1;
920 e9ce266e 2022-03-07 op imsg_init(ibuf, imsg_fds[0]);
922 e9ce266e 2022-03-07 op err = send_patch(ibuf, fd);
927 f2dd7807 2022-05-17 op err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
932 e9ce266e 2022-03-07 op while (!done && err == NULL) {
933 e9ce266e 2022-03-07 op struct got_patch p;
934 60aa1fa0 2022-03-17 op struct patch_args pa;
936 60aa1fa0 2022-03-17 op pa.progress_cb = progress_cb;
937 60aa1fa0 2022-03-17 op pa.progress_arg = progress_arg;
938 60aa1fa0 2022-03-17 op pa.head = &p.head;
940 9d6cabd5 2022-04-07 op err = recv_patch(ibuf, &done, &p, strip);
941 e9ce266e 2022-03-07 op if (err || done)
945 bad961bf 2022-04-23 op reverse_patch(&p);
947 78f5ac24 2022-03-19 op err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
948 78f5ac24 2022-03-19 op &newpath, worktree, repo, fileindex);
949 78f5ac24 2022-03-19 op if (err == NULL)
950 55e9459f 2022-06-19 op err = apply_patch(&overlapcnt, worktree, repo,
951 55e9459f 2022-06-19 op fileindex, oldpath, newpath, &p, nop, &pa,
952 55e9459f 2022-06-19 op cancel_cb, cancel_arg);
953 60aa1fa0 2022-03-17 op if (err != NULL) {
955 60aa1fa0 2022-03-17 op /* recoverable errors */
956 60aa1fa0 2022-03-17 op if (err->code == GOT_ERR_FILE_STATUS ||
957 60aa1fa0 2022-03-17 op (err->code == GOT_ERR_ERRNO && errno == ENOENT))
958 60aa1fa0 2022-03-17 op err = report_progress(&pa, p.old, p.new,
959 60aa1fa0 2022-03-17 op GOT_STATUS_CANNOT_UPDATE, err);
960 60aa1fa0 2022-03-17 op else if (err->code == GOT_ERR_HUNK_FAILED)
961 60aa1fa0 2022-03-17 op err = report_progress(&pa, p.old, p.new,
962 60aa1fa0 2022-03-17 op GOT_STATUS_CANNOT_UPDATE, NULL);
964 55e9459f 2022-06-19 op if (overlapcnt != 0)
967 60aa1fa0 2022-03-17 op free(oldpath);
968 60aa1fa0 2022-03-17 op free(newpath);
969 e9ce266e 2022-03-07 op patch_free(&p);
976 4bcdc895 2022-05-17 op if (fileindex != NULL)
977 4bcdc895 2022-05-17 op complete_err = got_worktree_patch_complete(fileindex,
978 4bcdc895 2022-05-17 op fileindex_path);
979 f2dd7807 2022-05-17 op if (complete_err && err == NULL)
980 f2dd7807 2022-05-17 op err = complete_err;
981 4bcdc895 2022-05-17 op free(fileindex_path);
982 e9ce266e 2022-03-07 op if (fd != -1 && close(fd) == -1 && err == NULL)
983 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
984 e9ce266e 2022-03-07 op if (ibuf != NULL)
985 e9ce266e 2022-03-07 op imsg_clear(ibuf);
986 e9ce266e 2022-03-07 op if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
987 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
988 e9ce266e 2022-03-07 op if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
989 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
990 60aa1fa0 2022-03-17 op if (err == NULL && failed)
991 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_PATCH_FAILED);
