2 e9ce266e 2022-03-07 op * Copyright 1986, Larry Wall
4 e9ce266e 2022-03-07 op * Redistribution and use in source and binary forms, with or without
5 e9ce266e 2022-03-07 op * modification, are permitted provided that the following condition is met:
6 e9ce266e 2022-03-07 op * 1. Redistributions of source code must retain the above copyright notice,
7 e9ce266e 2022-03-07 op * this condition and the following disclaimer.
9 e9ce266e 2022-03-07 op * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
10 e9ce266e 2022-03-07 op * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
11 e9ce266e 2022-03-07 op * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
12 e9ce266e 2022-03-07 op * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
13 e9ce266e 2022-03-07 op * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
14 e9ce266e 2022-03-07 op * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
15 e9ce266e 2022-03-07 op * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
16 e9ce266e 2022-03-07 op * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
17 e9ce266e 2022-03-07 op * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
18 e9ce266e 2022-03-07 op * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
19 e9ce266e 2022-03-07 op * SUCH DAMAGE.
23 e9ce266e 2022-03-07 op * Copyright (c) 2022 Omar Polo <op@openbsd.org>
25 e9ce266e 2022-03-07 op * Permission to use, copy, modify, and distribute this software for any
26 e9ce266e 2022-03-07 op * purpose with or without fee is hereby granted, provided that the above
27 e9ce266e 2022-03-07 op * copyright notice and this permission notice appear in all copies.
29 e9ce266e 2022-03-07 op * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
30 e9ce266e 2022-03-07 op * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
31 e9ce266e 2022-03-07 op * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
32 e9ce266e 2022-03-07 op * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
33 e9ce266e 2022-03-07 op * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
34 e9ce266e 2022-03-07 op * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
35 e9ce266e 2022-03-07 op * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
38 e9ce266e 2022-03-07 op #include <sys/types.h>
39 e9ce266e 2022-03-07 op #include <sys/queue.h>
40 e9ce266e 2022-03-07 op #include <sys/uio.h>
42 e9ce266e 2022-03-07 op #include <ctype.h>
43 e9ce266e 2022-03-07 op #include <limits.h>
44 e9ce266e 2022-03-07 op #include <paths.h>
45 e9ce266e 2022-03-07 op #include <sha1.h>
46 5822e79e 2023-02-23 op #include <sha2.h>
47 e9ce266e 2022-03-07 op #include <stdint.h>
48 e9ce266e 2022-03-07 op #include <stdio.h>
49 e9ce266e 2022-03-07 op #include <stdlib.h>
50 e9ce266e 2022-03-07 op #include <string.h>
51 e9ce266e 2022-03-07 op #include <unistd.h>
52 e9ce266e 2022-03-07 op #include <imsg.h>
54 e9ce266e 2022-03-07 op #include "got_error.h"
55 e9ce266e 2022-03-07 op #include "got_object.h"
57 e9ce266e 2022-03-07 op #include "got_lib_delta.h"
58 e9ce266e 2022-03-07 op #include "got_lib_object.h"
59 e9ce266e 2022-03-07 op #include "got_lib_privsep.h"
60 53bf0b54 2023-02-23 op #include "got_lib_hash.h"
62 e9ce266e 2022-03-07 op struct imsgbuf ibuf;
64 e9ce266e 2022-03-07 op static const struct got_error *
65 d8b5af43 2022-06-19 op send_patch(const char *oldname, const char *newname, const char *commitid,
66 611e5fc2 2022-09-21 mark const char *blob, const int xbit, int git)
68 e9ce266e 2022-03-07 op struct got_imsg_patch p;
70 e9ce266e 2022-03-07 op memset(&p, 0, sizeof(p));
72 9d6cabd5 2022-04-07 op if (oldname != NULL)
73 e9ce266e 2022-03-07 op strlcpy(p.old, oldname, sizeof(p.old));
75 e9ce266e 2022-03-07 op if (newname != NULL)
76 e9ce266e 2022-03-07 op strlcpy(p.new, newname, sizeof(p.new));
78 497a5915 2022-06-27 op if (commitid != NULL)
79 d8b5af43 2022-06-19 op strlcpy(p.cid, commitid, sizeof(p.cid));
81 497a5915 2022-06-27 op if (blob != NULL)
82 55e9459f 2022-06-19 op strlcpy(p.blob, blob, sizeof(p.blob));
84 611e5fc2 2022-09-21 mark p.xbit = xbit;
86 55e9459f 2022-06-19 op if (imsg_compose(&ibuf, GOT_IMSG_PATCH, 0, 0, -1, &p, sizeof(p)) == -1)
87 e9ce266e 2022-03-07 op return got_error_from_errno("imsg_compose GOT_IMSG_PATCH");
91 e9ce266e 2022-03-07 op static const struct got_error *
92 e9ce266e 2022-03-07 op send_patch_done(void)
94 e9ce266e 2022-03-07 op if (imsg_compose(&ibuf, GOT_IMSG_PATCH_DONE, 0, 0, -1,
95 e9ce266e 2022-03-07 op NULL, 0) == -1)
96 e9ce266e 2022-03-07 op return got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
97 08f44789 2022-07-07 op return got_privsep_flush_imsg(&ibuf);
100 e9ce266e 2022-03-07 op /* based on fetchname from usr.bin/patch/util.c */
101 e9ce266e 2022-03-07 op static const struct got_error *
102 9d6cabd5 2022-04-07 op filename(const char *at, char **name)
104 9d6cabd5 2022-04-07 op char *tmp, *t;
106 e9ce266e 2022-03-07 op *name = NULL;
107 e9ce266e 2022-03-07 op if (*at == '\0')
110 e9ce266e 2022-03-07 op while (isspace((unsigned char)*at))
113 e9ce266e 2022-03-07 op /* files can be created or removed by diffing against /dev/null */
114 46ebad13 2022-03-17 op if (!strncmp(at, _PATH_DEVNULL, sizeof(_PATH_DEVNULL) - 1))
117 9d6cabd5 2022-04-07 op tmp = strdup(at);
118 9d6cabd5 2022-04-07 op if (tmp == NULL)
119 e9ce266e 2022-03-07 op return got_error_from_errno("strdup");
120 9d6cabd5 2022-04-07 op if ((t = strchr(tmp, '\t')) != NULL)
122 9d6cabd5 2022-04-07 op if ((t = strchr(tmp, '\n')) != NULL)
125 9d6cabd5 2022-04-07 op *name = strdup(tmp);
127 e9ce266e 2022-03-07 op if (*name == NULL)
128 e9ce266e 2022-03-07 op return got_error_from_errno("strdup");
133 684a9a6c 2022-12-31 op binary_deleted(const char *line)
135 684a9a6c 2022-12-31 op const char *prefix = "Binary files ";
136 684a9a6c 2022-12-31 op const char *suffix = " and /dev/null differ\n";
137 684a9a6c 2022-12-31 op size_t len, d;
139 684a9a6c 2022-12-31 op if (strncmp(line, prefix, strlen(prefix)) != 0)
141 684a9a6c 2022-12-31 op line += strlen(prefix);
143 684a9a6c 2022-12-31 op len = strlen(line);
144 684a9a6c 2022-12-31 op if (len <= strlen(suffix))
146 684a9a6c 2022-12-31 op d = len - strlen(suffix);
147 684a9a6c 2022-12-31 op return (strcmp(line + d, suffix) == 0);
150 684a9a6c 2022-12-31 op static const struct got_error *
151 684a9a6c 2022-12-31 op binaryfilename(const char *at, char **name)
153 684a9a6c 2022-12-31 op const char *suffix = " and /dev/null differ\n";
154 684a9a6c 2022-12-31 op size_t len, d;
156 a5d68234 2022-12-31 op *name = NULL;
158 684a9a6c 2022-12-31 op len = strlen(at);
159 684a9a6c 2022-12-31 op if (len <= strlen(suffix))
162 684a9a6c 2022-12-31 op d = len - strlen(suffix);
163 684a9a6c 2022-12-31 op if (strcmp(at + d, suffix) != 0)
166 684a9a6c 2022-12-31 op *name = strndup(at, d);
167 684a9a6c 2022-12-31 op if (*name == NULL)
168 684a9a6c 2022-12-31 op return got_error_from_errno("strndup");
173 611e5fc2 2022-09-21 mark filexbit(const char *line)
177 611e5fc2 2022-09-21 mark m = strchr(line, '(');
178 611e5fc2 2022-09-21 mark if (m && !strncmp(m + 1, "mode ", 5))
179 611e5fc2 2022-09-21 mark return strncmp(m + 6, "755", 3) == 0;
184 e9ce266e 2022-03-07 op static const struct got_error *
185 db0dfdd7 2022-06-27 op blobid(const char *line, char **blob, int git)
187 55e9459f 2022-06-19 op uint8_t digest[SHA1_DIGEST_LENGTH];
190 55e9459f 2022-06-19 op *blob = NULL;
192 55e9459f 2022-06-19 op len = strspn(line, "0123456789abcdefABCDEF");
193 55e9459f 2022-06-19 op if ((*blob = strndup(line, len)) == NULL)
194 55e9459f 2022-06-19 op return got_error_from_errno("strndup");
196 87a3ab84 2023-02-23 op if (!git && !got_parse_hash_digest(digest, *blob, GOT_HASH_SHA1)) {
197 55e9459f 2022-06-19 op /* silently ignore invalid blob ids */
199 55e9459f 2022-06-19 op *blob = NULL;
204 55e9459f 2022-06-19 op static const struct got_error *
205 acf749fc 2022-07-02 op patch_start(int *git, char **cid, FILE *fp)
207 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
208 e9ce266e 2022-03-07 op char *line = NULL;
209 e9ce266e 2022-03-07 op size_t linesize = 0;
210 e9ce266e 2022-03-07 op ssize_t linelen;
214 acf749fc 2022-07-02 op while ((linelen = getline(&line, &linesize, fp)) != -1) {
215 acf749fc 2022-07-02 op if (!strncmp(line, "diff --git ", 11)) {
220 acf749fc 2022-07-02 op } else if (!strncmp(line, "diff ", 5)) {
224 acf749fc 2022-07-02 op } else if (!strncmp(line, "commit - ", 9)) {
226 acf749fc 2022-07-02 op err = blobid(line + 9, cid, *git);
229 acf749fc 2022-07-02 op } else if (!strncmp(line, "--- ", 4) ||
230 acf749fc 2022-07-02 op !strncmp(line, "+++ ", 4) ||
231 684a9a6c 2022-12-31 op !strncmp(line, "blob - ", 7) ||
232 684a9a6c 2022-12-31 op binary_deleted(line)) {
233 acf749fc 2022-07-02 op /* rewind to previous line */
234 acf749fc 2022-07-02 op if (fseeko(fp, -linelen, SEEK_CUR) == -1)
235 acf749fc 2022-07-02 op err = got_error_from_errno("fseeko");
241 acf749fc 2022-07-02 op if (ferror(fp) && err == NULL)
242 acf749fc 2022-07-02 op err = got_error_from_errno("getline");
243 acf749fc 2022-07-02 op if (feof(fp) && err == NULL)
244 acf749fc 2022-07-02 op err = got_error(GOT_ERR_NO_PATCH);
248 acf749fc 2022-07-02 op static const struct got_error *
249 acf749fc 2022-07-02 op find_diff(int *done, int *next, FILE *fp, int git, const char *commitid)
251 acf749fc 2022-07-02 op const struct got_error *err = NULL;
252 acf749fc 2022-07-02 op char *old = NULL, *new = NULL;
253 acf749fc 2022-07-02 op char *blob = NULL;
254 acf749fc 2022-07-02 op char *line = NULL;
255 acf749fc 2022-07-02 op size_t linesize = 0;
256 acf749fc 2022-07-02 op ssize_t linelen;
257 684a9a6c 2022-12-31 op int create, delete_binary = 0, rename = 0, xbit = 0;
261 e9ce266e 2022-03-07 op while ((linelen = getline(&line, &linesize, fp)) != -1) {
263 e9ce266e 2022-03-07 op * Ignore the Index name like GNU and larry' patch,
264 e9ce266e 2022-03-07 op * we don't have to follow POSIX.
267 9d6cabd5 2022-04-07 op if (!strncmp(line, "--- ", 4)) {
269 9d6cabd5 2022-04-07 op err = filename(line+4, &old);
270 4379a9aa 2022-05-02 op } else if (rename && !strncmp(line, "rename from ", 12)) {
272 4379a9aa 2022-05-02 op err = filename(line+12, &old);
273 e9ce266e 2022-03-07 op } else if (!strncmp(line, "+++ ", 4)) {
275 9d6cabd5 2022-04-07 op err = filename(line+4, &new);
276 c87842d5 2022-09-23 mark } else if (!strncmp(line, "blob + ", 7) ||
277 c87842d5 2022-09-23 mark !strncmp(line, "file + ", 7)) {
278 611e5fc2 2022-09-21 mark xbit = filexbit(line);
279 55e9459f 2022-06-19 op } else if (!git && !strncmp(line, "blob - ", 7)) {
281 db0dfdd7 2022-06-27 op err = blobid(line + 7, &blob, git);
282 684a9a6c 2022-12-31 op } else if (!strncmp(line, "Binary files ", 13)) {
283 684a9a6c 2022-12-31 op delete_binary = 1;
285 684a9a6c 2022-12-31 op err = binaryfilename(line + 13, &old);
286 4379a9aa 2022-05-02 op } else if (rename && !strncmp(line, "rename to ", 10)) {
288 4379a9aa 2022-05-02 op err = filename(line + 10, &new);
289 4379a9aa 2022-05-02 op } else if (git && !strncmp(line, "similarity index 100%", 21))
291 611e5fc2 2022-09-21 mark else if (git && !strncmp(line, "new file mode 100", 17))
292 611e5fc2 2022-09-21 mark xbit = strncmp(line + 17, "755", 3) == 0;
293 db0dfdd7 2022-06-27 op else if (git && !strncmp(line, "index ", 6)) {
295 db0dfdd7 2022-06-27 op err = blobid(line + 6, &blob, git);
296 acf749fc 2022-07-02 op } else if (!strncmp(line, "diff ", 5)) {
297 acf749fc 2022-07-02 op /* rewind to previous line */
298 acf749fc 2022-07-02 op if (fseeko(fp, -linelen, SEEK_CUR) == -1)
299 acf749fc 2022-07-02 op err = got_error_from_errno("fseeko");
308 4379a9aa 2022-05-02 op * Git-style diffs with "similarity index 100%" don't
309 4379a9aa 2022-05-02 op * have any hunks and ends with the "rename to foobar"
312 4379a9aa 2022-05-02 op if (rename && old != NULL && new != NULL) {
314 684a9a6c 2022-12-31 op err = send_patch(old, new, commitid,
315 684a9a6c 2022-12-31 op blob, xbit, git);
320 684a9a6c 2022-12-31 op * Diffs that remove binary files have no hunks.
322 684a9a6c 2022-12-31 op if (delete_binary && old != NULL) {
324 d8b5af43 2022-06-19 op err = send_patch(old, new, commitid,
325 611e5fc2 2022-09-21 mark blob, xbit, git);
329 e9ce266e 2022-03-07 op if (!strncmp(line, "@@ -", 4)) {
330 e9ce266e 2022-03-07 op create = !strncmp(line+4, "0,0", 3);
331 e9ce266e 2022-03-07 op if ((old == NULL && new == NULL) ||
332 e9ce266e 2022-03-07 op (!create && old == NULL))
333 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PATCH_MALFORMED);
335 d8b5af43 2022-06-19 op err = send_patch(old, new, commitid,
336 611e5fc2 2022-09-21 mark blob, xbit, git);
341 e9ce266e 2022-03-07 op /* rewind to previous line */
342 e45f7eba 2022-05-14 naddy if (fseeko(fp, -linelen, SEEK_CUR) == -1)
343 e45f7eba 2022-05-14 naddy err = got_error_from_errno("fseeko");
352 e9ce266e 2022-03-07 op if (ferror(fp) && err == NULL)
353 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
354 e9ce266e 2022-03-07 op if (feof(fp) && err == NULL)
355 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_NO_PATCH);
359 e9ce266e 2022-03-07 op static const struct got_error *
360 35095610 2022-06-14 op strtolnum(char **str, int *n)
363 e9ce266e 2022-03-07 op const char *errstr;
365 e9ce266e 2022-03-07 op for (p = *str; isdigit((unsigned char)*p); ++p)
371 35095610 2022-06-14 op *n = strtonum(*str, 0, INT_MAX, &errstr);
372 e9ce266e 2022-03-07 op if (errstr != NULL)
373 e9ce266e 2022-03-07 op return got_error(GOT_ERR_PATCH_MALFORMED);
380 e9ce266e 2022-03-07 op static const struct got_error *
381 d75b9573 2022-05-02 op parse_hdr(char *s, int *done, struct got_imsg_patch_hunk *hdr)
383 e9ce266e 2022-03-07 op static const struct got_error *err = NULL;
385 e9ce266e 2022-03-07 op if (strncmp(s, "@@ -", 4)) {
393 e9ce266e 2022-03-07 op err = strtolnum(&s, &hdr->oldfrom);
396 e9ce266e 2022-03-07 op if (*s == ',') {
398 e9ce266e 2022-03-07 op err = strtolnum(&s, &hdr->oldlines);
402 e9ce266e 2022-03-07 op hdr->oldlines = 1;
404 e9ce266e 2022-03-07 op if (*s == ' ')
407 e9ce266e 2022-03-07 op if (*s != '+' || !*++s)
408 e9ce266e 2022-03-07 op return got_error(GOT_ERR_PATCH_MALFORMED);
409 e9ce266e 2022-03-07 op err = strtolnum(&s, &hdr->newfrom);
412 e9ce266e 2022-03-07 op if (*s == ',') {
414 e9ce266e 2022-03-07 op err = strtolnum(&s, &hdr->newlines);
418 e9ce266e 2022-03-07 op hdr->newlines = 1;
420 e9ce266e 2022-03-07 op if (*s == ' ')
423 e9ce266e 2022-03-07 op if (*s != '@')
424 e9ce266e 2022-03-07 op return got_error(GOT_ERR_PATCH_MALFORMED);
426 35095610 2022-06-14 op if (hdr->oldfrom >= INT_MAX - hdr->oldlines ||
427 35095610 2022-06-14 op hdr->newfrom >= INT_MAX - hdr->newlines ||
428 e9ce266e 2022-03-07 op /* not so sure about this one */
429 35095610 2022-06-14 op hdr->oldlines >= INT_MAX - hdr->newlines - 1 ||
430 be33dff7 2022-05-13 op (hdr->oldlines == 0 && hdr->newlines == 0))
431 e9ce266e 2022-03-07 op return got_error(GOT_ERR_PATCH_MALFORMED);
433 e9ce266e 2022-03-07 op if (hdr->oldlines == 0) {
434 e9ce266e 2022-03-07 op /* larry says to "do append rather than insert"; I don't
435 e9ce266e 2022-03-07 op * quite get it, but i trust him.
437 e9ce266e 2022-03-07 op hdr->oldfrom++;
440 e9ce266e 2022-03-07 op if (imsg_compose(&ibuf, GOT_IMSG_PATCH_HUNK, 0, 0, -1,
441 e9ce266e 2022-03-07 op hdr, sizeof(*hdr)) == -1)
442 e9ce266e 2022-03-07 op return got_error_from_errno(
443 e9ce266e 2022-03-07 op "imsg_compose GOT_IMSG_PATCH_HUNK");
447 e9ce266e 2022-03-07 op static const struct got_error *
448 41208069 2023-10-23 op send_line(const char *line, size_t len)
450 e9ce266e 2022-03-07 op static const struct got_error *err = NULL;
451 41208069 2023-10-23 op struct iovec iov[2];
452 41208069 2023-10-23 op int iovcnt = 0;
454 41208069 2023-10-23 op memset(&iov, 0, sizeof(iov));
456 b3c57ab2 2022-03-22 op if (*line != '+' && *line != '-' && *line != ' ' && *line != '\\') {
457 41208069 2023-10-23 op iov[iovcnt].iov_base = (void *)" ";
458 41208069 2023-10-23 op iov[iovcnt].iov_len = 1;
462 41208069 2023-10-23 op iov[iovcnt].iov_base = (void *)line;
463 41208069 2023-10-23 op iov[iovcnt].iov_len = len;
466 41208069 2023-10-23 op if (imsg_composev(&ibuf, GOT_IMSG_PATCH_LINE, 0, 0, -1,
467 41208069 2023-10-23 op iov, iovcnt) == -1)
468 e9ce266e 2022-03-07 op err = got_error_from_errno(
469 e9ce266e 2022-03-07 op "imsg_compose GOT_IMSG_PATCH_LINE");
474 e9ce266e 2022-03-07 op static const struct got_error *
475 b2832778 2022-04-23 op peek_special_line(FILE *fp)
477 b3c57ab2 2022-03-22 op const struct got_error *err;
480 b3c57ab2 2022-03-22 op ch = fgetc(fp);
481 b3c57ab2 2022-03-22 op if (ch != EOF && ch != '\\') {
482 b3c57ab2 2022-03-22 op ungetc(ch, fp);
486 b2832778 2022-04-23 op if (ch == '\\') {
487 41208069 2023-10-23 op err = send_line("\\", 2);
492 b3c57ab2 2022-03-22 op while (ch != EOF && ch != '\n')
493 b3c57ab2 2022-03-22 op ch = fgetc(fp);
495 b3c57ab2 2022-03-22 op if (ch != EOF || feof(fp))
497 b3c57ab2 2022-03-22 op return got_error(GOT_ERR_IO);
500 b3c57ab2 2022-03-22 op static const struct got_error *
501 d75b9573 2022-05-02 op parse_hunk(FILE *fp, int *done)
503 e9ce266e 2022-03-07 op static const struct got_error *err = NULL;
504 e9ce266e 2022-03-07 op struct got_imsg_patch_hunk hdr;
505 e9ce266e 2022-03-07 op char *line = NULL, ch;
506 e9ce266e 2022-03-07 op size_t linesize = 0;
507 e9ce266e 2022-03-07 op ssize_t linelen;
508 35095610 2022-06-14 op int leftold, leftnew;
510 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, fp);
511 e9ce266e 2022-03-07 op if (linelen == -1) {
516 d75b9573 2022-05-02 op err = parse_hdr(line, done, &hdr);
520 e45f7eba 2022-05-14 naddy if (fseeko(fp, -linelen, SEEK_CUR) == -1)
521 e45f7eba 2022-05-14 naddy err = got_error_from_errno("fseeko");
525 e9ce266e 2022-03-07 op leftold = hdr.oldlines;
526 e9ce266e 2022-03-07 op leftnew = hdr.newlines;
528 e9ce266e 2022-03-07 op while (leftold > 0 || leftnew > 0) {
529 e9ce266e 2022-03-07 op linelen = getline(&line, &linesize, fp);
530 e9ce266e 2022-03-07 op if (linelen == -1) {
531 e9ce266e 2022-03-07 op if (ferror(fp)) {
532 e9ce266e 2022-03-07 op err = got_error_from_errno("getline");
536 e9ce266e 2022-03-07 op /* trailing newlines may be chopped */
537 e9ce266e 2022-03-07 op if (leftold < 3 && leftnew < 3) {
542 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PATCH_TRUNCATED);
545 b3c57ab2 2022-03-22 op if (line[linelen - 1] == '\n')
546 b3c57ab2 2022-03-22 op line[linelen - 1] = '\0';
548 e9ce266e 2022-03-07 op /* usr.bin/patch allows '=' as context char */
549 e9ce266e 2022-03-07 op if (*line == '=')
553 b3c57ab2 2022-03-22 op if (ch == '\t' || ch == '\0')
554 e9ce266e 2022-03-07 op ch = ' '; /* the space got eaten */
556 e9ce266e 2022-03-07 op switch (ch) {
568 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PATCH_MALFORMED);
572 e9ce266e 2022-03-07 op if (leftold < 0 || leftnew < 0) {
573 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PATCH_MALFORMED);
577 41208069 2023-10-23 op err = send_line(line, linelen);
581 b3c57ab2 2022-03-22 op if ((ch == '-' && leftold == 0) ||
582 b3c57ab2 2022-03-22 op (ch == '+' && leftnew == 0)) {
583 b2832778 2022-04-23 op err = peek_special_line(fp);
594 e9ce266e 2022-03-07 op static const struct got_error *
595 cfcfb026 2024-01-17 op read_patch(struct imsgbuf *ibuf, FILE *fp)
597 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
598 acf749fc 2022-07-02 op int git, patch_found = 0;
599 acf749fc 2022-07-02 op char *cid = NULL;
601 acf749fc 2022-07-02 op while ((err = patch_start(&git, &cid, fp)) == NULL) {
602 acf749fc 2022-07-02 op int done, next;
604 acf749fc 2022-07-02 op err = find_diff(&done, &next, fp, git, cid);
610 e9ce266e 2022-03-07 op patch_found = 1;
612 d75b9573 2022-05-02 op while (!done) {
613 d75b9573 2022-05-02 op err = parse_hunk(fp, &done);
618 d75b9573 2022-05-02 op err = send_patch_done();
626 e9ce266e 2022-03-07 op /* ignore trailing gibberish */
627 e9ce266e 2022-03-07 op if (err != NULL && err->code == GOT_ERR_NO_PATCH && patch_found)
634 e9ce266e 2022-03-07 op main(int argc, char **argv)
636 e9ce266e 2022-03-07 op const struct got_error *err = NULL;
637 e9ce266e 2022-03-07 op struct imsg imsg;
638 cfcfb026 2024-01-17 op FILE *fp = NULL;
641 e9ce266e 2022-03-07 op static int attached;
642 e9ce266e 2022-03-07 op while (!attached)
646 e9ce266e 2022-03-07 op imsg_init(&ibuf, GOT_IMSG_FD_CHILD);
647 e9ce266e 2022-03-07 op #ifndef PROFILE
648 e9ce266e 2022-03-07 op /* revoke access to most system calls */
649 e9ce266e 2022-03-07 op if (pledge("stdio recvfd", NULL) == -1) {
650 e9ce266e 2022-03-07 op err = got_error_from_errno("pledge");
651 e9ce266e 2022-03-07 op got_privsep_send_error(&ibuf, err);
656 e9ce266e 2022-03-07 op err = got_privsep_recv_imsg(&imsg, &ibuf, 0);
659 cfcfb026 2024-01-17 op if (imsg.hdr.type != GOT_IMSG_PATCH_FILE) {
660 e9ce266e 2022-03-07 op err = got_error(GOT_ERR_PRIVSEP_MSG);
663 cfcfb026 2024-01-17 op fd = imsg_get_fd(&imsg);
664 cfcfb026 2024-01-17 op if (fd == -1) {
665 cfcfb026 2024-01-17 op err = got_error(GOT_ERR_PRIVSEP_NO_FD);
669 cfcfb026 2024-01-17 op fp = fdopen(fd, "r");
670 cfcfb026 2024-01-17 op if (fp == NULL) {
671 cfcfb026 2024-01-17 op err = got_error_from_errno("fdopen");
676 cfcfb026 2024-01-17 op err = read_patch(&ibuf, fp);
679 e9ce266e 2022-03-07 op if (imsg_compose(&ibuf, GOT_IMSG_PATCH_EOF, 0, 0, -1,
680 e9ce266e 2022-03-07 op NULL, 0) == -1) {
681 e9ce266e 2022-03-07 op err = got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
684 e9ce266e 2022-03-07 op err = got_privsep_flush_imsg(&ibuf);
685 e9ce266e 2022-03-07 op imsg_free(&imsg);
687 cfcfb026 2024-01-17 op if (fd != -1 && close(fd) == -1 && err == NULL)
688 cfcfb026 2024-01-17 op err = got_error_from_errno("close");
689 cfcfb026 2024-01-17 op if (fp != NULL && fclose(fp) == EOF && err == NULL)
690 cfcfb026 2024-01-17 op err = got_error_from_errno("fclose");
691 e9ce266e 2022-03-07 op if (err != NULL) {
692 e9ce266e 2022-03-07 op got_privsep_send_error(&ibuf, err);
695 e9ce266e 2022-03-07 op if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)
696 e9ce266e 2022-03-07 op err = got_error_from_errno("close");
697 e9ce266e 2022-03-07 op if (err && err->code != GOT_ERR_PRIVSEP_PIPE)
698 e9ce266e 2022-03-07 op fprintf(stderr, "%s: %s\n", getprogname(), err->msg);
699 e9ce266e 2022-03-07 op return err ? 1 : 0;