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 oldo;
121 struct off_range newo;
131 * "de" is used to gather editing scripts. These are later spewed out
132 * in reverse order. Its first element must be all zero, the "new"
133 * component of "de" contains line positions, and "oldo" and "newo"
134 * components contain byte positions.
135 * Array overlap indicates which sections in "de" correspond to lines
136 * that are different in all three files.
142 int cline[3]; /* # of the last-read line in each file (0-2) */
145 * the latest known correspondence between line numbers of the 3 files
146 * is stored in last[1-3];
149 char f1mark[PATH_MAX];
150 char f2mark[PATH_MAX];
151 char f3mark[PATH_MAX];
159 static const struct got_error *duplicate(int *, int, struct line_range *,
160 struct line_range *, struct diff3_state *);
161 static const struct got_error *edit(struct diff *, int, int *,
162 struct diff3_state *);
163 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
164 static const struct got_error *get_line(char **, FILE *, size_t *,
165 struct diff3_state *);
166 static int number(char **);
167 static const struct got_error *readin(size_t *, char *, struct diff **,
168 struct diff3_state *);
169 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
170 static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
171 static const struct got_error *edscript(int, struct diff3_state *);
172 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
173 static const struct got_error *prange(struct line_range *, struct diff3_state *);
174 static const struct got_error *repos(int, struct diff3_state *);
175 static const struct got_error *increase(struct diff3_state *);
176 static const struct got_error *diff3_internal(char *, char *, char *,
177 char *, char *, const char *, const char *, struct diff3_state *,
178 const char *, const char *, const char *);
180 static const struct got_error *
181 diff_output(BUF *diffbuf, const char *fmt, ...)
183 const struct got_error *err = NULL;
190 i = vasprintf(&str, fmt, vap);
193 return got_error_from_errno("vasprintf");
194 err = buf_append(&newsize, diffbuf, str, strlen(str));
199 static const struct got_error*
200 diffreg(BUF **d, const char *path1, const char *path2)
202 const struct got_error *err = NULL;
203 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
204 char *outpath = NULL;
205 struct got_diff_state ds;
206 struct got_diff_args args;
211 f1 = fopen(path1, "r");
213 err = got_error_from_errno2("fopen", path1);
216 f2 = fopen(path2, "r");
218 err = got_error_from_errno2("fopen", path2);
222 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
226 memset(&ds, 0, sizeof(ds));
227 /* XXX should stat buffers be passed in args instead of ds? */
228 if (stat(path1, &ds.stb1) == -1) {
229 err = got_error_from_errno2("stat", path1);
232 if (stat(path2, &ds.stb2) == -1) {
233 err = got_error_from_errno2("stat", path2);
237 memset(&args, 0, sizeof(args));
238 args.diff_format = D_NORMAL;
241 args.diff_context = 0;
243 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
248 if (fflush(outfile) != 0) {
249 err = got_error_from_errno2("fflush", outpath);
253 err = buf_load(d, outpath);
256 if (unlink(outpath) == -1 && err == NULL)
257 err = got_error_from_errno2("unlink", outpath);
260 if (outfile && fclose(outfile) != 0 && err == NULL)
261 err = got_error_from_errno("fclose");
262 if (f1 && fclose(f1) != 0 && err == NULL)
263 err = got_error_from_errno("fclose");
264 if (f2 && fclose(f2) != 0 && err == NULL)
265 err = got_error_from_errno("fclose");
272 const struct got_error *
273 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
274 const char *p3, const char *label1, const char *label2, const char *label3)
276 const struct got_error *err = NULL;
277 char *dp13, *dp23, *path1, *path2, *path3;
278 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
279 u_char *data, *patch;
281 struct diff3_state *d3s;
286 d3s = calloc(1, sizeof(*d3s));
288 return got_error_from_errno("calloc");
290 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
291 dp13 = dp23 = path1 = path2 = path3 = NULL;
294 err = buf_load(&b1, p1);
297 err = buf_load(&b2, p2);
300 err = buf_load(&b3, p3);
304 err = buf_alloc(&diffb, 128);
308 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
309 err = got_error_from_errno("asprintf");
312 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
313 err = got_error_from_errno("asprintf");
316 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
317 err = got_error_from_errno("asprintf");
321 err = buf_write_stmp(b1, path1);
324 err = buf_write_stmp(b2, path2);
327 err = buf_write_stmp(b3, path3);
334 err = diffreg(&d1, path1, path3);
341 err = diffreg(&d2, path2, path3);
348 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
349 err = got_error_from_errno("asprintf");
352 err = buf_write_stmp(d1, dp13);
359 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
360 err = got_error_from_errno("asprintf");
363 err = buf_write_stmp(d2, dp23);
370 d3s->diffbuf = diffb;
371 err = diff3_internal(dp13, dp23, path1, path2, path3,
372 label1, label3, d3s, label1, label2, label3);
379 plen = buf_len(diffb);
380 patch = buf_release(diffb);
382 data = buf_release(b1);
384 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
391 if (unlink(path1) == -1 && err == NULL)
392 err = got_error_from_errno2("unlink", path1);
393 if (unlink(path2) == -1 && err == NULL)
394 err = got_error_from_errno2("unlink", path2);
395 if (unlink(path3) == -1 && err == NULL)
396 err = got_error_from_errno2("unlink", path3);
397 if (unlink(dp13) == -1 && err == NULL)
398 err = got_error_from_errno2("unlink", dp13);
399 if (unlink(dp23) == -1 && err == NULL)
400 err = got_error_from_errno2("unlink", dp23);
410 for (i = 0; i < nitems(d3s->fp); i++) {
411 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
412 err = got_error_from_errno("fclose");
414 if (err == NULL && diffb) {
415 if (buf_write_fd(diffb, outfd) < 0)
416 err = got_error_from_errno("buf_write_fd");
417 *overlapcnt = d3s->overlapcnt;
424 static const struct got_error *
425 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
426 const char *fmark, const char *rmark, struct diff3_state *d3s,
427 const char *label1, const char *label2, const char *label3)
429 const struct got_error *err = NULL;
433 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
434 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_BEGIN,
435 label1 ? " " : "", label1 ? label1 : "");
436 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
437 return got_error(GOT_ERR_NO_SPACE);
439 i = snprintf(d3s->f2mark, sizeof(d3s->f2mark),
440 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_ORIG,
441 label2 ? " " : "", label2 ? label2 : "");
442 if (i < 0 || i >= (int)sizeof(d3s->f2mark))
443 return got_error(GOT_ERR_NO_SPACE);
445 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
446 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_END,
447 label3 ? " " : "", label3 ? label3 : "");
448 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
449 return got_error(GOT_ERR_NO_SPACE);
455 err = readin(&m, dp13, &d3s->d13, d3s);
458 err = readin(&n, dp23, &d3s->d23, d3s);
462 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
463 return got_error_from_errno2("fopen", path1);
464 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
465 return got_error_from_errno2("fopen", path2);
466 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
467 return got_error_from_errno2("fopen", path3);
469 return merge(m, n, d3s);
473 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
476 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
477 int start, end, i, lineno;
480 dlp = TAILQ_FIRST(&(dlines->l_lines));
481 lp = TAILQ_FIRST(&(plines->l_lines));
484 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
485 lp = TAILQ_NEXT(lp, l_list)) {
486 /* Skip blank lines */
490 /* NUL-terminate line buffer for strtol() safety. */
491 tmp = lp->l_line[lp->l_len - 1];
492 lp->l_line[lp->l_len - 1] = '\0';
494 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
495 op = lp->l_line[lp->l_len - 2];
496 start = (int)strtol(lp->l_line, &ep, 10);
498 /* Restore the last byte of the buffer */
499 lp->l_line[lp->l_len - 1] = tmp;
502 if (start > dlines->l_nblines ||
503 start < 0 || *ep != 'a')
505 } else if (op == 'c') {
506 if (start > dlines->l_nblines ||
507 start < 0 || (*ep != ',' && *ep != 'c'))
512 end = (int)strtol(ep, &ep, 10);
513 if (end < 0 || *ep != 'c')
524 if (dlp->l_lineno == start)
526 if (dlp->l_lineno > start) {
527 dlp = TAILQ_PREV(dlp, tqh, l_list);
528 } else if (dlp->l_lineno < start) {
529 ndlp = TAILQ_NEXT(dlp, l_list);
530 if (ndlp->l_lineno > start)
541 insert_after = TAILQ_PREV(dlp, tqh, l_list);
542 for (i = 0; i <= (end - start); i++) {
543 ndlp = TAILQ_NEXT(dlp, l_list);
544 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
550 if (op == 'a' || op == 'c') {
553 lp = TAILQ_NEXT(lp, l_list);
557 if (lp->l_len == 2 &&
558 lp->l_line[0] == '.' &&
559 lp->l_line[1] == '\n')
562 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
563 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
567 lp->l_lineno = start;
573 * always resort lines as the markers might be put at the
574 * same line as we first started editing.
577 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
578 sort->l_lineno = lineno++;
579 dlines->l_nblines = lineno - 1;
586 * Pick up the line numbers of all changes from one change file.
587 * (This puts the numbers in a vector, which is not strictly necessary,
588 * since the vector is processed in one sequential pass.
589 * The vector could be optimized out of existence)
591 static const struct got_error *
592 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
594 const struct got_error *err = NULL;
602 f = fopen(name, "r");
604 return got_error_from_errno2("fopen", name);
605 err = getchange(&p, f, d3s);
608 for (i = 0; p; i++) {
609 if (i >= d3s->szchanges - 1) {
631 (*dd)[i].old.from = a;
633 (*dd)[i].new.from = c;
636 err = getchange(&p, f, d3s);
642 (*dd)[i].old.from = (*dd)[i - 1].old.to;
643 (*dd)[i].new.from = (*dd)[i - 1].new.to;
646 if (fclose(f) != 0 && err == NULL)
647 err = got_error_from_errno("fclose");
659 while (isdigit((unsigned char)(**lc)))
660 nn = nn*10 + *(*lc)++ - '0';
665 static const struct got_error *
666 getchange(char **line, FILE *b, struct diff3_state *d3s)
668 const struct got_error *err = NULL;
672 if (*line && isdigit((unsigned char)(*line)[0]))
674 err = get_line(line, b, NULL, d3s);
682 static const struct got_error *
683 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
685 const struct got_error *err = NULL;
693 len = getline(&cp, &size, b);
696 err = got_error_from_errno("getline");
700 if (cp[len - 1] != '\n') {
702 if (len + 1 > size) {
703 new = realloc(cp, len + 1);
705 err = got_error_from_errno("realloc");
715 *ret = d3s->buf = cp;
724 static const struct got_error *
725 merge(size_t m1, size_t m2, struct diff3_state *d3s)
727 const struct got_error *err = NULL;
728 struct diff *d1, *d2;
735 t1 = (d1 < d3s->d13 + m1);
736 t2 = (d2 < d3s->d23 + m2);
740 /* first file is different from others */
741 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
742 /* stuff peculiar to 1st file */
747 /* second file is different from others */
748 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
754 * Merge overlapping changes in first file
755 * this happens after extension (see below).
757 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
758 d1[1].old.from = d1->old.from;
759 d1[1].new.from = d1->new.from;
764 /* merge overlapping changes in second */
765 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
766 d2[1].old.from = d2->old.from;
767 d2[1].new.from = d2->new.from;
771 /* stuff peculiar to third file or different in all */
772 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
773 err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
778 * dpl = 0 means all files differ
779 * dpl = 1 means files 1 and 2 identical
781 err = edit(d1, dpl, &j, d3s);
790 * Overlapping changes from file 1 and 2; extend changes
791 * appropriately to make them coincide.
793 if (d1->new.from < d2->new.from) {
794 d2->old.from -= d2->new.from - d1->new.from;
795 d2->new.from = d1->new.from;
796 } else if (d2->new.from < d1->new.from) {
797 d1->old.from -= d1->new.from - d2->new.from;
798 d1->new.from = d2->new.from;
800 if (d1->new.to > d2->new.to) {
801 d2->old.to += d1->new.to - d2->new.to;
802 d2->new.to = d1->new.to;
803 } else if (d2->new.to > d1->new.to) {
804 d1->old.to += d2->new.to - d1->new.to;
805 d1->new.to = d2->new.to;
809 return (edscript(j, d3s));
813 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
815 static const struct got_error *
816 prange(struct line_range *rold, struct diff3_state *d3s)
818 const struct got_error *err = NULL;
820 if (rold->to <= rold->from) {
821 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
825 err = diff_output(d3s->diffbuf, "%d", rold->from);
828 if (rold->to > rold->from + 1) {
829 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
833 err = diff_output(d3s->diffbuf, "c\n");
842 * Skip to just before line number from in file "i".
843 * Return the number of bytes skipped in *nskipped.
845 static const struct got_error *
846 skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
848 const struct got_error *err = NULL;
853 for (n = 0; d3s->cline[i] < from - 1; n += len) {
854 err = get_line(&line, d3s->fp[i], &len, d3s);
864 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
865 * the same data as the new range (in file 2).
867 * If this change could overlap, remember start/end offsets in file 2 so we
868 * can write out the original lines of text if a merge conflict occurs.
870 static const struct got_error *
871 duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
872 struct diff3_state *d3s)
874 const struct got_error *err = NULL;
883 if (r1->to - r1->from != r2->to - r2->from)
886 err = skip(&nskipped, 0, r1->from, d3s);
889 err = skip(&nskipped, 1, r2->from, d3s);
893 off = ftello(d3s->fp[1]);
895 return got_error_from_errno("ftello");
896 d3s->de[j + 1].oldo.from = off; /* original lines start here */
899 for (nline = 0; nline < r1->to - r1->from; nline++) {
901 c = getc(d3s->fp[0]);
903 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
904 d = getc(d3s->fp[1]);
906 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
909 long orig_line_len = nchar;
911 d = getc(d3s->fp[1]);
916 if (orig_line_len > nchar &&
917 fseek(d3s->fp[1], -(orig_line_len - nchar),
919 return got_ferror(d3s->fp[1],
921 /* original lines end here */
922 d3s->de[j + 1].oldo.to = off + orig_line_len;
923 err = repos(nchar, d3s);
930 err = repos(nchar, d3s);
937 static const struct got_error *
938 repos(int nchar, struct diff3_state *d3s)
942 for (i = 0; i < 2; i++) {
943 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
944 return got_ferror(d3s->fp[i], GOT_ERR_IO);
951 * collect an editing script for later regurgitation
953 static const struct got_error *
954 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
956 const struct got_error *err = NULL;
959 if (((fdup + 1) & 3) == 0)
962 d3s->overlap[*j] = !fdup;
965 d3s->de[*j].old.from = diff->old.from;
966 d3s->de[*j].old.to = diff->old.to;
968 err = skip(&nskipped, 2, diff->new.from, d3s);
971 d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
973 err = skip(&nskipped, 2, diff->new.to, d3s);
976 d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
981 static const struct got_error *
982 edscript(int n, struct diff3_state *d3s)
984 const struct got_error *err = NULL;
986 char block[BUFSIZ+1];
989 if (!d3s->overlap[n]) {
990 err = prange(&d3s->de[n].old, d3s);
993 } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
994 /* Output a block of 3-way diff base file content. */
995 err = diff_output(d3s->diffbuf, "%da\n%s\n",
996 d3s->de[n].old.to - 1, d3s->f2mark);
999 if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1001 return got_error_from_errno("fseeko");
1002 k = (size_t)(d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1003 for (; k > 0; k -= len) {
1004 len = k > BUFSIZ ? BUFSIZ : k;
1005 if (fread(block, 1, len, d3s->fp[1]) != len)
1006 return got_ferror(d3s->fp[1],
1009 err = diff_output(d3s->diffbuf, "%s", block);
1013 err = diff_output(d3s->diffbuf, "%s\n",
1014 GOT_DIFF_CONFLICT_MARKER_SEP);
1018 err = diff_output(d3s->diffbuf, "%da\n%s\n",
1019 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1023 if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
1025 return got_error_from_errno("fseek");
1026 k = (size_t)(d3s->de[n].newo.to - d3s->de[n].newo.from);
1027 for (; k > 0; k -= len) {
1028 len = k > BUFSIZ ? BUFSIZ : k;
1029 if (fread(block, 1, len, d3s->fp[2]) != len)
1030 return got_ferror(d3s->fp[2], GOT_ERR_IO);
1032 err = diff_output(d3s->diffbuf, "%s", block);
1037 if (!d3s->overlap[n]) {
1038 err = diff_output(d3s->diffbuf, ".\n");
1042 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
1045 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
1046 d3s->de[n].old.from - 1, d3s->f1mark);
1055 static const struct got_error *
1056 increase(struct diff3_state *d3s)
1062 /* are the memset(3) calls needed? */
1063 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1064 incr = newsz - d3s->szchanges;
1066 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1068 return got_error_from_errno("reallocarray");
1070 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1072 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1074 return got_error_from_errno("reallocarray");
1076 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1078 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1080 return got_error_from_errno("reallocarray");
1082 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1084 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1086 return got_error_from_errno("reallocarray");
1088 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1089 d3s->szchanges = newsz;