2 * Copyright 1986, Larry Wall
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following condition is met:
6 * 1. Redistributions of source code must retain the above copyright notice,
7 * this condition and the following disclaimer.
9 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY
10 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
11 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
12 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
13 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
14 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
15 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
16 * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
17 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
18 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
23 * Copyright (c) 2022 Omar Polo <op@openbsd.org>
25 * Permission to use, copy, modify, and distribute this software for any
26 * purpose with or without fee is hereby granted, provided that the above
27 * copyright notice and this permission notice appear in all copies.
29 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
30 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
31 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
32 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
33 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
34 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
35 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
38 #include <sys/types.h>
39 #include <sys/queue.h>
53 #include "got_error.h"
54 #include "got_object.h"
56 #include "got_lib_delta.h"
57 #include "got_lib_object.h"
58 #include "got_lib_privsep.h"
62 static const struct got_error *
63 send_patch(const char *oldname, const char *newname)
65 struct got_imsg_patch p;
67 memset(&p, 0, sizeof(p));
70 strlcpy(p.old, oldname, sizeof(p.old));
72 strlcpy(p.new, newname, sizeof(p.new));
74 if (imsg_compose(&ibuf, GOT_IMSG_PATCH, 0, 0, -1,
76 return got_error_from_errno("imsg_compose GOT_IMSG_PATCH");
80 static const struct got_error *
83 if (imsg_compose(&ibuf, GOT_IMSG_PATCH_DONE, 0, 0, -1,
85 return got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
86 if (imsg_flush(&ibuf) == -1)
87 return got_error_from_errno("imsg_flush");
91 /* based on fetchname from usr.bin/patch/util.c */
92 static const struct got_error *
93 filename(const char *at, char **name, int strip)
102 while (isspace((unsigned char)*at))
105 /* files can be created or removed by diffing against /dev/null */
106 if (!strncmp(at, _PATH_DEVNULL, sizeof(_PATH_DEVNULL)-1))
111 return got_error_from_errno("strdup");
112 *name = fullname = t;
113 tab = strchr(t, '\t') != NULL;
115 /* strip off path components and NUL-terminate */
117 *t != '\0' && ((tab && *t != '\t') || !isspace((unsigned char)*t));
119 if (t[0] == '/' && t[1] != '/' && t[1] != '\0')
125 *name = strdup(*name);
128 return got_error_from_errno("strdup");
132 static const struct got_error *
135 const struct got_error *err = NULL;
136 char *old = NULL, *new = NULL;
142 while ((linelen = getline(&line, &linesize, fp)) != -1) {
144 * Ignore the Index name like GNU and larry' patch,
145 * we don't have to follow POSIX.
148 if (git && !strncmp(line, "--- a/", 6)) {
150 err = filename(line+6, &old, 0);
151 } else if (!strncmp(line, "--- ", 4)) {
153 err = filename(line+4, &old, 0);
154 } else if (git && !strncmp(line, "+++ b/", 6)) {
156 err = filename(line+6, &new, 0);
157 } else if (!strncmp(line, "+++ ", 4)) {
159 err = filename(line+4, &new, 0);
160 } else if (!strncmp(line, "diff --git a/", 13))
166 if (!strncmp(line, "@@ -", 4)) {
167 create = !strncmp(line+4, "0,0", 3);
168 if ((old == NULL && new == NULL) ||
169 (!create && old == NULL))
170 err = got_error(GOT_ERR_PATCH_MALFORMED);
172 err = send_patch(old, new);
177 /* rewind to previous line */
178 if (fseek(fp, linelen * -1, SEEK_CUR) == -1)
179 err = got_error_from_errno("fseek");
187 if (ferror(fp) && err == NULL)
188 err = got_error_from_errno("getline");
189 if (feof(fp) && err == NULL)
190 err = got_error(GOT_ERR_NO_PATCH);
194 static const struct got_error *
195 strtolnum(char **str, long *n)
200 for (p = *str; isdigit((unsigned char)*p); ++p)
206 *n = strtonum(*str, 0, LONG_MAX, &errstr);
208 return got_error(GOT_ERR_PATCH_MALFORMED);
215 static const struct got_error *
216 parse_hdr(char *s, int *ok, struct got_imsg_patch_hunk *hdr)
218 static const struct got_error *err = NULL;
221 if (strncmp(s, "@@ -", 4)) {
229 err = strtolnum(&s, &hdr->oldfrom);
234 err = strtolnum(&s, &hdr->oldlines);
243 if (*s != '+' || !*++s)
244 return got_error(GOT_ERR_PATCH_MALFORMED);
245 err = strtolnum(&s, &hdr->newfrom);
250 err = strtolnum(&s, &hdr->newlines);
260 return got_error(GOT_ERR_PATCH_MALFORMED);
262 if (hdr->oldfrom >= LONG_MAX - hdr->oldlines ||
263 hdr->newfrom >= LONG_MAX - hdr->newlines ||
264 /* not so sure about this one */
265 hdr->oldlines >= LONG_MAX - hdr->newlines - 1)
266 return got_error(GOT_ERR_PATCH_MALFORMED);
268 if (hdr->oldlines == 0) {
269 /* larry says to "do append rather than insert"; I don't
270 * quite get it, but i trust him.
275 if (imsg_compose(&ibuf, GOT_IMSG_PATCH_HUNK, 0, 0, -1,
276 hdr, sizeof(*hdr)) == -1)
277 return got_error_from_errno(
278 "imsg_compose GOT_IMSG_PATCH_HUNK");
282 static const struct got_error *
283 send_line(const char *line)
285 static const struct got_error *err = NULL;
288 if (*line != '+' && *line != '-' && *line != ' ') {
289 if (asprintf(&p, " %s", line) == -1)
290 return got_error_from_errno("asprintf");
294 if (imsg_compose(&ibuf, GOT_IMSG_PATCH_LINE, 0, 0, -1,
295 line, strlen(line)+1) == -1)
296 err = got_error_from_errno(
297 "imsg_compose GOT_IMSG_PATCH_LINE");
303 static const struct got_error *
304 parse_hunk(FILE *fp, int *ok)
306 static const struct got_error *err = NULL;
307 struct got_imsg_patch_hunk hdr;
308 char *line = NULL, ch;
311 long leftold, leftnew;
313 linelen = getline(&line, &linesize, fp);
319 err = parse_hdr(line, ok, &hdr);
323 if (fseek(fp, linelen * -1, SEEK_CUR) == -1)
324 err = got_error_from_errno("fseek");
328 leftold = hdr.oldlines;
329 leftnew = hdr.newlines;
331 while (leftold > 0 || leftnew > 0) {
332 linelen = getline(&line, &linesize, fp);
335 err = got_error_from_errno("getline");
339 /* trailing newlines may be chopped */
340 if (leftold < 3 && leftnew < 3) {
345 err = got_error(GOT_ERR_PATCH_TRUNCATED);
349 /* usr.bin/patch allows '=' as context char */
354 if (ch == '\t' || ch == '\n')
355 ch = ' '; /* the space got eaten */
369 err = got_error(GOT_ERR_PATCH_MALFORMED);
373 if (leftold < 0 || leftnew < 0) {
374 err = got_error(GOT_ERR_PATCH_MALFORMED);
378 err = send_line(line);
388 static const struct got_error *
389 read_patch(struct imsgbuf *ibuf, int fd)
391 const struct got_error *err = NULL;
393 int ok, patch_found = 0;
395 if ((fp = fdopen(fd, "r")) == NULL) {
396 err = got_error_from_errno("fdopen");
402 err = find_patch(fp);
408 err = parse_hunk(fp, &ok);
412 err = send_patch_done();
423 /* ignore trailing gibberish */
424 if (err != NULL && err->code == GOT_ERR_NO_PATCH && patch_found)
431 main(int argc, char **argv)
433 const struct got_error *err = NULL;
441 imsg_init(&ibuf, GOT_IMSG_FD_CHILD);
443 /* revoke access to most system calls */
444 if (pledge("stdio recvfd", NULL) == -1) {
445 err = got_error_from_errno("pledge");
446 got_privsep_send_error(&ibuf, err);
451 err = got_privsep_recv_imsg(&imsg, &ibuf, 0);
454 if (imsg.hdr.type != GOT_IMSG_PATCH_FILE || imsg.fd == -1) {
455 err = got_error(GOT_ERR_PRIVSEP_MSG);
459 err = read_patch(&ibuf, imsg.fd);
462 if (imsg_compose(&ibuf, GOT_IMSG_PATCH_EOF, 0, 0, -1,
464 err = got_error_from_errno("imsg_compose GOT_IMSG_PATCH_EOF");
467 err = got_privsep_flush_imsg(&ibuf);
471 got_privsep_send_error(&ibuf, err);
474 if (close(GOT_IMSG_FD_CHILD) == -1 && err == NULL)
475 err = got_error_from_errno("close");
476 if (err && err->code != GOT_ERR_PRIVSEP_PIPE)
477 fprintf(stderr, "%s: %s\n", getprogname(), err->msg);