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
78 #include "got_error.h"
79 #include "got_opentemp.h"
80 #include "got_object.h"
84 #include "got_lib_diff.h"
87 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
90 /* diff3 - 3-way differential file comparison */
92 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
94 * d13 = diff report on f1 vs f3
95 * d23 = diff report on f2 vs f3
96 * f1, f2, f3 the 3 files
97 * if changes in f1 overlap with changes in f3, m1 and m3 are used
98 * to mark the overlaps; otherwise, the file names f1 and f3 are used
99 * (only for options E and X).
103 * "from" is first in range of changed lines; "to" is last+1
104 * from=to=line after point of insertion for added lines.
117 struct line_range old;
118 struct line_range new;
119 struct off_range oldo;
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 "oldo" and "newo"
133 * components contain byte positions.
134 * Array overlap indicates which sections in "de" correspond to lines
135 * that are different in all three files.
141 int cline[3]; /* # of the last-read line in each file (0-2) */
144 * the latest known correspondence between line numbers of the 3 files
145 * is stored in last[1-3];
148 char f1mark[PATH_MAX];
149 char f2mark[PATH_MAX];
150 char f3mark[PATH_MAX];
158 static const struct got_error *duplicate(int *, int, struct line_range *,
159 struct line_range *, struct diff3_state *);
160 static const struct got_error *edit(struct diff *, int, int *,
161 struct diff3_state *);
162 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
163 static const struct got_error *get_line(char **, FILE *, size_t *,
164 struct diff3_state *);
165 static int number(char **);
166 static const struct got_error *readin(size_t *, char *, struct diff **,
167 struct diff3_state *);
168 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
169 static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
170 static const struct got_error *edscript(int, struct diff3_state *);
171 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
172 static const struct got_error *prange(struct line_range *, struct diff3_state *);
173 static const struct got_error *repos(int, struct diff3_state *);
174 static const struct got_error *increase(struct diff3_state *);
175 static const struct got_error *diff3_internal(char *, char *, char *,
176 char *, char *, const char *, const char *, struct diff3_state *,
177 const char *, const char *, const char *);
179 static const struct got_error *
180 diff_output(BUF *diffbuf, const char *fmt, ...)
182 const struct got_error *err = NULL;
189 i = vasprintf(&str, fmt, vap);
192 return got_error_from_errno("vasprintf");
193 err = buf_append(&newsize, diffbuf, str, strlen(str));
198 static const struct got_error*
199 diffreg(BUF **d, const char *path1, const char *path2,
200 enum got_diff_algorithm diff_algo)
202 const struct got_error *err = NULL;
203 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
204 char *outpath = NULL;
205 struct got_diffreg_result *diffreg_result = NULL;
209 f1 = fopen(path1, "r");
211 err = got_error_from_errno2("fopen", path1);
214 f2 = fopen(path2, "r");
216 err = got_error_from_errno2("fopen", path2);
220 err = got_opentemp_named(&outpath, &outfile,
221 GOT_TMPDIR_STR "/got-diffreg");
225 err = got_diffreg(&diffreg_result, f1, f2, diff_algo, 0, 1);
229 err = got_diffreg_output(NULL, NULL, diffreg_result, 1, 1, "", "",
230 GOT_DIFF_OUTPUT_EDSCRIPT, 0, outfile);
234 if (fflush(outfile) != 0) {
235 err = got_error_from_errno2("fflush", outpath);
238 if (fseek(outfile, 0L, SEEK_SET) == -1) {
239 err = got_ferror(outfile, GOT_ERR_IO);
243 err = buf_load(d, outfile);
246 if (unlink(outpath) == -1 && err == NULL)
247 err = got_error_from_errno2("unlink", outpath);
250 if (outfile && fclose(outfile) == EOF && err == NULL)
251 err = got_error_from_errno("fclose");
252 if (f1 && fclose(f1) == EOF && err == NULL)
253 err = got_error_from_errno("fclose");
254 if (f2 && fclose(f2) == EOF && err == NULL)
255 err = got_error_from_errno("fclose");
262 const struct got_error *
263 got_merge_diff3(int *overlapcnt, int outfd, FILE *f1, FILE *f2,
264 FILE *f3, const char *label1, const char *label2, const char *label3,
265 enum got_diff_algorithm diff_algo)
267 const struct got_error *err = NULL;
268 char *dp13, *dp23, *path1, *path2, *path3;
269 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
270 u_char *data, *patch;
271 size_t dlen, plen, i;
272 struct diff3_state *d3s;
276 d3s = calloc(1, sizeof(*d3s));
278 return got_error_from_errno("calloc");
280 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
281 dp13 = dp23 = path1 = path2 = path3 = NULL;
284 err = buf_load(&b1, f1);
287 err = buf_load(&b2, f2);
290 err = buf_load(&b3, f3);
294 err = buf_alloc(&diffb, 128);
298 if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXX") == -1) {
299 err = got_error_from_errno("asprintf");
302 if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXX") == -1) {
303 err = got_error_from_errno("asprintf");
306 if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXX") == -1) {
307 err = got_error_from_errno("asprintf");
311 err = buf_write_stmp(b1, path1);
314 err = buf_write_stmp(b2, path2);
317 err = buf_write_stmp(b3, path3);
324 err = diffreg(&d1, path1, path3, diff_algo);
331 err = diffreg(&d2, path2, path3, diff_algo);
338 if (asprintf(&dp13, GOT_TMPDIR_STR "/got-d13.XXXXXXXXXX") == -1) {
339 err = got_error_from_errno("asprintf");
342 err = buf_write_stmp(d1, dp13);
349 if (asprintf(&dp23, GOT_TMPDIR_STR "/got-d23.XXXXXXXXXX") == -1) {
350 err = got_error_from_errno("asprintf");
353 err = buf_write_stmp(d2, dp23);
360 d3s->diffbuf = diffb;
361 err = diff3_internal(dp13, dp23, path1, path2, path3,
362 label1, label3, d3s, label1, label2, label3);
369 plen = buf_len(diffb);
370 patch = buf_release(diffb);
372 data = buf_release(b1);
374 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
381 if (unlink(path1) == -1 && err == NULL)
382 err = got_error_from_errno2("unlink", path1);
383 if (unlink(path2) == -1 && err == NULL)
384 err = got_error_from_errno2("unlink", path2);
385 if (unlink(path3) == -1 && err == NULL)
386 err = got_error_from_errno2("unlink", path3);
387 if (unlink(dp13) == -1 && err == NULL)
388 err = got_error_from_errno2("unlink", dp13);
389 if (unlink(dp23) == -1 && err == NULL)
390 err = got_error_from_errno2("unlink", dp23);
400 for (i = 0; i < nitems(d3s->fp); i++) {
401 if (d3s->fp[i] && fclose(d3s->fp[i]) == EOF && err == NULL)
402 err = got_error_from_errno("fclose");
404 if (err == NULL && diffb) {
405 if (buf_write_fd(diffb, outfd) < 0)
406 err = got_error_from_errno("buf_write_fd");
407 *overlapcnt = d3s->overlapcnt;
414 static const struct got_error *
415 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
416 const char *fmark, const char *rmark, struct diff3_state *d3s,
417 const char *label1, const char *label2, const char *label3)
419 const struct got_error *err = NULL;
423 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
424 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_BEGIN,
425 label1 ? " " : "", label1 ? label1 : "");
426 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
427 return got_error(GOT_ERR_NO_SPACE);
429 i = snprintf(d3s->f2mark, sizeof(d3s->f2mark),
430 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_ORIG,
431 label2 ? " " : "", label2 ? label2 : "");
432 if (i < 0 || i >= (int)sizeof(d3s->f2mark))
433 return got_error(GOT_ERR_NO_SPACE);
435 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
436 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_END,
437 label3 ? " " : "", label3 ? label3 : "");
438 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
439 return got_error(GOT_ERR_NO_SPACE);
445 err = readin(&m, dp13, &d3s->d13, d3s);
448 err = readin(&n, dp23, &d3s->d23, d3s);
452 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
453 return got_error_from_errno2("fopen", path1);
454 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
455 return got_error_from_errno2("fopen", path2);
456 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
457 return got_error_from_errno2("fopen", path3);
459 return merge(m, n, d3s);
463 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
466 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
467 int start, end, i, lineno;
470 dlp = TAILQ_FIRST(&(dlines->l_lines));
471 lp = TAILQ_FIRST(&(plines->l_lines));
474 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
475 lp = TAILQ_NEXT(lp, l_list)) {
476 /* Skip blank lines */
480 /* NUL-terminate line buffer for strtol() safety. */
481 tmp = lp->l_line[lp->l_len - 1];
482 lp->l_line[lp->l_len - 1] = '\0';
484 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
485 op = lp->l_line[lp->l_len - 2];
486 start = (int)strtol(lp->l_line, &ep, 10);
488 /* Restore the last byte of the buffer */
489 lp->l_line[lp->l_len - 1] = tmp;
492 if (start > dlines->l_nblines ||
493 start < 0 || *ep != 'a')
495 } else if (op == 'c') {
496 if (start > dlines->l_nblines ||
497 start < 0 || (*ep != ',' && *ep != 'c'))
502 end = (int)strtol(ep, &ep, 10);
503 if (end < 0 || *ep != 'c')
514 if (dlp->l_lineno == start)
516 if (dlp->l_lineno > start) {
517 dlp = TAILQ_PREV(dlp, tqh, l_list);
518 } else if (dlp->l_lineno < start) {
519 ndlp = TAILQ_NEXT(dlp, l_list);
520 if (ndlp->l_lineno > start)
531 insert_after = TAILQ_PREV(dlp, tqh, l_list);
532 for (i = 0; i <= (end - start); i++) {
533 ndlp = TAILQ_NEXT(dlp, l_list);
534 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
540 if (op == 'a' || op == 'c') {
543 lp = TAILQ_NEXT(lp, l_list);
547 if (lp->l_len == 2 &&
548 lp->l_line[0] == '.' &&
549 lp->l_line[1] == '\n')
552 if (lp->l_line[0] == ':') {
556 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
557 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
561 lp->l_lineno = start;
567 * always resort lines as the markers might be put at the
568 * same line as we first started editing.
571 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
572 sort->l_lineno = lineno++;
573 dlines->l_nblines = lineno - 1;
580 * Pick up the line numbers of all changes from one change file.
581 * (This puts the numbers in a vector, which is not strictly necessary,
582 * since the vector is processed in one sequential pass.
583 * The vector could be optimized out of existence)
585 static const struct got_error *
586 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
588 const struct got_error *err = NULL;
596 f = fopen(name, "r");
598 return got_error_from_errno2("fopen", name);
599 err = getchange(&p, f, d3s);
602 for (i = 0; p; i++) {
603 if (i >= d3s->szchanges - 1) {
625 (*dd)[i].old.from = a;
627 (*dd)[i].new.from = c;
630 err = getchange(&p, f, d3s);
636 (*dd)[i].old.from = (*dd)[i - 1].old.to;
637 (*dd)[i].new.from = (*dd)[i - 1].new.to;
640 if (fclose(f) == EOF && err == NULL)
641 err = got_error_from_errno("fclose");
653 while (isdigit((unsigned char)(**lc)))
654 nn = nn*10 + *(*lc)++ - '0';
659 static const struct got_error *
660 getchange(char **line, FILE *b, struct diff3_state *d3s)
662 const struct got_error *err = NULL;
666 if (*line && isdigit((unsigned char)(*line)[0]))
668 err = get_line(line, b, NULL, d3s);
676 static const struct got_error *
677 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
679 const struct got_error *err = NULL;
689 len = getline(&cp, &size, b);
692 err = got_error_from_errno("getline");
696 if (cp[len - 1] != '\n') {
698 if (len + 1 > size) {
699 new = realloc(cp, len + 1);
701 err = got_error_from_errno("realloc");
711 *ret = d3s->buf = cp;
720 static const struct got_error *
721 merge(size_t m1, size_t m2, struct diff3_state *d3s)
723 const struct got_error *err = NULL;
724 struct diff *d1, *d2;
731 t1 = (d1 < d3s->d13 + m1);
732 t2 = (d2 < d3s->d23 + m2);
736 /* first file is different from others */
737 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
738 /* stuff peculiar to 1st file */
743 /* second file is different from others */
744 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
750 * Merge overlapping changes in first file
751 * this happens after extension (see below).
753 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
754 d1[1].old.from = d1->old.from;
755 d1[1].new.from = d1->new.from;
760 /* merge overlapping changes in second */
761 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
762 d2[1].old.from = d2->old.from;
763 d2[1].new.from = d2->new.from;
767 /* stuff peculiar to third file or different in all */
768 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
769 err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
774 * dpl = 0 means all files differ
775 * dpl = 1 means files 1 and 2 identical
777 err = edit(d1, dpl, &j, d3s);
786 * Overlapping changes from file 1 and 2; extend changes
787 * appropriately to make them coincide.
789 if (d1->new.from < d2->new.from) {
790 d2->old.from -= d2->new.from - d1->new.from;
791 d2->new.from = d1->new.from;
792 } else if (d2->new.from < d1->new.from) {
793 d1->old.from -= d1->new.from - d2->new.from;
794 d1->new.from = d2->new.from;
796 if (d1->new.to > d2->new.to) {
797 d2->old.to += d1->new.to - d2->new.to;
798 d2->new.to = d1->new.to;
799 } else if (d2->new.to > d1->new.to) {
800 d1->old.to += d2->new.to - d1->new.to;
801 d1->new.to = d2->new.to;
805 return (edscript(j, d3s));
809 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
811 static const struct got_error *
812 prange(struct line_range *rold, struct diff3_state *d3s)
814 const struct got_error *err = NULL;
816 if (rold->to <= rold->from) {
817 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
821 err = diff_output(d3s->diffbuf, "%d", rold->from);
824 if (rold->to > rold->from + 1) {
825 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
829 err = diff_output(d3s->diffbuf, "c\n");
838 * Skip to just before line number from in file "i".
839 * Return the number of bytes skipped in *nskipped.
841 static const struct got_error *
842 skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
844 const struct got_error *err = NULL;
849 for (n = 0; d3s->cline[i] < from - 1; n += len) {
850 err = get_line(&line, d3s->fp[i], &len, d3s);
860 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
861 * the same data as the new range (in file 2).
863 * If this change could overlap, remember start/end offsets in file 2 so we
864 * can write out the original lines of text if a merge conflict occurs.
866 static const struct got_error *
867 duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
868 struct diff3_state *d3s)
870 const struct got_error *err = NULL;
879 if (r1->to - r1->from != r2->to - r2->from)
882 err = skip(&nskipped, 0, r1->from, d3s);
885 err = skip(&nskipped, 1, r2->from, d3s);
889 off = ftello(d3s->fp[1]);
891 return got_error_from_errno("ftello");
892 d3s->de[j + 1].oldo.from = off; /* original lines start here */
895 for (nline = 0; nline < r1->to - r1->from; nline++) {
897 c = getc(d3s->fp[0]);
898 d = getc(d3s->fp[1]);
899 if (c == EOF && d == EOF)
902 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
904 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
907 long orig_line_len = nchar;
909 d = getc(d3s->fp[1]);
914 if (orig_line_len > nchar &&
915 fseek(d3s->fp[1], -(orig_line_len - nchar),
917 return got_ferror(d3s->fp[1],
919 /* original lines end here */
920 d3s->de[j + 1].oldo.to = off + orig_line_len;
921 err = repos(nchar, d3s);
929 /* original lines end here */
930 d3s->de[j + 1].oldo.to = off + nchar;
932 err = repos(nchar, d3s);
939 static const struct got_error *
940 repos(int nchar, struct diff3_state *d3s)
944 for (i = 0; i < 2; i++) {
945 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
946 return got_ferror(d3s->fp[i], GOT_ERR_IO);
953 * collect an editing script for later regurgitation
955 static const struct got_error *
956 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
958 const struct got_error *err = NULL;
961 if (((fdup + 1) & 3) == 0)
964 d3s->overlap[*j] = !fdup;
967 d3s->de[*j].old.from = diff->old.from;
968 d3s->de[*j].old.to = diff->old.to;
970 err = skip(&nskipped, 2, diff->new.from, d3s);
973 d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
975 err = skip(&nskipped, 2, diff->new.to, d3s);
978 d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
983 static const struct got_error *
984 edscript(int n, struct diff3_state *d3s)
986 const struct got_error *err = NULL;
990 ssize_t linelen = 0, k;
993 if (!d3s->overlap[n]) {
994 err = prange(&d3s->de[n].old, d3s);
997 } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
998 /* Output a block of 3-way diff base file content. */
999 err = diff_output(d3s->diffbuf, "%da\n:%s\n",
1000 d3s->de[n].old.to - 1, d3s->f2mark);
1003 if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1005 return got_error_from_errno("fseeko");
1006 len = (d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1007 for (k = 0; k < (ssize_t)len; k += linelen) {
1008 linelen = getline(&line, &linesize, d3s->fp[1]);
1009 if (linelen == -1) {
1010 if (feof(d3s->fp[1]))
1012 err = got_ferror(d3s->fp[1],
1016 err = diff_output(d3s->diffbuf, ":%s", line);
1020 err = diff_output(d3s->diffbuf, "%s%s\n",
1021 linelen > 0 && line[linelen] == '\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 err = got_error_from_errno("fseek");
1036 len = (d3s->de[n].newo.to - d3s->de[n].newo.from);
1037 for (k = 0; k < (ssize_t)len; k += linelen) {
1038 linelen = getline(&line, &linesize, d3s->fp[2]);
1039 if (linelen == -1) {
1040 if (feof(d3s->fp[2]))
1042 err = got_ferror(d3s->fp[2], GOT_ERR_IO);
1045 err = diff_output(d3s->diffbuf, ":%s", line);
1050 if (!d3s->overlap[n]) {
1051 err = diff_output(d3s->diffbuf, ".\n");
1055 err = diff_output(d3s->diffbuf, "%s%s\n.\n",
1056 linelen > 0 && line[linelen] == '\n' ? ":" : "",
1060 err = diff_output(d3s->diffbuf, "%da\n:%s\n.\n",
1061 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;