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"
87 0d26ce36 2019-02-08 stsp #ifndef nitems
88 0d26ce36 2019-02-08 stsp #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
91 74b37681 2019-02-07 stsp /* diff3 - 3-way differential file comparison */
93 74b37681 2019-02-07 stsp /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
95 74b37681 2019-02-07 stsp * d13 = diff report on f1 vs f3
96 74b37681 2019-02-07 stsp * d23 = diff report on f2 vs f3
97 74b37681 2019-02-07 stsp * f1, f2, f3 the 3 files
98 74b37681 2019-02-07 stsp * if changes in f1 overlap with changes in f3, m1 and m3 are used
99 74b37681 2019-02-07 stsp * to mark the overlaps; otherwise, the file names f1 and f3 are used
100 74b37681 2019-02-07 stsp * (only for options E and X).
104 74b37681 2019-02-07 stsp * "from" is first in range of changed lines; "to" is last+1
105 74b37681 2019-02-07 stsp * from=to=line after point of insertion for added lines.
107 b2338eff 2019-10-09 stsp struct line_range {
112 b2338eff 2019-10-09 stsp struct off_range {
113 b2338eff 2019-10-09 stsp off_t from;
117 74b37681 2019-02-07 stsp struct diff {
118 b2338eff 2019-10-09 stsp struct line_range old;
119 b2338eff 2019-10-09 stsp struct line_range new;
120 d136cfcb 2019-10-12 stsp struct off_range oldo;
121 b2338eff 2019-10-09 stsp struct off_range newo;
124 078e971d 2019-02-08 stsp struct diff3_state {
125 078e971d 2019-02-08 stsp size_t szchanges;
127 078e971d 2019-02-08 stsp struct diff *d13;
128 078e971d 2019-02-08 stsp struct diff *d23;
131 078e971d 2019-02-08 stsp * "de" is used to gather editing scripts. These are later spewed out
132 078e971d 2019-02-08 stsp * in reverse order. Its first element must be all zero, the "new"
133 d136cfcb 2019-10-12 stsp * component of "de" contains line positions, and "oldo" and "newo"
134 d136cfcb 2019-10-12 stsp * components contain byte positions.
135 b2338eff 2019-10-09 stsp * Array overlap indicates which sections in "de" correspond to lines
136 b2338eff 2019-10-09 stsp * that are different in all three files.
138 078e971d 2019-02-08 stsp struct diff *de;
139 078e971d 2019-02-08 stsp char *overlap;
140 078e971d 2019-02-08 stsp int overlapcnt;
141 078e971d 2019-02-08 stsp FILE *fp[3];
142 078e971d 2019-02-08 stsp int cline[3]; /* # of the last-read line in each file (0-2) */
145 078e971d 2019-02-08 stsp * the latest known correspondence between line numbers of the 3 files
146 078e971d 2019-02-08 stsp * is stored in last[1-3];
148 078e971d 2019-02-08 stsp int last[4];
149 f69721c3 2019-10-21 stsp char f1mark[PATH_MAX];
150 f69721c3 2019-10-21 stsp char f2mark[PATH_MAX];
151 f69721c3 2019-10-21 stsp char f3mark[PATH_MAX];
155 5176f942 2019-02-08 stsp BUF *diffbuf;
159 d136cfcb 2019-10-12 stsp static const struct got_error *duplicate(int *, int, struct line_range *,
160 b2338eff 2019-10-09 stsp struct line_range *, struct diff3_state *);
161 02b87977 2019-10-06 stsp static const struct got_error *edit(struct diff *, int, int *,
162 02b87977 2019-10-06 stsp struct diff3_state *);
163 02b87977 2019-10-06 stsp static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
164 02b87977 2019-10-06 stsp static const struct got_error *get_line(char **, FILE *, size_t *,
165 02b87977 2019-10-06 stsp struct diff3_state *);
166 74b37681 2019-02-07 stsp static int number(char **);
167 b90524b1 2019-02-08 stsp static const struct got_error *readin(size_t *, char *, struct diff **,
168 b90524b1 2019-02-08 stsp struct diff3_state *);
169 c03c6cb3 2019-02-08 stsp static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
170 88775814 2019-10-09 stsp static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
171 180dce26 2019-10-06 stsp static const struct got_error *edscript(int, struct diff3_state *);
172 180dce26 2019-10-06 stsp static const struct got_error *merge(size_t, size_t, struct diff3_state *);
173 b2338eff 2019-10-09 stsp static const struct got_error *prange(struct line_range *, struct diff3_state *);
174 f571bb85 2019-10-06 stsp static const struct got_error *repos(int, struct diff3_state *);
175 078e971d 2019-02-08 stsp static const struct got_error *increase(struct diff3_state *);
176 c03c6cb3 2019-02-08 stsp static const struct got_error *diff3_internal(char *, char *, char *,
177 a551f215 2019-02-08 stsp char *, char *, const char *, const char *, struct diff3_state *,
178 f69721c3 2019-10-21 stsp const char *, const char *, const char *);
180 c03c6cb3 2019-02-08 stsp static const struct got_error *
181 5176f942 2019-02-08 stsp diff_output(BUF *diffbuf, const char *fmt, ...)
183 346b301a 2019-10-06 stsp const struct got_error *err = NULL;
184 c03c6cb3 2019-02-08 stsp va_list vap;
187 c03c6cb3 2019-02-08 stsp size_t newsize;
189 c03c6cb3 2019-02-08 stsp va_start(vap, fmt);
190 c03c6cb3 2019-02-08 stsp i = vasprintf(&str, fmt, vap);
191 c03c6cb3 2019-02-08 stsp va_end(vap);
192 c03c6cb3 2019-02-08 stsp if (i == -1)
193 638f9024 2019-05-13 stsp return got_error_from_errno("vasprintf");
194 346b301a 2019-10-06 stsp err = buf_append(&newsize, diffbuf, str, strlen(str));
196 346b301a 2019-10-06 stsp return err;
199 c03c6cb3 2019-02-08 stsp static const struct got_error*
200 c03c6cb3 2019-02-08 stsp diffreg(BUF **d, const char *path1, const char *path2)
202 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
203 c03c6cb3 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
204 c03c6cb3 2019-02-08 stsp char *outpath = NULL;
205 c03c6cb3 2019-02-08 stsp struct got_diff_state ds;
206 c03c6cb3 2019-02-08 stsp struct got_diff_args args;
211 c03c6cb3 2019-02-08 stsp f1 = fopen(path1, "r");
212 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
213 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path1);
216 c03c6cb3 2019-02-08 stsp f2 = fopen(path2, "r");
217 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
218 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path2);
222 bb63914a 2020-02-17 stsp err = got_opentemp_named(&outpath, &outfile,
223 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-diffreg");
227 c03c6cb3 2019-02-08 stsp memset(&ds, 0, sizeof(ds));
228 c03c6cb3 2019-02-08 stsp /* XXX should stat buffers be passed in args instead of ds? */
229 c03c6cb3 2019-02-08 stsp if (stat(path1, &ds.stb1) == -1) {
230 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path1);
233 c03c6cb3 2019-02-08 stsp if (stat(path2, &ds.stb2) == -1) {
234 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path2);
238 c03c6cb3 2019-02-08 stsp memset(&args, 0, sizeof(args));
239 c03c6cb3 2019-02-08 stsp args.diff_format = D_NORMAL;
240 c03c6cb3 2019-02-08 stsp args.label[0] = "";
241 c03c6cb3 2019-02-08 stsp args.label[1] = "";
242 c03c6cb3 2019-02-08 stsp args.diff_context = 0;
244 c03c6cb3 2019-02-08 stsp err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
245 c03c6cb3 2019-02-08 stsp outfile, NULL);
249 cbe7f848 2019-02-11 stsp if (fflush(outfile) != 0) {
250 638f9024 2019-05-13 stsp err = got_error_from_errno2("fflush", outpath);
254 575e8218 2019-10-07 stsp err = buf_load(d, outpath);
256 a551f215 2019-02-08 stsp if (outpath) {
257 68bda3b1 2019-10-09 stsp if (unlink(outpath) == -1 && err == NULL)
258 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", outpath);
259 a551f215 2019-02-08 stsp free(outpath);
261 fb43ecf1 2019-02-11 stsp if (outfile && fclose(outfile) != 0 && err == NULL)
262 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
263 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
264 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
265 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
266 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
267 c03c6cb3 2019-02-08 stsp return err;
271 74b37681 2019-02-07 stsp * For merge(1).
273 c03c6cb3 2019-02-08 stsp const struct got_error *
274 57ee5d50 2019-02-08 stsp got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
275 f69721c3 2019-10-21 stsp const char *p3, const char *label1, const char *label2, const char *label3)
277 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
278 c03c6cb3 2019-02-08 stsp char *dp13, *dp23, *path1, *path2, *path3;
279 74b37681 2019-02-07 stsp BUF *b1, *b2, *b3, *d1, *d2, *diffb;
280 74b37681 2019-02-07 stsp u_char *data, *patch;
281 74b37681 2019-02-07 stsp size_t dlen, plen;
282 078e971d 2019-02-08 stsp struct diff3_state *d3s;
285 57ee5d50 2019-02-08 stsp *overlapcnt = 0;
287 078e971d 2019-02-08 stsp d3s = calloc(1, sizeof(*d3s));
288 078e971d 2019-02-08 stsp if (d3s == NULL)
289 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
291 74b37681 2019-02-07 stsp b1 = b2 = b3 = d1 = d2 = diffb = NULL;
292 74b37681 2019-02-07 stsp dp13 = dp23 = path1 = path2 = path3 = NULL;
293 74b37681 2019-02-07 stsp data = patch = NULL;
295 575e8218 2019-10-07 stsp err = buf_load(&b1, p1);
298 575e8218 2019-10-07 stsp err = buf_load(&b2, p2);
301 575e8218 2019-10-07 stsp err = buf_load(&b3, p3);
305 575e8218 2019-10-07 stsp err = buf_alloc(&diffb, 128);
309 bb63914a 2020-02-17 stsp if (asprintf(&path1, GOT_TMPDIR_STR "/got-diff1.XXXXXXXX") == -1) {
310 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
313 bb63914a 2020-02-17 stsp if (asprintf(&path2, GOT_TMPDIR_STR "/got-diff2.XXXXXXXX") == -1) {
314 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
317 bb63914a 2020-02-17 stsp if (asprintf(&path3, GOT_TMPDIR_STR "/got-diff3.XXXXXXXX") == -1) {
318 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
322 96cbb597 2019-10-09 stsp err = buf_write_stmp(b1, path1);
325 96cbb597 2019-10-09 stsp err = buf_write_stmp(b2, path2);
328 96cbb597 2019-10-09 stsp err = buf_write_stmp(b3, path3);
332 74b37681 2019-02-07 stsp buf_free(b2);
335 c03c6cb3 2019-02-08 stsp err = diffreg(&d1, path1, path3);
337 74b37681 2019-02-07 stsp buf_free(diffb);
338 74b37681 2019-02-07 stsp diffb = NULL;
342 c03c6cb3 2019-02-08 stsp err = diffreg(&d2, path2, path3);
344 c03c6cb3 2019-02-08 stsp buf_free(diffb);
345 c03c6cb3 2019-02-08 stsp diffb = NULL;
349 bb63914a 2020-02-17 stsp if (asprintf(&dp13, GOT_TMPDIR_STR "/got-d13.XXXXXXXXXX") == -1) {
350 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
353 96cbb597 2019-10-09 stsp err = buf_write_stmp(d1, dp13);
357 74b37681 2019-02-07 stsp buf_free(d1);
360 bb63914a 2020-02-17 stsp if (asprintf(&dp23, GOT_TMPDIR_STR "/got-d23.XXXXXXXXXX") == -1) {
361 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
364 96cbb597 2019-10-09 stsp err = buf_write_stmp(d2, dp23);
368 74b37681 2019-02-07 stsp buf_free(d2);
371 5176f942 2019-02-08 stsp d3s->diffbuf = diffb;
372 a551f215 2019-02-08 stsp err = diff3_internal(dp13, dp23, path1, path2, path3,
373 f69721c3 2019-10-21 stsp label1, label3, d3s, label1, label2, label3);
375 74b37681 2019-02-07 stsp buf_free(diffb);
376 74b37681 2019-02-07 stsp diffb = NULL;
380 74b37681 2019-02-07 stsp plen = buf_len(diffb);
381 74b37681 2019-02-07 stsp patch = buf_release(diffb);
382 74b37681 2019-02-07 stsp dlen = buf_len(b1);
383 74b37681 2019-02-07 stsp data = buf_release(b1);
385 5a3ad9e0 2019-02-08 stsp diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
387 74b37681 2019-02-07 stsp buf_free(b2);
388 74b37681 2019-02-07 stsp buf_free(b3);
389 74b37681 2019-02-07 stsp buf_free(d1);
390 74b37681 2019-02-07 stsp buf_free(d2);
392 68bda3b1 2019-10-09 stsp if (unlink(path1) == -1 && err == NULL)
393 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", path1);
394 68bda3b1 2019-10-09 stsp if (unlink(path2) == -1 && err == NULL)
395 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", path2);
396 68bda3b1 2019-10-09 stsp if (unlink(path3) == -1 && err == NULL)
397 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", path3);
398 68bda3b1 2019-10-09 stsp if (unlink(dp13) == -1 && err == NULL)
399 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", dp13);
400 68bda3b1 2019-10-09 stsp if (unlink(dp23) == -1 && err == NULL)
401 68bda3b1 2019-10-09 stsp err = got_error_from_errno2("unlink", dp23);
403 74b37681 2019-02-07 stsp free(path1);
404 74b37681 2019-02-07 stsp free(path2);
405 74b37681 2019-02-07 stsp free(path3);
406 74b37681 2019-02-07 stsp free(dp13);
407 74b37681 2019-02-07 stsp free(dp23);
408 74b37681 2019-02-07 stsp free(data);
409 74b37681 2019-02-07 stsp free(patch);
411 0d26ce36 2019-02-08 stsp for (i = 0; i < nitems(d3s->fp); i++) {
412 fb43ecf1 2019-02-11 stsp if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
413 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
415 5a3ad9e0 2019-02-08 stsp if (err == NULL && diffb) {
416 62f59172 2019-02-08 stsp if (buf_write_fd(diffb, outfd) < 0)
417 638f9024 2019-05-13 stsp err = got_error_from_errno("buf_write_fd");
418 57ee5d50 2019-02-08 stsp *overlapcnt = d3s->overlapcnt;
421 62f59172 2019-02-08 stsp buf_free(diffb);
422 c03c6cb3 2019-02-08 stsp return err;
425 c03c6cb3 2019-02-08 stsp static const struct got_error *
426 c03c6cb3 2019-02-08 stsp diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
427 a551f215 2019-02-08 stsp const char *fmark, const char *rmark, struct diff3_state *d3s,
428 f69721c3 2019-10-21 stsp const char *label1, const char *label2, const char *label3)
430 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
431 74b37681 2019-02-07 stsp ssize_t m, n;
434 01a44956 2019-03-27 stsp i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
435 f69721c3 2019-10-21 stsp "%s%s%s", GOT_DIFF_CONFLICT_MARKER_BEGIN,
436 f69721c3 2019-10-21 stsp label1 ? " " : "", label1 ? label1 : "");
437 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f1mark))
438 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
440 f69721c3 2019-10-21 stsp i = snprintf(d3s->f2mark, sizeof(d3s->f2mark),
441 f69721c3 2019-10-21 stsp "%s%s%s", GOT_DIFF_CONFLICT_MARKER_ORIG,
442 f69721c3 2019-10-21 stsp label2 ? " " : "", label2 ? label2 : "");
443 f69721c3 2019-10-21 stsp if (i < 0 || i >= (int)sizeof(d3s->f2mark))
444 f69721c3 2019-10-21 stsp return got_error(GOT_ERR_NO_SPACE);
446 01a44956 2019-03-27 stsp i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
447 f69721c3 2019-10-21 stsp "%s%s%s", GOT_DIFF_CONFLICT_MARKER_END,
448 f69721c3 2019-10-21 stsp label3 ? " " : "", label3 ? label3 : "");
449 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f3mark))
450 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
452 078e971d 2019-02-08 stsp err = increase(d3s);
454 c03c6cb3 2019-02-08 stsp return err;
456 b90524b1 2019-02-08 stsp err = readin(&m, dp13, &d3s->d13, d3s);
458 b90524b1 2019-02-08 stsp return err;
459 b90524b1 2019-02-08 stsp err = readin(&n, dp23, &d3s->d23, d3s);
461 b90524b1 2019-02-08 stsp return err;
463 078e971d 2019-02-08 stsp if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
464 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path1);
465 078e971d 2019-02-08 stsp if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
466 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path2);
467 078e971d 2019-02-08 stsp if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
468 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path3);
470 180dce26 2019-10-06 stsp return merge(m, n, d3s);
474 74b37681 2019-02-07 stsp ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
476 74b37681 2019-02-07 stsp char op, *ep;
477 74b37681 2019-02-07 stsp struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
478 74b37681 2019-02-07 stsp int start, end, i, lineno;
479 74b37681 2019-02-07 stsp u_char tmp;
481 74b37681 2019-02-07 stsp dlp = TAILQ_FIRST(&(dlines->l_lines));
482 74b37681 2019-02-07 stsp lp = TAILQ_FIRST(&(plines->l_lines));
485 74b37681 2019-02-07 stsp for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
486 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list)) {
487 74b37681 2019-02-07 stsp /* Skip blank lines */
488 74b37681 2019-02-07 stsp if (lp->l_len < 2)
491 74b37681 2019-02-07 stsp /* NUL-terminate line buffer for strtol() safety. */
492 74b37681 2019-02-07 stsp tmp = lp->l_line[lp->l_len - 1];
493 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = '\0';
495 74b37681 2019-02-07 stsp /* len - 1 is NUL terminator so we use len - 2 for 'op' */
496 74b37681 2019-02-07 stsp op = lp->l_line[lp->l_len - 2];
497 74b37681 2019-02-07 stsp start = (int)strtol(lp->l_line, &ep, 10);
499 74b37681 2019-02-07 stsp /* Restore the last byte of the buffer */
500 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = tmp;
502 74b37681 2019-02-07 stsp if (op == 'a') {
503 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
504 74b37681 2019-02-07 stsp start < 0 || *ep != 'a')
506 74b37681 2019-02-07 stsp } else if (op == 'c') {
507 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
508 74b37681 2019-02-07 stsp start < 0 || (*ep != ',' && *ep != 'c'))
511 74b37681 2019-02-07 stsp if (*ep == ',') {
513 74b37681 2019-02-07 stsp end = (int)strtol(ep, &ep, 10);
514 74b37681 2019-02-07 stsp if (end < 0 || *ep != 'c')
517 74b37681 2019-02-07 stsp end = start;
523 74b37681 2019-02-07 stsp if (dlp == NULL)
525 74b37681 2019-02-07 stsp if (dlp->l_lineno == start)
527 74b37681 2019-02-07 stsp if (dlp->l_lineno > start) {
528 74b37681 2019-02-07 stsp dlp = TAILQ_PREV(dlp, tqh, l_list);
529 74b37681 2019-02-07 stsp } else if (dlp->l_lineno < start) {
530 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
531 74b37681 2019-02-07 stsp if (ndlp->l_lineno > start)
533 74b37681 2019-02-07 stsp dlp = ndlp;
537 74b37681 2019-02-07 stsp if (dlp == NULL)
541 74b37681 2019-02-07 stsp if (op == 'c') {
542 74b37681 2019-02-07 stsp insert_after = TAILQ_PREV(dlp, tqh, l_list);
543 74b37681 2019-02-07 stsp for (i = 0; i <= (end - start); i++) {
544 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
545 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
546 74b37681 2019-02-07 stsp dlp = ndlp;
548 74b37681 2019-02-07 stsp dlp = insert_after;
551 74b37681 2019-02-07 stsp if (op == 'a' || op == 'c') {
554 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list);
555 74b37681 2019-02-07 stsp if (lp == NULL)
558 acb4e1d1 2019-08-10 stsp if (lp->l_len == 2 &&
559 acb4e1d1 2019-08-10 stsp lp->l_line[0] == '.' &&
560 acb4e1d1 2019-08-10 stsp lp->l_line[1] == '\n')
563 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
564 74b37681 2019-02-07 stsp TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
565 74b37681 2019-02-07 stsp lp, l_list);
568 74b37681 2019-02-07 stsp lp->l_lineno = start;
574 74b37681 2019-02-07 stsp * always resort lines as the markers might be put at the
575 74b37681 2019-02-07 stsp * same line as we first started editing.
577 74b37681 2019-02-07 stsp lineno = 0;
578 74b37681 2019-02-07 stsp TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
579 74b37681 2019-02-07 stsp sort->l_lineno = lineno++;
580 74b37681 2019-02-07 stsp dlines->l_nblines = lineno - 1;
583 74b37681 2019-02-07 stsp return (0);
587 74b37681 2019-02-07 stsp * Pick up the line numbers of all changes from one change file.
588 74b37681 2019-02-07 stsp * (This puts the numbers in a vector, which is not strictly necessary,
589 74b37681 2019-02-07 stsp * since the vector is processed in one sequential pass.
590 74b37681 2019-02-07 stsp * The vector could be optimized out of existence)
592 b90524b1 2019-02-08 stsp static const struct got_error *
593 b90524b1 2019-02-08 stsp readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
595 b90524b1 2019-02-08 stsp const struct got_error *err = NULL;
597 74b37681 2019-02-07 stsp int a, b, c, d;
598 74b37681 2019-02-07 stsp char kind, *p;
599 937e0e58 2019-10-21 stsp size_t i = 0;
603 971405a7 2019-10-09 stsp f = fopen(name, "r");
604 971405a7 2019-10-09 stsp if (f == NULL)
605 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", name);
606 971405a7 2019-10-09 stsp err = getchange(&p, f, d3s);
609 02b87977 2019-10-06 stsp for (i = 0; p; i++) {
610 b90524b1 2019-02-08 stsp if (i >= d3s->szchanges - 1) {
611 b90524b1 2019-02-08 stsp err = increase(d3s);
615 74b37681 2019-02-07 stsp a = b = number(&p);
616 74b37681 2019-02-07 stsp if (*p == ',') {
618 74b37681 2019-02-07 stsp b = number(&p);
620 74b37681 2019-02-07 stsp kind = *p++;
621 74b37681 2019-02-07 stsp c = d = number(&p);
622 e19660d5 2019-10-06 stsp if (*p == ',') {
624 74b37681 2019-02-07 stsp d = number(&p);
626 74b37681 2019-02-07 stsp if (kind == 'a')
628 74b37681 2019-02-07 stsp if (kind == 'd')
632 74b37681 2019-02-07 stsp (*dd)[i].old.from = a;
633 74b37681 2019-02-07 stsp (*dd)[i].old.to = b;
634 74b37681 2019-02-07 stsp (*dd)[i].new.from = c;
635 74b37681 2019-02-07 stsp (*dd)[i].new.to = d;
637 971405a7 2019-10-09 stsp err = getchange(&p, f, d3s);
643 e19660d5 2019-10-06 stsp (*dd)[i].old.from = (*dd)[i - 1].old.to;
644 e19660d5 2019-10-06 stsp (*dd)[i].new.from = (*dd)[i - 1].new.to;
647 e4531130 2019-10-09 stsp if (fclose(f) != 0 && err == NULL)
648 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
649 e4531130 2019-10-09 stsp if (err == NULL)
651 fb43ecf1 2019-02-11 stsp return err;
655 74b37681 2019-02-07 stsp number(char **lc)
660 74b37681 2019-02-07 stsp while (isdigit((unsigned char)(**lc)))
661 74b37681 2019-02-07 stsp nn = nn*10 + *(*lc)++ - '0';
663 74b37681 2019-02-07 stsp return (nn);
666 02b87977 2019-10-06 stsp static const struct got_error *
667 02b87977 2019-10-06 stsp getchange(char **line, FILE *b, struct diff3_state *d3s)
669 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
671 02b87977 2019-10-06 stsp *line = NULL;
673 02b87977 2019-10-06 stsp if (*line && isdigit((unsigned char)(*line)[0]))
674 02b87977 2019-10-06 stsp return NULL;
675 02b87977 2019-10-06 stsp err = get_line(line, b, NULL, d3s);
677 02b87977 2019-10-06 stsp return err;
678 02b87977 2019-10-06 stsp } while (*line);
680 02b87977 2019-10-06 stsp return NULL;
683 02b87977 2019-10-06 stsp static const struct got_error *
684 02b87977 2019-10-06 stsp get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
686 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
687 6dea73df 2019-09-23 stsp char *cp = NULL;
688 500467ff 2019-09-25 hiltjo size_t size;
689 500467ff 2019-09-25 hiltjo ssize_t len;
692 02b87977 2019-10-06 stsp *ret = NULL;
694 6dea73df 2019-09-23 stsp len = getline(&cp, &size, b);
695 02b87977 2019-10-06 stsp if (len == -1) {
696 02b87977 2019-10-06 stsp if (ferror(b))
697 02b87977 2019-10-06 stsp err = got_error_from_errno("getline");
701 6dea73df 2019-09-23 stsp if (cp[len - 1] != '\n') {
703 6dea73df 2019-09-23 stsp if (len + 1 > size) {
704 6dea73df 2019-09-23 stsp new = realloc(cp, len + 1);
705 02b87977 2019-10-06 stsp if (new == NULL) {
706 02b87977 2019-10-06 stsp err = got_error_from_errno("realloc");
711 6dea73df 2019-09-23 stsp cp[len - 1] = '\n';
712 6dea73df 2019-09-23 stsp cp[len] = '\0';
715 6dea73df 2019-09-23 stsp free(d3s->buf);
716 02b87977 2019-10-06 stsp *ret = d3s->buf = cp;
718 74b37681 2019-02-07 stsp if (n != NULL)
722 02b87977 2019-10-06 stsp return err;
725 180dce26 2019-10-06 stsp static const struct got_error *
726 078e971d 2019-02-08 stsp merge(size_t m1, size_t m2, struct diff3_state *d3s)
728 180dce26 2019-10-06 stsp const struct got_error *err = NULL;
729 18b9ebab 2019-10-06 stsp struct diff *d1, *d2;
730 74b37681 2019-02-07 stsp int dpl, j, t1, t2;
732 078e971d 2019-02-08 stsp d1 = d3s->d13;
733 078e971d 2019-02-08 stsp d2 = d3s->d23;
736 078e971d 2019-02-08 stsp t1 = (d1 < d3s->d13 + m1);
737 078e971d 2019-02-08 stsp t2 = (d2 < d3s->d23 + m2);
738 74b37681 2019-02-07 stsp if (!t1 && !t2)
741 74b37681 2019-02-07 stsp /* first file is different from others */
742 74b37681 2019-02-07 stsp if (!t2 || (t1 && d1->new.to < d2->new.from)) {
743 74b37681 2019-02-07 stsp /* stuff peculiar to 1st file */
748 74b37681 2019-02-07 stsp /* second file is different from others */
749 74b37681 2019-02-07 stsp if (!t1 || (t2 && d2->new.to < d1->new.from)) {
755 74b37681 2019-02-07 stsp * Merge overlapping changes in first file
756 74b37681 2019-02-07 stsp * this happens after extension (see below).
758 078e971d 2019-02-08 stsp if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
759 74b37681 2019-02-07 stsp d1[1].old.from = d1->old.from;
760 74b37681 2019-02-07 stsp d1[1].new.from = d1->new.from;
765 74b37681 2019-02-07 stsp /* merge overlapping changes in second */
766 078e971d 2019-02-08 stsp if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
767 74b37681 2019-02-07 stsp d2[1].old.from = d2->old.from;
768 74b37681 2019-02-07 stsp d2[1].new.from = d2->new.from;
772 74b37681 2019-02-07 stsp /* stuff peculiar to third file or different in all */
773 74b37681 2019-02-07 stsp if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
774 d136cfcb 2019-10-12 stsp err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
776 180dce26 2019-10-06 stsp return err;
779 74b37681 2019-02-07 stsp * dpl = 0 means all files differ
780 74b37681 2019-02-07 stsp * dpl = 1 means files 1 and 2 identical
782 18b9ebab 2019-10-06 stsp err = edit(d1, dpl, &j, d3s);
784 18b9ebab 2019-10-06 stsp return err;
791 74b37681 2019-02-07 stsp * Overlapping changes from file 1 and 2; extend changes
792 74b37681 2019-02-07 stsp * appropriately to make them coincide.
794 74b37681 2019-02-07 stsp if (d1->new.from < d2->new.from) {
795 e19660d5 2019-10-06 stsp d2->old.from -= d2->new.from - d1->new.from;
796 74b37681 2019-02-07 stsp d2->new.from = d1->new.from;
797 74b37681 2019-02-07 stsp } else if (d2->new.from < d1->new.from) {
798 e19660d5 2019-10-06 stsp d1->old.from -= d1->new.from - d2->new.from;
799 74b37681 2019-02-07 stsp d1->new.from = d2->new.from;
801 74b37681 2019-02-07 stsp if (d1->new.to > d2->new.to) {
802 74b37681 2019-02-07 stsp d2->old.to += d1->new.to - d2->new.to;
803 74b37681 2019-02-07 stsp d2->new.to = d1->new.to;
804 74b37681 2019-02-07 stsp } else if (d2->new.to > d1->new.to) {
805 74b37681 2019-02-07 stsp d1->old.to += d2->new.to - d1->new.to;
806 74b37681 2019-02-07 stsp d1->new.to = d2->new.to;
810 078e971d 2019-02-08 stsp return (edscript(j, d3s));
814 74b37681 2019-02-07 stsp * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
816 ce09ab8d 2019-10-06 stsp static const struct got_error *
817 b2338eff 2019-10-09 stsp prange(struct line_range *rold, struct diff3_state *d3s)
819 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
821 ce09ab8d 2019-10-06 stsp if (rold->to <= rold->from) {
822 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
824 ce09ab8d 2019-10-06 stsp return err;
826 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%d", rold->from);
828 ce09ab8d 2019-10-06 stsp return err;
829 ce09ab8d 2019-10-06 stsp if (rold->to > rold->from + 1) {
830 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
832 ce09ab8d 2019-10-06 stsp return err;
834 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "c\n");
836 ce09ab8d 2019-10-06 stsp return err;
839 ce09ab8d 2019-10-06 stsp return NULL;
843 88775814 2019-10-09 stsp * Skip to just before line number from in file "i".
844 88775814 2019-10-09 stsp * Return the number of bytes skipped in *nskipped.
846 02b87977 2019-10-06 stsp static const struct got_error *
847 88775814 2019-10-09 stsp skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
849 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
850 9d4a5e89 2019-10-09 stsp size_t len, n;
851 74b37681 2019-02-07 stsp char *line;
853 02b87977 2019-10-06 stsp *nskipped = 0;
854 9d4a5e89 2019-10-09 stsp for (n = 0; d3s->cline[i] < from - 1; n += len) {
855 9d4a5e89 2019-10-09 stsp err = get_line(&line, d3s->fp[i], &len, d3s);
857 02b87977 2019-10-06 stsp return err;
858 078e971d 2019-02-08 stsp d3s->cline[i]++;
860 02b87977 2019-10-06 stsp *nskipped = n;
861 02b87977 2019-10-06 stsp return NULL;
865 180dce26 2019-10-06 stsp * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
866 74b37681 2019-02-07 stsp * the same data as the new range (in file 2).
868 d136cfcb 2019-10-12 stsp * If this change could overlap, remember start/end offsets in file 2 so we
869 d136cfcb 2019-10-12 stsp * can write out the original lines of text if a merge conflict occurs.
871 180dce26 2019-10-06 stsp static const struct got_error *
872 d136cfcb 2019-10-12 stsp duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
873 b2338eff 2019-10-09 stsp struct diff3_state *d3s)
875 f571bb85 2019-10-06 stsp const struct got_error *err = NULL;
879 88775814 2019-10-09 stsp size_t nskipped;
884 e19660d5 2019-10-06 stsp if (r1->to - r1->from != r2->to - r2->from)
885 180dce26 2019-10-06 stsp return NULL;
887 50351dee 2019-10-09 stsp err = skip(&nskipped, 0, r1->from, d3s);
889 02b87977 2019-10-06 stsp return err;
890 50351dee 2019-10-09 stsp err = skip(&nskipped, 1, r2->from, d3s);
892 02b87977 2019-10-06 stsp return err;
894 d136cfcb 2019-10-12 stsp off = ftello(d3s->fp[1]);
895 d136cfcb 2019-10-12 stsp if (off == -1)
896 d136cfcb 2019-10-12 stsp return got_error_from_errno("ftello");
897 d136cfcb 2019-10-12 stsp d3s->de[j + 1].oldo.from = off; /* original lines start here */
900 e19660d5 2019-10-06 stsp for (nline = 0; nline < r1->to - r1->from; nline++) {
902 078e971d 2019-02-08 stsp c = getc(d3s->fp[0]);
903 180dce26 2019-10-06 stsp if (c == EOF)
904 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[0], GOT_ERR_EOF);
905 078e971d 2019-02-08 stsp d = getc(d3s->fp[1]);
906 180dce26 2019-10-06 stsp if (d == EOF)
907 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[1], GOT_ERR_EOF);
909 d136cfcb 2019-10-12 stsp if (c != d) {
910 d136cfcb 2019-10-12 stsp long orig_line_len = nchar;
911 d136cfcb 2019-10-12 stsp while (d != '\n') {
912 d136cfcb 2019-10-12 stsp d = getc(d3s->fp[1]);
913 d136cfcb 2019-10-12 stsp if (d == EOF)
915 d136cfcb 2019-10-12 stsp orig_line_len++;
917 d136cfcb 2019-10-12 stsp if (orig_line_len > nchar &&
918 d136cfcb 2019-10-12 stsp fseek(d3s->fp[1], -(orig_line_len - nchar),
919 d136cfcb 2019-10-12 stsp SEEK_CUR) == -1)
920 d136cfcb 2019-10-12 stsp return got_ferror(d3s->fp[1],
921 d136cfcb 2019-10-12 stsp GOT_ERR_IO);
922 d136cfcb 2019-10-12 stsp /* original lines end here */
923 d136cfcb 2019-10-12 stsp d3s->de[j + 1].oldo.to = off + orig_line_len;
924 d136cfcb 2019-10-12 stsp err = repos(nchar, d3s);
926 d136cfcb 2019-10-12 stsp return err;
927 d136cfcb 2019-10-12 stsp return NULL;
929 74b37681 2019-02-07 stsp } while (c != '\n');
931 f571bb85 2019-10-06 stsp err = repos(nchar, d3s);
933 f571bb85 2019-10-06 stsp return err;
935 180dce26 2019-10-06 stsp return NULL;
938 f571bb85 2019-10-06 stsp static const struct got_error *
939 078e971d 2019-02-08 stsp repos(int nchar, struct diff3_state *d3s)
943 f571bb85 2019-10-06 stsp for (i = 0; i < 2; i++) {
944 f571bb85 2019-10-06 stsp if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
945 f571bb85 2019-10-06 stsp return got_ferror(d3s->fp[i], GOT_ERR_IO);
948 f571bb85 2019-10-06 stsp return NULL;
952 74b37681 2019-02-07 stsp * collect an editing script for later regurgitation
954 02b87977 2019-10-06 stsp static const struct got_error *
955 02b87977 2019-10-06 stsp edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
957 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
958 88775814 2019-10-09 stsp size_t nskipped;
960 18b9ebab 2019-10-06 stsp if (((fdup + 1) & 3) == 0)
961 02b87977 2019-10-06 stsp return NULL;
963 02b87977 2019-10-06 stsp d3s->overlap[*j] = !fdup;
965 078e971d 2019-02-08 stsp d3s->overlapcnt++;
966 02b87977 2019-10-06 stsp d3s->de[*j].old.from = diff->old.from;
967 02b87977 2019-10-06 stsp d3s->de[*j].old.to = diff->old.to;
969 50351dee 2019-10-09 stsp err = skip(&nskipped, 2, diff->new.from, d3s);
971 02b87977 2019-10-06 stsp return err;
972 b2338eff 2019-10-09 stsp d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
974 50351dee 2019-10-09 stsp err = skip(&nskipped, 2, diff->new.to, d3s);
976 b2338eff 2019-10-09 stsp return err;
977 b2338eff 2019-10-09 stsp d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
978 02b87977 2019-10-06 stsp return NULL;
981 74b37681 2019-02-07 stsp /* regurgitate */
982 180dce26 2019-10-06 stsp static const struct got_error *
983 078e971d 2019-02-08 stsp edscript(int n, struct diff3_state *d3s)
985 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
986 d59c0cb2 2019-10-09 stsp size_t k, len;
987 74b37681 2019-02-07 stsp char block[BUFSIZ+1];
989 74b37681 2019-02-07 stsp for (; n > 0; n--) {
990 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
991 ce09ab8d 2019-10-06 stsp err = prange(&d3s->de[n].old, d3s);
993 ce09ab8d 2019-10-06 stsp return err;
994 d136cfcb 2019-10-12 stsp } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
995 d136cfcb 2019-10-12 stsp /* Output a block of 3-way diff base file content. */
996 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n%s\n",
997 f69721c3 2019-10-21 stsp d3s->de[n].old.to - 1, d3s->f2mark);
999 d136cfcb 2019-10-12 stsp return err;
1000 d136cfcb 2019-10-12 stsp if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1002 d136cfcb 2019-10-12 stsp return got_error_from_errno("fseeko");
1003 d136cfcb 2019-10-12 stsp k = (size_t)(d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1004 d136cfcb 2019-10-12 stsp for (; k > 0; k -= len) {
1005 d136cfcb 2019-10-12 stsp len = k > BUFSIZ ? BUFSIZ : k;
1006 d136cfcb 2019-10-12 stsp if (fread(block, 1, len, d3s->fp[1]) != len)
1007 d136cfcb 2019-10-12 stsp return got_ferror(d3s->fp[1],
1008 d136cfcb 2019-10-12 stsp GOT_ERR_IO);
1009 d136cfcb 2019-10-12 stsp block[len] = '\0';
1010 d136cfcb 2019-10-12 stsp err = diff_output(d3s->diffbuf, "%s", block);
1012 d136cfcb 2019-10-12 stsp return err;
1014 d136cfcb 2019-10-12 stsp err = diff_output(d3s->diffbuf, "%s\n",
1015 d136cfcb 2019-10-12 stsp GOT_DIFF_CONFLICT_MARKER_SEP);
1017 d136cfcb 2019-10-12 stsp return err;
1019 d136cfcb 2019-10-12 stsp err = diff_output(d3s->diffbuf, "%da\n%s\n",
1020 01a44956 2019-03-27 stsp d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1022 ce09ab8d 2019-10-06 stsp return err;
1024 b2338eff 2019-10-09 stsp if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
1026 e9dabdfb 2019-10-06 stsp return got_error_from_errno("fseek");
1027 d59c0cb2 2019-10-09 stsp k = (size_t)(d3s->de[n].newo.to - d3s->de[n].newo.from);
1028 9688d20a 2019-10-09 stsp for (; k > 0; k -= len) {
1029 9688d20a 2019-10-09 stsp len = k > BUFSIZ ? BUFSIZ : k;
1030 d59c0cb2 2019-10-09 stsp if (fread(block, 1, len, d3s->fp[2]) != len)
1031 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[2], GOT_ERR_IO);
1032 9688d20a 2019-10-09 stsp block[len] = '\0';
1033 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%s", block);
1035 ce09ab8d 2019-10-06 stsp return err;
1038 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
1039 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ".\n");
1041 ce09ab8d 2019-10-06 stsp return err;
1043 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
1045 ce09ab8d 2019-10-06 stsp return err;
1046 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
1047 5176f942 2019-02-08 stsp d3s->de[n].old.from - 1, d3s->f1mark);
1049 ce09ab8d 2019-10-06 stsp return err;
1053 180dce26 2019-10-06 stsp return NULL;
1056 c03c6cb3 2019-02-08 stsp static const struct got_error *
1057 078e971d 2019-02-08 stsp increase(struct diff3_state *d3s)
1059 74b37681 2019-02-07 stsp size_t newsz, incr;
1060 c03c6cb3 2019-02-08 stsp struct diff *d;
1063 74b37681 2019-02-07 stsp /* are the memset(3) calls needed? */
1064 078e971d 2019-02-08 stsp newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1065 078e971d 2019-02-08 stsp incr = newsz - d3s->szchanges;
1067 078e971d 2019-02-08 stsp d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1068 c03c6cb3 2019-02-08 stsp if (d == NULL)
1069 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1070 078e971d 2019-02-08 stsp d3s->d13 = d;
1071 078e971d 2019-02-08 stsp memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1073 078e971d 2019-02-08 stsp d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1074 c03c6cb3 2019-02-08 stsp if (d == NULL)
1075 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1076 078e971d 2019-02-08 stsp d3s->d23 = d;
1077 078e971d 2019-02-08 stsp memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1079 078e971d 2019-02-08 stsp d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1080 c03c6cb3 2019-02-08 stsp if (d == NULL)
1081 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1082 078e971d 2019-02-08 stsp d3s->de = d;
1083 078e971d 2019-02-08 stsp memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1085 078e971d 2019-02-08 stsp s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1086 c03c6cb3 2019-02-08 stsp if (s == NULL)
1087 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1088 078e971d 2019-02-08 stsp d3s->overlap = s;
1089 078e971d 2019-02-08 stsp memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1090 078e971d 2019-02-08 stsp d3s->szchanges = newsz;
1092 c03c6cb3 2019-02-08 stsp return NULL;