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 e9ce266e 2022-03-07 op #include "got_opentemp.h"
46 e9ce266e 2022-03-07 op #include "got_patch.h"
48 e9ce266e 2022-03-07 op #include "got_lib_delta.h"
49 e9ce266e 2022-03-07 op #include "got_lib_object.h"
50 e9ce266e 2022-03-07 op #include "got_lib_privsep.h"
52 e9ce266e 2022-03-07 op #define MIN(a, b) ((a) < (b) ? (a) : (b))
54 e9ce266e 2022-03-07 op struct got_patch_hunk {
55 e9ce266e 2022-03-07 op STAILQ_ENTRY(got_patch_hunk) entries;
56 60aa1fa0 2022-03-17 op const struct got_error *err;
60 e9ce266e 2022-03-07 op long old_from;
61 e9ce266e 2022-03-07 op long old_lines;
62 e9ce266e 2022-03-07 op long new_from;
63 e9ce266e 2022-03-07 op long new_lines;
69 60aa1fa0 2022-03-17 op STAILQ_HEAD(got_patch_hunk_head, got_patch_hunk);
70 e9ce266e 2022-03-07 op struct got_patch {
73 60aa1fa0 2022-03-17 op struct got_patch_hunk_head head;
76 b22138f5 2022-03-16 op struct patch_args {
77 b22138f5 2022-03-16 op got_patch_progress_cb progress_cb;
78 b22138f5 2022-03-16 op void *progress_arg;
79 60aa1fa0 2022-03-17 op struct got_patch_hunk_head *head;
82 e9ce266e 2022-03-07 op static const struct got_error *
83 e9ce266e 2022-03-07 op send_patch(struct imsgbuf *ibuf, int fd)
85 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
87 e9ce266e 2022-03-07 op if (imsg_compose(ibuf, GOT_IMSG_PATCH_FILE, 0, 0, fd,
88 e9ce266e 2022-03-07 op NULL, 0) == -1) {
89 e9ce266e 2022-03-07 op err = got_error_from_errno(
90 e9ce266e 2022-03-07 op "imsg_compose GOT_IMSG_PATCH_FILE");
95 e9ce266e 2022-03-07 op if (imsg_flush(ibuf) == -1) {
96 e9ce266e 2022-03-07 op err = got_error_from_errno("imsg_flush");
97 e9ce266e 2022-03-07 op imsg_clear(ibuf);
104 e9ce266e 2022-03-07 op patch_free(struct got_patch *p)
106 e9ce266e 2022-03-07 op struct got_patch_hunk *h;
109 e9ce266e 2022-03-07 op while (!STAILQ_EMPTY(&p->head)) {
110 e9ce266e 2022-03-07 op h = STAILQ_FIRST(&p->head);
111 e9ce266e 2022-03-07 op STAILQ_REMOVE_HEAD(&p->head, entries);
113 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i)
114 e9ce266e 2022-03-07 op free(h->lines[i]);
115 e9ce266e 2022-03-07 op free(h->lines);
119 e9ce266e 2022-03-07 op free(p->new);
120 e9ce266e 2022-03-07 op free(p->old);
122 0e07a2a1 2022-06-13 op memset(p, 0, sizeof(*p));
123 0e07a2a1 2022-06-13 op STAILQ_INIT(&p->head);
126 e9ce266e 2022-03-07 op static const struct got_error *
127 e9ce266e 2022-03-07 op pushline(struct got_patch_hunk *h, const char *line)
130 e9ce266e 2022-03-07 op size_t newcap;
132 e9ce266e 2022-03-07 op if (h->len == h->cap) {
133 e9ce266e 2022-03-07 op if ((newcap = h->cap * 1.5) == 0)
135 e9ce266e 2022-03-07 op t = recallocarray(h->lines, h->cap, newcap,
136 e9ce266e 2022-03-07 op sizeof(h->lines[0]));
137 e9ce266e 2022-03-07 op if (t == NULL)
138 e9ce266e 2022-03-07 op return got_error_from_errno("recallocarray");
139 e9ce266e 2022-03-07 op h->lines = t;
140 e9ce266e 2022-03-07 op h->cap = newcap;
143 e9ce266e 2022-03-07 op if ((t = strdup(line)) == NULL)
144 e9ce266e 2022-03-07 op return got_error_from_errno("strdup");
146 e9ce266e 2022-03-07 op h->lines[h->len++] = t;
150 e9ce266e 2022-03-07 op static const struct got_error *
151 9d6cabd5 2022-04-07 op recv_patch(struct imsgbuf *ibuf, int *done, struct got_patch *p, int strip)
153 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
154 e9ce266e 2022-03-07 op struct imsg imsg;
155 e9ce266e 2022-03-07 op struct got_imsg_patch_hunk hdr;
156 e9ce266e 2022-03-07 op struct got_imsg_patch patch;
157 e9ce266e 2022-03-07 op struct got_patch_hunk *h = NULL;
158 e9ce266e 2022-03-07 op size_t datalen;
159 b2832778 2022-04-23 op int lastmode = -1;
161 e9ce266e 2022-03-07 op memset(p, 0, sizeof(*p));
162 e9ce266e 2022-03-07 op STAILQ_INIT(&p->head);
164 e9ce266e 2022-03-07 op err = got_privsep_recv_imsg(&imsg, ibuf, 0);
167 e9ce266e 2022-03-07 op if (imsg.hdr.type == GOT_IMSG_PATCH_EOF) {
171 e9ce266e 2022-03-07 op if (imsg.hdr.type != GOT_IMSG_PATCH) {
172 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
175 e9ce266e 2022-03-07 op datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
176 e9ce266e 2022-03-07 op if (datalen != sizeof(patch)) {
177 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_LEN);
180 e9ce266e 2022-03-07 op memcpy(&patch, imsg.data, sizeof(patch));
182 99b94ad7 2022-06-13 op if (patch.old[sizeof(patch.old)-1] != '\0' ||
183 99b94ad7 2022-06-13 op patch.new[sizeof(patch.new)-1] != '\0') {
184 99b94ad7 2022-06-13 op err = got_error(GOT_ERR_PRIVSEP_LEN);
188 9d6cabd5 2022-04-07 op /* automatically set strip=1 for git-style diffs */
189 9d6cabd5 2022-04-07 op if (strip == -1 && patch.git &&
190 9d6cabd5 2022-04-07 op (*patch.old == '\0' || !strncmp(patch.old, "a/", 2)) &&
191 9d6cabd5 2022-04-07 op (*patch.new == '\0' || !strncmp(patch.new, "b/", 2)))
194 9d6cabd5 2022-04-07 op /* prefer the new name if not /dev/null for not git-style diffs */
195 9d6cabd5 2022-04-07 op if (!patch.git && *patch.new != '\0' && *patch.old != '\0') {
196 9d6cabd5 2022-04-07 op err = got_path_strip(&p->old, patch.new, strip);
199 9d6cabd5 2022-04-07 op } else if (*patch.old != '\0') {
200 9d6cabd5 2022-04-07 op err = got_path_strip(&p->old, patch.old, strip);
205 9d6cabd5 2022-04-07 op if (*patch.new != '\0') {
206 9d6cabd5 2022-04-07 op err = got_path_strip(&p->new, patch.new, strip);
211 b95c53df 2022-03-12 op if (p->old == NULL && p->new == NULL) {
212 b95c53df 2022-03-12 op err = got_error(GOT_ERR_PATCH_MALFORMED);
216 e9ce266e 2022-03-07 op imsg_free(&imsg);
221 e9ce266e 2022-03-07 op err = got_privsep_recv_imsg(&imsg, ibuf, 0);
223 0e07a2a1 2022-06-13 op patch_free(p);
227 e9ce266e 2022-03-07 op switch (imsg.hdr.type) {
228 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_DONE:
229 be33dff7 2022-05-13 op if (h != NULL && h->len == 0)
230 be33dff7 2022-05-13 op err = got_error(GOT_ERR_PATCH_MALFORMED);
232 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_HUNK:
233 be33dff7 2022-05-13 op if (h != NULL &&
234 be33dff7 2022-05-13 op (h->len == 0 || h->old_nonl || h->new_nonl)) {
235 b3c57ab2 2022-03-22 op err = got_error(GOT_ERR_PATCH_MALFORMED);
238 b2832778 2022-04-23 op lastmode = -1;
239 e9ce266e 2022-03-07 op datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
240 e9ce266e 2022-03-07 op if (datalen != sizeof(hdr)) {
241 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_LEN);
244 e9ce266e 2022-03-07 op memcpy(&hdr, imsg.data, sizeof(hdr));
245 e9ce266e 2022-03-07 op if ((h = calloc(1, sizeof(*h))) == NULL) {
246 e9ce266e 2022-03-07 op err = got_error_from_errno("calloc");
249 71393b5c 2022-06-14 op if (h->old_from < 0 || h->new_from < 0) {
250 71393b5c 2022-06-14 op err = got_error(GOT_ERR_PRIVSEP_LEN);
253 e9ce266e 2022-03-07 op h->old_from = hdr.oldfrom;
254 e9ce266e 2022-03-07 op h->old_lines = hdr.oldlines;
255 e9ce266e 2022-03-07 op h->new_from = hdr.newfrom;
256 e9ce266e 2022-03-07 op h->new_lines = hdr.newlines;
257 e9ce266e 2022-03-07 op STAILQ_INSERT_TAIL(&p->head, h, entries);
259 e9ce266e 2022-03-07 op case GOT_IMSG_PATCH_LINE:
260 e9ce266e 2022-03-07 op if (h == NULL) {
261 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
264 e9ce266e 2022-03-07 op datalen = imsg.hdr.len - IMSG_HEADER_SIZE;
265 e9ce266e 2022-03-07 op t = imsg.data;
266 b3c57ab2 2022-03-22 op /* at least one char */
267 e9ce266e 2022-03-07 op if (datalen < 2 || t[datalen-1] != '\0') {
268 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
271 b3c57ab2 2022-03-22 op if (*t != ' ' && *t != '-' && *t != '+' &&
272 b3c57ab2 2022-03-22 op *t != '\\') {
273 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
277 b2832778 2022-04-23 op if (*t != '\\')
278 b3c57ab2 2022-03-22 op err = pushline(h, t);
279 b2832778 2022-04-23 op else if (lastmode == '-')
280 b2832778 2022-04-23 op h->old_nonl = 1;
281 b2832778 2022-04-23 op else if (lastmode == '+')
282 b2832778 2022-04-23 op h->new_nonl = 1;
284 b2832778 2022-04-23 op err = got_error(GOT_ERR_PATCH_MALFORMED);
289 b2832778 2022-04-23 op lastmode = *t;
292 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
296 e9ce266e 2022-03-07 op imsg_free(&imsg);
301 0e07a2a1 2022-06-13 op patch_free(p);
303 e9ce266e 2022-03-07 op imsg_free(&imsg);
308 e9ce266e 2022-03-07 op * Copy data from orig starting at copypos until pos into tmp.
309 e9ce266e 2022-03-07 op * If pos is -1, copy until EOF.
311 e9ce266e 2022-03-07 op static const struct got_error *
312 e9ce266e 2022-03-07 op copy(FILE *tmp, FILE *orig, off_t copypos, off_t pos)
314 e9ce266e 2022-03-07 op char buf[BUFSIZ];
315 e9ce266e 2022-03-07 op size_t len, r, w;
317 e45f7eba 2022-05-14 naddy if (fseeko(orig, copypos, SEEK_SET) == -1)
318 e45f7eba 2022-05-14 naddy return got_error_from_errno("fseeko");
320 e9ce266e 2022-03-07 op while (pos == -1 || copypos < pos) {
321 e9ce266e 2022-03-07 op len = sizeof(buf);
323 e9ce266e 2022-03-07 op len = MIN(len, (size_t)pos - copypos);
324 e9ce266e 2022-03-07 op r = fread(buf, 1, len, orig);
325 e9ce266e 2022-03-07 op if (r != len && ferror(orig))
326 e9ce266e 2022-03-07 op return got_error_from_errno("fread");
327 e9ce266e 2022-03-07 op w = fwrite(buf, 1, r, tmp);
329 e9ce266e 2022-03-07 op return got_error_from_errno("fwrite");
330 e9ce266e 2022-03-07 op copypos += len;
331 e9ce266e 2022-03-07 op if (r != len && feof(orig)) {
332 e9ce266e 2022-03-07 op if (pos == -1)
334 60aa1fa0 2022-03-17 op return got_error(GOT_ERR_HUNK_FAILED);
340 e9ce266e 2022-03-07 op static const struct got_error *
341 33df9995 2022-03-11 op locate_hunk(FILE *orig, struct got_patch_hunk *h, off_t *pos, long *lineno)
343 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
344 e9ce266e 2022-03-07 op char *line = NULL;
345 e9ce266e 2022-03-07 op char mode = *h->lines[0];
346 e9ce266e 2022-03-07 op size_t linesize = 0;
347 e9ce266e 2022-03-07 op ssize_t linelen;
348 e9ce266e 2022-03-07 op off_t match = -1;
349 e9ce266e 2022-03-07 op long match_lineno = -1;
352 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
353 e9ce266e 2022-03-07 op if (linelen == -1) {
354 e9ce266e 2022-03-07 op if (ferror(orig))
355 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
356 e9ce266e 2022-03-07 op else if (match == -1)
357 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_HUNK_FAILED);
360 b3c57ab2 2022-03-22 op if (line[linelen - 1] == '\n')
361 b3c57ab2 2022-03-22 op line[linelen - 1] = '\0';
364 46ebad13 2022-03-17 op if ((mode == ' ' && !strcmp(h->lines[0] + 1, line)) ||
365 46ebad13 2022-03-17 op (mode == '-' && !strcmp(h->lines[0] + 1, line)) ||
366 e9ce266e 2022-03-07 op (mode == '+' && *lineno == h->old_from)) {
367 e9ce266e 2022-03-07 op match = ftello(orig);
368 e9ce266e 2022-03-07 op if (match == -1) {
369 e9ce266e 2022-03-07 op err = got_error_from_errno("ftello");
372 e9ce266e 2022-03-07 op match -= linelen;
373 e9ce266e 2022-03-07 op match_lineno = (*lineno)-1;
376 e9ce266e 2022-03-07 op if (*lineno >= h->old_from && match != -1)
380 e9ce266e 2022-03-07 op if (err == NULL) {
381 33df9995 2022-03-11 op *pos = match;
382 e9ce266e 2022-03-07 op *lineno = match_lineno;
383 e45f7eba 2022-05-14 naddy if (fseeko(orig, match, SEEK_SET) == -1)
384 e45f7eba 2022-05-14 naddy err = got_error_from_errno("fseeko");
391 e9ce266e 2022-03-07 op static const struct got_error *
392 e9ce266e 2022-03-07 op test_hunk(FILE *orig, struct got_patch_hunk *h)
394 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
395 e9ce266e 2022-03-07 op char *line = NULL;
396 e9ce266e 2022-03-07 op size_t linesize = 0, i = 0;
397 e9ce266e 2022-03-07 op ssize_t linelen;
399 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i) {
400 e9ce266e 2022-03-07 op switch (*h->lines[i]) {
405 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
406 e9ce266e 2022-03-07 op if (linelen == -1) {
407 e9ce266e 2022-03-07 op if (ferror(orig))
408 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
410 e9ce266e 2022-03-07 op err = got_error(
411 60aa1fa0 2022-03-17 op GOT_ERR_HUNK_FAILED);
414 b3c57ab2 2022-03-22 op if (line[linelen - 1] == '\n')
415 b3c57ab2 2022-03-22 op line[linelen - 1] = '\0';
416 46ebad13 2022-03-17 op if (strcmp(h->lines[i] + 1, line)) {
417 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_HUNK_FAILED);
429 e9ce266e 2022-03-07 op static const struct got_error *
430 e9ce266e 2022-03-07 op apply_hunk(FILE *tmp, struct got_patch_hunk *h, long *lineno)
432 b2832778 2022-04-23 op size_t i, new = 0;
434 e9ce266e 2022-03-07 op for (i = 0; i < h->len; ++i) {
435 e9ce266e 2022-03-07 op switch (*h->lines[i]) {
437 b3c57ab2 2022-03-22 op if (fprintf(tmp, "%s\n", h->lines[i] + 1) < 0)
438 e9ce266e 2022-03-07 op return got_error_from_errno("fprintf");
439 e9ce266e 2022-03-07 op /* fallthrough */
445 46ebad13 2022-03-17 op if (fprintf(tmp, "%s", h->lines[i] + 1) < 0)
446 e9ce266e 2022-03-07 op return got_error_from_errno("fprintf");
447 b2832778 2022-04-23 op if (new != h->new_lines || !h->new_nonl) {
448 b3c57ab2 2022-03-22 op if (fprintf(tmp, "\n") < 0)
449 b3c57ab2 2022-03-22 op return got_error_from_errno(
458 6e96b326 2022-03-12 op static const struct got_error *
459 2be5e1a2 2022-03-16 op patch_file(struct got_patch *p, const char *path, FILE *tmp, int nop,
460 2be5e1a2 2022-03-16 op mode_t *mode)
462 6e96b326 2022-03-12 op const struct got_error *err = NULL;
463 6e96b326 2022-03-12 op struct got_patch_hunk *h;
464 2be5e1a2 2022-03-16 op struct stat sb;
465 6e96b326 2022-03-12 op long lineno = 0;
467 6e96b326 2022-03-12 op off_t copypos, pos;
468 6e96b326 2022-03-12 op char *line = NULL;
469 6e96b326 2022-03-12 op size_t linesize = 0;
470 6e96b326 2022-03-12 op ssize_t linelen;
472 e9ce266e 2022-03-07 op if (p->old == NULL) { /* create */
473 e9ce266e 2022-03-07 op h = STAILQ_FIRST(&p->head);
474 6e96b326 2022-03-12 op if (h == NULL || STAILQ_NEXT(h, entries) != NULL)
475 6e96b326 2022-03-12 op return got_error(GOT_ERR_PATCH_MALFORMED);
478 4027dbc2 2022-03-22 op return apply_hunk(tmp, h, &lineno);
481 e9ce266e 2022-03-07 op if ((orig = fopen(path, "r")) == NULL) {
482 e9ce266e 2022-03-07 op err = got_error_from_errno2("fopen", path);
486 2be5e1a2 2022-03-16 op if (fstat(fileno(orig), &sb) == -1) {
487 2be5e1a2 2022-03-16 op err = got_error_from_errno("fstat");
490 2be5e1a2 2022-03-16 op *mode = sb.st_mode;
493 e9ce266e 2022-03-07 op STAILQ_FOREACH(h, &p->head, entries) {
495 33df9995 2022-03-11 op err = locate_hunk(orig, h, &pos, &lineno);
496 60aa1fa0 2022-03-17 op if (err != NULL && err->code == GOT_ERR_HUNK_FAILED)
497 60aa1fa0 2022-03-17 op h->err = err;
498 e9ce266e 2022-03-07 op if (err != NULL)
501 899fcfdf 2022-03-13 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 e45f7eba 2022-05-14 naddy if (fseeko(orig, pos, SEEK_SET) == -1) {
513 e45f7eba 2022-05-14 naddy err = got_error_from_errno("fseeko");
516 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, orig);
517 e9ce266e 2022-03-07 op if (linelen == -1) {
518 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
522 e9ce266e 2022-03-07 op goto tryagain;
524 e9ce266e 2022-03-07 op if (err != NULL)
527 60aa1fa0 2022-03-17 op if (lineno + 1 != h->old_from)
528 60aa1fa0 2022-03-17 op h->offset = lineno + 1 - h->old_from;
531 899fcfdf 2022-03-13 op err = apply_hunk(tmp, h, &lineno);
532 e9ce266e 2022-03-07 op if (err != NULL)
535 e9ce266e 2022-03-07 op copypos = ftello(orig);
536 e9ce266e 2022-03-07 op if (copypos == -1) {
537 e9ce266e 2022-03-07 op err = got_error_from_errno("ftello");
542 60aa1fa0 2022-03-17 op if (p->new == NULL && sb.st_size != copypos) {
543 60aa1fa0 2022-03-17 op h = STAILQ_FIRST(&p->head);
544 60aa1fa0 2022-03-17 op h->err = got_error(GOT_ERR_HUNK_FAILED);
545 60aa1fa0 2022-03-17 op err = h->err;
546 60aa1fa0 2022-03-17 op } else if (!nop && !feof(orig))
547 e9ce266e 2022-03-07 op err = copy(tmp, orig, copypos, -1);
550 6e96b326 2022-03-12 op if (orig != NULL)
551 6e96b326 2022-03-12 op fclose(orig);
555 dbda770b 2022-03-13 op static const struct got_error *
556 60aa1fa0 2022-03-17 op report_progress(struct patch_args *pa, const char *old, const char *new,
557 60aa1fa0 2022-03-17 op unsigned char status, const struct got_error *orig_error)
559 60aa1fa0 2022-03-17 op const struct got_error *err;
560 60aa1fa0 2022-03-17 op struct got_patch_hunk *h;
562 60aa1fa0 2022-03-17 op err = pa->progress_cb(pa->progress_arg, old, new, status,
563 60aa1fa0 2022-03-17 op orig_error, 0, 0, 0, 0, 0, NULL);
567 60aa1fa0 2022-03-17 op STAILQ_FOREACH(h, pa->head, entries) {
568 60aa1fa0 2022-03-17 op if (h->offset == 0 && h->err == NULL)
571 60aa1fa0 2022-03-17 op err = pa->progress_cb(pa->progress_arg, old, new, 0, NULL,
572 60aa1fa0 2022-03-17 op h->old_from, h->old_lines, h->new_from, h->new_lines,
573 60aa1fa0 2022-03-17 op h->offset, h->err);
581 60aa1fa0 2022-03-17 op static const struct got_error *
582 b22138f5 2022-03-16 op patch_delete(void *arg, unsigned char status, unsigned char staged_status,
583 b22138f5 2022-03-16 op const char *path)
585 60aa1fa0 2022-03-17 op return report_progress(arg, path, NULL, status, NULL);
588 b22138f5 2022-03-16 op static const struct got_error *
589 b22138f5 2022-03-16 op patch_add(void *arg, unsigned char status, const char *path)
591 60aa1fa0 2022-03-17 op return report_progress(arg, NULL, path, status, NULL);
594 b22138f5 2022-03-16 op static const struct got_error *
595 6e96b326 2022-03-12 op apply_patch(struct got_worktree *worktree, struct got_repository *repo,
596 f2dd7807 2022-05-17 op struct got_fileindex *fileindex, const char *old, const char *new,
597 f2dd7807 2022-05-17 op struct got_patch *p, int nop, struct patch_args *pa,
598 f2dd7807 2022-05-17 op got_cancel_cb cancel_cb, void *cancel_arg)
600 6e96b326 2022-03-12 op const struct got_error *err = NULL;
601 6e96b326 2022-03-12 op int file_renamed = 0;
602 ed3bff83 2022-04-23 op char *oldpath = NULL, *newpath = NULL;
603 60aa1fa0 2022-03-17 op char *tmppath = NULL, *template = NULL, *parent = NULL;;
604 6e96b326 2022-03-12 op FILE *tmp = NULL;
605 2be5e1a2 2022-03-16 op mode_t mode = GOT_DEFAULT_FILE_MODE;
607 ed3bff83 2022-04-23 op if (asprintf(&oldpath, "%s/%s", got_worktree_get_root_path(worktree),
608 ed3bff83 2022-04-23 op old) == -1) {
609 ed3bff83 2022-04-23 op err = got_error_from_errno("asprintf");
613 ed3bff83 2022-04-23 op if (asprintf(&newpath, "%s/%s", got_worktree_get_root_path(worktree),
614 ed3bff83 2022-04-23 op new) == -1) {
615 ed3bff83 2022-04-23 op err = got_error_from_errno("asprintf");
619 78f5ac24 2022-03-19 op file_renamed = strcmp(oldpath, newpath);
621 6e96b326 2022-03-12 op if (asprintf(&template, "%s/got-patch",
622 6e96b326 2022-03-12 op got_worktree_get_root_path(worktree)) == -1) {
623 6e96b326 2022-03-12 op err = got_error_from_errno(template);
628 899fcfdf 2022-03-13 op err = got_opentemp_named(&tmppath, &tmp, template);
631 2be5e1a2 2022-03-16 op err = patch_file(p, oldpath, tmp, nop, &mode);
638 5b67f96e 2022-03-13 op if (p->old != NULL && p->new == NULL) {
639 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_rm(old, repo, worktree,
640 f2dd7807 2022-05-17 op fileindex, patch_delete, pa);
644 2be5e1a2 2022-03-16 op if (fchmod(fileno(tmp), mode) == -1) {
645 41a37a44 2022-04-23 op err = got_error_from_errno2("chmod", tmppath);
649 6e96b326 2022-03-12 op if (rename(tmppath, newpath) == -1) {
650 95d68340 2022-03-16 op if (errno != ENOENT) {
651 95d68340 2022-03-16 op err = got_error_from_errno3("rename", tmppath,
656 95d68340 2022-03-16 op err = got_path_dirname(&parent, newpath);
657 95d68340 2022-03-16 op if (err != NULL)
659 95d68340 2022-03-16 op err = got_path_mkdir(parent);
660 95d68340 2022-03-16 op if (err != NULL)
662 95d68340 2022-03-16 op if (rename(tmppath, newpath) == -1) {
663 95d68340 2022-03-16 op err = got_error_from_errno3("rename", tmppath,
669 6e96b326 2022-03-12 op if (file_renamed) {
670 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_rm(old, repo, worktree,
671 f2dd7807 2022-05-17 op fileindex, patch_delete, pa);
672 6e96b326 2022-03-12 op if (err == NULL)
673 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_add(new, repo,
674 f2dd7807 2022-05-17 op worktree, fileindex, patch_add,
677 78f5ac24 2022-03-19 op unlink(newpath);
678 78f5ac24 2022-03-19 op } else if (p->old == NULL) {
679 f2dd7807 2022-05-17 op err = got_worktree_patch_schedule_add(new, repo, worktree,
680 f2dd7807 2022-05-17 op fileindex, patch_add, pa);
682 78f5ac24 2022-03-19 op unlink(newpath);
684 ed3bff83 2022-04-23 op err = report_progress(pa, old, new, GOT_STATUS_MODIFY, NULL);
687 95d68340 2022-03-16 op free(parent);
688 6f5cb1bd 2022-03-08 op free(template);
689 e9ce266e 2022-03-07 op if (tmppath != NULL)
690 e9ce266e 2022-03-07 op unlink(tmppath);
691 e9ce266e 2022-03-07 op free(tmppath);
692 ed3bff83 2022-04-23 op free(oldpath);
693 ed3bff83 2022-04-23 op free(newpath);
698 bad961bf 2022-04-23 op reverse_patch(struct got_patch *p)
700 bad961bf 2022-04-23 op struct got_patch_hunk *h;
704 bad961bf 2022-04-23 op STAILQ_FOREACH(h, &p->head, entries) {
705 bad961bf 2022-04-23 op tmp = h->old_from;
706 bad961bf 2022-04-23 op h->old_from = h->new_from;
707 bad961bf 2022-04-23 op h->new_from = tmp;
709 bad961bf 2022-04-23 op tmp = h->old_lines;
710 bad961bf 2022-04-23 op h->old_lines = h->new_lines;
711 bad961bf 2022-04-23 op h->new_lines = tmp;
713 bad961bf 2022-04-23 op tmp = h->old_nonl;
714 bad961bf 2022-04-23 op h->old_nonl = h->new_nonl;
715 bad961bf 2022-04-23 op h->new_nonl = tmp;
717 bad961bf 2022-04-23 op for (i = 0; i < h->len; ++i) {
718 bad961bf 2022-04-23 op if (*h->lines[i] == '+')
719 bad961bf 2022-04-23 op *h->lines[i] = '-';
720 bad961bf 2022-04-23 op else if (*h->lines[i] == '-')
721 bad961bf 2022-04-23 op *h->lines[i] = '+';
726 e9ce266e 2022-03-07 op const struct got_error *
727 e9ce266e 2022-03-07 op got_patch(int fd, struct got_worktree *worktree, struct got_repository *repo,
728 bad961bf 2022-04-23 op int nop, int strip, int reverse, got_patch_progress_cb progress_cb,
729 bad961bf 2022-04-23 op void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
731 4bcdc895 2022-05-17 op const struct got_error *err = NULL, *complete_err = NULL;
732 78f5ac24 2022-03-19 op struct got_fileindex *fileindex = NULL;
733 f2dd7807 2022-05-17 op char *fileindex_path = NULL;
734 60aa1fa0 2022-03-17 op char *oldpath, *newpath;
735 e9ce266e 2022-03-07 op struct imsgbuf *ibuf;
736 e9ce266e 2022-03-07 op int imsg_fds[2] = {-1, -1};
737 60aa1fa0 2022-03-17 op int done = 0, failed = 0;
740 e9ce266e 2022-03-07 op ibuf = calloc(1, sizeof(*ibuf));
741 e9ce266e 2022-03-07 op if (ibuf == NULL) {
742 e9ce266e 2022-03-07 op err = got_error_from_errno("calloc");
746 e9ce266e 2022-03-07 op if (socketpair(AF_UNIX, SOCK_STREAM, PF_UNSPEC, imsg_fds) == -1) {
747 e9ce266e 2022-03-07 op err = got_error_from_errno("socketpair");
751 e9ce266e 2022-03-07 op pid = fork();
752 e9ce266e 2022-03-07 op if (pid == -1) {
753 e9ce266e 2022-03-07 op err = got_error_from_errno("fork");
755 e9ce266e 2022-03-07 op } else if (pid == 0) {
756 e9ce266e 2022-03-07 op got_privsep_exec_child(imsg_fds, GOT_PATH_PROG_READ_PATCH,
758 e9ce266e 2022-03-07 op /* not reached */
761 e9ce266e 2022-03-07 op if (close(imsg_fds[1]) == -1) {
762 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
765 e9ce266e 2022-03-07 op imsg_fds[1] = -1;
766 e9ce266e 2022-03-07 op imsg_init(ibuf, imsg_fds[0]);
768 e9ce266e 2022-03-07 op err = send_patch(ibuf, fd);
773 f2dd7807 2022-05-17 op err = got_worktree_patch_prepare(&fileindex, &fileindex_path,
778 e9ce266e 2022-03-07 op while (!done && err == NULL) {
779 e9ce266e 2022-03-07 op struct got_patch p;
780 60aa1fa0 2022-03-17 op struct patch_args pa;
782 60aa1fa0 2022-03-17 op pa.progress_cb = progress_cb;
783 60aa1fa0 2022-03-17 op pa.progress_arg = progress_arg;
784 60aa1fa0 2022-03-17 op pa.head = &p.head;
786 9d6cabd5 2022-04-07 op err = recv_patch(ibuf, &done, &p, strip);
787 e9ce266e 2022-03-07 op if (err || done)
791 bad961bf 2022-04-23 op reverse_patch(&p);
793 78f5ac24 2022-03-19 op err = got_worktree_patch_check_path(p.old, p.new, &oldpath,
794 78f5ac24 2022-03-19 op &newpath, worktree, repo, fileindex);
795 78f5ac24 2022-03-19 op if (err == NULL)
796 f2dd7807 2022-05-17 op err = apply_patch(worktree, repo, fileindex, oldpath,
797 f2dd7807 2022-05-17 op newpath, &p, nop, &pa, cancel_cb, cancel_arg);
798 60aa1fa0 2022-03-17 op if (err != NULL) {
800 60aa1fa0 2022-03-17 op /* recoverable errors */
801 60aa1fa0 2022-03-17 op if (err->code == GOT_ERR_FILE_STATUS ||
802 60aa1fa0 2022-03-17 op (err->code == GOT_ERR_ERRNO && errno == ENOENT))
803 60aa1fa0 2022-03-17 op err = report_progress(&pa, p.old, p.new,
804 60aa1fa0 2022-03-17 op GOT_STATUS_CANNOT_UPDATE, err);
805 60aa1fa0 2022-03-17 op else if (err->code == GOT_ERR_HUNK_FAILED)
806 60aa1fa0 2022-03-17 op err = report_progress(&pa, p.old, p.new,
807 60aa1fa0 2022-03-17 op GOT_STATUS_CANNOT_UPDATE, NULL);
810 60aa1fa0 2022-03-17 op free(oldpath);
811 60aa1fa0 2022-03-17 op free(newpath);
812 e9ce266e 2022-03-07 op patch_free(&p);
819 4bcdc895 2022-05-17 op if (fileindex != NULL)
820 4bcdc895 2022-05-17 op complete_err = got_worktree_patch_complete(fileindex,
821 4bcdc895 2022-05-17 op fileindex_path);
822 f2dd7807 2022-05-17 op if (complete_err && err == NULL)
823 f2dd7807 2022-05-17 op err = complete_err;
824 4bcdc895 2022-05-17 op free(fileindex_path);
825 e9ce266e 2022-03-07 op if (fd != -1 && close(fd) == -1 && err == NULL)
826 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
827 e9ce266e 2022-03-07 op if (ibuf != NULL)
828 e9ce266e 2022-03-07 op imsg_clear(ibuf);
829 e9ce266e 2022-03-07 op if (imsg_fds[0] != -1 && close(imsg_fds[0]) == -1 && err == NULL)
830 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
831 e9ce266e 2022-03-07 op if (imsg_fds[1] != -1 && close(imsg_fds[1]) == -1 && err == NULL)
832 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
833 60aa1fa0 2022-03-17 op if (err == NULL && failed)
834 60aa1fa0 2022-03-17 op err = got_error(GOT_ERR_PATCH_FAILED);