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];
146 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
155 static int duplicate(struct range *, struct range *, struct diff3_state *);
156 static int edit(struct diff *, int, int, struct diff3_state *);
157 static char *getchange(FILE *, struct diff3_state *);
158 static char *get_line(FILE *, size_t *, struct diff3_state *);
159 static int number(char **);
160 static const struct got_error *readin(size_t *, char *, struct diff **,
161 struct diff3_state *);
162 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
163 static int skip(int, int, char *, struct diff3_state *);
164 static int edscript(int, struct diff3_state *);
165 static int merge(size_t, size_t, struct diff3_state *);
166 static void change(int, struct range *, int, struct diff3_state *);
167 static void keep(int, struct range *, struct diff3_state *);
168 static void prange(struct range *, struct diff3_state *);
169 static void repos(int, struct diff3_state *);
170 static void separate(const char *, 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, ...)
185 i = vasprintf(&str, fmt, vap);
188 return got_error_from_errno("vasprintf");
189 buf_append(&newsize, diffbuf, str, strlen(str));
194 static const struct got_error*
195 diffreg(BUF **d, const char *path1, const char *path2)
197 const struct got_error *err = NULL;
198 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
199 char *outpath = NULL;
200 struct got_diff_state ds;
201 struct got_diff_args args;
206 f1 = fopen(path1, "r");
208 err = got_error_from_errno2("fopen", path1);
211 f2 = fopen(path2, "r");
213 err = got_error_from_errno2("fopen", path2);
217 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
221 memset(&ds, 0, sizeof(ds));
222 /* XXX should stat buffers be passed in args instead of ds? */
223 if (stat(path1, &ds.stb1) == -1) {
224 err = got_error_from_errno2("stat", path1);
227 if (stat(path2, &ds.stb2) == -1) {
228 err = got_error_from_errno2("stat", path2);
232 memset(&args, 0, sizeof(args));
233 args.diff_format = D_NORMAL;
236 args.diff_context = 0;
238 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
243 if (fflush(outfile) != 0) {
244 err = got_error_from_errno2("fflush", outpath);
248 *d = buf_load(outpath);
250 err = got_error_from_errno("buf_load");
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 wklhead temp_files;
278 struct diff3_state *d3s;
283 SLIST_INIT(&temp_files);
285 d3s = calloc(1, sizeof(*d3s));
287 return got_error_from_errno("calloc");
288 d3s->eflag = 3; /* default -E for compatibility with former RCS */
289 d3s->oflag = 1; /* default -E for compatibility with former RCS */
291 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
292 dp13 = dp23 = path1 = path2 = path3 = NULL;
295 if ((b1 = buf_load(p1)) == NULL)
297 if ((b2 = buf_load(p2)) == NULL)
299 if ((b3 = buf_load(p3)) == NULL)
302 diffb = buf_alloc(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, &temp_files);
320 err = buf_write_stmp(b2, path2, &temp_files);
323 err = buf_write_stmp(b3, path3, &temp_files);
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, &temp_files);
355 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
356 err = got_error_from_errno("asprintf");
359 err = buf_write_stmp(d2, dp23, &temp_files);
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);
401 worklist_clean(&temp_files, worklist_unlink);
403 for (i = 0; i < nitems(d3s->fp); i++) {
404 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
405 err = got_error_from_errno("fclose");
407 if (err == NULL && diffb) {
408 if (buf_write_fd(diffb, outfd) < 0)
409 err = got_error_from_errno("buf_write_fd");
410 *overlapcnt = d3s->overlapcnt;
417 static const struct got_error *
418 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
419 const char *fmark, const char *rmark, struct diff3_state *d3s,
420 const char *label1, const char *label3)
422 const struct got_error *err = NULL;
426 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
427 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
428 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
429 return got_error(GOT_ERR_NO_SPACE);
431 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
432 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
433 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
434 return got_error(GOT_ERR_NO_SPACE);
440 err = readin(&m, dp13, &d3s->d13, d3s);
443 err = readin(&n, dp23, &d3s->d23, d3s);
447 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
448 return got_error_from_errno2("fopen", path1);
449 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
450 return got_error_from_errno2("fopen", path2);
451 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
452 return got_error_from_errno2("fopen", path3);
454 if (merge(m, n, d3s) < 0)
455 return got_error_from_errno("merge");
460 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
463 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
464 int start, end, i, lineno;
467 dlp = TAILQ_FIRST(&(dlines->l_lines));
468 lp = TAILQ_FIRST(&(plines->l_lines));
471 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
472 lp = TAILQ_NEXT(lp, l_list)) {
473 /* Skip blank lines */
477 /* NUL-terminate line buffer for strtol() safety. */
478 tmp = lp->l_line[lp->l_len - 1];
479 lp->l_line[lp->l_len - 1] = '\0';
481 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
482 op = lp->l_line[lp->l_len - 2];
483 start = (int)strtol(lp->l_line, &ep, 10);
485 /* Restore the last byte of the buffer */
486 lp->l_line[lp->l_len - 1] = tmp;
489 if (start > dlines->l_nblines ||
490 start < 0 || *ep != 'a')
492 } else if (op == 'c') {
493 if (start > dlines->l_nblines ||
494 start < 0 || (*ep != ',' && *ep != 'c'))
499 end = (int)strtol(ep, &ep, 10);
500 if (end < 0 || *ep != 'c')
511 if (dlp->l_lineno == start)
513 if (dlp->l_lineno > start) {
514 dlp = TAILQ_PREV(dlp, tqh, l_list);
515 } else if (dlp->l_lineno < start) {
516 ndlp = TAILQ_NEXT(dlp, l_list);
517 if (ndlp->l_lineno > start)
528 insert_after = TAILQ_PREV(dlp, tqh, l_list);
529 for (i = 0; i <= (end - start); i++) {
530 ndlp = TAILQ_NEXT(dlp, l_list);
531 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
537 if (op == 'a' || op == 'c') {
540 lp = TAILQ_NEXT(lp, l_list);
544 if (lp->l_len == 2 &&
545 lp->l_line[0] == '.' &&
546 lp->l_line[1] == '\n')
549 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
550 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
554 lp->l_lineno = start;
560 * always resort lines as the markers might be put at the
561 * same line as we first started editing.
564 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
565 sort->l_lineno = lineno++;
566 dlines->l_nblines = lineno - 1;
573 * Pick up the line numbers of all changes from one change file.
574 * (This puts the numbers in a vector, which is not strictly necessary,
575 * since the vector is processed in one sequential pass.
576 * The vector could be optimized out of existence)
578 static const struct got_error *
579 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
581 const struct got_error *err = NULL;
588 d3s->fp[0] = fopen(name, "r");
589 if (d3s->fp[0] == NULL)
590 return got_error_from_errno2("fopen", name);
591 for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
592 if (i >= d3s->szchanges - 1) {
614 (*dd)[i].old.from = a;
616 (*dd)[i].new.from = c;
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';
645 getchange(FILE *b, struct diff3_state *d3s)
649 while ((line = get_line(b, NULL, d3s))) {
650 if (isdigit((unsigned char)line[0]))
658 get_line(FILE *b, size_t *n, struct diff3_state *d3s)
664 if ((cp = fgetln(b, &len)) == NULL)
667 if (cp[len - 1] != '\n')
669 if (len + 1 > d3s->bufsize) {
671 d3s->bufsize += 1024;
672 } while (len + 1 > d3s->bufsize);
673 new = reallocarray(d3s->buf, 1, d3s->bufsize);
678 memcpy(d3s->buf, cp, len - 1);
679 d3s->buf[len - 1] = '\n';
680 d3s->buf[len] = '\0';
688 merge(size_t m1, size_t m2, struct diff3_state *d3s)
690 struct diff *d1, *d2, *d3;
697 t1 = (d1 < d3s->d13 + m1);
698 t2 = (d2 < d3s->d23 + m2);
703 printf("%d,%d=%d,%d %d,%d=%d,%d\n",
704 d1->old.from, d1->old.to,
705 d1->new.from, d1->new.to,
706 d2->old.from, d2->old.to,
707 d2->new.from, d2->new.to);
710 /* first file is different from others */
711 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
712 /* stuff peculiar to 1st file */
713 if (d3s->eflag == 0) {
715 change(1, &d1->old, 0, d3s);
716 keep(2, &d1->new, d3s);
717 change(3, &d1->new, 0, d3s);
723 /* second file is different from others */
724 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
725 if (d3s->eflag == 0) {
727 keep(1, &d2->new, d3s);
728 change(2, &d2->old, 0, d3s);
729 change(3, &d2->new, 0, d3s);
736 * Merge overlapping changes in first file
737 * this happens after extension (see below).
739 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
740 d1[1].old.from = d1->old.from;
741 d1[1].new.from = d1->new.from;
746 /* merge overlapping changes in second */
747 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
748 d2[1].old.from = d2->old.from;
749 d2[1].new.from = d2->new.from;
753 /* stuff peculiar to third file or different in all */
754 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
755 dpl = duplicate(&d1->old, &d2->old, d3s);
760 * dpl = 0 means all files differ
761 * dpl = 1 means files 1 and 2 identical
763 if (d3s->eflag == 0) {
764 separate(dpl ? "3" : "", d3s);
765 change(1, &d1->old, dpl, d3s);
766 change(2, &d2->old, 0, d3s);
767 d3 = d1->old.to > d1->old.from ? d1 : d2;
768 change(3, &d3->new, 0, d3s);
770 j = edit(d1, dpl, j, d3s);
777 * Overlapping changes from file 1 and 2; extend changes
778 * appropriately to make them coincide.
780 if (d1->new.from < d2->new.from) {
781 d2->old.from -= d2->new.from-d1->new.from;
782 d2->new.from = d1->new.from;
783 } else if (d2->new.from < d1->new.from) {
784 d1->old.from -= d1->new.from-d2->new.from;
785 d1->new.from = d2->new.from;
787 if (d1->new.to > d2->new.to) {
788 d2->old.to += d1->new.to - d2->new.to;
789 d2->new.to = d1->new.to;
790 } else if (d2->new.to > d1->new.to) {
791 d1->old.to += d2->new.to - d1->new.to;
792 d1->new.to = d2->new.to;
796 return (edscript(j, d3s));
800 separate(const char *s, struct diff3_state *d3s)
802 diff_output(d3s->diffbuf, "====%s\n", s);
806 * The range of lines rold.from thru rold.to in file i is to be changed.
807 * It is to be printed only if it does not duplicate something to be
811 change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
813 diff_output(d3s->diffbuf, "%d:", i);
814 d3s->last[i] = rold->to;
816 if (fdup || d3s->debug)
819 (void)skip(i, rold->from, NULL, d3s);
820 (void)skip(i, rold->to, " ", d3s);
824 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
827 prange(struct range *rold, struct diff3_state *d3s)
829 if (rold->to <= rold->from)
830 diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
832 diff_output(d3s->diffbuf, "%d", rold->from);
833 if (rold->to > rold->from+1)
834 diff_output(d3s->diffbuf, ",%d", rold->to - 1);
835 diff_output(d3s->diffbuf, "c\n");
840 * No difference was reported by diff between file 1 (or 2) and file 3,
841 * and an artificial dummy difference (trange) must be ginned up to
842 * correspond to the change reported in the other file.
845 keep(int i, struct range *rnew, struct diff3_state *d3s)
850 delta = d3s->last[3] - d3s->last[i];
851 trange.from = rnew->from - delta;
852 trange.to = rnew->to - delta;
853 change(i, &trange, 1, d3s);
857 * skip to just before line number from in file "i". If "pr" is non-NULL,
858 * print all skipped stuff with string pr as a prefix.
861 skip(int i, int from, char *pr, struct diff3_state *d3s)
866 for (n = 0; d3s->cline[i] < from - 1; n += j) {
867 if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
870 diff_output(d3s->diffbuf, "%s%s", pr, line);
877 * Return 1 or 0 according as the old range (in file 1) contains exactly
878 * the same data as the new range (in file 2).
881 duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
887 if (r1->to-r1->from != r2->to-r2->from)
889 (void)skip(0, r1->from, NULL, d3s);
890 (void)skip(1, r2->from, NULL, d3s);
892 for (nline=0; nline < r1->to - r1->from; nline++) {
894 c = getc(d3s->fp[0]);
895 d = getc(d3s->fp[1]);
896 if (c == -1 || d== -1)
910 repos(int nchar, struct diff3_state *d3s)
914 for (i = 0; i < 2; i++)
915 (void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
919 * collect an editing script for later regurgitation
922 edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
924 if (((fdup + 1) & d3s->eflag) == 0)
927 d3s->overlap[j] = !fdup;
930 d3s->de[j].old.from = diff->old.from;
931 d3s->de[j].old.to = diff->old.to;
932 d3s->de[j].new.from =
933 d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
935 d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
941 edscript(int n, struct diff3_state *d3s)
944 char block[BUFSIZ+1];
947 if (!d3s->oflag || !d3s->overlap[n])
948 prange(&d3s->de[n].old, d3s);
950 diff_output(d3s->diffbuf, "%da\n%s\n",
951 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
952 (void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
953 k = d3s->de[n].new.to - d3s->de[n].new.from;
954 for (; k > 0; k-= j) {
955 j = k > BUFSIZ ? BUFSIZ : k;
956 if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
959 diff_output(d3s->diffbuf, "%s", block);
962 if (!d3s->oflag || !d3s->overlap[n])
963 diff_output(d3s->diffbuf, ".\n");
965 diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
966 diff_output(d3s->diffbuf, "%da\n%s\n.\n",
967 d3s->de[n].old.from - 1, d3s->f1mark);
971 return (d3s->overlapcnt);
974 static const struct got_error *
975 increase(struct diff3_state *d3s)
981 /* are the memset(3) calls needed? */
982 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
983 incr = newsz - d3s->szchanges;
985 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
987 return got_error_from_errno("reallocarray");
989 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
991 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
993 return got_error_from_errno("reallocarray");
995 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
997 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
999 return got_error_from_errno("reallocarray");
1001 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1003 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1005 return got_error_from_errno("reallocarray");
1007 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1008 d3s->szchanges = newsz;