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 069bbb86 2022-03-07 thomas #include <sys/uio.h>
41 069bbb86 2022-03-07 thomas #include <ctype.h>
42 069bbb86 2022-03-07 thomas #include <limits.h>
43 069bbb86 2022-03-07 thomas #include <paths.h>
44 069bbb86 2022-03-07 thomas #include <stdint.h>
45 069bbb86 2022-03-07 thomas #include <stdio.h>
46 069bbb86 2022-03-07 thomas #include <stdlib.h>
47 069bbb86 2022-03-07 thomas #include <string.h>
48 069bbb86 2022-03-07 thomas #include <unistd.h>
50 069bbb86 2022-03-07 thomas #include "got_error.h"
51 069bbb86 2022-03-07 thomas #include "got_object.h"
53 973f3f6e 2022-03-07 thomas #include "got_compat.h"
55 069bbb86 2022-03-07 thomas #include "got_lib_delta.h"
56 069bbb86 2022-03-07 thomas #include "got_lib_object.h"
57 069bbb86 2022-03-07 thomas #include "got_lib_privsep.h"
58 0f76ab83 2022-06-23 thomas #include "got_lib_sha1.h"
60 069bbb86 2022-03-07 thomas struct imsgbuf ibuf;
62 069bbb86 2022-03-07 thomas static const struct got_error *
63 016bfe4b 2022-06-23 thomas send_patch(const char *oldname, const char *newname, const char *commitid,
64 016bfe4b 2022-06-23 thomas const char *blob, int git)
66 069bbb86 2022-03-07 thomas struct got_imsg_patch p;
68 069bbb86 2022-03-07 thomas memset(&p, 0, sizeof(p));
70 d9db2ff9 2022-04-16 thomas if (oldname != NULL)
71 069bbb86 2022-03-07 thomas strlcpy(p.old, oldname, sizeof(p.old));
73 069bbb86 2022-03-07 thomas if (newname != NULL)
74 069bbb86 2022-03-07 thomas strlcpy(p.new, newname, sizeof(p.new));
76 8afec5d5 2022-07-01 thomas if (commitid != NULL)
77 016bfe4b 2022-06-23 thomas strlcpy(p.cid, commitid, sizeof(p.cid));
79 8afec5d5 2022-07-01 thomas if (blob != NULL)
80 0f76ab83 2022-06-23 thomas strlcpy(p.blob, blob, sizeof(p.blob));
82 d9db2ff9 2022-04-16 thomas p.git = git;
83 0f76ab83 2022-06-23 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH, 0, 0, -1, &p, sizeof(p)) == -1)
84 069bbb86 2022-03-07 thomas return got_error_from_errno("imsg_compose GOT_IMSG_PATCH");
85 069bbb86 2022-03-07 thomas return NULL;
88 069bbb86 2022-03-07 thomas static const struct got_error *
89 069bbb86 2022-03-07 thomas send_patch_done(void)
91 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_DONE, 0, 0, -1,
92 069bbb86 2022-03-07 thomas NULL, 0) == -1)
93 069bbb86 2022-03-07 thomas return got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
94 dab315a5 2022-07-07 thomas return got_privsep_flush_imsg(&ibuf);
97 069bbb86 2022-03-07 thomas /* based on fetchname from usr.bin/patch/util.c */
98 069bbb86 2022-03-07 thomas static const struct got_error *
99 d9db2ff9 2022-04-16 thomas filename(const char *at, char **name)
101 d9db2ff9 2022-04-16 thomas char *tmp, *t;
103 069bbb86 2022-03-07 thomas *name = NULL;
104 069bbb86 2022-03-07 thomas if (*at == '\0')
105 069bbb86 2022-03-07 thomas return NULL;
107 069bbb86 2022-03-07 thomas while (isspace((unsigned char)*at))
110 069bbb86 2022-03-07 thomas /* files can be created or removed by diffing against /dev/null */
111 17d6446a 2022-03-22 thomas if (!strncmp(at, _PATH_DEVNULL, sizeof(_PATH_DEVNULL) - 1))
112 069bbb86 2022-03-07 thomas return NULL;
114 d9db2ff9 2022-04-16 thomas tmp = strdup(at);
115 d9db2ff9 2022-04-16 thomas if (tmp == NULL)
116 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
117 d9db2ff9 2022-04-16 thomas if ((t = strchr(tmp, '\t')) != NULL)
118 d9db2ff9 2022-04-16 thomas *t = '\0';
119 d9db2ff9 2022-04-16 thomas if ((t = strchr(tmp, '\n')) != NULL)
120 d9db2ff9 2022-04-16 thomas *t = '\0';
122 d9db2ff9 2022-04-16 thomas *name = strdup(tmp);
123 d9db2ff9 2022-04-16 thomas free(tmp);
124 069bbb86 2022-03-07 thomas if (*name == NULL)
125 069bbb86 2022-03-07 thomas return got_error_from_errno("strdup");
126 069bbb86 2022-03-07 thomas return NULL;
129 069bbb86 2022-03-07 thomas static const struct got_error *
130 19dd85cb 2022-07-01 thomas blobid(const char *line, char **blob, int git)
132 0f76ab83 2022-06-23 thomas uint8_t digest[SHA1_DIGEST_LENGTH];
133 0f76ab83 2022-06-23 thomas size_t len;
135 0f76ab83 2022-06-23 thomas *blob = NULL;
137 0f76ab83 2022-06-23 thomas len = strspn(line, "0123456789abcdefABCDEF");
138 0f76ab83 2022-06-23 thomas if ((*blob = strndup(line, len)) == NULL)
139 0f76ab83 2022-06-23 thomas return got_error_from_errno("strndup");
141 19dd85cb 2022-07-01 thomas if (!git && !got_parse_sha1_digest(digest, *blob)) {
142 0f76ab83 2022-06-23 thomas /* silently ignore invalid blob ids */
143 0f76ab83 2022-06-23 thomas free(*blob);
144 0f76ab83 2022-06-23 thomas *blob = NULL;
146 0f76ab83 2022-06-23 thomas return NULL;
149 0f76ab83 2022-06-23 thomas static const struct got_error *
150 68ceedb3 2022-07-03 thomas patch_start(int *git, char **cid, FILE *fp)
152 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
153 069bbb86 2022-03-07 thomas char *line = NULL;
154 069bbb86 2022-03-07 thomas size_t linesize = 0;
155 069bbb86 2022-03-07 thomas ssize_t linelen;
157 68ceedb3 2022-07-03 thomas *git = 0;
159 68ceedb3 2022-07-03 thomas while ((linelen = getline(&line, &linesize, fp)) != -1) {
160 68ceedb3 2022-07-03 thomas if (!strncmp(line, "diff --git ", 11)) {
161 68ceedb3 2022-07-03 thomas *git = 1;
162 68ceedb3 2022-07-03 thomas free(*cid);
163 68ceedb3 2022-07-03 thomas *cid = NULL;
165 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "diff ", 5)) {
166 68ceedb3 2022-07-03 thomas *git = 0;
167 68ceedb3 2022-07-03 thomas free(*cid);
168 68ceedb3 2022-07-03 thomas *cid = NULL;
169 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "commit - ", 9)) {
170 68ceedb3 2022-07-03 thomas free(*cid);
171 68ceedb3 2022-07-03 thomas err = blobid(line + 9, cid, *git);
174 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "--- ", 4) ||
175 68ceedb3 2022-07-03 thomas !strncmp(line, "+++ ", 4) ||
176 68ceedb3 2022-07-03 thomas !strncmp(line, "blob - ", 7)) {
177 68ceedb3 2022-07-03 thomas /* rewind to previous line */
178 68ceedb3 2022-07-03 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
179 68ceedb3 2022-07-03 thomas err = got_error_from_errno("fseeko");
184 68ceedb3 2022-07-03 thomas free(line);
185 68ceedb3 2022-07-03 thomas if (ferror(fp) && err == NULL)
186 68ceedb3 2022-07-03 thomas err = got_error_from_errno("getline");
187 68ceedb3 2022-07-03 thomas if (feof(fp) && err == NULL)
188 68ceedb3 2022-07-03 thomas err = got_error(GOT_ERR_NO_PATCH);
189 68ceedb3 2022-07-03 thomas return err;
192 68ceedb3 2022-07-03 thomas static const struct got_error *
193 68ceedb3 2022-07-03 thomas find_diff(int *done, int *next, FILE *fp, int git, const char *commitid)
195 68ceedb3 2022-07-03 thomas const struct got_error *err = NULL;
196 68ceedb3 2022-07-03 thomas char *old = NULL, *new = NULL;
197 68ceedb3 2022-07-03 thomas char *blob = NULL;
198 68ceedb3 2022-07-03 thomas char *line = NULL;
199 68ceedb3 2022-07-03 thomas size_t linesize = 0;
200 68ceedb3 2022-07-03 thomas ssize_t linelen;
201 68ceedb3 2022-07-03 thomas int create, rename = 0;
203 68ceedb3 2022-07-03 thomas *done = 0;
204 68ceedb3 2022-07-03 thomas *next = 0;
205 069bbb86 2022-03-07 thomas while ((linelen = getline(&line, &linesize, fp)) != -1) {
207 069bbb86 2022-03-07 thomas * Ignore the Index name like GNU and larry' patch,
208 069bbb86 2022-03-07 thomas * we don't have to follow POSIX.
211 d9db2ff9 2022-04-16 thomas if (!strncmp(line, "--- ", 4)) {
212 069bbb86 2022-03-07 thomas free(old);
213 d9db2ff9 2022-04-16 thomas err = filename(line+4, &old);
214 8afe1f71 2022-05-12 thomas } else if (rename && !strncmp(line, "rename from ", 12)) {
215 8afe1f71 2022-05-12 thomas free(old);
216 8afe1f71 2022-05-12 thomas err = filename(line+12, &old);
217 069bbb86 2022-03-07 thomas } else if (!strncmp(line, "+++ ", 4)) {
218 069bbb86 2022-03-07 thomas free(new);
219 d9db2ff9 2022-04-16 thomas err = filename(line+4, &new);
220 0f76ab83 2022-06-23 thomas } else if (!git && !strncmp(line, "blob - ", 7)) {
221 0f76ab83 2022-06-23 thomas free(blob);
222 19dd85cb 2022-07-01 thomas err = blobid(line + 7, &blob, git);
223 8afe1f71 2022-05-12 thomas } else if (rename && !strncmp(line, "rename to ", 10)) {
224 8afe1f71 2022-05-12 thomas free(new);
225 8afe1f71 2022-05-12 thomas err = filename(line + 10, &new);
226 8afe1f71 2022-05-12 thomas } else if (git && !strncmp(line, "similarity index 100%", 21))
227 8afe1f71 2022-05-12 thomas rename = 1;
228 19dd85cb 2022-07-01 thomas else if (git && !strncmp(line, "index ", 6)) {
229 19dd85cb 2022-07-01 thomas free(blob);
230 19dd85cb 2022-07-01 thomas err = blobid(line + 6, &blob, git);
231 68ceedb3 2022-07-03 thomas } else if (!strncmp(line, "diff ", 5)) {
232 68ceedb3 2022-07-03 thomas /* rewind to previous line */
233 68ceedb3 2022-07-03 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
234 68ceedb3 2022-07-03 thomas err = got_error_from_errno("fseeko");
235 68ceedb3 2022-07-03 thomas *next = 1;
243 8afe1f71 2022-05-12 thomas * Git-style diffs with "similarity index 100%" don't
244 8afe1f71 2022-05-12 thomas * have any hunks and ends with the "rename to foobar"
247 8afe1f71 2022-05-12 thomas if (rename && old != NULL && new != NULL) {
248 3b488fde 2022-05-12 thomas *done = 1;
249 016bfe4b 2022-06-23 thomas err = send_patch(old, new, commitid,
250 016bfe4b 2022-06-23 thomas blob, git);
254 069bbb86 2022-03-07 thomas if (!strncmp(line, "@@ -", 4)) {
255 069bbb86 2022-03-07 thomas create = !strncmp(line+4, "0,0", 3);
256 069bbb86 2022-03-07 thomas if ((old == NULL && new == NULL) ||
257 069bbb86 2022-03-07 thomas (!create && old == NULL))
258 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
260 016bfe4b 2022-06-23 thomas err = send_patch(old, new, commitid,
261 016bfe4b 2022-06-23 thomas blob, git);
266 069bbb86 2022-03-07 thomas /* rewind to previous line */
267 bafaf650 2022-05-14 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
268 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
273 19f1a2ac 2022-03-13 thomas free(old);
274 19f1a2ac 2022-03-13 thomas free(new);
275 0f76ab83 2022-06-23 thomas free(blob);
276 069bbb86 2022-03-07 thomas free(line);
277 069bbb86 2022-03-07 thomas if (ferror(fp) && err == NULL)
278 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
279 069bbb86 2022-03-07 thomas if (feof(fp) && err == NULL)
280 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_NO_PATCH);
281 069bbb86 2022-03-07 thomas return err;
284 069bbb86 2022-03-07 thomas static const struct got_error *
285 8ebb3daa 2022-06-23 thomas strtolnum(char **str, int *n)
287 069bbb86 2022-03-07 thomas char *p, c;
288 069bbb86 2022-03-07 thomas const char *errstr;
290 069bbb86 2022-03-07 thomas for (p = *str; isdigit((unsigned char)*p); ++p)
291 069bbb86 2022-03-07 thomas /* nop */;
294 069bbb86 2022-03-07 thomas *p = '\0';
296 8ebb3daa 2022-06-23 thomas *n = strtonum(*str, 0, INT_MAX, &errstr);
297 069bbb86 2022-03-07 thomas if (errstr != NULL)
298 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
301 069bbb86 2022-03-07 thomas *str = p;
302 069bbb86 2022-03-07 thomas return NULL;
305 069bbb86 2022-03-07 thomas static const struct got_error *
306 1992b6cb 2022-05-12 thomas parse_hdr(char *s, int *done, struct got_imsg_patch_hunk *hdr)
308 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
310 069bbb86 2022-03-07 thomas if (strncmp(s, "@@ -", 4)) {
311 1992b6cb 2022-05-12 thomas *done = 1;
312 069bbb86 2022-03-07 thomas return NULL;
317 069bbb86 2022-03-07 thomas return NULL;
318 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->oldfrom);
320 069bbb86 2022-03-07 thomas return err;
321 069bbb86 2022-03-07 thomas if (*s == ',') {
323 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->oldlines);
325 069bbb86 2022-03-07 thomas return err;
327 069bbb86 2022-03-07 thomas hdr->oldlines = 1;
329 069bbb86 2022-03-07 thomas if (*s == ' ')
332 069bbb86 2022-03-07 thomas if (*s != '+' || !*++s)
333 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
334 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->newfrom);
336 069bbb86 2022-03-07 thomas return err;
337 069bbb86 2022-03-07 thomas if (*s == ',') {
339 069bbb86 2022-03-07 thomas err = strtolnum(&s, &hdr->newlines);
341 069bbb86 2022-03-07 thomas return err;
343 069bbb86 2022-03-07 thomas hdr->newlines = 1;
345 069bbb86 2022-03-07 thomas if (*s == ' ')
348 069bbb86 2022-03-07 thomas if (*s != '@')
349 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
351 8ebb3daa 2022-06-23 thomas if (hdr->oldfrom >= INT_MAX - hdr->oldlines ||
352 8ebb3daa 2022-06-23 thomas hdr->newfrom >= INT_MAX - hdr->newlines ||
353 069bbb86 2022-03-07 thomas /* not so sure about this one */
354 8ebb3daa 2022-06-23 thomas hdr->oldlines >= INT_MAX - hdr->newlines - 1 ||
355 88c260f4 2022-05-14 thomas (hdr->oldlines == 0 && hdr->newlines == 0))
356 069bbb86 2022-03-07 thomas return got_error(GOT_ERR_PATCH_MALFORMED);
358 069bbb86 2022-03-07 thomas if (hdr->oldlines == 0) {
359 069bbb86 2022-03-07 thomas /* larry says to "do append rather than insert"; I don't
360 069bbb86 2022-03-07 thomas * quite get it, but i trust him.
362 069bbb86 2022-03-07 thomas hdr->oldfrom++;
365 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_HUNK, 0, 0, -1,
366 069bbb86 2022-03-07 thomas hdr, sizeof(*hdr)) == -1)
367 069bbb86 2022-03-07 thomas return got_error_from_errno(
368 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_HUNK");
369 069bbb86 2022-03-07 thomas return NULL;
372 069bbb86 2022-03-07 thomas static const struct got_error *
373 069bbb86 2022-03-07 thomas send_line(const char *line)
375 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
376 069bbb86 2022-03-07 thomas char *p = NULL;
378 ff7f34d3 2022-03-22 thomas if (*line != '+' && *line != '-' && *line != ' ' && *line != '\\') {
379 069bbb86 2022-03-07 thomas if (asprintf(&p, " %s", line) == -1)
380 069bbb86 2022-03-07 thomas return got_error_from_errno("asprintf");
381 069bbb86 2022-03-07 thomas line = p;
384 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_LINE, 0, 0, -1,
385 17d6446a 2022-03-22 thomas line, strlen(line) + 1) == -1)
386 069bbb86 2022-03-07 thomas err = got_error_from_errno(
387 069bbb86 2022-03-07 thomas "imsg_compose GOT_IMSG_PATCH_LINE");
390 069bbb86 2022-03-07 thomas return err;
393 069bbb86 2022-03-07 thomas static const struct got_error *
394 656c2baa 2022-04-23 thomas peek_special_line(FILE *fp)
396 ff7f34d3 2022-03-22 thomas const struct got_error *err;
399 ff7f34d3 2022-03-22 thomas ch = fgetc(fp);
400 ff7f34d3 2022-03-22 thomas if (ch != EOF && ch != '\\') {
401 ff7f34d3 2022-03-22 thomas ungetc(ch, fp);
402 ff7f34d3 2022-03-22 thomas return NULL;
405 656c2baa 2022-04-23 thomas if (ch == '\\') {
406 ff7f34d3 2022-03-22 thomas err = send_line("\\");
408 ff7f34d3 2022-03-22 thomas return err;
411 ff7f34d3 2022-03-22 thomas while (ch != EOF && ch != '\n')
412 ff7f34d3 2022-03-22 thomas ch = fgetc(fp);
414 ff7f34d3 2022-03-22 thomas if (ch != EOF || feof(fp))
415 ff7f34d3 2022-03-22 thomas return NULL;
416 ff7f34d3 2022-03-22 thomas return got_error(GOT_ERR_IO);
419 ff7f34d3 2022-03-22 thomas static const struct got_error *
420 1992b6cb 2022-05-12 thomas parse_hunk(FILE *fp, int *done)
422 069bbb86 2022-03-07 thomas static const struct got_error *err = NULL;
423 069bbb86 2022-03-07 thomas struct got_imsg_patch_hunk hdr;
424 069bbb86 2022-03-07 thomas char *line = NULL, ch;
425 069bbb86 2022-03-07 thomas size_t linesize = 0;
426 069bbb86 2022-03-07 thomas ssize_t linelen;
427 8ebb3daa 2022-06-23 thomas int leftold, leftnew;
429 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, fp);
430 069bbb86 2022-03-07 thomas if (linelen == -1) {
431 1992b6cb 2022-05-12 thomas *done = 1;
432 069bbb86 2022-03-07 thomas goto done;
435 1992b6cb 2022-05-12 thomas err = parse_hdr(line, done, &hdr);
437 069bbb86 2022-03-07 thomas goto done;
438 1992b6cb 2022-05-12 thomas if (*done) {
439 bafaf650 2022-05-14 thomas if (fseeko(fp, -linelen, SEEK_CUR) == -1)
440 bafaf650 2022-05-14 thomas err = got_error_from_errno("fseeko");
441 069bbb86 2022-03-07 thomas goto done;
444 069bbb86 2022-03-07 thomas leftold = hdr.oldlines;
445 069bbb86 2022-03-07 thomas leftnew = hdr.newlines;
447 069bbb86 2022-03-07 thomas while (leftold > 0 || leftnew > 0) {
448 069bbb86 2022-03-07 thomas linelen = getline(&line, &linesize, fp);
449 069bbb86 2022-03-07 thomas if (linelen == -1) {
450 069bbb86 2022-03-07 thomas if (ferror(fp)) {
451 069bbb86 2022-03-07 thomas err = got_error_from_errno("getline");
452 069bbb86 2022-03-07 thomas goto done;
455 069bbb86 2022-03-07 thomas /* trailing newlines may be chopped */
456 069bbb86 2022-03-07 thomas if (leftold < 3 && leftnew < 3) {
457 1992b6cb 2022-05-12 thomas *done = 1;
461 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_TRUNCATED);
462 069bbb86 2022-03-07 thomas goto done;
464 ff7f34d3 2022-03-22 thomas if (line[linelen - 1] == '\n')
465 ff7f34d3 2022-03-22 thomas line[linelen - 1] = '\0';
467 069bbb86 2022-03-07 thomas /* usr.bin/patch allows '=' as context char */
468 069bbb86 2022-03-07 thomas if (*line == '=')
469 069bbb86 2022-03-07 thomas *line = ' ';
471 069bbb86 2022-03-07 thomas ch = *line;
472 ff7f34d3 2022-03-22 thomas if (ch == '\t' || ch == '\0')
473 069bbb86 2022-03-07 thomas ch = ' '; /* the space got eaten */
475 069bbb86 2022-03-07 thomas switch (ch) {
476 069bbb86 2022-03-07 thomas case '-':
477 069bbb86 2022-03-07 thomas leftold--;
479 069bbb86 2022-03-07 thomas case ' ':
480 069bbb86 2022-03-07 thomas leftold--;
481 069bbb86 2022-03-07 thomas leftnew--;
483 069bbb86 2022-03-07 thomas case '+':
484 069bbb86 2022-03-07 thomas leftnew--;
487 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
488 069bbb86 2022-03-07 thomas goto done;
491 069bbb86 2022-03-07 thomas if (leftold < 0 || leftnew < 0) {
492 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PATCH_MALFORMED);
493 069bbb86 2022-03-07 thomas goto done;
496 069bbb86 2022-03-07 thomas err = send_line(line);
498 069bbb86 2022-03-07 thomas goto done;
500 ff7f34d3 2022-03-22 thomas if ((ch == '-' && leftold == 0) ||
501 ff7f34d3 2022-03-22 thomas (ch == '+' && leftnew == 0)) {
502 656c2baa 2022-04-23 thomas err = peek_special_line(fp);
504 ff7f34d3 2022-03-22 thomas goto done;
509 069bbb86 2022-03-07 thomas free(line);
510 069bbb86 2022-03-07 thomas return err;
513 069bbb86 2022-03-07 thomas static const struct got_error *
514 069bbb86 2022-03-07 thomas read_patch(struct imsgbuf *ibuf, int fd)
516 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
517 069bbb86 2022-03-07 thomas FILE *fp;
518 68ceedb3 2022-07-03 thomas int git, patch_found = 0;
519 68ceedb3 2022-07-03 thomas char *cid = NULL;
521 069bbb86 2022-03-07 thomas if ((fp = fdopen(fd, "r")) == NULL) {
522 069bbb86 2022-03-07 thomas err = got_error_from_errno("fdopen");
523 069bbb86 2022-03-07 thomas close(fd);
524 069bbb86 2022-03-07 thomas return err;
527 68ceedb3 2022-07-03 thomas while ((err = patch_start(&git, &cid, fp)) == NULL) {
528 68ceedb3 2022-07-03 thomas int done, next;
530 68ceedb3 2022-07-03 thomas err = find_diff(&done, &next, fp, git, cid);
532 069bbb86 2022-03-07 thomas goto done;
533 68ceedb3 2022-07-03 thomas if (next)
534 68ceedb3 2022-07-03 thomas continue;
536 069bbb86 2022-03-07 thomas patch_found = 1;
538 1992b6cb 2022-05-12 thomas while (!done) {
539 1992b6cb 2022-05-12 thomas err = parse_hunk(fp, &done);
541 069bbb86 2022-03-07 thomas goto done;
544 1992b6cb 2022-05-12 thomas err = send_patch_done();
546 1992b6cb 2022-05-12 thomas goto done;
550 069bbb86 2022-03-07 thomas fclose(fp);
551 68ceedb3 2022-07-03 thomas free(cid);
553 069bbb86 2022-03-07 thomas /* ignore trailing gibberish */
554 069bbb86 2022-03-07 thomas if (err != NULL && err->code == GOT_ERR_NO_PATCH && patch_found)
555 069bbb86 2022-03-07 thomas err = NULL;
557 069bbb86 2022-03-07 thomas return err;
561 069bbb86 2022-03-07 thomas main(int argc, char **argv)
563 069bbb86 2022-03-07 thomas const struct got_error *err = NULL;
564 069bbb86 2022-03-07 thomas struct imsg imsg;
566 069bbb86 2022-03-07 thomas static int attached;
567 069bbb86 2022-03-07 thomas while (!attached)
568 069bbb86 2022-03-07 thomas sleep(1);
571 069bbb86 2022-03-07 thomas imsg_init(&ibuf, GOT_IMSG_FD_CHILD);
572 069bbb86 2022-03-07 thomas #ifndef PROFILE
573 069bbb86 2022-03-07 thomas /* revoke access to most system calls */
574 069bbb86 2022-03-07 thomas if (pledge("stdio recvfd", NULL) == -1) {
575 069bbb86 2022-03-07 thomas err = got_error_from_errno("pledge");
576 069bbb86 2022-03-07 thomas got_privsep_send_error(&ibuf, err);
577 069bbb86 2022-03-07 thomas return 1;
580 762ddcd8 2022-03-09 thomas /* revoke fs access */
581 762ddcd8 2022-03-09 thomas if (landlock_no_fs() == -1) {
582 762ddcd8 2022-03-09 thomas err = got_error_from_errno("landlock_no_fs");
583 762ddcd8 2022-03-09 thomas got_privsep_send_error(&ibuf, err);
584 762ddcd8 2022-03-09 thomas return 1;
586 5d120ea8 2022-06-23 op if (cap_enter() == -1) {
587 5d120ea8 2022-06-23 op err = got_error_from_errno("cap_enter");
588 5d120ea8 2022-06-23 op got_privsep_send_error(&ibuf, err);
593 069bbb86 2022-03-07 thomas err = got_privsep_recv_imsg(&imsg, &ibuf, 0);
595 069bbb86 2022-03-07 thomas goto done;
596 069bbb86 2022-03-07 thomas if (imsg.hdr.type != GOT_IMSG_PATCH_FILE || imsg.fd == -1) {
597 069bbb86 2022-03-07 thomas err = got_error(GOT_ERR_PRIVSEP_MSG);
598 069bbb86 2022-03-07 thomas goto done;
601 069bbb86 2022-03-07 thomas err = read_patch(&ibuf, imsg.fd);
603 069bbb86 2022-03-07 thomas goto done;
604 069bbb86 2022-03-07 thomas if (imsg_compose(&ibuf, GOT_IMSG_PATCH_EOF, 0, 0, -1,
605 069bbb86 2022-03-07 thomas NULL, 0) == -1) {
606 069bbb86 2022-03-07 thomas err = got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
607 069bbb86 2022-03-07 thomas goto done;
609 069bbb86 2022-03-07 thomas err = got_privsep_flush_imsg(&ibuf);
611 069bbb86 2022-03-07 thomas imsg_free(&imsg);
612 069bbb86 2022-03-07 thomas if (err != NULL) {
613 069bbb86 2022-03-07 thomas got_privsep_send_error(&ibuf, err);
614 069bbb86 2022-03-07 thomas err = NULL;
616 069bbb86 2022-03-07 thomas if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)
617 069bbb86 2022-03-07 thomas err = got_error_from_errno("close");
618 069bbb86 2022-03-07 thomas if (err && err->code != GOT_ERR_PRIVSEP_PIPE)
619 069bbb86 2022-03-07 thomas fprintf(stderr, "%s: %s\n", getprogname(), err->msg);
620 069bbb86 2022-03-07 thomas return err ? 1 : 0;
