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];
145 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
153 static const struct got_error *duplicate(int *, struct range *, struct range *,
154 struct diff3_state *);
155 static const struct got_error *edit(struct diff *, int, int *,
156 struct diff3_state *);
157 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
158 static const struct got_error *get_line(char **, FILE *, size_t *,
159 struct diff3_state *);
160 static int number(char **);
161 static const struct got_error *readin(size_t *, char *, struct diff **,
162 struct diff3_state *);
163 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
164 static const struct got_error *skip(int *, int, int, char *,
165 struct diff3_state *);
166 static const struct got_error *edscript(int, struct diff3_state *);
167 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
168 static const struct got_error *change(int, struct range *, int,
169 struct diff3_state *);
170 static const struct got_error *keep(int, struct range *, struct diff3_state *);
171 static const struct got_error *prange(struct range *, struct diff3_state *);
172 static const struct got_error *repos(int, struct diff3_state *);
173 static const struct got_error *separate(const char *, 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 *);
179 static const struct got_error *
180 diff_output(BUF *diffbuf, const char *fmt, ...)
188 i = vasprintf(&str, fmt, vap);
191 return got_error_from_errno("vasprintf");
192 buf_append(&newsize, diffbuf, str, strlen(str));
197 static const struct got_error*
198 diffreg(BUF **d, const char *path1, const char *path2)
200 const struct got_error *err = NULL;
201 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
202 char *outpath = NULL;
203 struct got_diff_state ds;
204 struct got_diff_args args;
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, "/tmp/got-diffreg");
224 memset(&ds, 0, sizeof(ds));
225 /* XXX should stat buffers be passed in args instead of ds? */
226 if (stat(path1, &ds.stb1) == -1) {
227 err = got_error_from_errno2("stat", path1);
230 if (stat(path2, &ds.stb2) == -1) {
231 err = got_error_from_errno2("stat", path2);
235 memset(&args, 0, sizeof(args));
236 args.diff_format = D_NORMAL;
239 args.diff_context = 0;
241 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
246 if (fflush(outfile) != 0) {
247 err = got_error_from_errno2("fflush", outpath);
251 *d = buf_load(outpath);
253 err = got_error_from_errno("buf_load");
259 if (outfile && fclose(outfile) != 0 && err == NULL)
260 err = got_error_from_errno("fclose");
261 if (f1 && fclose(f1) != 0 && err == NULL)
262 err = got_error_from_errno("fclose");
263 if (f2 && fclose(f2) != 0 && err == NULL)
264 err = got_error_from_errno("fclose");
271 const struct got_error *
272 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
273 const char *p3, const char *label1, const char *label3)
275 const struct got_error *err = NULL;
276 char *dp13, *dp23, *path1, *path2, *path3;
277 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
278 u_char *data, *patch;
280 struct wklhead temp_files;
281 struct diff3_state *d3s;
286 SLIST_INIT(&temp_files);
288 d3s = calloc(1, sizeof(*d3s));
290 return got_error_from_errno("calloc");
291 d3s->eflag = 3; /* default -E for compatibility with former RCS */
293 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
294 dp13 = dp23 = path1 = path2 = path3 = NULL;
297 if ((b1 = buf_load(p1)) == NULL)
299 if ((b2 = buf_load(p2)) == NULL)
301 if ((b3 = buf_load(p3)) == NULL)
304 diffb = buf_alloc(128);
306 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
307 err = got_error_from_errno("asprintf");
310 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
311 err = got_error_from_errno("asprintf");
314 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
315 err = got_error_from_errno("asprintf");
319 err = buf_write_stmp(b1, path1, &temp_files);
322 err = buf_write_stmp(b2, path2, &temp_files);
325 err = buf_write_stmp(b3, path3, &temp_files);
332 err = diffreg(&d1, path1, path3);
339 err = diffreg(&d2, path2, path3);
346 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
347 err = got_error_from_errno("asprintf");
350 err = buf_write_stmp(d1, dp13, &temp_files);
357 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
358 err = got_error_from_errno("asprintf");
361 err = buf_write_stmp(d2, dp23, &temp_files);
368 d3s->diffbuf = diffb;
369 err = diff3_internal(dp13, dp23, path1, path2, path3,
370 label1, label3, d3s, label1, label3);
377 plen = buf_len(diffb);
378 patch = buf_release(diffb);
380 data = buf_release(b1);
382 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
403 worklist_clean(&temp_files, worklist_unlink);
405 for (i = 0; i < nitems(d3s->fp); i++) {
406 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
407 err = got_error_from_errno("fclose");
409 if (err == NULL && diffb) {
410 if (buf_write_fd(diffb, outfd) < 0)
411 err = got_error_from_errno("buf_write_fd");
412 *overlapcnt = d3s->overlapcnt;
419 static const struct got_error *
420 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
421 const char *fmark, const char *rmark, struct diff3_state *d3s,
422 const char *label1, const char *label3)
424 const struct got_error *err = NULL;
428 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
429 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
430 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
431 return got_error(GOT_ERR_NO_SPACE);
433 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
434 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
435 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
436 return got_error(GOT_ERR_NO_SPACE);
442 err = readin(&m, dp13, &d3s->d13, d3s);
445 err = readin(&n, dp23, &d3s->d23, d3s);
449 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
450 return got_error_from_errno2("fopen", path1);
451 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
452 return got_error_from_errno2("fopen", path2);
453 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
454 return got_error_from_errno2("fopen", path3);
456 return merge(m, n, d3s);
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 err = getchange(&p, d3s->fp[0], d3s);
594 for (i = 0; p; i++) {
595 if (i >= d3s->szchanges - 1) {
617 (*dd)[i].old.from = a;
619 (*dd)[i].new.from = c;
622 err = getchange(&p, d3s->fp[0], d3s);
628 (*dd)[i].old.from = (*dd)[i-1].old.to;
629 (*dd)[i].new.from = (*dd)[i-1].new.to;
632 if (fclose(d3s->fp[0]) != 0)
633 err = got_error_from_errno("fclose");
645 while (isdigit((unsigned char)(**lc)))
646 nn = nn*10 + *(*lc)++ - '0';
651 static const struct got_error *
652 getchange(char **line, FILE *b, struct diff3_state *d3s)
654 const struct got_error *err = NULL;
658 if (*line && isdigit((unsigned char)(*line)[0]))
660 err = get_line(line, b, NULL, d3s);
668 static const struct got_error *
669 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
671 const struct got_error *err = NULL;
679 len = getline(&cp, &size, b);
682 err = got_error_from_errno("getline");
686 if (cp[len - 1] != '\n') {
688 if (len + 1 > size) {
689 new = realloc(cp, len + 1);
691 err = got_error_from_errno("realloc");
701 *ret = d3s->buf = cp;
710 static const struct got_error *
711 merge(size_t m1, size_t m2, struct diff3_state *d3s)
713 const struct got_error *err = NULL;
714 struct diff *d1, *d2, *d3;
721 t1 = (d1 < d3s->d13 + m1);
722 t2 = (d2 < d3s->d23 + m2);
727 printf("%d,%d=%d,%d %d,%d=%d,%d\n",
728 d1->old.from, d1->old.to,
729 d1->new.from, d1->new.to,
730 d2->old.from, d2->old.to,
731 d2->new.from, d2->new.to);
734 /* first file is different from others */
735 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
736 /* stuff peculiar to 1st file */
737 if (d3s->eflag == 0) {
738 err = separate("1", d3s);
741 err = change(1, &d1->old, 0, d3s);
744 err = keep(2, &d1->new, d3s);
747 err = change(3, &d1->new, 0, d3s);
755 /* second file is different from others */
756 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
757 if (d3s->eflag == 0) {
758 err = separate("2", d3s);
761 err = keep(1, &d2->new, d3s);
764 err = change(2, &d2->old, 0, d3s);
767 err = change(3, &d2->new, 0, d3s);
776 * Merge overlapping changes in first file
777 * this happens after extension (see below).
779 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
780 d1[1].old.from = d1->old.from;
781 d1[1].new.from = d1->new.from;
786 /* merge overlapping changes in second */
787 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
788 d2[1].old.from = d2->old.from;
789 d2[1].new.from = d2->new.from;
793 /* stuff peculiar to third file or different in all */
794 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
795 err = duplicate(&dpl, &d1->old, &d2->old, d3s);
800 * dpl = 0 means all files differ
801 * dpl = 1 means files 1 and 2 identical
803 if (d3s->eflag == 0) {
804 err = separate(dpl ? "3" : "", d3s);
807 err = change(1, &d1->old, dpl, d3s);
810 err = change(2, &d2->old, 0, d3s);
813 d3 = d1->old.to > d1->old.from ? d1 : d2;
814 err = change(3, &d3->new, 0, d3s);
818 err = edit(d1, dpl, &j, d3s);
828 * Overlapping changes from file 1 and 2; extend changes
829 * appropriately to make them coincide.
831 if (d1->new.from < d2->new.from) {
832 d2->old.from -= d2->new.from-d1->new.from;
833 d2->new.from = d1->new.from;
834 } else if (d2->new.from < d1->new.from) {
835 d1->old.from -= d1->new.from-d2->new.from;
836 d1->new.from = d2->new.from;
838 if (d1->new.to > d2->new.to) {
839 d2->old.to += d1->new.to - d2->new.to;
840 d2->new.to = d1->new.to;
841 } else if (d2->new.to > d1->new.to) {
842 d1->old.to += d2->new.to - d1->new.to;
843 d1->new.to = d2->new.to;
847 return (edscript(j, d3s));
850 static const struct got_error *
851 separate(const char *s, struct diff3_state *d3s)
853 return diff_output(d3s->diffbuf, "====%s\n", s);
857 * The range of lines rold.from thru rold.to in file i is to be changed.
858 * It is to be printed only if it does not duplicate something to be
861 static const struct got_error *
862 change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
864 const struct got_error *err = NULL;
867 err = diff_output(d3s->diffbuf, "%d:", i);
870 d3s->last[i] = rold->to;
871 err = prange(rold, d3s);
874 if (fdup || d3s->debug)
877 err = skip(&nskipped, i, rold->from, NULL, d3s);
880 return skip(&nskipped, i, rold->to, " ", d3s);
884 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
886 static const struct got_error *
887 prange(struct range *rold, struct diff3_state *d3s)
889 const struct got_error *err = NULL;
891 if (rold->to <= rold->from) {
892 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
896 err = diff_output(d3s->diffbuf, "%d", rold->from);
899 if (rold->to > rold->from + 1) {
900 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
904 err = diff_output(d3s->diffbuf, "c\n");
913 * No difference was reported by diff between file 1 (or 2) and file 3,
914 * and an artificial dummy difference (trange) must be ginned up to
915 * correspond to the change reported in the other file.
917 static const struct got_error *
918 keep(int i, struct range *rnew, struct diff3_state *d3s)
923 delta = d3s->last[3] - d3s->last[i];
924 trange.from = rnew->from - delta;
925 trange.to = rnew->to - delta;
926 return change(i, &trange, 1, d3s);
930 * skip to just before line number from in file "i". If "pr" is non-NULL,
931 * print all skipped stuff with string pr as a prefix.
933 static const struct got_error *
934 skip(int *nskipped, int i, int from, char *pr, struct diff3_state *d3s)
936 const struct got_error *err = NULL;
941 for (n = 0; d3s->cline[i] < from - 1; n += j) {
942 err = get_line(&line, d3s->fp[i], &j, d3s);
946 err = diff_output(d3s->diffbuf, "%s%s", pr, line);
957 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
958 * the same data as the new range (in file 2).
960 static const struct got_error *
961 duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
963 const struct got_error *err = NULL;
970 if (r1->to-r1->from != r2->to-r2->from)
973 err = skip(&nskipped, 0, r1->from, NULL, d3s);
976 err = skip(&nskipped, 1, r2->from, NULL, d3s);
980 for (nline=0; nline < r1->to - r1->from; nline++) {
982 c = getc(d3s->fp[0]);
984 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
985 d = getc(d3s->fp[1]);
987 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
990 return repos(nchar, d3s);
993 err = repos(nchar, d3s);
1000 static const struct got_error *
1001 repos(int nchar, struct diff3_state *d3s)
1005 for (i = 0; i < 2; i++) {
1006 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
1007 return got_ferror(d3s->fp[i], GOT_ERR_IO);
1014 * collect an editing script for later regurgitation
1016 static const struct got_error *
1017 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
1019 const struct got_error *err = NULL;
1022 if (((fdup + 1) & d3s->eflag) == 0)
1025 d3s->overlap[*j] = !fdup;
1028 d3s->de[*j].old.from = diff->old.from;
1029 d3s->de[*j].old.to = diff->old.to;
1030 err = skip(&nskipped, 2, diff->new.from, NULL, d3s);
1033 d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
1034 err = skip(&nskipped, 2, diff->new.to, NULL, d3s);
1035 d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
1040 static const struct got_error *
1041 edscript(int n, struct diff3_state *d3s)
1043 const struct got_error *err = NULL;
1045 char block[BUFSIZ+1];
1047 for (; n > 0; n--) {
1048 if (!d3s->overlap[n]) {
1049 err = prange(&d3s->de[n].old, d3s);
1053 err = diff_output(d3s->diffbuf, "%da\n%s\n",
1054 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1058 if (fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET)
1060 return got_error_from_errno("fseek");
1061 k = d3s->de[n].new.to - d3s->de[n].new.from;
1062 for (; k > 0; k-= j) {
1063 j = k > BUFSIZ ? BUFSIZ : k;
1064 if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
1065 return got_ferror(d3s->fp[2], GOT_ERR_IO);
1067 err = diff_output(d3s->diffbuf, "%s", block);
1072 if (!d3s->overlap[n]) {
1073 err = diff_output(d3s->diffbuf, ".\n");
1077 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
1080 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
1081 d3s->de[n].old.from - 1, d3s->f1mark);
1090 static const struct got_error *
1091 increase(struct diff3_state *d3s)
1097 /* are the memset(3) calls needed? */
1098 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1099 incr = newsz - d3s->szchanges;
1101 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1103 return got_error_from_errno("reallocarray");
1105 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1107 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1109 return got_error_from_errno("reallocarray");
1111 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1113 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1115 return got_error_from_errno("reallocarray");
1117 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1119 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1121 return got_error_from_errno("reallocarray");
1123 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1124 d3s->szchanges = newsz;