1 /* $OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $ */
4 * Copyright (C) Caldera International Inc. 2001-2002.
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
10 * 1. Redistributions of source code and documentation must retain the above
11 * copyright notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. All advertising materials mentioning features or use of this software
16 * must display the following acknowledgement:
17 * This product includes software developed or owned by Caldera
19 * 4. Neither the name of Caldera International, Inc. nor the names of other
20 * contributors may be used to endorse or promote products derived from
21 * this software without specific prior written permission.
23 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 * POSSIBILITY OF SUCH DAMAGE.
37 * Copyright (c) 1991, 1993
38 * The Regents of the University of California. All rights reserved.
40 * Redistribution and use in source and binary forms, with or without
41 * modification, are permitted provided that the following conditions
43 * 1. Redistributions of source code must retain the above copyright
44 * notice, this list of conditions and the following disclaimer.
45 * 2. Redistributions in binary form must reproduce the above copyright
46 * notice, this list of conditions and the following disclaimer in the
47 * documentation and/or other materials provided with the distribution.
48 * 3. Neither the name of the University nor the names of its contributors
49 * may be used to endorse or promote products derived from this software
50 * without specific prior written permission.
52 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 * @(#)diff3.c 8.1 (Berkeley) 6/6/93
68 #include <sys/queue.h>
79 #include "got_error.h"
80 #include "got_opentemp.h"
81 #include "got_object.h"
85 #include "got_lib_diff.h"
89 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
92 /* diff3 - 3-way differential file comparison */
94 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
96 * d13 = diff report on f1 vs f3
97 * d23 = diff report on f2 vs f3
98 * f1, f2, f3 the 3 files
99 * if changes in f1 overlap with changes in f3, m1 and m3 are used
100 * to mark the overlaps; otherwise, the file names f1 and f3 are used
101 * (only for options E and X).
105 * "from" is first in range of changed lines; "to" is last+1
106 * from=to=line after point of insertion for added lines.
125 * "de" is used to gather editing scripts. These are later spewed out
126 * in reverse order. Its first element must be all zero, the "new"
127 * component of "de" contains line positions or byte positions
128 * depending on when you look (!?). Array overlap indicates which
129 * sections in "de" correspond to lines that are different in all
136 int cline[3]; /* # of the last-read line in each file (0-2) */
139 * the latest known correspondence between line numbers of the 3 files
140 * is stored in last[1-3];
143 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
151 static const struct got_error *duplicate(int *, struct range *, struct range *,
152 struct diff3_state *);
153 static const struct got_error *edit(struct diff *, int, int *,
154 struct diff3_state *);
155 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
156 static const struct got_error *get_line(char **, FILE *, size_t *,
157 struct diff3_state *);
158 static int number(char **);
159 static const struct got_error *readin(size_t *, char *, struct diff **,
160 struct diff3_state *);
161 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
162 static const struct got_error *skip(int *, int, int, char *,
163 struct diff3_state *);
164 static const struct got_error *edscript(int, struct diff3_state *);
165 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
166 static const struct got_error *prange(struct range *, struct diff3_state *);
167 static const struct got_error *repos(int, struct diff3_state *);
168 static const struct got_error *increase(struct diff3_state *);
169 static const struct got_error *diff3_internal(char *, char *, char *,
170 char *, char *, const char *, const char *, struct diff3_state *,
171 const char *, const char *);
173 static const struct got_error *
174 diff_output(BUF *diffbuf, const char *fmt, ...)
182 i = vasprintf(&str, fmt, vap);
185 return got_error_from_errno("vasprintf");
186 buf_append(&newsize, diffbuf, str, strlen(str));
191 static const struct got_error*
192 diffreg(BUF **d, const char *path1, const char *path2)
194 const struct got_error *err = NULL;
195 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
196 char *outpath = NULL;
197 struct got_diff_state ds;
198 struct got_diff_args args;
203 f1 = fopen(path1, "r");
205 err = got_error_from_errno2("fopen", path1);
208 f2 = fopen(path2, "r");
210 err = got_error_from_errno2("fopen", path2);
214 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
218 memset(&ds, 0, sizeof(ds));
219 /* XXX should stat buffers be passed in args instead of ds? */
220 if (stat(path1, &ds.stb1) == -1) {
221 err = got_error_from_errno2("stat", path1);
224 if (stat(path2, &ds.stb2) == -1) {
225 err = got_error_from_errno2("stat", path2);
229 memset(&args, 0, sizeof(args));
230 args.diff_format = D_NORMAL;
233 args.diff_context = 0;
235 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
240 if (fflush(outfile) != 0) {
241 err = got_error_from_errno2("fflush", outpath);
245 *d = buf_load(outpath);
247 err = got_error_from_errno("buf_load");
253 if (outfile && fclose(outfile) != 0 && err == NULL)
254 err = got_error_from_errno("fclose");
255 if (f1 && fclose(f1) != 0 && err == NULL)
256 err = got_error_from_errno("fclose");
257 if (f2 && fclose(f2) != 0 && err == NULL)
258 err = got_error_from_errno("fclose");
265 const struct got_error *
266 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
267 const char *p3, const char *label1, const char *label3)
269 const struct got_error *err = NULL;
270 char *dp13, *dp23, *path1, *path2, *path3;
271 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
272 u_char *data, *patch;
274 struct wklhead temp_files;
275 struct diff3_state *d3s;
280 SLIST_INIT(&temp_files);
282 d3s = calloc(1, sizeof(*d3s));
284 return got_error_from_errno("calloc");
286 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
287 dp13 = dp23 = path1 = path2 = path3 = NULL;
290 if ((b1 = buf_load(p1)) == NULL)
292 if ((b2 = buf_load(p2)) == NULL)
294 if ((b3 = buf_load(p3)) == NULL)
297 diffb = buf_alloc(128);
299 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
300 err = got_error_from_errno("asprintf");
303 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
304 err = got_error_from_errno("asprintf");
307 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
308 err = got_error_from_errno("asprintf");
312 err = buf_write_stmp(b1, path1, &temp_files);
315 err = buf_write_stmp(b2, path2, &temp_files);
318 err = buf_write_stmp(b3, path3, &temp_files);
325 err = diffreg(&d1, path1, path3);
332 err = diffreg(&d2, path2, path3);
339 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
340 err = got_error_from_errno("asprintf");
343 err = buf_write_stmp(d1, dp13, &temp_files);
350 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
351 err = got_error_from_errno("asprintf");
354 err = buf_write_stmp(d2, dp23, &temp_files);
361 d3s->diffbuf = diffb;
362 err = diff3_internal(dp13, dp23, path1, path2, path3,
363 label1, label3, d3s, label1, label3);
370 plen = buf_len(diffb);
371 patch = buf_release(diffb);
373 data = buf_release(b1);
375 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
396 worklist_clean(&temp_files, worklist_unlink);
398 for (i = 0; i < nitems(d3s->fp); i++) {
399 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
400 err = got_error_from_errno("fclose");
402 if (err == NULL && diffb) {
403 if (buf_write_fd(diffb, outfd) < 0)
404 err = got_error_from_errno("buf_write_fd");
405 *overlapcnt = d3s->overlapcnt;
412 static const struct got_error *
413 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
414 const char *fmark, const char *rmark, struct diff3_state *d3s,
415 const char *label1, const char *label3)
417 const struct got_error *err = NULL;
421 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
422 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
423 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
424 return got_error(GOT_ERR_NO_SPACE);
426 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
427 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
428 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
429 return got_error(GOT_ERR_NO_SPACE);
435 err = readin(&m, dp13, &d3s->d13, d3s);
438 err = readin(&n, dp23, &d3s->d23, d3s);
442 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
443 return got_error_from_errno2("fopen", path1);
444 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
445 return got_error_from_errno2("fopen", path2);
446 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
447 return got_error_from_errno2("fopen", path3);
449 return merge(m, n, d3s);
453 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
456 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
457 int start, end, i, lineno;
460 dlp = TAILQ_FIRST(&(dlines->l_lines));
461 lp = TAILQ_FIRST(&(plines->l_lines));
464 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
465 lp = TAILQ_NEXT(lp, l_list)) {
466 /* Skip blank lines */
470 /* NUL-terminate line buffer for strtol() safety. */
471 tmp = lp->l_line[lp->l_len - 1];
472 lp->l_line[lp->l_len - 1] = '\0';
474 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
475 op = lp->l_line[lp->l_len - 2];
476 start = (int)strtol(lp->l_line, &ep, 10);
478 /* Restore the last byte of the buffer */
479 lp->l_line[lp->l_len - 1] = tmp;
482 if (start > dlines->l_nblines ||
483 start < 0 || *ep != 'a')
485 } else if (op == 'c') {
486 if (start > dlines->l_nblines ||
487 start < 0 || (*ep != ',' && *ep != 'c'))
492 end = (int)strtol(ep, &ep, 10);
493 if (end < 0 || *ep != 'c')
504 if (dlp->l_lineno == start)
506 if (dlp->l_lineno > start) {
507 dlp = TAILQ_PREV(dlp, tqh, l_list);
508 } else if (dlp->l_lineno < start) {
509 ndlp = TAILQ_NEXT(dlp, l_list);
510 if (ndlp->l_lineno > start)
521 insert_after = TAILQ_PREV(dlp, tqh, l_list);
522 for (i = 0; i <= (end - start); i++) {
523 ndlp = TAILQ_NEXT(dlp, l_list);
524 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
530 if (op == 'a' || op == 'c') {
533 lp = TAILQ_NEXT(lp, l_list);
537 if (lp->l_len == 2 &&
538 lp->l_line[0] == '.' &&
539 lp->l_line[1] == '\n')
542 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
543 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
547 lp->l_lineno = start;
553 * always resort lines as the markers might be put at the
554 * same line as we first started editing.
557 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
558 sort->l_lineno = lineno++;
559 dlines->l_nblines = lineno - 1;
566 * Pick up the line numbers of all changes from one change file.
567 * (This puts the numbers in a vector, which is not strictly necessary,
568 * since the vector is processed in one sequential pass.
569 * The vector could be optimized out of existence)
571 static const struct got_error *
572 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
574 const struct got_error *err = NULL;
581 d3s->fp[0] = fopen(name, "r");
582 if (d3s->fp[0] == NULL)
583 return got_error_from_errno2("fopen", name);
584 err = getchange(&p, d3s->fp[0], d3s);
587 for (i = 0; p; i++) {
588 if (i >= d3s->szchanges - 1) {
610 (*dd)[i].old.from = a;
612 (*dd)[i].new.from = c;
615 err = getchange(&p, d3s->fp[0], d3s);
621 (*dd)[i].old.from = (*dd)[i-1].old.to;
622 (*dd)[i].new.from = (*dd)[i-1].new.to;
625 if (fclose(d3s->fp[0]) != 0)
626 err = got_error_from_errno("fclose");
638 while (isdigit((unsigned char)(**lc)))
639 nn = nn*10 + *(*lc)++ - '0';
644 static const struct got_error *
645 getchange(char **line, FILE *b, struct diff3_state *d3s)
647 const struct got_error *err = NULL;
651 if (*line && isdigit((unsigned char)(*line)[0]))
653 err = get_line(line, b, NULL, d3s);
661 static const struct got_error *
662 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
664 const struct got_error *err = NULL;
672 len = getline(&cp, &size, b);
675 err = got_error_from_errno("getline");
679 if (cp[len - 1] != '\n') {
681 if (len + 1 > size) {
682 new = realloc(cp, len + 1);
684 err = got_error_from_errno("realloc");
694 *ret = d3s->buf = cp;
703 static const struct got_error *
704 merge(size_t m1, size_t m2, struct diff3_state *d3s)
706 const struct got_error *err = NULL;
707 struct diff *d1, *d2;
714 t1 = (d1 < d3s->d13 + m1);
715 t2 = (d2 < d3s->d23 + m2);
719 /* first file is different from others */
720 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
721 /* stuff peculiar to 1st file */
726 /* second file is different from others */
727 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
733 * Merge overlapping changes in first file
734 * this happens after extension (see below).
736 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
737 d1[1].old.from = d1->old.from;
738 d1[1].new.from = d1->new.from;
743 /* merge overlapping changes in second */
744 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
745 d2[1].old.from = d2->old.from;
746 d2[1].new.from = d2->new.from;
750 /* stuff peculiar to third file or different in all */
751 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
752 err = duplicate(&dpl, &d1->old, &d2->old, d3s);
757 * dpl = 0 means all files differ
758 * dpl = 1 means files 1 and 2 identical
760 err = edit(d1, dpl, &j, d3s);
769 * Overlapping changes from file 1 and 2; extend changes
770 * appropriately to make them coincide.
772 if (d1->new.from < d2->new.from) {
773 d2->old.from -= d2->new.from-d1->new.from;
774 d2->new.from = d1->new.from;
775 } else if (d2->new.from < d1->new.from) {
776 d1->old.from -= d1->new.from-d2->new.from;
777 d1->new.from = d2->new.from;
779 if (d1->new.to > d2->new.to) {
780 d2->old.to += d1->new.to - d2->new.to;
781 d2->new.to = d1->new.to;
782 } else if (d2->new.to > d1->new.to) {
783 d1->old.to += d2->new.to - d1->new.to;
784 d1->new.to = d2->new.to;
788 return (edscript(j, d3s));
792 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
794 static const struct got_error *
795 prange(struct range *rold, struct diff3_state *d3s)
797 const struct got_error *err = NULL;
799 if (rold->to <= rold->from) {
800 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
804 err = diff_output(d3s->diffbuf, "%d", rold->from);
807 if (rold->to > rold->from + 1) {
808 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
812 err = diff_output(d3s->diffbuf, "c\n");
821 * skip to just before line number from in file "i". If "pr" is non-NULL,
822 * print all skipped stuff with string pr as a prefix.
824 static const struct got_error *
825 skip(int *nskipped, int i, int from, char *pr, struct diff3_state *d3s)
827 const struct got_error *err = NULL;
832 for (n = 0; d3s->cline[i] < from - 1; n += j) {
833 err = get_line(&line, d3s->fp[i], &j, d3s);
837 err = diff_output(d3s->diffbuf, "%s%s", pr, line);
848 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
849 * the same data as the new range (in file 2).
851 static const struct got_error *
852 duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
854 const struct got_error *err = NULL;
861 if (r1->to-r1->from != r2->to-r2->from)
864 err = skip(&nskipped, 0, r1->from, NULL, d3s);
867 err = skip(&nskipped, 1, r2->from, NULL, d3s);
871 for (nline=0; nline < r1->to - r1->from; nline++) {
873 c = getc(d3s->fp[0]);
875 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
876 d = getc(d3s->fp[1]);
878 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
881 return repos(nchar, d3s);
884 err = repos(nchar, d3s);
891 static const struct got_error *
892 repos(int nchar, struct diff3_state *d3s)
896 for (i = 0; i < 2; i++) {
897 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
898 return got_ferror(d3s->fp[i], GOT_ERR_IO);
905 * collect an editing script for later regurgitation
907 static const struct got_error *
908 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
910 const struct got_error *err = NULL;
913 if (((fdup + 1) & 3) == 0)
916 d3s->overlap[*j] = !fdup;
919 d3s->de[*j].old.from = diff->old.from;
920 d3s->de[*j].old.to = diff->old.to;
921 err = skip(&nskipped, 2, diff->new.from, NULL, d3s);
924 d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
925 err = skip(&nskipped, 2, diff->new.to, NULL, d3s);
926 d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
931 static const struct got_error *
932 edscript(int n, struct diff3_state *d3s)
934 const struct got_error *err = NULL;
936 char block[BUFSIZ+1];
939 if (!d3s->overlap[n]) {
940 err = prange(&d3s->de[n].old, d3s);
944 err = diff_output(d3s->diffbuf, "%da\n%s\n",
945 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
949 if (fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET)
951 return got_error_from_errno("fseek");
952 k = d3s->de[n].new.to - d3s->de[n].new.from;
953 for (; k > 0; k-= j) {
954 j = k > BUFSIZ ? BUFSIZ : k;
955 if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
956 return got_ferror(d3s->fp[2], GOT_ERR_IO);
958 err = diff_output(d3s->diffbuf, "%s", block);
963 if (!d3s->overlap[n]) {
964 err = diff_output(d3s->diffbuf, ".\n");
968 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
971 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
972 d3s->de[n].old.from - 1, d3s->f1mark);
981 static const struct got_error *
982 increase(struct diff3_state *d3s)
988 /* are the memset(3) calls needed? */
989 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
990 incr = newsz - d3s->szchanges;
992 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
994 return got_error_from_errno("reallocarray");
996 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
998 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1000 return got_error_from_errno("reallocarray");
1002 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1004 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1006 return got_error_from_errno("reallocarray");
1008 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1010 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1012 return got_error_from_errno("reallocarray");
1014 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1015 d3s->szchanges = newsz;