2 069bbb86 2022-03-07 thomas * Copyright 1986, Larry Wall
4 069bbb86 2022-03-07 thomas * Redistribution and use in source and binary forms, with or without
5 069bbb86 2022-03-07 thomas * modification, are permitted provided that the following condition is met:
6 069bbb86 2022-03-07 thomas * 1. Redistributions of source code must retain the above copyright notice,
7 069bbb86 2022-03-07 thomas * this condition and the following disclaimer.
9 069bbb86 2022-03-07 thomas * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
10 069bbb86 2022-03-07 thomas * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
11 069bbb86 2022-03-07 thomas * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
12 069bbb86 2022-03-07 thomas * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
13 069bbb86 2022-03-07 thomas * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
14 069bbb86 2022-03-07 thomas * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
15 069bbb86 2022-03-07 thomas * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
16 069bbb86 2022-03-07 thomas * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
17 069bbb86 2022-03-07 thomas * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
18 069bbb86 2022-03-07 thomas * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
19 069bbb86 2022-03-07 thomas * SUCH DAMAGE.
23 069bbb86 2022-03-07 thomas * Copyright (c) 2022 Omar Polo <op@openbsd.org>
25 069bbb86 2022-03-07 thomas * Permission to use, copy, modify, and distribute this software for any
26 069bbb86 2022-03-07 thomas * purpose with or without fee is hereby granted, provided that the above
27 069bbb86 2022-03-07 thomas * copyright notice and this permission notice appear in all copies.
29 069bbb86 2022-03-07 thomas * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
30 069bbb86 2022-03-07 thomas * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
31 069bbb86 2022-03-07 thomas * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
32 069bbb86 2022-03-07 thomas * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
33 069bbb86 2022-03-07 thomas * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
34 069bbb86 2022-03-07 thomas * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
35 069bbb86 2022-03-07 thomas * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
38 069bbb86 2022-03-07 thomas #include <sys/types.h>
39 8b925c6c 2022-07-16 thomas #include <sys/queue.h>
40 069bbb86 2022-03-07 thomas #include <sys/uio.h>
42 069bbb86 2022-03-07 thomas #include <ctype.h>
43 069bbb86 2022-03-07 thomas #include <limits.h>
44 069bbb86 2022-03-07 thomas #include <paths.h>
45 069bbb86 2022-03-07 thomas #include <stdint.h>
46 069bbb86 2022-03-07 thomas #include <stdio.h>
47 069bbb86 2022-03-07 thomas #include <stdlib.h>
48 069bbb86 2022-03-07 thomas #include <string.h>
49 069bbb86 2022-03-07 thomas #include <unistd.h>
51 069bbb86 2022-03-07 thomas #include "got_error.h"
52 069bbb86 2022-03-07 thomas #include "got_object.h"
54 973f3f6e 2022-03-07 thomas #include "got_compat.h"
56 069bbb86 2022-03-07 thomas #include "got_lib_delta.h"
57 069bbb86 2022-03-07 thomas #include "got_lib_object.h"
58 069bbb86 2022-03-07 thomas #include "got_lib_privsep.h"
59 0f76ab83 2022-06-23 thomas #include "got_lib_sha1.h"
61 069bbb86 2022-03-07 thomas struct imsgbuf ibuf;
63 069bbb86 2022-03-07 thomas static const struct got_error *
64 016bfe4b 2022-06-23 thomas send_patch(const char *oldname, const char *newname, const char *commitid,
65 016bfe4b 2022-06-23 thomas const char *blob, int git)
67 069bbb86 2022-03-07 thomas struct got_imsg_patch p;
69 069bbb86 2022-03-07 thomas memset(&p, 0, sizeof(p));
71 d9db2ff9 2022-04-16 thomas if (oldname != NULL)
72 069bbb86 2022-03-07 thomas strlcpy(p.old, oldname, sizeof(p.old));
74 069bbb86 2022-03-07 thomas if (newname != NULL)
75 069bbb86 2022-03-07 thomas strlcpy(p.new, newname, sizeof(p.new));
77 8afec5d5 2022-07-01 thomas if (commitid != NULL)
78 016bfe4b 2022-06-23 thomas strlcpy(p.cid, commitid, sizeof(p.cid));
80 8afec5d5 2022-07-01 thomas if (blob != NULL)
81 0f76ab83 2022-06-23 thomas strlcpy(p.blob, blob, sizeof(p.blob));
83 d9db2ff9 2022-04-16 thomas p.git = git;
84 0f76ab83 2022-06-23 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH, 0, 0, -1, &p, sizeof(p)) == -1)
85 069bbb86 2022-03-07 thomas return got_error_from_errno("imsg_compose GOT_IMSG_PATCH");
86 069bbb86 2022-03-07 thomas return NULL;
89 069bbb86 2022-03-07 thomas static const struct got_error *
90 069bbb86 2022-03-07 thomas send_patch_done(void)
92 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_DONE, 0, 0, -1,
93 069bbb86 2022-03-07 thomas NULL, 0) == -1)
94 069bbb86 2022-03-07 thomas return got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
95 dab315a5 2022-07-07 thomas return got_privsep_flush_imsg(&ibuf);
98 069bbb86 2022-03-07 thomas /* based on fetchname from usr.bin/patch/util.c */
99 069bbb86 2022-03-07 thomas static const struct got_error *
100 d9db2ff9 2022-04-16 thomas filename(const char *at, char **name)
102 d9db2ff9 2022-04-16 thomas char *tmp, *t;
104 069bbb86 2022-03-07 thomas *name = NULL;
105 069bbb86 2022-03-07 thomas if (*at == '\0')
106 069bbb86 2022-03-07 thomas return NULL;
108 069bbb86 2022-03-07 thomas while (isspace((unsigned char)*at))
111 069bbb86 2022-03-07 thomas /* files can be created or removed by diffing against /dev/null */
112 17d6446a 2022-03-22 thomas if (!strncmp(at, _PATH_DEVNULL, sizeof(_PATH_DEVNULL) - 1))
113 069bbb86 2022-03-07 thomas return NULL;
115 d9db2ff9 2022-04-16 thomas tmp = strdup(at);
116 d9db2ff9 2022-04-16 thomas if (tmp == NULL)
117 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
118 d9db2ff9 2022-04-16 thomas if ((t = strchr(tmp, '\t')) != NULL)
119 d9db2ff9 2022-04-16 thomas *t = '\0';
120 d9db2ff9 2022-04-16 thomas if ((t = strchr(tmp, '\n')) != NULL)
121 d9db2ff9 2022-04-16 thomas *t = '\0';
123 d9db2ff9 2022-04-16 thomas *name = strdup(tmp);
124 d9db2ff9 2022-04-16 thomas free(tmp);
125 069bbb86 2022-03-07 thomas if (*name == NULL)
126 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
127 069bbb86 2022-03-07 thomas return NULL;
130 069bbb86 2022-03-07 thomas static const struct got_error *
131 19dd85cb 2022-07-01 thomas blobid(const char *line, char **blob, int git)
133 0f76ab83 2022-06-23 thomas uint8_t digest[SHA1_DIGEST_LENGTH];
134 0f76ab83 2022-06-23 thomas size_t len;
136 0f76ab83 2022-06-23 thomas *blob = NULL;
138 0f76ab83 2022-06-23 thomas len = strspn(line, "0123456789abcdefABCDEF");
139 0f76ab83 2022-06-23 thomas if ((*blob = strndup(line, len)) == NULL)
140 0f76ab83 2022-06-23 thomas return got_error_from_errno("strndup");
142 19dd85cb 2022-07-01 thomas if (!git && !got_parse_sha1_digest(digest, *blob)) {
143 0f76ab83 2022-06-23 thomas /* silently ignore invalid blob ids */
144 0f76ab83 2022-06-23 thomas free(*blob);
145 0f76ab83 2022-06-23 thomas *blob = NULL;
147 0f76ab83 2022-06-23 thomas return NULL;
150 0f76ab83 2022-06-23 thomas static const struct got_error *
151 68ceedb3 2022-07-03 thomas patch_start(int *git, char **cid, FILE *fp)
153 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
154 069bbb86 2022-03-07 thomas char *line = NULL;
155 069bbb86 2022-03-07 thomas size_t linesize = 0;
156 069bbb86 2022-03-07 thomas ssize_t linelen;
158 68ceedb3 2022-07-03 thomas *git = 0;
160 68ceedb3 2022-07-03 thomas while ((linelen = getline(&line, &linesize, fp)) != -1) {
161 68ceedb3 2022-07-03 thomas if (!strncmp(line, "diff --git ", 11)) {
162 68ceedb3 2022-07-03 thomas *git = 1;
163 68ceedb3 2022-07-03 thomas free(*cid);
164 68ceedb3 2022-07-03 thomas *cid = NULL;
166 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "diff ", 5)) {
167 68ceedb3 2022-07-03 thomas *git = 0;
168 68ceedb3 2022-07-03 thomas free(*cid);
169 68ceedb3 2022-07-03 thomas *cid = NULL;
170 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "commit - ", 9)) {
171 68ceedb3 2022-07-03 thomas free(*cid);
172 68ceedb3 2022-07-03 thomas err = blobid(line + 9, cid, *git);
175 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "--- ", 4) ||
176 68ceedb3 2022-07-03 thomas !strncmp(line, "+++ ", 4) ||
177 68ceedb3 2022-07-03 thomas !strncmp(line, "blob - ", 7)) {
178 68ceedb3 2022-07-03 thomas /* rewind to previous line */
179 68ceedb3 2022-07-03 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
180 68ceedb3 2022-07-03 thomas err = got_error_from_errno("fseeko");
185 68ceedb3 2022-07-03 thomas free(line);
186 68ceedb3 2022-07-03 thomas if (ferror(fp) && err == NULL)
187 68ceedb3 2022-07-03 thomas err = got_error_from_errno("getline");
188 68ceedb3 2022-07-03 thomas if (feof(fp) && err == NULL)
189 68ceedb3 2022-07-03 thomas err = got_error(GOT_ERR_NO_PATCH);
190 68ceedb3 2022-07-03 thomas return err;
193 68ceedb3 2022-07-03 thomas static const struct got_error *
194 68ceedb3 2022-07-03 thomas find_diff(int *done, int *next, FILE *fp, int git, const char *commitid)
196 68ceedb3 2022-07-03 thomas const struct got_error *err = NULL;
197 68ceedb3 2022-07-03 thomas char *old = NULL, *new = NULL;
198 68ceedb3 2022-07-03 thomas char *blob = NULL;
199 68ceedb3 2022-07-03 thomas char *line = NULL;
200 68ceedb3 2022-07-03 thomas size_t linesize = 0;
201 68ceedb3 2022-07-03 thomas ssize_t linelen;
202 68ceedb3 2022-07-03 thomas int create, rename = 0;
204 68ceedb3 2022-07-03 thomas *done = 0;
205 68ceedb3 2022-07-03 thomas *next = 0;
206 069bbb86 2022-03-07 thomas while ((linelen = getline(&line, &linesize, fp)) != -1) {
208 069bbb86 2022-03-07 thomas * Ignore the Index name like GNU and larry' patch,
209 069bbb86 2022-03-07 thomas * we don't have to follow POSIX.
212 d9db2ff9 2022-04-16 thomas if (!strncmp(line, "--- ", 4)) {
213 069bbb86 2022-03-07 thomas free(old);
214 d9db2ff9 2022-04-16 thomas err = filename(line+4, &old);
215 8afe1f71 2022-05-12 thomas } else if (rename && !strncmp(line, "rename from ", 12)) {
216 8afe1f71 2022-05-12 thomas free(old);
217 8afe1f71 2022-05-12 thomas err = filename(line+12, &old);
218 069bbb86 2022-03-07 thomas } else if (!strncmp(line, "+++ ", 4)) {
219 069bbb86 2022-03-07 thomas free(new);
220 d9db2ff9 2022-04-16 thomas err = filename(line+4, &new);
221 0f76ab83 2022-06-23 thomas } else if (!git && !strncmp(line, "blob - ", 7)) {
222 0f76ab83 2022-06-23 thomas free(blob);
223 19dd85cb 2022-07-01 thomas err = blobid(line + 7, &blob, git);
224 8afe1f71 2022-05-12 thomas } else if (rename && !strncmp(line, "rename to ", 10)) {
225 8afe1f71 2022-05-12 thomas free(new);
226 8afe1f71 2022-05-12 thomas err = filename(line + 10, &new);
227 8afe1f71 2022-05-12 thomas } else if (git && !strncmp(line, "similarity index 100%", 21))
228 8afe1f71 2022-05-12 thomas rename = 1;
229 19dd85cb 2022-07-01 thomas else if (git && !strncmp(line, "index ", 6)) {
230 19dd85cb 2022-07-01 thomas free(blob);
231 19dd85cb 2022-07-01 thomas err = blobid(line + 6, &blob, git);
232 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "diff ", 5)) {
233 68ceedb3 2022-07-03 thomas /* rewind to previous line */
234 68ceedb3 2022-07-03 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
235 68ceedb3 2022-07-03 thomas err = got_error_from_errno("fseeko");
236 68ceedb3 2022-07-03 thomas *next = 1;
244 8afe1f71 2022-05-12 thomas * Git-style diffs with "similarity index 100%" don't
245 8afe1f71 2022-05-12 thomas * have any hunks and ends with the "rename to foobar"
248 8afe1f71 2022-05-12 thomas if (rename && old != NULL && new != NULL) {
249 3b488fde 2022-05-12 thomas *done = 1;
250 016bfe4b 2022-06-23 thomas err = send_patch(old, new, commitid,
251 016bfe4b 2022-06-23 thomas blob, git);
255 069bbb86 2022-03-07 thomas if (!strncmp(line, "@@ -", 4)) {
256 069bbb86 2022-03-07 thomas create = !strncmp(line+4, "0,0", 3);
257 069bbb86 2022-03-07 thomas if ((old == NULL && new == NULL) ||
258 069bbb86 2022-03-07 thomas (!create && old == NULL))
259 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
261 016bfe4b 2022-06-23 thomas err = send_patch(old, new, commitid,
262 016bfe4b 2022-06-23 thomas blob, git);
267 069bbb86 2022-03-07 thomas /* rewind to previous line */
268 bafaf650 2022-05-14 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
269 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
274 19f1a2ac 2022-03-13 thomas free(old);
275 19f1a2ac 2022-03-13 thomas free(new);
276 0f76ab83 2022-06-23 thomas free(blob);
277 069bbb86 2022-03-07 thomas free(line);
278 069bbb86 2022-03-07 thomas if (ferror(fp) && err == NULL)
279 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
280 069bbb86 2022-03-07 thomas if (feof(fp) && err == NULL)
281 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_NO_PATCH);
282 069bbb86 2022-03-07 thomas return err;
285 069bbb86 2022-03-07 thomas static const struct got_error *
286 8ebb3daa 2022-06-23 thomas strtolnum(char **str, int *n)
288 069bbb86 2022-03-07 thomas char *p, c;
289 069bbb86 2022-03-07 thomas const char *errstr;
291 069bbb86 2022-03-07 thomas for (p = *str; isdigit((unsigned char)*p); ++p)
292 069bbb86 2022-03-07 thomas /* nop */;
295 069bbb86 2022-03-07 thomas *p = '\0';
297 8ebb3daa 2022-06-23 thomas *n = strtonum(*str, 0, INT_MAX, &errstr);
298 069bbb86 2022-03-07 thomas if (errstr != NULL)
299 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
302 069bbb86 2022-03-07 thomas *str = p;
303 069bbb86 2022-03-07 thomas return NULL;
306 069bbb86 2022-03-07 thomas static const struct got_error *
307 1992b6cb 2022-05-12 thomas parse_hdr(char *s, int *done, struct got_imsg_patch_hunk *hdr)
309 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
311 069bbb86 2022-03-07 thomas if (strncmp(s, "@@ -", 4)) {
312 1992b6cb 2022-05-12 thomas *done = 1;
313 069bbb86 2022-03-07 thomas return NULL;
318 069bbb86 2022-03-07 thomas return NULL;
319 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->oldfrom);
321 069bbb86 2022-03-07 thomas return err;
322 069bbb86 2022-03-07 thomas if (*s == ',') {
324 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->oldlines);
326 069bbb86 2022-03-07 thomas return err;
328 069bbb86 2022-03-07 thomas hdr->oldlines = 1;
330 069bbb86 2022-03-07 thomas if (*s == ' ')
333 069bbb86 2022-03-07 thomas if (*s != '+' || !*++s)
334 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
335 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->newfrom);
337 069bbb86 2022-03-07 thomas return err;
338 069bbb86 2022-03-07 thomas if (*s == ',') {
340 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->newlines);
342 069bbb86 2022-03-07 thomas return err;
344 069bbb86 2022-03-07 thomas hdr->newlines = 1;
346 069bbb86 2022-03-07 thomas if (*s == ' ')
349 069bbb86 2022-03-07 thomas if (*s != '@')
350 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
352 8ebb3daa 2022-06-23 thomas if (hdr->oldfrom >= INT_MAX - hdr->oldlines ||
353 8ebb3daa 2022-06-23 thomas hdr->newfrom >= INT_MAX - hdr->newlines ||
354 069bbb86 2022-03-07 thomas /* not so sure about this one */
355 8ebb3daa 2022-06-23 thomas hdr->oldlines >= INT_MAX - hdr->newlines - 1 ||
356 88c260f4 2022-05-14 thomas (hdr->oldlines == 0 && hdr->newlines == 0))
357 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
359 069bbb86 2022-03-07 thomas if (hdr->oldlines == 0) {
360 069bbb86 2022-03-07 thomas /* larry says to "do append rather than insert"; I don't
361 069bbb86 2022-03-07 thomas * quite get it, but i trust him.
363 069bbb86 2022-03-07 thomas hdr->oldfrom++;
366 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_HUNK, 0, 0, -1,
367 069bbb86 2022-03-07 thomas hdr, sizeof(*hdr)) == -1)
368 069bbb86 2022-03-07 thomas return got_error_from_errno(
369 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_HUNK");
370 069bbb86 2022-03-07 thomas return NULL;
373 069bbb86 2022-03-07 thomas static const struct got_error *
374 069bbb86 2022-03-07 thomas send_line(const char *line)
376 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
377 069bbb86 2022-03-07 thomas char *p = NULL;
379 ff7f34d3 2022-03-22 thomas if (*line != '+' && *line != '-' && *line != ' ' && *line != '\\') {
380 069bbb86 2022-03-07 thomas if (asprintf(&p, " %s", line) == -1)
381 069bbb86 2022-03-07 thomas return got_error_from_errno("asprintf");
382 069bbb86 2022-03-07 thomas line = p;
385 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_LINE, 0, 0, -1,
386 17d6446a 2022-03-22 thomas line, strlen(line) + 1) == -1)
387 069bbb86 2022-03-07 thomas err = got_error_from_errno(
388 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_LINE");
391 069bbb86 2022-03-07 thomas return err;
394 069bbb86 2022-03-07 thomas static const struct got_error *
395 656c2baa 2022-04-23 thomas peek_special_line(FILE *fp)
397 ff7f34d3 2022-03-22 thomas const struct got_error *err;
400 ff7f34d3 2022-03-22 thomas ch = fgetc(fp);
401 ff7f34d3 2022-03-22 thomas if (ch != EOF && ch != '\\') {
402 ff7f34d3 2022-03-22 thomas ungetc(ch, fp);
403 ff7f34d3 2022-03-22 thomas return NULL;
406 656c2baa 2022-04-23 thomas if (ch == '\\') {
407 ff7f34d3 2022-03-22 thomas err = send_line("\\");
409 ff7f34d3 2022-03-22 thomas return err;
412 ff7f34d3 2022-03-22 thomas while (ch != EOF && ch != '\n')
413 ff7f34d3 2022-03-22 thomas ch = fgetc(fp);
415 ff7f34d3 2022-03-22 thomas if (ch != EOF || feof(fp))
416 ff7f34d3 2022-03-22 thomas return NULL;
417 ff7f34d3 2022-03-22 thomas return got_error(GOT_ERR_IO);
420 ff7f34d3 2022-03-22 thomas static const struct got_error *
421 1992b6cb 2022-05-12 thomas parse_hunk(FILE *fp, int *done)
423 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
424 069bbb86 2022-03-07 thomas struct got_imsg_patch_hunk hdr;
425 069bbb86 2022-03-07 thomas char *line = NULL, ch;
426 069bbb86 2022-03-07 thomas size_t linesize = 0;
427 069bbb86 2022-03-07 thomas ssize_t linelen;
428 8ebb3daa 2022-06-23 thomas int leftold, leftnew;
430 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, fp);
431 069bbb86 2022-03-07 thomas if (linelen == -1) {
432 1992b6cb 2022-05-12 thomas *done = 1;
433 069bbb86 2022-03-07 thomas goto done;
436 1992b6cb 2022-05-12 thomas err = parse_hdr(line, done, &hdr);
438 069bbb86 2022-03-07 thomas goto done;
439 1992b6cb 2022-05-12 thomas if (*done) {
440 bafaf650 2022-05-14 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
441 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
442 069bbb86 2022-03-07 thomas goto done;
445 069bbb86 2022-03-07 thomas leftold = hdr.oldlines;
446 069bbb86 2022-03-07 thomas leftnew = hdr.newlines;
448 069bbb86 2022-03-07 thomas while (leftold > 0 || leftnew > 0) {
449 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, fp);
450 069bbb86 2022-03-07 thomas if (linelen == -1) {
451 069bbb86 2022-03-07 thomas if (ferror(fp)) {
452 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
453 069bbb86 2022-03-07 thomas goto done;
456 069bbb86 2022-03-07 thomas /* trailing newlines may be chopped */
457 069bbb86 2022-03-07 thomas if (leftold < 3 && leftnew < 3) {
458 1992b6cb 2022-05-12 thomas *done = 1;
462 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_TRUNCATED);
463 069bbb86 2022-03-07 thomas goto done;
465 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
466 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
468 069bbb86 2022-03-07 thomas /* usr.bin/patch allows '=' as context char */
469 069bbb86 2022-03-07 thomas if (*line == '=')
470 069bbb86 2022-03-07 thomas *line = ' ';
472 069bbb86 2022-03-07 thomas ch = *line;
473 ff7f34d3 2022-03-22 thomas if (ch == '\t' || ch == '\0')
474 069bbb86 2022-03-07 thomas ch = ' '; /* the space got eaten */
476 069bbb86 2022-03-07 thomas switch (ch) {
477 069bbb86 2022-03-07 thomas case '-':
478 069bbb86 2022-03-07 thomas leftold--;
480 069bbb86 2022-03-07 thomas case ' ':
481 069bbb86 2022-03-07 thomas leftold--;
482 069bbb86 2022-03-07 thomas leftnew--;
484 069bbb86 2022-03-07 thomas case '+':
485 069bbb86 2022-03-07 thomas leftnew--;
488 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
489 069bbb86 2022-03-07 thomas goto done;
492 069bbb86 2022-03-07 thomas if (leftold < 0 || leftnew < 0) {
493 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
494 069bbb86 2022-03-07 thomas goto done;
497 069bbb86 2022-03-07 thomas err = send_line(line);
499 069bbb86 2022-03-07 thomas goto done;
501 ff7f34d3 2022-03-22 thomas if ((ch == '-' && leftold == 0) ||
502 ff7f34d3 2022-03-22 thomas (ch == '+' && leftnew == 0)) {
503 656c2baa 2022-04-23 thomas err = peek_special_line(fp);
505 ff7f34d3 2022-03-22 thomas goto done;
510 069bbb86 2022-03-07 thomas free(line);
511 069bbb86 2022-03-07 thomas return err;
514 069bbb86 2022-03-07 thomas static const struct got_error *
515 069bbb86 2022-03-07 thomas read_patch(struct imsgbuf *ibuf, int fd)
517 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
518 069bbb86 2022-03-07 thomas FILE *fp;
519 68ceedb3 2022-07-03 thomas int git, patch_found = 0;
520 68ceedb3 2022-07-03 thomas char *cid = NULL;
522 069bbb86 2022-03-07 thomas if ((fp = fdopen(fd, "r")) == NULL) {
523 069bbb86 2022-03-07 thomas err = got_error_from_errno("fdopen");
524 069bbb86 2022-03-07 thomas close(fd);
525 069bbb86 2022-03-07 thomas return err;
528 68ceedb3 2022-07-03 thomas while ((err = patch_start(&git, &cid, fp)) == NULL) {
529 68ceedb3 2022-07-03 thomas int done, next;
531 68ceedb3 2022-07-03 thomas err = find_diff(&done, &next, fp, git, cid);
533 069bbb86 2022-03-07 thomas goto done;
534 68ceedb3 2022-07-03 thomas if (next)
535 68ceedb3 2022-07-03 thomas continue;
537 069bbb86 2022-03-07 thomas patch_found = 1;
539 1992b6cb 2022-05-12 thomas while (!done) {
540 1992b6cb 2022-05-12 thomas err = parse_hunk(fp, &done);
542 069bbb86 2022-03-07 thomas goto done;
545 1992b6cb 2022-05-12 thomas err = send_patch_done();
547 1992b6cb 2022-05-12 thomas goto done;
551 069bbb86 2022-03-07 thomas fclose(fp);
552 68ceedb3 2022-07-03 thomas free(cid);
554 069bbb86 2022-03-07 thomas /* ignore trailing gibberish */
555 069bbb86 2022-03-07 thomas if (err != NULL && err->code == GOT_ERR_NO_PATCH && patch_found)
556 069bbb86 2022-03-07 thomas err = NULL;
558 069bbb86 2022-03-07 thomas return err;
562 069bbb86 2022-03-07 thomas main(int argc, char **argv)
564 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
565 069bbb86 2022-03-07 thomas struct imsg imsg;
567 069bbb86 2022-03-07 thomas static int attached;
568 069bbb86 2022-03-07 thomas while (!attached)
569 069bbb86 2022-03-07 thomas sleep(1);
572 069bbb86 2022-03-07 thomas imsg_init(&ibuf, GOT_IMSG_FD_CHILD);
573 069bbb86 2022-03-07 thomas #ifndef PROFILE
574 069bbb86 2022-03-07 thomas /* revoke access to most system calls */
575 069bbb86 2022-03-07 thomas if (pledge("stdio recvfd", NULL) == -1) {
576 069bbb86 2022-03-07 thomas err = got_error_from_errno("pledge");
577 069bbb86 2022-03-07 thomas got_privsep_send_error(&ibuf, err);
578 069bbb86 2022-03-07 thomas return 1;
581 762ddcd8 2022-03-09 thomas /* revoke fs access */
582 762ddcd8 2022-03-09 thomas if (landlock_no_fs() == -1) {
583 762ddcd8 2022-03-09 thomas err = got_error_from_errno("landlock_no_fs");
584 762ddcd8 2022-03-09 thomas got_privsep_send_error(&ibuf, err);
585 762ddcd8 2022-03-09 thomas return 1;
587 5d120ea8 2022-06-23 op if (cap_enter() == -1) {
588 5d120ea8 2022-06-23 op err = got_error_from_errno("cap_enter");
589 5d120ea8 2022-06-23 op got_privsep_send_error(&ibuf, err);
594 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, &ibuf, 0);
596 069bbb86 2022-03-07 thomas goto done;
597 069bbb86 2022-03-07 thomas if (imsg.hdr.type != GOT_IMSG_PATCH_FILE || imsg.fd == -1) {
598 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
599 069bbb86 2022-03-07 thomas goto done;
602 069bbb86 2022-03-07 thomas err = read_patch(&ibuf, imsg.fd);
604 069bbb86 2022-03-07 thomas goto done;
605 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_EOF, 0, 0, -1,
606 069bbb86 2022-03-07 thomas NULL, 0) == -1) {
607 069bbb86 2022-03-07 thomas err = got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
608 069bbb86 2022-03-07 thomas goto done;
610 069bbb86 2022-03-07 thomas err = got_privsep_flush_imsg(&ibuf);
612 069bbb86 2022-03-07 thomas imsg_free(&imsg);
613 069bbb86 2022-03-07 thomas if (err != NULL) {
614 069bbb86 2022-03-07 thomas got_privsep_send_error(&ibuf, err);
615 069bbb86 2022-03-07 thomas err = NULL;
617 069bbb86 2022-03-07 thomas if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)
618 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
619 069bbb86 2022-03-07 thomas if (err && err->code != GOT_ERR_PRIVSEP_PIPE)
620 069bbb86 2022-03-07 thomas fprintf(stderr, "%s: %s\n", getprogname(), err->msg);
621 069bbb86 2022-03-07 thomas return err ? 1 : 0;
