1 74b37681 2019-02-07 stsp /* $OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $ */
4 74b37681 2019-02-07 stsp * Copyright (C) Caldera International Inc. 2001-2002.
5 74b37681 2019-02-07 stsp * All rights reserved.
7 74b37681 2019-02-07 stsp * Redistribution and use in source and binary forms, with or without
8 74b37681 2019-02-07 stsp * modification, are permitted provided that the following conditions
10 74b37681 2019-02-07 stsp * 1. Redistributions of source code and documentation must retain the above
11 74b37681 2019-02-07 stsp * copyright notice, this list of conditions and the following disclaimer.
12 74b37681 2019-02-07 stsp * 2. Redistributions in binary form must reproduce the above copyright
13 74b37681 2019-02-07 stsp * notice, this list of conditions and the following disclaimer in the
14 74b37681 2019-02-07 stsp * documentation and/or other materials provided with the distribution.
15 74b37681 2019-02-07 stsp * 3. All advertising materials mentioning features or use of this software
16 74b37681 2019-02-07 stsp * must display the following acknowledgement:
17 74b37681 2019-02-07 stsp * This product includes software developed or owned by Caldera
18 74b37681 2019-02-07 stsp * International, Inc.
19 74b37681 2019-02-07 stsp * 4. Neither the name of Caldera International, Inc. nor the names of other
20 74b37681 2019-02-07 stsp * contributors may be used to endorse or promote products derived from
21 74b37681 2019-02-07 stsp * this software without specific prior written permission.
23 74b37681 2019-02-07 stsp * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24 74b37681 2019-02-07 stsp * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25 74b37681 2019-02-07 stsp * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 74b37681 2019-02-07 stsp * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 74b37681 2019-02-07 stsp * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28 74b37681 2019-02-07 stsp * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29 74b37681 2019-02-07 stsp * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30 74b37681 2019-02-07 stsp * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 74b37681 2019-02-07 stsp * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32 74b37681 2019-02-07 stsp * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33 74b37681 2019-02-07 stsp * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 74b37681 2019-02-07 stsp * POSSIBILITY OF SUCH DAMAGE.
37 74b37681 2019-02-07 stsp * Copyright (c) 1991, 1993
38 74b37681 2019-02-07 stsp * The Regents of the University of California. All rights reserved.
40 74b37681 2019-02-07 stsp * Redistribution and use in source and binary forms, with or without
41 74b37681 2019-02-07 stsp * modification, are permitted provided that the following conditions
43 74b37681 2019-02-07 stsp * 1. Redistributions of source code must retain the above copyright
44 74b37681 2019-02-07 stsp * notice, this list of conditions and the following disclaimer.
45 74b37681 2019-02-07 stsp * 2. Redistributions in binary form must reproduce the above copyright
46 74b37681 2019-02-07 stsp * notice, this list of conditions and the following disclaimer in the
47 74b37681 2019-02-07 stsp * documentation and/or other materials provided with the distribution.
48 74b37681 2019-02-07 stsp * 3. Neither the name of the University nor the names of its contributors
49 74b37681 2019-02-07 stsp * may be used to endorse or promote products derived from this software
50 74b37681 2019-02-07 stsp * without specific prior written permission.
52 74b37681 2019-02-07 stsp * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53 74b37681 2019-02-07 stsp * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54 74b37681 2019-02-07 stsp * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55 74b37681 2019-02-07 stsp * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56 74b37681 2019-02-07 stsp * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57 74b37681 2019-02-07 stsp * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 74b37681 2019-02-07 stsp * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 74b37681 2019-02-07 stsp * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 74b37681 2019-02-07 stsp * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 74b37681 2019-02-07 stsp * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 74b37681 2019-02-07 stsp * SUCH DAMAGE.
64 74b37681 2019-02-07 stsp * @(#)diff3.c 8.1 (Berkeley) 6/6/93
67 c03c6cb3 2019-02-08 stsp #include <sys/stat.h>
68 c03c6cb3 2019-02-08 stsp #include <sys/queue.h>
70 74b37681 2019-02-07 stsp #include <ctype.h>
71 c03c6cb3 2019-02-08 stsp #include <limits.h>
72 74b37681 2019-02-07 stsp #include <stdio.h>
73 c03c6cb3 2019-02-08 stsp #include <stdarg.h>
74 74b37681 2019-02-07 stsp #include <stdlib.h>
75 74b37681 2019-02-07 stsp #include <string.h>
76 74b37681 2019-02-07 stsp #include <time.h>
77 74b37681 2019-02-07 stsp #include <unistd.h>
79 c03c6cb3 2019-02-08 stsp #include "got_error.h"
80 c03c6cb3 2019-02-08 stsp #include "got_opentemp.h"
81 c03c6cb3 2019-02-08 stsp #include "got_object.h"
83 c03c6cb3 2019-02-08 stsp #include "buf.h"
84 c03c6cb3 2019-02-08 stsp #include "rcsutil.h"
85 c03c6cb3 2019-02-08 stsp #include "got_lib_diff.h"
86 c03c6cb3 2019-02-08 stsp #include "worklist.h"
88 0d26ce36 2019-02-08 stsp #ifndef nitems
89 0d26ce36 2019-02-08 stsp #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
92 74b37681 2019-02-07 stsp /* diff3 - 3-way differential file comparison */
94 74b37681 2019-02-07 stsp /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
96 74b37681 2019-02-07 stsp * d13 = diff report on f1 vs f3
97 74b37681 2019-02-07 stsp * d23 = diff report on f2 vs f3
98 74b37681 2019-02-07 stsp * f1, f2, f3 the 3 files
99 74b37681 2019-02-07 stsp * if changes in f1 overlap with changes in f3, m1 and m3 are used
100 74b37681 2019-02-07 stsp * to mark the overlaps; otherwise, the file names f1 and f3 are used
101 74b37681 2019-02-07 stsp * (only for options E and X).
105 74b37681 2019-02-07 stsp * "from" is first in range of changed lines; "to" is last+1
106 74b37681 2019-02-07 stsp * from=to=line after point of insertion for added lines.
108 74b37681 2019-02-07 stsp struct range {
113 74b37681 2019-02-07 stsp struct diff {
114 74b37681 2019-02-07 stsp struct range old;
115 74b37681 2019-02-07 stsp struct range new;
118 078e971d 2019-02-08 stsp struct diff3_state {
119 078e971d 2019-02-08 stsp size_t szchanges;
121 078e971d 2019-02-08 stsp struct diff *d13;
122 078e971d 2019-02-08 stsp struct diff *d23;
125 078e971d 2019-02-08 stsp * "de" is used to gather editing scripts. These are later spewed out
126 078e971d 2019-02-08 stsp * in reverse order. Its first element must be all zero, the "new"
127 078e971d 2019-02-08 stsp * component of "de" contains line positions or byte positions
128 078e971d 2019-02-08 stsp * depending on when you look (!?). Array overlap indicates which
129 078e971d 2019-02-08 stsp * sections in "de" correspond to lines that are different in all
130 078e971d 2019-02-08 stsp * three files.
132 078e971d 2019-02-08 stsp struct diff *de;
133 078e971d 2019-02-08 stsp char *overlap;
134 078e971d 2019-02-08 stsp int overlapcnt;
135 078e971d 2019-02-08 stsp FILE *fp[3];
136 078e971d 2019-02-08 stsp int cline[3]; /* # of the last-read line in each file (0-2) */
139 078e971d 2019-02-08 stsp * the latest known correspondence between line numbers of the 3 files
140 078e971d 2019-02-08 stsp * is stored in last[1-3];
142 078e971d 2019-02-08 stsp int last[4];
146 078e971d 2019-02-08 stsp char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
150 5176f942 2019-02-08 stsp BUF *diffbuf;
154 078e971d 2019-02-08 stsp static int duplicate(struct range *, struct range *, struct diff3_state *);
155 078e971d 2019-02-08 stsp static int edit(struct diff *, int, int, struct diff3_state *);
156 dfc4f8fe 2019-02-08 stsp static char *getchange(FILE *, struct diff3_state *);
157 dfc4f8fe 2019-02-08 stsp static char *get_line(FILE *, size_t *, struct diff3_state *);
158 74b37681 2019-02-07 stsp static int number(char **);
159 b90524b1 2019-02-08 stsp static const struct got_error *readin(size_t *, char *, struct diff **,
160 b90524b1 2019-02-08 stsp struct diff3_state *);
161 c03c6cb3 2019-02-08 stsp static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
162 078e971d 2019-02-08 stsp static int skip(int, int, char *, struct diff3_state *);
163 078e971d 2019-02-08 stsp static int edscript(int, struct diff3_state *);
164 078e971d 2019-02-08 stsp static int merge(size_t, size_t, struct diff3_state *);
165 078e971d 2019-02-08 stsp static void change(int, struct range *, int, struct diff3_state *);
166 078e971d 2019-02-08 stsp static void keep(int, struct range *, struct diff3_state *);
167 5176f942 2019-02-08 stsp static void prange(struct range *, struct diff3_state *);
168 078e971d 2019-02-08 stsp static void repos(int, struct diff3_state *);
169 5176f942 2019-02-08 stsp static void separate(const char *, struct diff3_state *);
170 078e971d 2019-02-08 stsp static const struct got_error *increase(struct diff3_state *);
171 c03c6cb3 2019-02-08 stsp static const struct got_error *diff3_internal(char *, char *, char *,
172 a551f215 2019-02-08 stsp char *, char *, const char *, const char *, struct diff3_state *,
173 a551f215 2019-02-08 stsp const char *, const char *);
175 c03c6cb3 2019-02-08 stsp static const struct got_error *
176 5176f942 2019-02-08 stsp diff_output(BUF *diffbuf, const char *fmt, ...)
178 c03c6cb3 2019-02-08 stsp va_list vap;
181 c03c6cb3 2019-02-08 stsp size_t newsize;
183 c03c6cb3 2019-02-08 stsp va_start(vap, fmt);
184 c03c6cb3 2019-02-08 stsp i = vasprintf(&str, fmt, vap);
185 c03c6cb3 2019-02-08 stsp va_end(vap);
186 c03c6cb3 2019-02-08 stsp if (i == -1)
187 638f9024 2019-05-13 stsp return got_error_from_errno("vasprintf");
188 5176f942 2019-02-08 stsp buf_append(&newsize, diffbuf, str, strlen(str));
190 c03c6cb3 2019-02-08 stsp return NULL;
193 c03c6cb3 2019-02-08 stsp static const struct got_error*
194 c03c6cb3 2019-02-08 stsp diffreg(BUF **d, const char *path1, const char *path2)
196 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
197 c03c6cb3 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
198 c03c6cb3 2019-02-08 stsp char *outpath = NULL;
199 c03c6cb3 2019-02-08 stsp struct got_diff_state ds;
200 c03c6cb3 2019-02-08 stsp struct got_diff_args args;
205 c03c6cb3 2019-02-08 stsp f1 = fopen(path1, "r");
206 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
207 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path1);
210 c03c6cb3 2019-02-08 stsp f2 = fopen(path2, "r");
211 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
212 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path2);
216 a551f215 2019-02-08 stsp err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
220 c03c6cb3 2019-02-08 stsp memset(&ds, 0, sizeof(ds));
221 c03c6cb3 2019-02-08 stsp /* XXX should stat buffers be passed in args instead of ds? */
222 c03c6cb3 2019-02-08 stsp if (stat(path1, &ds.stb1) == -1) {
223 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path1);
226 c03c6cb3 2019-02-08 stsp if (stat(path2, &ds.stb2) == -1) {
227 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path2);
231 c03c6cb3 2019-02-08 stsp memset(&args, 0, sizeof(args));
232 c03c6cb3 2019-02-08 stsp args.diff_format = D_NORMAL;
233 c03c6cb3 2019-02-08 stsp args.label[0] = "";
234 c03c6cb3 2019-02-08 stsp args.label[1] = "";
235 c03c6cb3 2019-02-08 stsp args.diff_context = 0;
237 c03c6cb3 2019-02-08 stsp err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
238 c03c6cb3 2019-02-08 stsp outfile, NULL);
242 cbe7f848 2019-02-11 stsp if (fflush(outfile) != 0) {
243 638f9024 2019-05-13 stsp err = got_error_from_errno2("fflush", outpath);
247 c03c6cb3 2019-02-08 stsp *d = buf_load(outpath);
248 c03c6cb3 2019-02-08 stsp if (*d == NULL)
249 638f9024 2019-05-13 stsp err = got_error_from_errno("buf_load");
251 a551f215 2019-02-08 stsp if (outpath) {
252 a551f215 2019-02-08 stsp unlink(outpath);
253 a551f215 2019-02-08 stsp free(outpath);
255 fb43ecf1 2019-02-11 stsp if (outfile && fclose(outfile) != 0 && err == NULL)
256 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
257 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
258 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
259 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
260 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
261 c03c6cb3 2019-02-08 stsp return err;
265 74b37681 2019-02-07 stsp * For merge(1).
267 c03c6cb3 2019-02-08 stsp const struct got_error *
268 57ee5d50 2019-02-08 stsp got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
269 57ee5d50 2019-02-08 stsp const char *p3, const char *label1, const char *label3)
271 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
272 c03c6cb3 2019-02-08 stsp char *dp13, *dp23, *path1, *path2, *path3;
273 74b37681 2019-02-07 stsp BUF *b1, *b2, *b3, *d1, *d2, *diffb;
274 74b37681 2019-02-07 stsp u_char *data, *patch;
275 74b37681 2019-02-07 stsp size_t dlen, plen;
276 c03c6cb3 2019-02-08 stsp struct wklhead temp_files;
277 078e971d 2019-02-08 stsp struct diff3_state *d3s;
280 57ee5d50 2019-02-08 stsp *overlapcnt = 0;
282 5d731149 2019-02-08 stsp SLIST_INIT(&temp_files);
284 078e971d 2019-02-08 stsp d3s = calloc(1, sizeof(*d3s));
285 078e971d 2019-02-08 stsp if (d3s == NULL)
286 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
287 078e971d 2019-02-08 stsp d3s->eflag = 3; /* default -E for compatibility with former RCS */
288 078e971d 2019-02-08 stsp d3s->oflag = 1; /* default -E for compatibility with former RCS */
290 74b37681 2019-02-07 stsp b1 = b2 = b3 = d1 = d2 = diffb = NULL;
291 74b37681 2019-02-07 stsp dp13 = dp23 = path1 = path2 = path3 = NULL;
292 74b37681 2019-02-07 stsp data = patch = NULL;
294 0ec6f014 2019-02-08 stsp if ((b1 = buf_load(p1)) == NULL)
296 0ec6f014 2019-02-08 stsp if ((b2 = buf_load(p2)) == NULL)
298 0ec6f014 2019-02-08 stsp if ((b3 = buf_load(p3)) == NULL)
301 74b37681 2019-02-07 stsp diffb = buf_alloc(128);
303 c03c6cb3 2019-02-08 stsp if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
304 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
307 c03c6cb3 2019-02-08 stsp if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
308 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
311 c03c6cb3 2019-02-08 stsp if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
312 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
316 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b1, path1, &temp_files);
319 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b2, path2, &temp_files);
322 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b3, path3, &temp_files);
326 74b37681 2019-02-07 stsp buf_free(b2);
329 c03c6cb3 2019-02-08 stsp err = diffreg(&d1, path1, path3);
331 74b37681 2019-02-07 stsp buf_free(diffb);
332 74b37681 2019-02-07 stsp diffb = NULL;
336 c03c6cb3 2019-02-08 stsp err = diffreg(&d2, path2, path3);
338 c03c6cb3 2019-02-08 stsp buf_free(diffb);
339 c03c6cb3 2019-02-08 stsp diffb = NULL;
343 c03c6cb3 2019-02-08 stsp if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
344 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
347 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(d1, dp13, &temp_files);
351 74b37681 2019-02-07 stsp buf_free(d1);
354 c03c6cb3 2019-02-08 stsp if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
355 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
358 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(d2, dp23, &temp_files);
362 74b37681 2019-02-07 stsp buf_free(d2);
365 5176f942 2019-02-08 stsp d3s->diffbuf = diffb;
366 a551f215 2019-02-08 stsp err = diff3_internal(dp13, dp23, path1, path2, path3,
367 a551f215 2019-02-08 stsp label1, label3, d3s, label1, label3);
369 74b37681 2019-02-07 stsp buf_free(diffb);
370 74b37681 2019-02-07 stsp diffb = NULL;
374 74b37681 2019-02-07 stsp plen = buf_len(diffb);
375 74b37681 2019-02-07 stsp patch = buf_release(diffb);
376 74b37681 2019-02-07 stsp dlen = buf_len(b1);
377 74b37681 2019-02-07 stsp data = buf_release(b1);
379 5a3ad9e0 2019-02-08 stsp diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
381 74b37681 2019-02-07 stsp buf_free(b2);
382 74b37681 2019-02-07 stsp buf_free(b3);
383 74b37681 2019-02-07 stsp buf_free(d1);
384 74b37681 2019-02-07 stsp buf_free(d2);
386 74b37681 2019-02-07 stsp (void)unlink(path1);
387 74b37681 2019-02-07 stsp (void)unlink(path2);
388 74b37681 2019-02-07 stsp (void)unlink(path3);
389 74b37681 2019-02-07 stsp (void)unlink(dp13);
390 74b37681 2019-02-07 stsp (void)unlink(dp23);
392 74b37681 2019-02-07 stsp free(path1);
393 74b37681 2019-02-07 stsp free(path2);
394 74b37681 2019-02-07 stsp free(path3);
395 74b37681 2019-02-07 stsp free(dp13);
396 74b37681 2019-02-07 stsp free(dp23);
397 74b37681 2019-02-07 stsp free(data);
398 74b37681 2019-02-07 stsp free(patch);
400 c03c6cb3 2019-02-08 stsp worklist_clean(&temp_files, worklist_unlink);
402 0d26ce36 2019-02-08 stsp for (i = 0; i < nitems(d3s->fp); i++) {
403 fb43ecf1 2019-02-11 stsp if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
404 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
406 5a3ad9e0 2019-02-08 stsp if (err == NULL && diffb) {
407 62f59172 2019-02-08 stsp if (buf_write_fd(diffb, outfd) < 0)
408 638f9024 2019-05-13 stsp err = got_error_from_errno("buf_write_fd");
409 57ee5d50 2019-02-08 stsp *overlapcnt = d3s->overlapcnt;
412 62f59172 2019-02-08 stsp buf_free(diffb);
413 c03c6cb3 2019-02-08 stsp return err;
416 c03c6cb3 2019-02-08 stsp static const struct got_error *
417 c03c6cb3 2019-02-08 stsp diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
418 a551f215 2019-02-08 stsp const char *fmark, const char *rmark, struct diff3_state *d3s,
419 a551f215 2019-02-08 stsp const char *label1, const char *label3)
421 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
422 74b37681 2019-02-07 stsp ssize_t m, n;
425 01a44956 2019-03-27 stsp i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
426 01a44956 2019-03-27 stsp "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
427 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f1mark))
428 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
430 01a44956 2019-03-27 stsp i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
431 01a44956 2019-03-27 stsp "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
432 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f3mark))
433 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
435 078e971d 2019-02-08 stsp err = increase(d3s);
437 c03c6cb3 2019-02-08 stsp return err;
439 b90524b1 2019-02-08 stsp err = readin(&m, dp13, &d3s->d13, d3s);
441 b90524b1 2019-02-08 stsp return err;
442 b90524b1 2019-02-08 stsp err = readin(&n, dp23, &d3s->d23, d3s);
444 b90524b1 2019-02-08 stsp return err;
446 078e971d 2019-02-08 stsp if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
447 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path1);
448 078e971d 2019-02-08 stsp if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
449 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path2);
450 078e971d 2019-02-08 stsp if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
451 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path3);
453 078e971d 2019-02-08 stsp if (merge(m, n, d3s) < 0)
454 638f9024 2019-05-13 stsp return got_error_from_errno("merge");
455 c03c6cb3 2019-02-08 stsp return NULL;
459 74b37681 2019-02-07 stsp ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
461 74b37681 2019-02-07 stsp char op, *ep;
462 74b37681 2019-02-07 stsp struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
463 74b37681 2019-02-07 stsp int start, end, i, lineno;
464 74b37681 2019-02-07 stsp u_char tmp;
466 74b37681 2019-02-07 stsp dlp = TAILQ_FIRST(&(dlines->l_lines));
467 74b37681 2019-02-07 stsp lp = TAILQ_FIRST(&(plines->l_lines));
470 74b37681 2019-02-07 stsp for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
471 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list)) {
472 74b37681 2019-02-07 stsp /* Skip blank lines */
473 74b37681 2019-02-07 stsp if (lp->l_len < 2)
476 74b37681 2019-02-07 stsp /* NUL-terminate line buffer for strtol() safety. */
477 74b37681 2019-02-07 stsp tmp = lp->l_line[lp->l_len - 1];
478 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = '\0';
480 74b37681 2019-02-07 stsp /* len - 1 is NUL terminator so we use len - 2 for 'op' */
481 74b37681 2019-02-07 stsp op = lp->l_line[lp->l_len - 2];
482 74b37681 2019-02-07 stsp start = (int)strtol(lp->l_line, &ep, 10);
484 74b37681 2019-02-07 stsp /* Restore the last byte of the buffer */
485 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = tmp;
487 74b37681 2019-02-07 stsp if (op == 'a') {
488 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
489 74b37681 2019-02-07 stsp start < 0 || *ep != 'a')
491 74b37681 2019-02-07 stsp } else if (op == 'c') {
492 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
493 74b37681 2019-02-07 stsp start < 0 || (*ep != ',' && *ep != 'c'))
496 74b37681 2019-02-07 stsp if (*ep == ',') {
498 74b37681 2019-02-07 stsp end = (int)strtol(ep, &ep, 10);
499 74b37681 2019-02-07 stsp if (end < 0 || *ep != 'c')
502 74b37681 2019-02-07 stsp end = start;
508 74b37681 2019-02-07 stsp if (dlp == NULL)
510 74b37681 2019-02-07 stsp if (dlp->l_lineno == start)
512 74b37681 2019-02-07 stsp if (dlp->l_lineno > start) {
513 74b37681 2019-02-07 stsp dlp = TAILQ_PREV(dlp, tqh, l_list);
514 74b37681 2019-02-07 stsp } else if (dlp->l_lineno < start) {
515 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
516 74b37681 2019-02-07 stsp if (ndlp->l_lineno > start)
518 74b37681 2019-02-07 stsp dlp = ndlp;
522 74b37681 2019-02-07 stsp if (dlp == NULL)
526 74b37681 2019-02-07 stsp if (op == 'c') {
527 74b37681 2019-02-07 stsp insert_after = TAILQ_PREV(dlp, tqh, l_list);
528 74b37681 2019-02-07 stsp for (i = 0; i <= (end - start); i++) {
529 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
530 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
531 74b37681 2019-02-07 stsp dlp = ndlp;
533 74b37681 2019-02-07 stsp dlp = insert_after;
536 74b37681 2019-02-07 stsp if (op == 'a' || op == 'c') {
539 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list);
540 74b37681 2019-02-07 stsp if (lp == NULL)
543 acb4e1d1 2019-08-10 stsp if (lp->l_len == 2 &&
544 acb4e1d1 2019-08-10 stsp lp->l_line[0] == '.' &&
545 acb4e1d1 2019-08-10 stsp lp->l_line[1] == '\n')
548 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
549 74b37681 2019-02-07 stsp TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
550 74b37681 2019-02-07 stsp lp, l_list);
553 74b37681 2019-02-07 stsp lp->l_lineno = start;
559 74b37681 2019-02-07 stsp * always resort lines as the markers might be put at the
560 74b37681 2019-02-07 stsp * same line as we first started editing.
562 74b37681 2019-02-07 stsp lineno = 0;
563 74b37681 2019-02-07 stsp TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
564 74b37681 2019-02-07 stsp sort->l_lineno = lineno++;
565 74b37681 2019-02-07 stsp dlines->l_nblines = lineno - 1;
568 74b37681 2019-02-07 stsp return (0);
572 74b37681 2019-02-07 stsp * Pick up the line numbers of all changes from one change file.
573 74b37681 2019-02-07 stsp * (This puts the numbers in a vector, which is not strictly necessary,
574 74b37681 2019-02-07 stsp * since the vector is processed in one sequential pass.
575 74b37681 2019-02-07 stsp * The vector could be optimized out of existence)
577 b90524b1 2019-02-08 stsp static const struct got_error *
578 b90524b1 2019-02-08 stsp readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
580 b90524b1 2019-02-08 stsp const struct got_error *err = NULL;
581 74b37681 2019-02-07 stsp int a, b, c, d;
582 74b37681 2019-02-07 stsp char kind, *p;
587 078e971d 2019-02-08 stsp d3s->fp[0] = fopen(name, "r");
588 078e971d 2019-02-08 stsp if (d3s->fp[0] == NULL)
589 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", name);
590 dfc4f8fe 2019-02-08 stsp for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
591 b90524b1 2019-02-08 stsp if (i >= d3s->szchanges - 1) {
592 b90524b1 2019-02-08 stsp err = increase(d3s);
594 b90524b1 2019-02-08 stsp return err;
596 74b37681 2019-02-07 stsp a = b = number(&p);
597 74b37681 2019-02-07 stsp if (*p == ',') {
599 74b37681 2019-02-07 stsp b = number(&p);
601 74b37681 2019-02-07 stsp kind = *p++;
602 74b37681 2019-02-07 stsp c = d = number(&p);
603 74b37681 2019-02-07 stsp if (*p==',') {
605 74b37681 2019-02-07 stsp d = number(&p);
607 74b37681 2019-02-07 stsp if (kind == 'a')
609 74b37681 2019-02-07 stsp if (kind == 'd')
613 74b37681 2019-02-07 stsp (*dd)[i].old.from = a;
614 74b37681 2019-02-07 stsp (*dd)[i].old.to = b;
615 74b37681 2019-02-07 stsp (*dd)[i].new.from = c;
616 74b37681 2019-02-07 stsp (*dd)[i].new.to = d;
620 74b37681 2019-02-07 stsp (*dd)[i].old.from = (*dd)[i-1].old.to;
621 74b37681 2019-02-07 stsp (*dd)[i].new.from = (*dd)[i-1].new.to;
624 fb43ecf1 2019-02-11 stsp if (fclose(d3s->fp[0]) != 0)
625 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
628 fb43ecf1 2019-02-11 stsp return err;
632 74b37681 2019-02-07 stsp number(char **lc)
637 74b37681 2019-02-07 stsp while (isdigit((unsigned char)(**lc)))
638 74b37681 2019-02-07 stsp nn = nn*10 + *(*lc)++ - '0';
640 74b37681 2019-02-07 stsp return (nn);
643 74b37681 2019-02-07 stsp static char *
644 dfc4f8fe 2019-02-08 stsp getchange(FILE *b, struct diff3_state *d3s)
646 74b37681 2019-02-07 stsp char *line;
648 dfc4f8fe 2019-02-08 stsp while ((line = get_line(b, NULL, d3s))) {
649 74b37681 2019-02-07 stsp if (isdigit((unsigned char)line[0]))
650 74b37681 2019-02-07 stsp return (line);
653 74b37681 2019-02-07 stsp return (NULL);
656 74b37681 2019-02-07 stsp static char *
657 dfc4f8fe 2019-02-08 stsp get_line(FILE *b, size_t *n, struct diff3_state *d3s)
659 6dea73df 2019-09-23 stsp char *cp = NULL;
660 6dea73df 2019-09-23 stsp size_t size, len;
662 6dea73df 2019-09-23 stsp char *ret = NULL;
664 6dea73df 2019-09-23 stsp len = getline(&cp, &size, b);
665 6dea73df 2019-09-23 stsp if (len == -1)
668 6dea73df 2019-09-23 stsp if (cp[len - 1] != '\n') {
670 6dea73df 2019-09-23 stsp if (len + 1 > size) {
671 6dea73df 2019-09-23 stsp new = realloc(cp, len + 1);
672 6dea73df 2019-09-23 stsp if (new == NULL)
676 6dea73df 2019-09-23 stsp cp[len - 1] = '\n';
677 6dea73df 2019-09-23 stsp cp[len] = '\0';
680 6dea73df 2019-09-23 stsp free(d3s->buf);
681 6dea73df 2019-09-23 stsp ret = d3s->buf = cp;
683 74b37681 2019-02-07 stsp if (n != NULL)
687 6dea73df 2019-09-23 stsp return (ret);
691 078e971d 2019-02-08 stsp merge(size_t m1, size_t m2, struct diff3_state *d3s)
693 74b37681 2019-02-07 stsp struct diff *d1, *d2, *d3;
694 74b37681 2019-02-07 stsp int dpl, j, t1, t2;
696 078e971d 2019-02-08 stsp d1 = d3s->d13;
697 078e971d 2019-02-08 stsp d2 = d3s->d23;
700 078e971d 2019-02-08 stsp t1 = (d1 < d3s->d13 + m1);
701 078e971d 2019-02-08 stsp t2 = (d2 < d3s->d23 + m2);
702 74b37681 2019-02-07 stsp if (!t1 && !t2)
705 078e971d 2019-02-08 stsp if (d3s->debug) {
706 74b37681 2019-02-07 stsp printf("%d,%d=%d,%d %d,%d=%d,%d\n",
707 74b37681 2019-02-07 stsp d1->old.from, d1->old.to,
708 74b37681 2019-02-07 stsp d1->new.from, d1->new.to,
709 74b37681 2019-02-07 stsp d2->old.from, d2->old.to,
710 74b37681 2019-02-07 stsp d2->new.from, d2->new.to);
713 74b37681 2019-02-07 stsp /* first file is different from others */
714 74b37681 2019-02-07 stsp if (!t2 || (t1 && d1->new.to < d2->new.from)) {
715 74b37681 2019-02-07 stsp /* stuff peculiar to 1st file */
716 078e971d 2019-02-08 stsp if (d3s->eflag == 0) {
717 5176f942 2019-02-08 stsp separate("1", d3s);
718 078e971d 2019-02-08 stsp change(1, &d1->old, 0, d3s);
719 078e971d 2019-02-08 stsp keep(2, &d1->new, d3s);
720 078e971d 2019-02-08 stsp change(3, &d1->new, 0, d3s);
726 74b37681 2019-02-07 stsp /* second file is different from others */
727 74b37681 2019-02-07 stsp if (!t1 || (t2 && d2->new.to < d1->new.from)) {
728 078e971d 2019-02-08 stsp if (d3s->eflag == 0) {
729 5176f942 2019-02-08 stsp separate("2", d3s);
730 078e971d 2019-02-08 stsp keep(1, &d2->new, d3s);
731 078e971d 2019-02-08 stsp change(2, &d2->old, 0, d3s);
732 078e971d 2019-02-08 stsp change(3, &d2->new, 0, d3s);
739 74b37681 2019-02-07 stsp * Merge overlapping changes in first file
740 74b37681 2019-02-07 stsp * this happens after extension (see below).
742 078e971d 2019-02-08 stsp if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
743 74b37681 2019-02-07 stsp d1[1].old.from = d1->old.from;
744 74b37681 2019-02-07 stsp d1[1].new.from = d1->new.from;
749 74b37681 2019-02-07 stsp /* merge overlapping changes in second */
750 078e971d 2019-02-08 stsp if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
751 74b37681 2019-02-07 stsp d2[1].old.from = d2->old.from;
752 74b37681 2019-02-07 stsp d2[1].new.from = d2->new.from;
756 74b37681 2019-02-07 stsp /* stuff peculiar to third file or different in all */
757 74b37681 2019-02-07 stsp if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
758 078e971d 2019-02-08 stsp dpl = duplicate(&d1->old, &d2->old, d3s);
759 74b37681 2019-02-07 stsp if (dpl == -1)
760 74b37681 2019-02-07 stsp return (-1);
763 74b37681 2019-02-07 stsp * dpl = 0 means all files differ
764 74b37681 2019-02-07 stsp * dpl = 1 means files 1 and 2 identical
766 078e971d 2019-02-08 stsp if (d3s->eflag == 0) {
767 5176f942 2019-02-08 stsp separate(dpl ? "3" : "", d3s);
768 078e971d 2019-02-08 stsp change(1, &d1->old, dpl, d3s);
769 078e971d 2019-02-08 stsp change(2, &d2->old, 0, d3s);
770 74b37681 2019-02-07 stsp d3 = d1->old.to > d1->old.from ? d1 : d2;
771 078e971d 2019-02-08 stsp change(3, &d3->new, 0, d3s);
773 078e971d 2019-02-08 stsp j = edit(d1, dpl, j, d3s);
780 74b37681 2019-02-07 stsp * Overlapping changes from file 1 and 2; extend changes
781 74b37681 2019-02-07 stsp * appropriately to make them coincide.
783 74b37681 2019-02-07 stsp if (d1->new.from < d2->new.from) {
784 74b37681 2019-02-07 stsp d2->old.from -= d2->new.from-d1->new.from;
785 74b37681 2019-02-07 stsp d2->new.from = d1->new.from;
786 74b37681 2019-02-07 stsp } else if (d2->new.from < d1->new.from) {
787 74b37681 2019-02-07 stsp d1->old.from -= d1->new.from-d2->new.from;
788 74b37681 2019-02-07 stsp d1->new.from = d2->new.from;
790 74b37681 2019-02-07 stsp if (d1->new.to > d2->new.to) {
791 74b37681 2019-02-07 stsp d2->old.to += d1->new.to - d2->new.to;
792 74b37681 2019-02-07 stsp d2->new.to = d1->new.to;
793 74b37681 2019-02-07 stsp } else if (d2->new.to > d1->new.to) {
794 74b37681 2019-02-07 stsp d1->old.to += d2->new.to - d1->new.to;
795 74b37681 2019-02-07 stsp d1->new.to = d2->new.to;
799 078e971d 2019-02-08 stsp return (edscript(j, d3s));
802 74b37681 2019-02-07 stsp static void
803 5176f942 2019-02-08 stsp separate(const char *s, struct diff3_state *d3s)
805 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "====%s\n", s);
809 74b37681 2019-02-07 stsp * The range of lines rold.from thru rold.to in file i is to be changed.
810 74b37681 2019-02-07 stsp * It is to be printed only if it does not duplicate something to be
811 74b37681 2019-02-07 stsp * printed later.
813 74b37681 2019-02-07 stsp static void
814 078e971d 2019-02-08 stsp change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
816 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%d:", i);
817 078e971d 2019-02-08 stsp d3s->last[i] = rold->to;
818 5176f942 2019-02-08 stsp prange(rold, d3s);
819 078e971d 2019-02-08 stsp if (fdup || d3s->debug)
822 078e971d 2019-02-08 stsp (void)skip(i, rold->from, NULL, d3s);
823 078e971d 2019-02-08 stsp (void)skip(i, rold->to, " ", d3s);
827 74b37681 2019-02-07 stsp * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
829 74b37681 2019-02-07 stsp static void
830 5176f942 2019-02-08 stsp prange(struct range *rold, struct diff3_state *d3s)
832 74b37681 2019-02-07 stsp if (rold->to <= rold->from)
833 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
835 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%d", rold->from);
836 74b37681 2019-02-07 stsp if (rold->to > rold->from+1)
837 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, ",%d", rold->to - 1);
838 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "c\n");
843 74b37681 2019-02-07 stsp * No difference was reported by diff between file 1 (or 2) and file 3,
844 74b37681 2019-02-07 stsp * and an artificial dummy difference (trange) must be ginned up to
845 74b37681 2019-02-07 stsp * correspond to the change reported in the other file.
847 74b37681 2019-02-07 stsp static void
848 078e971d 2019-02-08 stsp keep(int i, struct range *rnew, struct diff3_state *d3s)
851 74b37681 2019-02-07 stsp struct range trange;
853 078e971d 2019-02-08 stsp delta = d3s->last[3] - d3s->last[i];
854 74b37681 2019-02-07 stsp trange.from = rnew->from - delta;
855 74b37681 2019-02-07 stsp trange.to = rnew->to - delta;
856 078e971d 2019-02-08 stsp change(i, &trange, 1, d3s);
860 74b37681 2019-02-07 stsp * skip to just before line number from in file "i". If "pr" is non-NULL,
861 74b37681 2019-02-07 stsp * print all skipped stuff with string pr as a prefix.
864 078e971d 2019-02-08 stsp skip(int i, int from, char *pr, struct diff3_state *d3s)
866 74b37681 2019-02-07 stsp size_t j, n;
867 74b37681 2019-02-07 stsp char *line;
869 078e971d 2019-02-08 stsp for (n = 0; d3s->cline[i] < from - 1; n += j) {
870 dfc4f8fe 2019-02-08 stsp if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
871 74b37681 2019-02-07 stsp return (-1);
872 74b37681 2019-02-07 stsp if (pr != NULL)
873 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%s%s", pr, line);
874 078e971d 2019-02-08 stsp d3s->cline[i]++;
876 74b37681 2019-02-07 stsp return ((int) n);
880 74b37681 2019-02-07 stsp * Return 1 or 0 according as the old range (in file 1) contains exactly
881 74b37681 2019-02-07 stsp * the same data as the new range (in file 2).
884 078e971d 2019-02-08 stsp duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
890 74b37681 2019-02-07 stsp if (r1->to-r1->from != r2->to-r2->from)
891 74b37681 2019-02-07 stsp return (0);
892 078e971d 2019-02-08 stsp (void)skip(0, r1->from, NULL, d3s);
893 078e971d 2019-02-08 stsp (void)skip(1, r2->from, NULL, d3s);
895 74b37681 2019-02-07 stsp for (nline=0; nline < r1->to - r1->from; nline++) {
897 078e971d 2019-02-08 stsp c = getc(d3s->fp[0]);
898 078e971d 2019-02-08 stsp d = getc(d3s->fp[1]);
899 74b37681 2019-02-07 stsp if (c == -1 || d== -1)
900 74b37681 2019-02-07 stsp return (-1);
902 74b37681 2019-02-07 stsp if (c != d) {
903 078e971d 2019-02-08 stsp repos(nchar, d3s);
904 74b37681 2019-02-07 stsp return (0);
906 74b37681 2019-02-07 stsp } while (c != '\n');
908 078e971d 2019-02-08 stsp repos(nchar, d3s);
909 74b37681 2019-02-07 stsp return (1);
912 74b37681 2019-02-07 stsp static void
913 078e971d 2019-02-08 stsp repos(int nchar, struct diff3_state *d3s)
917 74b37681 2019-02-07 stsp for (i = 0; i < 2; i++)
918 078e971d 2019-02-08 stsp (void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
922 74b37681 2019-02-07 stsp * collect an editing script for later regurgitation
925 078e971d 2019-02-08 stsp edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
927 078e971d 2019-02-08 stsp if (((fdup + 1) & d3s->eflag) == 0)
928 74b37681 2019-02-07 stsp return (j);
930 078e971d 2019-02-08 stsp d3s->overlap[j] = !fdup;
932 078e971d 2019-02-08 stsp d3s->overlapcnt++;
933 078e971d 2019-02-08 stsp d3s->de[j].old.from = diff->old.from;
934 078e971d 2019-02-08 stsp d3s->de[j].old.to = diff->old.to;
935 078e971d 2019-02-08 stsp d3s->de[j].new.from =
936 078e971d 2019-02-08 stsp d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
937 078e971d 2019-02-08 stsp d3s->de[j].new.to =
938 078e971d 2019-02-08 stsp d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
939 74b37681 2019-02-07 stsp return (j);
942 74b37681 2019-02-07 stsp /* regurgitate */
944 078e971d 2019-02-08 stsp edscript(int n, struct diff3_state *d3s)
947 74b37681 2019-02-07 stsp char block[BUFSIZ+1];
949 74b37681 2019-02-07 stsp for (; n > 0; n--) {
950 078e971d 2019-02-08 stsp if (!d3s->oflag || !d3s->overlap[n])
951 5176f942 2019-02-08 stsp prange(&d3s->de[n].old, d3s);
953 01a44956 2019-03-27 stsp diff_output(d3s->diffbuf, "%da\n%s\n",
954 01a44956 2019-03-27 stsp d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
955 078e971d 2019-02-08 stsp (void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
956 078e971d 2019-02-08 stsp k = d3s->de[n].new.to - d3s->de[n].new.from;
957 078e971d 2019-02-08 stsp for (; k > 0; k-= j) {
958 74b37681 2019-02-07 stsp j = k > BUFSIZ ? BUFSIZ : k;
959 078e971d 2019-02-08 stsp if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
960 74b37681 2019-02-07 stsp return (-1);
961 74b37681 2019-02-07 stsp block[j] = '\0';
962 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%s", block);
965 078e971d 2019-02-08 stsp if (!d3s->oflag || !d3s->overlap[n])
966 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, ".\n");
968 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
969 5176f942 2019-02-08 stsp diff_output(d3s->diffbuf, "%da\n%s\n.\n",
970 5176f942 2019-02-08 stsp d3s->de[n].old.from - 1, d3s->f1mark);
974 078e971d 2019-02-08 stsp return (d3s->overlapcnt);
977 c03c6cb3 2019-02-08 stsp static const struct got_error *
978 078e971d 2019-02-08 stsp increase(struct diff3_state *d3s)
980 74b37681 2019-02-07 stsp size_t newsz, incr;
981 c03c6cb3 2019-02-08 stsp struct diff *d;
984 74b37681 2019-02-07 stsp /* are the memset(3) calls needed? */
985 078e971d 2019-02-08 stsp newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
986 078e971d 2019-02-08 stsp incr = newsz - d3s->szchanges;
988 078e971d 2019-02-08 stsp d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
989 c03c6cb3 2019-02-08 stsp if (d == NULL)
990 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
991 078e971d 2019-02-08 stsp d3s->d13 = d;
992 078e971d 2019-02-08 stsp memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
994 078e971d 2019-02-08 stsp d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
995 c03c6cb3 2019-02-08 stsp if (d == NULL)
996 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
997 078e971d 2019-02-08 stsp d3s->d23 = d;
998 078e971d 2019-02-08 stsp memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1000 078e971d 2019-02-08 stsp d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1001 c03c6cb3 2019-02-08 stsp if (d == NULL)
1002 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1003 078e971d 2019-02-08 stsp d3s->de = d;
1004 078e971d 2019-02-08 stsp memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1006 078e971d 2019-02-08 stsp s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1007 c03c6cb3 2019-02-08 stsp if (s == NULL)
1008 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1009 078e971d 2019-02-08 stsp d3s->overlap = s;
1010 078e971d 2019-02-08 stsp memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1011 078e971d 2019-02-08 stsp d3s->szchanges = newsz;
1013 c03c6cb3 2019-02-08 stsp return NULL;
