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"
88 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
91 /* diff3 - 3-way differential file comparison */
93 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
95 * d13 = diff report on f1 vs f3
96 * d23 = diff report on f2 vs f3
97 * f1, f2, f3 the 3 files
98 * if changes in f1 overlap with changes in f3, m1 and m3 are used
99 * to mark the overlaps; otherwise, the file names f1 and f3 are used
100 * (only for options E and X).
104 * "from" is first in range of changed lines; "to" is last+1
105 * from=to=line after point of insertion for added lines.
118 struct line_range old;
119 struct line_range new;
120 struct off_range newo;
130 * "de" is used to gather editing scripts. These are later spewed out
131 * in reverse order. Its first element must be all zero, the "new"
132 * component of "de" contains line positions and byte positions.
133 * Array overlap indicates which sections in "de" correspond to lines
134 * that are different in all three files.
140 int cline[3]; /* # of the last-read line in each file (0-2) */
143 * the latest known correspondence between line numbers of the 3 files
144 * is stored in last[1-3];
147 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
155 static const struct got_error *duplicate(int *, struct line_range *,
156 struct line_range *, struct diff3_state *);
157 static const struct got_error *edit(struct diff *, int, int *,
158 struct diff3_state *);
159 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
160 static const struct got_error *get_line(char **, FILE *, size_t *,
161 struct diff3_state *);
162 static int number(char **);
163 static const struct got_error *readin(size_t *, char *, struct diff **,
164 struct diff3_state *);
165 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
166 static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
167 static const struct got_error *edscript(int, struct diff3_state *);
168 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
169 static const struct got_error *prange(struct line_range *, struct diff3_state *);
170 static const struct got_error *repos(int, struct diff3_state *);
171 static const struct got_error *increase(struct diff3_state *);
172 static const struct got_error *diff3_internal(char *, char *, char *,
173 char *, char *, const char *, const char *, struct diff3_state *,
174 const char *, const char *);
176 static const struct got_error *
177 diff_output(BUF *diffbuf, const char *fmt, ...)
179 const struct got_error *err = NULL;
186 i = vasprintf(&str, fmt, vap);
189 return got_error_from_errno("vasprintf");
190 err = buf_append(&newsize, diffbuf, str, strlen(str));
195 static const struct got_error*
196 diffreg(BUF **d, const char *path1, const char *path2)
198 const struct got_error *err = NULL;
199 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
200 char *outpath = NULL;
201 struct got_diff_state ds;
202 struct got_diff_args args;
207 f1 = fopen(path1, "r");
209 err = got_error_from_errno2("fopen", path1);
212 f2 = fopen(path2, "r");
214 err = got_error_from_errno2("fopen", path2);
218 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
222 memset(&ds, 0, sizeof(ds));
223 /* XXX should stat buffers be passed in args instead of ds? */
224 if (stat(path1, &ds.stb1) == -1) {
225 err = got_error_from_errno2("stat", path1);
228 if (stat(path2, &ds.stb2) == -1) {
229 err = got_error_from_errno2("stat", path2);
233 memset(&args, 0, sizeof(args));
234 args.diff_format = D_NORMAL;
237 args.diff_context = 0;
239 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
244 if (fflush(outfile) != 0) {
245 err = got_error_from_errno2("fflush", outpath);
249 err = buf_load(d, outpath);
252 if (unlink(outpath) == -1 && err == NULL)
253 err = got_error_from_errno2("unlink", outpath);
256 if (outfile && fclose(outfile) != 0 && err == NULL)
257 err = got_error_from_errno("fclose");
258 if (f1 && fclose(f1) != 0 && err == NULL)
259 err = got_error_from_errno("fclose");
260 if (f2 && fclose(f2) != 0 && err == NULL)
261 err = got_error_from_errno("fclose");
268 const struct got_error *
269 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
270 const char *p3, const char *label1, const char *label3)
272 const struct got_error *err = NULL;
273 char *dp13, *dp23, *path1, *path2, *path3;
274 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
275 u_char *data, *patch;
277 struct diff3_state *d3s;
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 err = buf_load(&b1, p1);
293 err = buf_load(&b2, p2);
296 err = buf_load(&b3, p3);
300 err = buf_alloc(&diffb, 128);
304 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
305 err = got_error_from_errno("asprintf");
308 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
309 err = got_error_from_errno("asprintf");
312 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
313 err = got_error_from_errno("asprintf");
317 err = buf_write_stmp(b1, path1);
320 err = buf_write_stmp(b2, path2);
323 err = buf_write_stmp(b3, path3);
330 err = diffreg(&d1, path1, path3);
337 err = diffreg(&d2, path2, path3);
344 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
345 err = got_error_from_errno("asprintf");
348 err = buf_write_stmp(d1, dp13);
355 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
356 err = got_error_from_errno("asprintf");
359 err = buf_write_stmp(d2, dp23);
366 d3s->diffbuf = diffb;
367 err = diff3_internal(dp13, dp23, path1, path2, path3,
368 label1, label3, d3s, label1, label3);
375 plen = buf_len(diffb);
376 patch = buf_release(diffb);
378 data = buf_release(b1);
380 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
387 if (unlink(path1) == -1 && err == NULL)
388 err = got_error_from_errno2("unlink", path1);
389 if (unlink(path2) == -1 && err == NULL)
390 err = got_error_from_errno2("unlink", path2);
391 if (unlink(path3) == -1 && err == NULL)
392 err = got_error_from_errno2("unlink", path3);
393 if (unlink(dp13) == -1 && err == NULL)
394 err = got_error_from_errno2("unlink", dp13);
395 if (unlink(dp23) == -1 && err == NULL)
396 err = got_error_from_errno2("unlink", dp23);
406 for (i = 0; i < nitems(d3s->fp); i++) {
407 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
408 err = got_error_from_errno("fclose");
410 if (err == NULL && diffb) {
411 if (buf_write_fd(diffb, outfd) < 0)
412 err = got_error_from_errno("buf_write_fd");
413 *overlapcnt = d3s->overlapcnt;
420 static const struct got_error *
421 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
422 const char *fmark, const char *rmark, struct diff3_state *d3s,
423 const char *label1, const char *label3)
425 const struct got_error *err = NULL;
429 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
430 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
431 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
432 return got_error(GOT_ERR_NO_SPACE);
434 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
435 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
436 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
437 return got_error(GOT_ERR_NO_SPACE);
443 err = readin(&m, dp13, &d3s->d13, d3s);
446 err = readin(&n, dp23, &d3s->d23, d3s);
450 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
451 return got_error_from_errno2("fopen", path1);
452 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
453 return got_error_from_errno2("fopen", path2);
454 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
455 return got_error_from_errno2("fopen", path3);
457 return merge(m, n, d3s);
461 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
464 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
465 int start, end, i, lineno;
468 dlp = TAILQ_FIRST(&(dlines->l_lines));
469 lp = TAILQ_FIRST(&(plines->l_lines));
472 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
473 lp = TAILQ_NEXT(lp, l_list)) {
474 /* Skip blank lines */
478 /* NUL-terminate line buffer for strtol() safety. */
479 tmp = lp->l_line[lp->l_len - 1];
480 lp->l_line[lp->l_len - 1] = '\0';
482 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
483 op = lp->l_line[lp->l_len - 2];
484 start = (int)strtol(lp->l_line, &ep, 10);
486 /* Restore the last byte of the buffer */
487 lp->l_line[lp->l_len - 1] = tmp;
490 if (start > dlines->l_nblines ||
491 start < 0 || *ep != 'a')
493 } else if (op == 'c') {
494 if (start > dlines->l_nblines ||
495 start < 0 || (*ep != ',' && *ep != 'c'))
500 end = (int)strtol(ep, &ep, 10);
501 if (end < 0 || *ep != 'c')
512 if (dlp->l_lineno == start)
514 if (dlp->l_lineno > start) {
515 dlp = TAILQ_PREV(dlp, tqh, l_list);
516 } else if (dlp->l_lineno < start) {
517 ndlp = TAILQ_NEXT(dlp, l_list);
518 if (ndlp->l_lineno > start)
529 insert_after = TAILQ_PREV(dlp, tqh, l_list);
530 for (i = 0; i <= (end - start); i++) {
531 ndlp = TAILQ_NEXT(dlp, l_list);
532 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
538 if (op == 'a' || op == 'c') {
541 lp = TAILQ_NEXT(lp, l_list);
545 if (lp->l_len == 2 &&
546 lp->l_line[0] == '.' &&
547 lp->l_line[1] == '\n')
550 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
551 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
555 lp->l_lineno = start;
561 * always resort lines as the markers might be put at the
562 * same line as we first started editing.
565 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
566 sort->l_lineno = lineno++;
567 dlines->l_nblines = lineno - 1;
574 * Pick up the line numbers of all changes from one change file.
575 * (This puts the numbers in a vector, which is not strictly necessary,
576 * since the vector is processed in one sequential pass.
577 * The vector could be optimized out of existence)
579 static const struct got_error *
580 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
582 const struct got_error *err = NULL;
590 f = fopen(name, "r");
592 return got_error_from_errno2("fopen", name);
593 err = getchange(&p, f, d3s);
596 for (i = 0; p; i++) {
597 if (i >= d3s->szchanges - 1) {
619 (*dd)[i].old.from = a;
621 (*dd)[i].new.from = c;
624 err = getchange(&p, f, d3s);
630 (*dd)[i].old.from = (*dd)[i - 1].old.to;
631 (*dd)[i].new.from = (*dd)[i - 1].new.to;
634 if (fclose(f) != 0 && err == NULL)
635 err = got_error_from_errno("fclose");
647 while (isdigit((unsigned char)(**lc)))
648 nn = nn*10 + *(*lc)++ - '0';
653 static const struct got_error *
654 getchange(char **line, FILE *b, struct diff3_state *d3s)
656 const struct got_error *err = NULL;
660 if (*line && isdigit((unsigned char)(*line)[0]))
662 err = get_line(line, b, NULL, d3s);
670 static const struct got_error *
671 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
673 const struct got_error *err = NULL;
681 len = getline(&cp, &size, b);
684 err = got_error_from_errno("getline");
688 if (cp[len - 1] != '\n') {
690 if (len + 1 > size) {
691 new = realloc(cp, len + 1);
693 err = got_error_from_errno("realloc");
703 *ret = d3s->buf = cp;
712 static const struct got_error *
713 merge(size_t m1, size_t m2, struct diff3_state *d3s)
715 const struct got_error *err = NULL;
716 struct diff *d1, *d2;
723 t1 = (d1 < d3s->d13 + m1);
724 t2 = (d2 < d3s->d23 + m2);
728 /* first file is different from others */
729 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
730 /* stuff peculiar to 1st file */
735 /* second file is different from others */
736 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
742 * Merge overlapping changes in first file
743 * this happens after extension (see below).
745 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
746 d1[1].old.from = d1->old.from;
747 d1[1].new.from = d1->new.from;
752 /* merge overlapping changes in second */
753 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
754 d2[1].old.from = d2->old.from;
755 d2[1].new.from = d2->new.from;
759 /* stuff peculiar to third file or different in all */
760 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
761 err = duplicate(&dpl, &d1->old, &d2->old, d3s);
766 * dpl = 0 means all files differ
767 * dpl = 1 means files 1 and 2 identical
769 err = edit(d1, dpl, &j, d3s);
778 * Overlapping changes from file 1 and 2; extend changes
779 * appropriately to make them coincide.
781 if (d1->new.from < d2->new.from) {
782 d2->old.from -= d2->new.from - d1->new.from;
783 d2->new.from = d1->new.from;
784 } else if (d2->new.from < d1->new.from) {
785 d1->old.from -= d1->new.from - d2->new.from;
786 d1->new.from = d2->new.from;
788 if (d1->new.to > d2->new.to) {
789 d2->old.to += d1->new.to - d2->new.to;
790 d2->new.to = d1->new.to;
791 } else if (d2->new.to > d1->new.to) {
792 d1->old.to += d2->new.to - d1->new.to;
793 d1->new.to = d2->new.to;
797 return (edscript(j, d3s));
801 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
803 static const struct got_error *
804 prange(struct line_range *rold, struct diff3_state *d3s)
806 const struct got_error *err = NULL;
808 if (rold->to <= rold->from) {
809 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
813 err = diff_output(d3s->diffbuf, "%d", rold->from);
816 if (rold->to > rold->from + 1) {
817 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
821 err = diff_output(d3s->diffbuf, "c\n");
830 * Skip to just before line number from in file "i".
831 * Return the number of bytes skipped in *nskipped.
833 static const struct got_error *
834 skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
836 const struct got_error *err = NULL;
841 for (n = 0; d3s->cline[i] < from - 1; n += len) {
842 err = get_line(&line, d3s->fp[i], &len, d3s);
852 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
853 * the same data as the new range (in file 2).
855 static const struct got_error *
856 duplicate(int *dpl, struct line_range *r1, struct line_range *r2,
857 struct diff3_state *d3s)
859 const struct got_error *err = NULL;
867 if (r1->to - r1->from != r2->to - r2->from)
870 err = skip(&nskipped, 0, r1->from, d3s);
873 err = skip(&nskipped, 1, r2->from, d3s);
877 for (nline = 0; nline < r1->to - r1->from; nline++) {
879 c = getc(d3s->fp[0]);
881 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
882 d = getc(d3s->fp[1]);
884 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
887 return repos(nchar, d3s);
890 err = repos(nchar, d3s);
897 static const struct got_error *
898 repos(int nchar, struct diff3_state *d3s)
902 for (i = 0; i < 2; i++) {
903 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
904 return got_ferror(d3s->fp[i], GOT_ERR_IO);
911 * collect an editing script for later regurgitation
913 static const struct got_error *
914 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
916 const struct got_error *err = NULL;
919 if (((fdup + 1) & 3) == 0)
922 d3s->overlap[*j] = !fdup;
925 d3s->de[*j].old.from = diff->old.from;
926 d3s->de[*j].old.to = diff->old.to;
928 err = skip(&nskipped, 2, diff->new.from, d3s);
931 d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
933 err = skip(&nskipped, 2, diff->new.to, d3s);
936 d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
941 static const struct got_error *
942 edscript(int n, struct diff3_state *d3s)
944 const struct got_error *err = NULL;
946 char block[BUFSIZ+1];
949 if (!d3s->overlap[n]) {
950 err = prange(&d3s->de[n].old, d3s);
954 err = diff_output(d3s->diffbuf, "%da\n%s\n",
955 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
959 if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
961 return got_error_from_errno("fseek");
962 k = d3s->de[n].newo.to - d3s->de[n].newo.from;
963 for (; k > 0; k -= len) {
964 len = k > BUFSIZ ? BUFSIZ : k;
965 if (fread(block, 1, len, d3s->fp[2]) != (size_t)len)
966 return got_ferror(d3s->fp[2], GOT_ERR_IO);
968 err = diff_output(d3s->diffbuf, "%s", block);
973 if (!d3s->overlap[n]) {
974 err = diff_output(d3s->diffbuf, ".\n");
978 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
981 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
982 d3s->de[n].old.from - 1, d3s->f1mark);
991 static const struct got_error *
992 increase(struct diff3_state *d3s)
998 /* are the memset(3) calls needed? */
999 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1000 incr = newsz - d3s->szchanges;
1002 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1004 return got_error_from_errno("reallocarray");
1006 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1008 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1010 return got_error_from_errno("reallocarray");
1012 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1014 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1016 return got_error_from_errno("reallocarray");
1018 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1020 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1022 return got_error_from_errno("reallocarray");
1024 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1025 d3s->szchanges = newsz;