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,
223 GOT_TMPDIR_STR "/got-diffreg");
227 memset(&ds, 0, sizeof(ds));
228 /* XXX should stat buffers be passed in args instead of ds? */
229 if (stat(path1, &ds.stb1) == -1) {
230 err = got_error_from_errno2("stat", path1);
233 if (stat(path2, &ds.stb2) == -1) {
234 err = got_error_from_errno2("stat", path2);
238 memset(&args, 0, sizeof(args));
239 args.diff_format = D_NORMAL;
242 args.diff_context = 0;
244 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
249 if (fflush(outfile) != 0) {
250 err = got_error_from_errno2("fflush", outpath);
254 err = buf_load(d, outpath);
257 if (unlink(outpath) == -1 && err == NULL)
258 err = got_error_from_errno2("unlink", outpath);
261 if (outfile && fclose(outfile) != 0 && err == NULL)
262 err = got_error_from_errno("fclose");
263 if (f1 && fclose(f1) != 0 && err == NULL)
264 err = got_error_from_errno("fclose");
265 if (f2 && fclose(f2) != 0 && err == NULL)
266 err = got_error_from_errno("fclose");
273 const struct got_error *
274 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
275 const char *p3, const char *label1, const char *label2, const char *label3)
277 const struct got_error *err = NULL;
278 char *dp13, *dp23, *path1, *path2, *path3;
279 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
280 u_char *data, *patch;
282 struct diff3_state *d3s;
287 d3s = calloc(1, sizeof(*d3s));
289 return got_error_from_errno("calloc");
291 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
292 dp13 = dp23 = path1 = path2 = path3 = NULL;
295 err = buf_load(&b1, p1);
298 err = buf_load(&b2, p2);
301 err = buf_load(&b3, p3);
305 err = buf_alloc(&diffb, 128);
309 if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXX") == -1) {
310 err = got_error_from_errno("asprintf");
313 if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXX") == -1) {
314 err = got_error_from_errno("asprintf");
317 if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXX") == -1) {
318 err = got_error_from_errno("asprintf");
322 err = buf_write_stmp(b1, path1);
325 err = buf_write_stmp(b2, path2);
328 err = buf_write_stmp(b3, path3);
335 err = diffreg(&d1, path1, path3);
342 err = diffreg(&d2, path2, path3);
349 if (asprintf(&dp13, GOT_TMPDIR_STR "/got-d13.XXXXXXXXXX") == -1) {
350 err = got_error_from_errno("asprintf");
353 err = buf_write_stmp(d1, dp13);
360 if (asprintf(&dp23, GOT_TMPDIR_STR "/got-d23.XXXXXXXXXX") == -1) {
361 err = got_error_from_errno("asprintf");
364 err = buf_write_stmp(d2, dp23);
371 d3s->diffbuf = diffb;
372 err = diff3_internal(dp13, dp23, path1, path2, path3,
373 label1, label3, d3s, label1, label2, label3);
380 plen = buf_len(diffb);
381 patch = buf_release(diffb);
383 data = buf_release(b1);
385 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
392 if (unlink(path1) == -1 && err == NULL)
393 err = got_error_from_errno2("unlink", path1);
394 if (unlink(path2) == -1 && err == NULL)
395 err = got_error_from_errno2("unlink", path2);
396 if (unlink(path3) == -1 && err == NULL)
397 err = got_error_from_errno2("unlink", path3);
398 if (unlink(dp13) == -1 && err == NULL)
399 err = got_error_from_errno2("unlink", dp13);
400 if (unlink(dp23) == -1 && err == NULL)
401 err = got_error_from_errno2("unlink", dp23);
411 for (i = 0; i < nitems(d3s->fp); i++) {
412 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
413 err = got_error_from_errno("fclose");
415 if (err == NULL && diffb) {
416 if (buf_write_fd(diffb, outfd) < 0)
417 err = got_error_from_errno("buf_write_fd");
418 *overlapcnt = d3s->overlapcnt;
425 static const struct got_error *
426 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
427 const char *fmark, const char *rmark, struct diff3_state *d3s,
428 const char *label1, const char *label2, const char *label3)
430 const struct got_error *err = NULL;
434 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
435 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_BEGIN,
436 label1 ? " " : "", label1 ? label1 : "");
437 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
438 return got_error(GOT_ERR_NO_SPACE);
440 i = snprintf(d3s->f2mark, sizeof(d3s->f2mark),
441 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_ORIG,
442 label2 ? " " : "", label2 ? label2 : "");
443 if (i < 0 || i >= (int)sizeof(d3s->f2mark))
444 return got_error(GOT_ERR_NO_SPACE);
446 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
447 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_END,
448 label3 ? " " : "", label3 ? label3 : "");
449 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
450 return got_error(GOT_ERR_NO_SPACE);
456 err = readin(&m, dp13, &d3s->d13, d3s);
459 err = readin(&n, dp23, &d3s->d23, d3s);
463 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
464 return got_error_from_errno2("fopen", path1);
465 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
466 return got_error_from_errno2("fopen", path2);
467 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
468 return got_error_from_errno2("fopen", path3);
470 return merge(m, n, d3s);
474 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
477 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
478 int start, end, i, lineno;
481 dlp = TAILQ_FIRST(&(dlines->l_lines));
482 lp = TAILQ_FIRST(&(plines->l_lines));
485 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
486 lp = TAILQ_NEXT(lp, l_list)) {
487 /* Skip blank lines */
491 /* NUL-terminate line buffer for strtol() safety. */
492 tmp = lp->l_line[lp->l_len - 1];
493 lp->l_line[lp->l_len - 1] = '\0';
495 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
496 op = lp->l_line[lp->l_len - 2];
497 start = (int)strtol(lp->l_line, &ep, 10);
499 /* Restore the last byte of the buffer */
500 lp->l_line[lp->l_len - 1] = tmp;
503 if (start > dlines->l_nblines ||
504 start < 0 || *ep != 'a')
506 } else if (op == 'c') {
507 if (start > dlines->l_nblines ||
508 start < 0 || (*ep != ',' && *ep != 'c'))
513 end = (int)strtol(ep, &ep, 10);
514 if (end < 0 || *ep != 'c')
525 if (dlp->l_lineno == start)
527 if (dlp->l_lineno > start) {
528 dlp = TAILQ_PREV(dlp, tqh, l_list);
529 } else if (dlp->l_lineno < start) {
530 ndlp = TAILQ_NEXT(dlp, l_list);
531 if (ndlp->l_lineno > start)
542 insert_after = TAILQ_PREV(dlp, tqh, l_list);
543 for (i = 0; i <= (end - start); i++) {
544 ndlp = TAILQ_NEXT(dlp, l_list);
545 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
551 if (op == 'a' || op == 'c') {
554 lp = TAILQ_NEXT(lp, l_list);
558 if (lp->l_len == 2 &&
559 lp->l_line[0] == '.' &&
560 lp->l_line[1] == '\n')
563 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
564 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
568 lp->l_lineno = start;
574 * always resort lines as the markers might be put at the
575 * same line as we first started editing.
578 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
579 sort->l_lineno = lineno++;
580 dlines->l_nblines = lineno - 1;
587 * Pick up the line numbers of all changes from one change file.
588 * (This puts the numbers in a vector, which is not strictly necessary,
589 * since the vector is processed in one sequential pass.
590 * The vector could be optimized out of existence)
592 static const struct got_error *
593 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
595 const struct got_error *err = NULL;
603 f = fopen(name, "r");
605 return got_error_from_errno2("fopen", name);
606 err = getchange(&p, f, d3s);
609 for (i = 0; p; i++) {
610 if (i >= d3s->szchanges - 1) {
632 (*dd)[i].old.from = a;
634 (*dd)[i].new.from = c;
637 err = getchange(&p, f, d3s);
643 (*dd)[i].old.from = (*dd)[i - 1].old.to;
644 (*dd)[i].new.from = (*dd)[i - 1].new.to;
647 if (fclose(f) != 0 && err == NULL)
648 err = got_error_from_errno("fclose");
660 while (isdigit((unsigned char)(**lc)))
661 nn = nn*10 + *(*lc)++ - '0';
666 static const struct got_error *
667 getchange(char **line, FILE *b, struct diff3_state *d3s)
669 const struct got_error *err = NULL;
673 if (*line && isdigit((unsigned char)(*line)[0]))
675 err = get_line(line, b, NULL, d3s);
683 static const struct got_error *
684 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
686 const struct got_error *err = NULL;
694 len = getline(&cp, &size, b);
697 err = got_error_from_errno("getline");
701 if (cp[len - 1] != '\n') {
703 if (len + 1 > size) {
704 new = realloc(cp, len + 1);
706 err = got_error_from_errno("realloc");
716 *ret = d3s->buf = cp;
725 static const struct got_error *
726 merge(size_t m1, size_t m2, struct diff3_state *d3s)
728 const struct got_error *err = NULL;
729 struct diff *d1, *d2;
736 t1 = (d1 < d3s->d13 + m1);
737 t2 = (d2 < d3s->d23 + m2);
741 /* first file is different from others */
742 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
743 /* stuff peculiar to 1st file */
748 /* second file is different from others */
749 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
755 * Merge overlapping changes in first file
756 * this happens after extension (see below).
758 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
759 d1[1].old.from = d1->old.from;
760 d1[1].new.from = d1->new.from;
765 /* merge overlapping changes in second */
766 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
767 d2[1].old.from = d2->old.from;
768 d2[1].new.from = d2->new.from;
772 /* stuff peculiar to third file or different in all */
773 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
774 err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
779 * dpl = 0 means all files differ
780 * dpl = 1 means files 1 and 2 identical
782 err = edit(d1, dpl, &j, d3s);
791 * Overlapping changes from file 1 and 2; extend changes
792 * appropriately to make them coincide.
794 if (d1->new.from < d2->new.from) {
795 d2->old.from -= d2->new.from - d1->new.from;
796 d2->new.from = d1->new.from;
797 } else if (d2->new.from < d1->new.from) {
798 d1->old.from -= d1->new.from - d2->new.from;
799 d1->new.from = d2->new.from;
801 if (d1->new.to > d2->new.to) {
802 d2->old.to += d1->new.to - d2->new.to;
803 d2->new.to = d1->new.to;
804 } else if (d2->new.to > d1->new.to) {
805 d1->old.to += d2->new.to - d1->new.to;
806 d1->new.to = d2->new.to;
810 return (edscript(j, d3s));
814 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
816 static const struct got_error *
817 prange(struct line_range *rold, struct diff3_state *d3s)
819 const struct got_error *err = NULL;
821 if (rold->to <= rold->from) {
822 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
826 err = diff_output(d3s->diffbuf, "%d", rold->from);
829 if (rold->to > rold->from + 1) {
830 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
834 err = diff_output(d3s->diffbuf, "c\n");
843 * Skip to just before line number from in file "i".
844 * Return the number of bytes skipped in *nskipped.
846 static const struct got_error *
847 skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
849 const struct got_error *err = NULL;
854 for (n = 0; d3s->cline[i] < from - 1; n += len) {
855 err = get_line(&line, d3s->fp[i], &len, d3s);
865 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
866 * the same data as the new range (in file 2).
868 * If this change could overlap, remember start/end offsets in file 2 so we
869 * can write out the original lines of text if a merge conflict occurs.
871 static const struct got_error *
872 duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
873 struct diff3_state *d3s)
875 const struct got_error *err = NULL;
884 if (r1->to - r1->from != r2->to - r2->from)
887 err = skip(&nskipped, 0, r1->from, d3s);
890 err = skip(&nskipped, 1, r2->from, d3s);
894 off = ftello(d3s->fp[1]);
896 return got_error_from_errno("ftello");
897 d3s->de[j + 1].oldo.from = off; /* original lines start here */
900 for (nline = 0; nline < r1->to - r1->from; nline++) {
902 c = getc(d3s->fp[0]);
904 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
905 d = getc(d3s->fp[1]);
907 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
910 long orig_line_len = nchar;
912 d = getc(d3s->fp[1]);
917 if (orig_line_len > nchar &&
918 fseek(d3s->fp[1], -(orig_line_len - nchar),
920 return got_ferror(d3s->fp[1],
922 /* original lines end here */
923 d3s->de[j + 1].oldo.to = off + orig_line_len;
924 err = repos(nchar, d3s);
931 err = repos(nchar, d3s);
938 static const struct got_error *
939 repos(int nchar, struct diff3_state *d3s)
943 for (i = 0; i < 2; i++) {
944 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
945 return got_ferror(d3s->fp[i], GOT_ERR_IO);
952 * collect an editing script for later regurgitation
954 static const struct got_error *
955 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
957 const struct got_error *err = NULL;
960 if (((fdup + 1) & 3) == 0)
963 d3s->overlap[*j] = !fdup;
966 d3s->de[*j].old.from = diff->old.from;
967 d3s->de[*j].old.to = diff->old.to;
969 err = skip(&nskipped, 2, diff->new.from, d3s);
972 d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
974 err = skip(&nskipped, 2, diff->new.to, d3s);
977 d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
982 static const struct got_error *
983 edscript(int n, struct diff3_state *d3s)
985 const struct got_error *err = NULL;
987 char block[BUFSIZ+1];
990 if (!d3s->overlap[n]) {
991 err = prange(&d3s->de[n].old, d3s);
994 } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
995 /* Output a block of 3-way diff base file content. */
996 err = diff_output(d3s->diffbuf, "%da\n%s\n",
997 d3s->de[n].old.to - 1, d3s->f2mark);
1000 if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1002 return got_error_from_errno("fseeko");
1003 k = (size_t)(d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1004 for (; k > 0; k -= len) {
1006 len = k > BUFSIZ ? BUFSIZ : k;
1007 r = fread(block, 1, len, d3s->fp[1]);
1009 if (feof(d3s->fp[1]))
1011 return got_ferror(d3s->fp[1],
1017 err = diff_output(d3s->diffbuf, "%s", block);
1021 err = diff_output(d3s->diffbuf, "%s\n",
1022 GOT_DIFF_CONFLICT_MARKER_SEP);
1026 err = diff_output(d3s->diffbuf, "%da\n%s\n",
1027 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1031 if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
1033 return got_error_from_errno("fseek");
1034 k = (size_t)(d3s->de[n].newo.to - d3s->de[n].newo.from);
1035 for (; k > 0; k -= len) {
1037 len = k > BUFSIZ ? BUFSIZ : k;
1038 r = fread(block, 1, len, d3s->fp[2]);
1040 if (feof(d3s->fp[2]))
1042 return got_ferror(d3s->fp[2],
1048 err = diff_output(d3s->diffbuf, "%s", block);
1053 if (!d3s->overlap[n]) {
1054 err = diff_output(d3s->diffbuf, ".\n");
1058 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
1061 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
1062 d3s->de[n].old.from - 1, d3s->f1mark);
1071 static const struct got_error *
1072 increase(struct diff3_state *d3s)
1078 /* are the memset(3) calls needed? */
1079 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1080 incr = newsz - d3s->szchanges;
1082 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1084 return got_error_from_errno("reallocarray");
1086 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1088 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1090 return got_error_from_errno("reallocarray");
1092 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1094 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1096 return got_error_from_errno("reallocarray");
1098 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1100 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1102 return got_error_from_errno("reallocarray");
1104 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1105 d3s->szchanges = newsz;