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>
80 #include "got_error.h"
81 #include "got_opentemp.h"
82 #include "got_object.h"
86 #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.
119 struct line_range old;
120 struct line_range new;
121 struct off_range oldo;
122 struct off_range newo;
132 * "de" is used to gather editing scripts. These are later spewed out
133 * in reverse order. Its first element must be all zero, the "new"
134 * component of "de" contains line positions, and "oldo" and "newo"
135 * components contain byte positions.
136 * Array overlap indicates which sections in "de" correspond to lines
137 * that are different in all three files.
143 int cline[3]; /* # of the last-read line in each file (0-2) */
146 * the latest known correspondence between line numbers of the 3 files
147 * is stored in last[1-3];
150 char f1mark[PATH_MAX];
151 char f2mark[PATH_MAX];
152 char f3mark[PATH_MAX];
160 static const struct got_error *duplicate(int *, int, struct line_range *,
161 struct line_range *, struct diff3_state *);
162 static const struct got_error *edit(struct diff *, int, int *,
163 struct diff3_state *);
164 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
165 static const struct got_error *get_line(char **, FILE *, size_t *,
166 struct diff3_state *);
167 static int number(char **);
168 static const struct got_error *readin(size_t *, char *, struct diff **,
169 struct diff3_state *);
170 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
171 static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
172 static const struct got_error *edscript(int, struct diff3_state *);
173 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
174 static const struct got_error *prange(struct line_range *,
175 struct diff3_state *);
176 static const struct got_error *repos(int, struct diff3_state *);
177 static const struct got_error *increase(struct diff3_state *);
178 static const struct got_error *diff3_internal(char *, char *, char *,
179 char *, char *, const char *, const char *, struct diff3_state *,
180 const char *, const char *, const char *);
182 static const struct got_error *
183 diff_output(BUF *diffbuf, const char *fmt, ...)
185 const struct got_error *err = NULL;
192 i = vasprintf(&str, fmt, vap);
195 return got_error_from_errno("vasprintf");
196 err = buf_append(&newsize, diffbuf, str, strlen(str));
201 static const struct got_error*
202 diffreg(BUF **d, const char *path1, const char *path2,
203 enum got_diff_algorithm diff_algo)
205 const struct got_error *err = NULL;
206 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
207 char *outpath = NULL;
208 struct got_diffreg_result *diffreg_result = NULL;
212 f1 = fopen(path1, "re");
214 err = got_error_from_errno2("fopen", path1);
217 f2 = fopen(path2, "re");
219 err = got_error_from_errno2("fopen", path2);
223 err = got_opentemp_named(&outpath, &outfile,
224 GOT_TMPDIR_STR "/got-diffreg");
228 err = got_diffreg(&diffreg_result, f1, f2, diff_algo, 0, 0);
232 if (diffreg_result) {
233 struct diff_result *diff_result = diffreg_result->result;
234 int atomizer_flags = (diff_result->left->atomizer_flags |
235 diff_result->right->atomizer_flags);
236 if ((atomizer_flags & DIFF_ATOMIZER_FOUND_BINARY_DATA)) {
237 err = got_error(GOT_ERR_FILE_BINARY);
242 err = got_diffreg_output(NULL, NULL, diffreg_result, 1, 1, "", "",
243 GOT_DIFF_OUTPUT_EDSCRIPT, 0, outfile);
247 if (fflush(outfile) != 0) {
248 err = got_error_from_errno2("fflush", outpath);
251 if (fseek(outfile, 0L, SEEK_SET) == -1) {
252 err = got_ferror(outfile, GOT_ERR_IO);
256 err = buf_load(d, outfile);
259 if (unlink(outpath) == -1 && err == NULL)
260 err = got_error_from_errno2("unlink", outpath);
263 if (outfile && fclose(outfile) == EOF && err == NULL)
264 err = got_error_from_errno("fclose");
265 if (f1 && fclose(f1) == EOF && err == NULL)
266 err = got_error_from_errno("fclose");
267 if (f2 && fclose(f2) == EOF && err == NULL)
268 err = got_error_from_errno("fclose");
275 const struct got_error *
276 got_merge_diff3(int *overlapcnt, int outfd, FILE *f1, FILE *f2,
277 FILE *f3, const char *label1, const char *label2, const char *label3,
278 enum got_diff_algorithm diff_algo)
280 const struct got_error *err = NULL;
281 char *dp13, *dp23, *path1, *path2, *path3;
282 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
283 u_char *data, *patch;
284 size_t dlen, plen, i;
285 struct diff3_state *d3s;
289 d3s = calloc(1, sizeof(*d3s));
291 return got_error_from_errno("calloc");
293 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
294 dp13 = dp23 = path1 = path2 = path3 = NULL;
297 err = buf_load(&b1, f1);
300 err = buf_load(&b2, f2);
303 err = buf_load(&b3, f3);
307 err = buf_alloc(&diffb, 128);
311 if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXX") == -1) {
312 err = got_error_from_errno("asprintf");
315 if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXX") == -1) {
316 err = got_error_from_errno("asprintf");
319 if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXX") == -1) {
320 err = got_error_from_errno("asprintf");
324 err = buf_write_stmp(b1, path1);
327 err = buf_write_stmp(b2, path2);
330 err = buf_write_stmp(b3, path3);
337 err = diffreg(&d1, path1, path3, diff_algo);
344 err = diffreg(&d2, path2, path3, diff_algo);
351 if (asprintf(&dp13, GOT_TMPDIR_STR "/got-d13.XXXXXXXXXX") == -1) {
352 err = got_error_from_errno("asprintf");
355 err = buf_write_stmp(d1, dp13);
362 if (asprintf(&dp23, GOT_TMPDIR_STR "/got-d23.XXXXXXXXXX") == -1) {
363 err = got_error_from_errno("asprintf");
366 err = buf_write_stmp(d2, dp23);
373 d3s->diffbuf = diffb;
374 err = diff3_internal(dp13, dp23, path1, path2, path3,
375 label1, label3, d3s, label1, label2, label3);
382 plen = buf_len(diffb);
383 patch = buf_release(diffb);
385 data = buf_release(b1);
387 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
394 if (unlink(path1) == -1 && err == NULL)
395 err = got_error_from_errno2("unlink", path1);
396 if (unlink(path2) == -1 && err == NULL)
397 err = got_error_from_errno2("unlink", path2);
398 if (unlink(path3) == -1 && err == NULL)
399 err = got_error_from_errno2("unlink", path3);
400 if (unlink(dp13) == -1 && err == NULL)
401 err = got_error_from_errno2("unlink", dp13);
402 if (unlink(dp23) == -1 && err == NULL)
403 err = got_error_from_errno2("unlink", dp23);
413 for (i = 0; i < nitems(d3s->fp); i++) {
414 if (d3s->fp[i] && fclose(d3s->fp[i]) == EOF && err == NULL)
415 err = got_error_from_errno("fclose");
417 if (err == NULL && diffb) {
418 if (buf_write_fd(diffb, outfd) < 0)
419 err = got_error_from_errno("buf_write_fd");
420 *overlapcnt = d3s->overlapcnt;
427 static const struct got_error *
428 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
429 const char *fmark, const char *rmark, struct diff3_state *d3s,
430 const char *label1, const char *label2, const char *label3)
432 const struct got_error *err = NULL;
436 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
437 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_BEGIN,
438 label1 ? " " : "", label1 ? label1 : "");
439 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
440 return got_error(GOT_ERR_NO_SPACE);
442 i = snprintf(d3s->f2mark, sizeof(d3s->f2mark),
443 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_ORIG,
444 label2 ? " " : "", label2 ? label2 : "");
445 if (i < 0 || i >= (int)sizeof(d3s->f2mark))
446 return got_error(GOT_ERR_NO_SPACE);
448 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
449 "%s%s%s", GOT_DIFF_CONFLICT_MARKER_END,
450 label3 ? " " : "", label3 ? label3 : "");
451 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
452 return got_error(GOT_ERR_NO_SPACE);
458 err = readin(&m, dp13, &d3s->d13, d3s);
461 err = readin(&n, dp23, &d3s->d23, d3s);
465 if ((d3s->fp[0] = fopen(path1, "re")) == NULL)
466 return got_error_from_errno2("fopen", path1);
467 if ((d3s->fp[1] = fopen(path2, "re")) == NULL)
468 return got_error_from_errno2("fopen", path2);
469 if ((d3s->fp[2] = fopen(path3, "re")) == NULL)
470 return got_error_from_errno2("fopen", path3);
472 return merge(m, n, d3s);
476 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
479 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
480 int start, end, i, lineno;
483 dlp = TAILQ_FIRST(&(dlines->l_lines));
484 lp = TAILQ_FIRST(&(plines->l_lines));
487 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
488 lp = TAILQ_NEXT(lp, l_list)) {
489 /* Skip blank lines */
493 /* NUL-terminate line buffer for strtol() safety. */
494 tmp = lp->l_line[lp->l_len - 1];
495 lp->l_line[lp->l_len - 1] = '\0';
497 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
498 op = lp->l_line[lp->l_len - 2];
499 start = (int)strtol(lp->l_line, &ep, 10);
501 /* Restore the last byte of the buffer */
502 lp->l_line[lp->l_len - 1] = tmp;
505 if (start > dlines->l_nblines ||
506 start < 0 || *ep != 'a')
508 } else if (op == 'c') {
509 if (start > dlines->l_nblines ||
510 start < 0 || (*ep != ',' && *ep != 'c'))
515 end = (int)strtol(ep, &ep, 10);
516 if (end < 0 || *ep != 'c')
527 if (dlp->l_lineno == start)
529 if (dlp->l_lineno > start) {
530 dlp = TAILQ_PREV(dlp, tqh, l_list);
531 } else if (dlp->l_lineno < start) {
532 ndlp = TAILQ_NEXT(dlp, l_list);
533 if (ndlp->l_lineno > start)
544 insert_after = TAILQ_PREV(dlp, tqh, l_list);
545 for (i = 0; i <= (end - start); i++) {
546 ndlp = TAILQ_NEXT(dlp, l_list);
547 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
553 if (op == 'a' || op == 'c') {
556 lp = TAILQ_NEXT(lp, l_list);
560 if (lp->l_len == 2 &&
561 lp->l_line[0] == '.' &&
562 lp->l_line[1] == '\n')
565 if (lp->l_line[0] == ':') {
569 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
570 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
574 lp->l_lineno = start;
580 * always resort lines as the markers might be put at the
581 * same line as we first started editing.
584 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
585 sort->l_lineno = lineno++;
586 dlines->l_nblines = lineno - 1;
593 * Pick up the line numbers of all changes from one change file.
594 * (This puts the numbers in a vector, which is not strictly necessary,
595 * since the vector is processed in one sequential pass.
596 * The vector could be optimized out of existence)
598 static const struct got_error *
599 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
601 const struct got_error *err = NULL;
609 f = fopen(name, "re");
611 return got_error_from_errno2("fopen", name);
612 err = getchange(&p, f, d3s);
615 for (i = 0; p; i++) {
616 if (i >= d3s->szchanges - 1) {
638 (*dd)[i].old.from = a;
640 (*dd)[i].new.from = c;
643 err = getchange(&p, f, d3s);
649 (*dd)[i].old.from = (*dd)[i - 1].old.to;
650 (*dd)[i].new.from = (*dd)[i - 1].new.to;
653 if (fclose(f) == EOF && err == NULL)
654 err = got_error_from_errno("fclose");
666 while (isdigit((unsigned char)(**lc)))
667 nn = nn*10 + *(*lc)++ - '0';
672 static const struct got_error *
673 getchange(char **line, FILE *b, struct diff3_state *d3s)
675 const struct got_error *err = NULL;
679 if (*line && isdigit((unsigned char)(*line)[0]))
681 err = get_line(line, b, NULL, d3s);
689 static const struct got_error *
690 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
692 const struct got_error *err = NULL;
702 len = getline(&cp, &size, b);
705 err = got_error_from_errno("getline");
709 if (cp[len - 1] != '\n') {
711 if (len + 1 > size) {
712 new = realloc(cp, len + 1);
714 err = got_error_from_errno("realloc");
724 *ret = d3s->buf = cp;
733 static const struct got_error *
734 merge(size_t m1, size_t m2, struct diff3_state *d3s)
736 const struct got_error *err = NULL;
737 struct diff *d1, *d2;
744 t1 = (d1 < d3s->d13 + m1);
745 t2 = (d2 < d3s->d23 + m2);
749 /* first file is different from others */
750 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
751 /* stuff peculiar to 1st file */
756 /* second file is different from others */
757 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
763 * Merge overlapping changes in first file
764 * this happens after extension (see below).
766 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
767 d1[1].old.from = d1->old.from;
768 d1[1].new.from = d1->new.from;
773 /* merge overlapping changes in second */
774 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
775 d2[1].old.from = d2->old.from;
776 d2[1].new.from = d2->new.from;
780 /* stuff peculiar to third file or different in all */
781 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
782 err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
787 * dpl = 0 means all files differ
788 * dpl = 1 means files 1 and 2 identical
790 err = edit(d1, dpl, &j, d3s);
799 * Overlapping changes from file 1 and 2; extend changes
800 * appropriately to make them coincide.
802 if (d1->new.from < d2->new.from) {
803 d2->old.from -= d2->new.from - d1->new.from;
804 d2->new.from = d1->new.from;
805 } else if (d2->new.from < d1->new.from) {
806 d1->old.from -= d1->new.from - d2->new.from;
807 d1->new.from = d2->new.from;
809 if (d1->new.to > d2->new.to) {
810 d2->old.to += d1->new.to - d2->new.to;
811 d2->new.to = d1->new.to;
812 } else if (d2->new.to > d1->new.to) {
813 d1->old.to += d2->new.to - d1->new.to;
814 d1->new.to = d2->new.to;
818 return (edscript(j, d3s));
822 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
824 static const struct got_error *
825 prange(struct line_range *rold, struct diff3_state *d3s)
827 const struct got_error *err = NULL;
829 if (rold->to <= rold->from) {
830 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
834 err = diff_output(d3s->diffbuf, "%d", rold->from);
837 if (rold->to > rold->from + 1) {
838 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
842 err = diff_output(d3s->diffbuf, "c\n");
851 * Skip to just before line number from in file "i".
852 * Return the number of bytes skipped in *nskipped.
854 static const struct got_error *
855 skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
857 const struct got_error *err = NULL;
862 for (n = 0; d3s->cline[i] < from - 1; n += len) {
863 err = get_line(&line, d3s->fp[i], &len, d3s);
873 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
874 * the same data as the new range (in file 2).
876 * If this change could overlap, remember start/end offsets in file 2 so we
877 * can write out the original lines of text if a merge conflict occurs.
879 static const struct got_error *
880 duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
881 struct diff3_state *d3s)
883 const struct got_error *err = NULL;
892 if (r1->to - r1->from != r2->to - r2->from)
895 err = skip(&nskipped, 0, r1->from, d3s);
898 err = skip(&nskipped, 1, r2->from, d3s);
902 off = ftello(d3s->fp[1]);
904 return got_error_from_errno("ftello");
905 d3s->de[j + 1].oldo.from = off; /* original lines start here */
908 for (nline = 0; nline < r1->to - r1->from; nline++) {
910 c = getc(d3s->fp[0]);
911 d = getc(d3s->fp[1]);
912 if (c == EOF && d == EOF)
915 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
917 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
920 long orig_line_len = nchar;
922 d = getc(d3s->fp[1]);
927 if (orig_line_len > nchar &&
928 fseek(d3s->fp[1], -(orig_line_len - nchar),
930 return got_ferror(d3s->fp[1],
932 /* original lines end here */
933 d3s->de[j + 1].oldo.to = off + orig_line_len;
934 err = repos(nchar, d3s);
942 /* original lines end here */
943 d3s->de[j + 1].oldo.to = off + nchar;
945 err = repos(nchar, d3s);
952 static const struct got_error *
953 repos(int nchar, struct diff3_state *d3s)
957 for (i = 0; i < 2; i++) {
958 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
959 return got_ferror(d3s->fp[i], GOT_ERR_IO);
966 * collect an editing script for later regurgitation
968 static const struct got_error *
969 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
971 const struct got_error *err = NULL;
974 if (((fdup + 1) & 3) == 0)
977 d3s->overlap[*j] = !fdup;
980 d3s->de[*j].old.from = diff->old.from;
981 d3s->de[*j].old.to = diff->old.to;
983 err = skip(&nskipped, 2, diff->new.from, d3s);
986 d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
988 err = skip(&nskipped, 2, diff->new.to, d3s);
991 d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
996 static const struct got_error *
997 edscript(int n, struct diff3_state *d3s)
999 const struct got_error *err = NULL;
1002 size_t linesize = 0;
1003 ssize_t linelen = 0, k;
1005 for (; n > 0; n--) {
1006 if (!d3s->overlap[n]) {
1007 err = prange(&d3s->de[n].old, d3s);
1010 } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
1011 /* Output a block of 3-way diff base file content. */
1012 err = diff_output(d3s->diffbuf, "%da\n:%s\n",
1013 d3s->de[n].old.to - 1, d3s->f2mark);
1016 if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1018 return got_error_from_errno("fseeko");
1019 len = (d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1020 for (k = 0; k < (ssize_t)len; k += linelen) {
1021 linelen = getline(&line, &linesize, d3s->fp[1]);
1022 if (linelen == -1) {
1023 if (feof(d3s->fp[1]))
1025 err = got_ferror(d3s->fp[1],
1029 err = diff_output(d3s->diffbuf, ":%s", line);
1033 err = diff_output(d3s->diffbuf, "%s%s\n",
1034 linelen > 0 && line[linelen] == '\n' ? ":" : "",
1035 GOT_DIFF_CONFLICT_MARKER_SEP);
1039 err = diff_output(d3s->diffbuf, "%da\n:%s\n",
1040 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1044 if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
1046 err = got_error_from_errno("fseek");
1049 len = (d3s->de[n].newo.to - d3s->de[n].newo.from);
1050 for (k = 0; k < (ssize_t)len; k += linelen) {
1051 linelen = getline(&line, &linesize, d3s->fp[2]);
1052 if (linelen == -1) {
1053 if (feof(d3s->fp[2]))
1055 err = got_ferror(d3s->fp[2], GOT_ERR_IO);
1058 err = diff_output(d3s->diffbuf, ":%s", line);
1063 if (!d3s->overlap[n]) {
1064 err = diff_output(d3s->diffbuf, ".\n");
1068 err = diff_output(d3s->diffbuf, "%s%s\n.\n",
1069 linelen > 0 && line[linelen] == '\n' ? ":" : "",
1073 err = diff_output(d3s->diffbuf, "%da\n:%s\n.\n",
1074 d3s->de[n].old.from - 1, d3s->f1mark);
1084 static const struct got_error *
1085 increase(struct diff3_state *d3s)
1091 /* are the memset(3) calls needed? */
1092 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1093 incr = newsz - d3s->szchanges;
1095 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1097 return got_error_from_errno("reallocarray");
1099 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1101 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1103 return got_error_from_errno("reallocarray");
1105 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1107 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1109 return got_error_from_errno("reallocarray");
1111 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1113 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1115 return got_error_from_errno("reallocarray");
1117 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1118 d3s->szchanges = newsz;