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>
69 74b37681 2019-02-07 stsp #include <ctype.h>
70 c03c6cb3 2019-02-08 stsp #include <limits.h>
71 74b37681 2019-02-07 stsp #include <stdio.h>
72 c03c6cb3 2019-02-08 stsp #include <stdarg.h>
73 74b37681 2019-02-07 stsp #include <stdlib.h>
74 74b37681 2019-02-07 stsp #include <string.h>
75 74b37681 2019-02-07 stsp #include <time.h>
76 74b37681 2019-02-07 stsp #include <unistd.h>
78 c03c6cb3 2019-02-08 stsp #include "got_error.h"
79 c03c6cb3 2019-02-08 stsp #include "got_opentemp.h"
80 c03c6cb3 2019-02-08 stsp #include "got_object.h"
82 c03c6cb3 2019-02-08 stsp #include "buf.h"
83 c03c6cb3 2019-02-08 stsp #include "rcsutil.h"
84 c03c6cb3 2019-02-08 stsp #include "got_lib_diff.h"
86 0d26ce36 2019-02-08 stsp #ifndef nitems
87 0d26ce36 2019-02-08 stsp #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
90 74b37681 2019-02-07 stsp /* diff3 - 3-way differential file comparison */
92 74b37681 2019-02-07 stsp /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
94 74b37681 2019-02-07 stsp * d13 = diff report on f1 vs f3
95 74b37681 2019-02-07 stsp * d23 = diff report on f2 vs f3
96 74b37681 2019-02-07 stsp * f1, f2, f3 the 3 files
97 74b37681 2019-02-07 stsp * if changes in f1 overlap with changes in f3, m1 and m3 are used
98 74b37681 2019-02-07 stsp * to mark the overlaps; otherwise, the file names f1 and f3 are used
99 74b37681 2019-02-07 stsp * (only for options E and X).
103 74b37681 2019-02-07 stsp * "from" is first in range of changed lines; "to" is last+1
104 74b37681 2019-02-07 stsp * from=to=line after point of insertion for added lines.
106 b2338eff 2019-10-09 stsp struct line_range {
111 b2338eff 2019-10-09 stsp struct off_range {
112 b2338eff 2019-10-09 stsp off_t from;
116 74b37681 2019-02-07 stsp struct diff {
117 b2338eff 2019-10-09 stsp struct line_range old;
118 b2338eff 2019-10-09 stsp struct line_range new;
119 d136cfcb 2019-10-12 stsp struct off_range oldo;
120 b2338eff 2019-10-09 stsp struct off_range newo;
123 078e971d 2019-02-08 stsp struct diff3_state {
124 078e971d 2019-02-08 stsp size_t szchanges;
126 078e971d 2019-02-08 stsp struct diff *d13;
127 078e971d 2019-02-08 stsp struct diff *d23;
130 078e971d 2019-02-08 stsp * "de" is used to gather editing scripts. These are later spewed out
131 078e971d 2019-02-08 stsp * in reverse order. Its first element must be all zero, the "new"
132 d136cfcb 2019-10-12 stsp * component of "de" contains line positions, and "oldo" and "newo"
133 d136cfcb 2019-10-12 stsp * components contain byte positions.
134 b2338eff 2019-10-09 stsp * Array overlap indicates which sections in "de" correspond to lines
135 b2338eff 2019-10-09 stsp * that are different in all three files.
137 078e971d 2019-02-08 stsp struct diff *de;
138 078e971d 2019-02-08 stsp char *overlap;
139 078e971d 2019-02-08 stsp int overlapcnt;
140 078e971d 2019-02-08 stsp FILE *fp[3];
141 078e971d 2019-02-08 stsp int cline[3]; /* # of the last-read line in each file (0-2) */
144 078e971d 2019-02-08 stsp * the latest known correspondence between line numbers of the 3 files
145 078e971d 2019-02-08 stsp * is stored in last[1-3];
147 078e971d 2019-02-08 stsp int last[4];
148 f69721c3 2019-10-21 stsp char f1mark[PATH_MAX];
149 f69721c3 2019-10-21 stsp char f2mark[PATH_MAX];
150 f69721c3 2019-10-21 stsp char f3mark[PATH_MAX];
154 5176f942 2019-02-08 stsp BUF *diffbuf;
158 d136cfcb 2019-10-12 stsp static const struct got_error *duplicate(int *, int, struct line_range *,
159 b2338eff 2019-10-09 stsp struct line_range *, struct diff3_state *);
160 02b87977 2019-10-06 stsp static const struct got_error *edit(struct diff *, int, int *,
161 02b87977 2019-10-06 stsp struct diff3_state *);
162 02b87977 2019-10-06 stsp static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
163 02b87977 2019-10-06 stsp static const struct got_error *get_line(char **, FILE *, size_t *,
164 02b87977 2019-10-06 stsp struct diff3_state *);
165 74b37681 2019-02-07 stsp static int number(char **);
166 b90524b1 2019-02-08 stsp static const struct got_error *readin(size_t *, char *, struct diff **,
167 b90524b1 2019-02-08 stsp struct diff3_state *);
168 c03c6cb3 2019-02-08 stsp static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
169 88775814 2019-10-09 stsp static const struct got_error *skip(size_t *, int, int, struct diff3_state *);
170 180dce26 2019-10-06 stsp static const struct got_error *edscript(int, struct diff3_state *);
171 180dce26 2019-10-06 stsp static const struct got_error *merge(size_t, size_t, struct diff3_state *);
172 48b4f239 2021-12-31 thomas static const struct got_error *prange(struct line_range *,
173 48b4f239 2021-12-31 thomas 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 fdf3c2d3 2021-06-17 stsp diffreg(BUF **d, const char *path1, const char *path2,
201 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo)
203 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
204 c03c6cb3 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
205 c03c6cb3 2019-02-08 stsp char *outpath = NULL;
206 fe621944 2020-11-10 stsp struct got_diffreg_result *diffreg_result = NULL;
210 c56c5d8a 2021-12-31 thomas f1 = fopen(path1, "re");
211 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
212 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path1);
215 c56c5d8a 2021-12-31 thomas f2 = fopen(path2, "re");
216 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
217 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path2);
221 bb63914a 2020-02-17 stsp err = got_opentemp_named(&outpath, &outfile,
222 bb63914a 2020-02-17 stsp GOT_TMPDIR_STR "/got-diffreg");
226 24f136e0 2021-11-20 thomas err = got_diffreg(&diffreg_result, f1, f2, diff_algo, 0, 0);
230 24f136e0 2021-11-20 thomas if (diffreg_result) {
231 24f136e0 2021-11-20 thomas struct diff_result *diff_result = diffreg_result->result;
232 24f136e0 2021-11-20 thomas int atomizer_flags = (diff_result->left->atomizer_flags |
233 24f136e0 2021-11-20 thomas diff_result->right->atomizer_flags);
234 24f136e0 2021-11-20 thomas if ((atomizer_flags & DIFF_ATOMIZER_FOUND_BINARY_DATA)) {
235 24f136e0 2021-11-20 thomas err = got_error(GOT_ERR_FILE_BINARY);
236 24f136e0 2021-11-20 thomas goto done;
240 1cb46f00 2020-11-21 stsp err = got_diffreg_output(NULL, NULL, diffreg_result, 1, 1, "", "",
241 fe621944 2020-11-10 stsp GOT_DIFF_OUTPUT_EDSCRIPT, 0, outfile);
245 cbe7f848 2019-02-11 stsp if (fflush(outfile) != 0) {
246 638f9024 2019-05-13 stsp err = got_error_from_errno2("fflush", outpath);
249 db590691 2021-06-02 stsp if (fseek(outfile, 0L, SEEK_SET) == -1) {
250 db590691 2021-06-02 stsp err = got_ferror(outfile, GOT_ERR_IO);
254 db590691 2021-06-02 stsp err = buf_load(d, outfile);
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 56b63ca4 2021-01-22 stsp if (outfile && fclose(outfile) == EOF && err == NULL)
262 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
263 56b63ca4 2021-01-22 stsp if (f1 && fclose(f1) == EOF && err == NULL)
264 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
265 56b63ca4 2021-01-22 stsp if (f2 && fclose(f2) == EOF && 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 db590691 2021-06-02 stsp got_merge_diff3(int *overlapcnt, int outfd, FILE *f1, FILE *f2,
275 fdf3c2d3 2021-06-17 stsp FILE *f3, const char *label1, const char *label2, const char *label3,
276 fdf3c2d3 2021-06-17 stsp enum got_diff_algorithm diff_algo)
278 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
279 c03c6cb3 2019-02-08 stsp char *dp13, *dp23, *path1, *path2, *path3;
280 74b37681 2019-02-07 stsp BUF *b1, *b2, *b3, *d1, *d2, *diffb;
281 74b37681 2019-02-07 stsp u_char *data, *patch;
282 16aeacf7 2020-11-26 stsp size_t dlen, plen, i;
283 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 db590691 2021-06-02 stsp err = buf_load(&b1, f1);
298 db590691 2021-06-02 stsp err = buf_load(&b2, f2);
301 db590691 2021-06-02 stsp err = buf_load(&b3, f3);
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 fdf3c2d3 2021-06-17 stsp err = diffreg(&d1, path1, path3, diff_algo);
337 74b37681 2019-02-07 stsp buf_free(diffb);
338 74b37681 2019-02-07 stsp diffb = NULL;
342 fdf3c2d3 2021-06-17 stsp err = diffreg(&d2, path2, path3, diff_algo);
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 56b63ca4 2021-01-22 stsp if (d3s->fp[i] && fclose(d3s->fp[i]) == EOF && 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 c56c5d8a 2021-12-31 thomas if ((d3s->fp[0] = fopen(path1, "re")) == NULL)
464 c56c5d8a 2021-12-31 thomas return got_error_from_errno2("fopen", path1);
465 c56c5d8a 2021-12-31 thomas if ((d3s->fp[1] = fopen(path2, "re")) == NULL)
466 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path2);
467 c56c5d8a 2021-12-31 thomas if ((d3s->fp[2] = fopen(path3, "re")) == 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 461f6aed 2021-10-12 thomas if (lp->l_line[0] == ':') {
564 461f6aed 2021-10-12 thomas lp->l_line++;
565 461f6aed 2021-10-12 thomas lp->l_len--;
567 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
568 74b37681 2019-02-07 stsp TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
569 74b37681 2019-02-07 stsp lp, l_list);
572 74b37681 2019-02-07 stsp lp->l_lineno = start;
578 74b37681 2019-02-07 stsp * always resort lines as the markers might be put at the
579 74b37681 2019-02-07 stsp * same line as we first started editing.
581 74b37681 2019-02-07 stsp lineno = 0;
582 74b37681 2019-02-07 stsp TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
583 74b37681 2019-02-07 stsp sort->l_lineno = lineno++;
584 74b37681 2019-02-07 stsp dlines->l_nblines = lineno - 1;
587 74b37681 2019-02-07 stsp return (0);
591 74b37681 2019-02-07 stsp * Pick up the line numbers of all changes from one change file.
592 74b37681 2019-02-07 stsp * (This puts the numbers in a vector, which is not strictly necessary,
593 74b37681 2019-02-07 stsp * since the vector is processed in one sequential pass.
594 74b37681 2019-02-07 stsp * The vector could be optimized out of existence)
596 b90524b1 2019-02-08 stsp static const struct got_error *
597 b90524b1 2019-02-08 stsp readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
599 b90524b1 2019-02-08 stsp const struct got_error *err = NULL;
601 74b37681 2019-02-07 stsp int a, b, c, d;
602 74b37681 2019-02-07 stsp char kind, *p;
603 937e0e58 2019-10-21 stsp size_t i = 0;
607 c56c5d8a 2021-12-31 thomas f = fopen(name, "re");
608 971405a7 2019-10-09 stsp if (f == NULL)
609 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", name);
610 971405a7 2019-10-09 stsp err = getchange(&p, f, d3s);
613 02b87977 2019-10-06 stsp for (i = 0; p; i++) {
614 b90524b1 2019-02-08 stsp if (i >= d3s->szchanges - 1) {
615 b90524b1 2019-02-08 stsp err = increase(d3s);
619 74b37681 2019-02-07 stsp a = b = number(&p);
620 74b37681 2019-02-07 stsp if (*p == ',') {
622 74b37681 2019-02-07 stsp b = number(&p);
624 74b37681 2019-02-07 stsp kind = *p++;
625 74b37681 2019-02-07 stsp c = d = number(&p);
626 e19660d5 2019-10-06 stsp if (*p == ',') {
628 74b37681 2019-02-07 stsp d = number(&p);
630 74b37681 2019-02-07 stsp if (kind == 'a')
632 74b37681 2019-02-07 stsp if (kind == 'd')
636 74b37681 2019-02-07 stsp (*dd)[i].old.from = a;
637 74b37681 2019-02-07 stsp (*dd)[i].old.to = b;
638 74b37681 2019-02-07 stsp (*dd)[i].new.from = c;
639 74b37681 2019-02-07 stsp (*dd)[i].new.to = d;
641 971405a7 2019-10-09 stsp err = getchange(&p, f, d3s);
647 e19660d5 2019-10-06 stsp (*dd)[i].old.from = (*dd)[i - 1].old.to;
648 e19660d5 2019-10-06 stsp (*dd)[i].new.from = (*dd)[i - 1].new.to;
651 56b63ca4 2021-01-22 stsp if (fclose(f) == EOF && err == NULL)
652 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
653 e4531130 2019-10-09 stsp if (err == NULL)
655 fb43ecf1 2019-02-11 stsp return err;
659 74b37681 2019-02-07 stsp number(char **lc)
664 74b37681 2019-02-07 stsp while (isdigit((unsigned char)(**lc)))
665 74b37681 2019-02-07 stsp nn = nn*10 + *(*lc)++ - '0';
667 74b37681 2019-02-07 stsp return (nn);
670 02b87977 2019-10-06 stsp static const struct got_error *
671 02b87977 2019-10-06 stsp getchange(char **line, FILE *b, struct diff3_state *d3s)
673 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
675 02b87977 2019-10-06 stsp *line = NULL;
677 02b87977 2019-10-06 stsp if (*line && isdigit((unsigned char)(*line)[0]))
678 02b87977 2019-10-06 stsp return NULL;
679 02b87977 2019-10-06 stsp err = get_line(line, b, NULL, d3s);
681 02b87977 2019-10-06 stsp return err;
682 02b87977 2019-10-06 stsp } while (*line);
684 02b87977 2019-10-06 stsp return NULL;
687 02b87977 2019-10-06 stsp static const struct got_error *
688 02b87977 2019-10-06 stsp get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
690 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
691 6dea73df 2019-09-23 stsp char *cp = NULL;
692 500467ff 2019-09-25 hiltjo size_t size;
693 500467ff 2019-09-25 hiltjo ssize_t len;
696 02b87977 2019-10-06 stsp *ret = NULL;
697 8e831ff1 2021-10-17 thomas if (n != NULL)
700 6dea73df 2019-09-23 stsp len = getline(&cp, &size, b);
701 02b87977 2019-10-06 stsp if (len == -1) {
702 02b87977 2019-10-06 stsp if (ferror(b))
703 02b87977 2019-10-06 stsp err = got_error_from_errno("getline");
707 6dea73df 2019-09-23 stsp if (cp[len - 1] != '\n') {
709 6dea73df 2019-09-23 stsp if (len + 1 > size) {
710 6dea73df 2019-09-23 stsp new = realloc(cp, len + 1);
711 02b87977 2019-10-06 stsp if (new == NULL) {
712 02b87977 2019-10-06 stsp err = got_error_from_errno("realloc");
717 6dea73df 2019-09-23 stsp cp[len - 1] = '\n';
718 6dea73df 2019-09-23 stsp cp[len] = '\0';
721 6dea73df 2019-09-23 stsp free(d3s->buf);
722 02b87977 2019-10-06 stsp *ret = d3s->buf = cp;
724 74b37681 2019-02-07 stsp if (n != NULL)
728 02b87977 2019-10-06 stsp return err;
731 180dce26 2019-10-06 stsp static const struct got_error *
732 078e971d 2019-02-08 stsp merge(size_t m1, size_t m2, struct diff3_state *d3s)
734 180dce26 2019-10-06 stsp const struct got_error *err = NULL;
735 18b9ebab 2019-10-06 stsp struct diff *d1, *d2;
736 74b37681 2019-02-07 stsp int dpl, j, t1, t2;
738 078e971d 2019-02-08 stsp d1 = d3s->d13;
739 078e971d 2019-02-08 stsp d2 = d3s->d23;
742 078e971d 2019-02-08 stsp t1 = (d1 < d3s->d13 + m1);
743 078e971d 2019-02-08 stsp t2 = (d2 < d3s->d23 + m2);
744 74b37681 2019-02-07 stsp if (!t1 && !t2)
747 74b37681 2019-02-07 stsp /* first file is different from others */
748 74b37681 2019-02-07 stsp if (!t2 || (t1 && d1->new.to < d2->new.from)) {
749 74b37681 2019-02-07 stsp /* stuff peculiar to 1st file */
754 74b37681 2019-02-07 stsp /* second file is different from others */
755 74b37681 2019-02-07 stsp if (!t1 || (t2 && d2->new.to < d1->new.from)) {
761 74b37681 2019-02-07 stsp * Merge overlapping changes in first file
762 74b37681 2019-02-07 stsp * this happens after extension (see below).
764 078e971d 2019-02-08 stsp if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
765 74b37681 2019-02-07 stsp d1[1].old.from = d1->old.from;
766 74b37681 2019-02-07 stsp d1[1].new.from = d1->new.from;
771 74b37681 2019-02-07 stsp /* merge overlapping changes in second */
772 078e971d 2019-02-08 stsp if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
773 74b37681 2019-02-07 stsp d2[1].old.from = d2->old.from;
774 74b37681 2019-02-07 stsp d2[1].new.from = d2->new.from;
778 74b37681 2019-02-07 stsp /* stuff peculiar to third file or different in all */
779 74b37681 2019-02-07 stsp if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
780 d136cfcb 2019-10-12 stsp err = duplicate(&dpl, j, &d1->old, &d2->old, d3s);
782 180dce26 2019-10-06 stsp return err;
785 74b37681 2019-02-07 stsp * dpl = 0 means all files differ
786 74b37681 2019-02-07 stsp * dpl = 1 means files 1 and 2 identical
788 18b9ebab 2019-10-06 stsp err = edit(d1, dpl, &j, d3s);
790 18b9ebab 2019-10-06 stsp return err;
797 74b37681 2019-02-07 stsp * Overlapping changes from file 1 and 2; extend changes
798 74b37681 2019-02-07 stsp * appropriately to make them coincide.
800 74b37681 2019-02-07 stsp if (d1->new.from < d2->new.from) {
801 e19660d5 2019-10-06 stsp d2->old.from -= d2->new.from - d1->new.from;
802 74b37681 2019-02-07 stsp d2->new.from = d1->new.from;
803 74b37681 2019-02-07 stsp } else if (d2->new.from < d1->new.from) {
804 e19660d5 2019-10-06 stsp d1->old.from -= d1->new.from - d2->new.from;
805 74b37681 2019-02-07 stsp d1->new.from = d2->new.from;
807 74b37681 2019-02-07 stsp if (d1->new.to > d2->new.to) {
808 74b37681 2019-02-07 stsp d2->old.to += d1->new.to - d2->new.to;
809 74b37681 2019-02-07 stsp d2->new.to = d1->new.to;
810 74b37681 2019-02-07 stsp } else if (d2->new.to > d1->new.to) {
811 74b37681 2019-02-07 stsp d1->old.to += d2->new.to - d1->new.to;
812 74b37681 2019-02-07 stsp d1->new.to = d2->new.to;
816 078e971d 2019-02-08 stsp return (edscript(j, d3s));
820 74b37681 2019-02-07 stsp * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
822 ce09ab8d 2019-10-06 stsp static const struct got_error *
823 b2338eff 2019-10-09 stsp prange(struct line_range *rold, struct diff3_state *d3s)
825 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
827 ce09ab8d 2019-10-06 stsp if (rold->to <= rold->from) {
828 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
830 ce09ab8d 2019-10-06 stsp return err;
832 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%d", rold->from);
834 ce09ab8d 2019-10-06 stsp return err;
835 ce09ab8d 2019-10-06 stsp if (rold->to > rold->from + 1) {
836 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
838 ce09ab8d 2019-10-06 stsp return err;
840 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "c\n");
842 ce09ab8d 2019-10-06 stsp return err;
845 ce09ab8d 2019-10-06 stsp return NULL;
849 88775814 2019-10-09 stsp * Skip to just before line number from in file "i".
850 88775814 2019-10-09 stsp * Return the number of bytes skipped in *nskipped.
852 02b87977 2019-10-06 stsp static const struct got_error *
853 88775814 2019-10-09 stsp skip(size_t *nskipped, int i, int from, struct diff3_state *d3s)
855 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
856 9d4a5e89 2019-10-09 stsp size_t len, n;
857 74b37681 2019-02-07 stsp char *line;
859 02b87977 2019-10-06 stsp *nskipped = 0;
860 9d4a5e89 2019-10-09 stsp for (n = 0; d3s->cline[i] < from - 1; n += len) {
861 9d4a5e89 2019-10-09 stsp err = get_line(&line, d3s->fp[i], &len, d3s);
863 02b87977 2019-10-06 stsp return err;
864 078e971d 2019-02-08 stsp d3s->cline[i]++;
866 02b87977 2019-10-06 stsp *nskipped = n;
867 02b87977 2019-10-06 stsp return NULL;
871 180dce26 2019-10-06 stsp * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
872 74b37681 2019-02-07 stsp * the same data as the new range (in file 2).
874 d136cfcb 2019-10-12 stsp * If this change could overlap, remember start/end offsets in file 2 so we
875 d136cfcb 2019-10-12 stsp * can write out the original lines of text if a merge conflict occurs.
877 180dce26 2019-10-06 stsp static const struct got_error *
878 d136cfcb 2019-10-12 stsp duplicate(int *dpl, int j, struct line_range *r1, struct line_range *r2,
879 b2338eff 2019-10-09 stsp struct diff3_state *d3s)
881 f571bb85 2019-10-06 stsp const struct got_error *err = NULL;
885 88775814 2019-10-09 stsp size_t nskipped;
890 e19660d5 2019-10-06 stsp if (r1->to - r1->from != r2->to - r2->from)
891 180dce26 2019-10-06 stsp return NULL;
893 50351dee 2019-10-09 stsp err = skip(&nskipped, 0, r1->from, d3s);
895 02b87977 2019-10-06 stsp return err;
896 50351dee 2019-10-09 stsp err = skip(&nskipped, 1, r2->from, d3s);
898 02b87977 2019-10-06 stsp return err;
900 d136cfcb 2019-10-12 stsp off = ftello(d3s->fp[1]);
901 d136cfcb 2019-10-12 stsp if (off == -1)
902 d136cfcb 2019-10-12 stsp return got_error_from_errno("ftello");
903 d136cfcb 2019-10-12 stsp d3s->de[j + 1].oldo.from = off; /* original lines start here */
906 e19660d5 2019-10-06 stsp for (nline = 0; nline < r1->to - r1->from; nline++) {
908 078e971d 2019-02-08 stsp c = getc(d3s->fp[0]);
909 078e971d 2019-02-08 stsp d = getc(d3s->fp[1]);
910 1fee9f40 2021-04-13 stsp if (c == EOF && d == EOF)
912 1fee9f40 2021-04-13 stsp else if (c == EOF)
913 1fee9f40 2021-04-13 stsp return got_ferror(d3s->fp[0], GOT_ERR_EOF);
914 1fee9f40 2021-04-13 stsp else if (d == EOF)
915 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[1], GOT_ERR_EOF);
917 d136cfcb 2019-10-12 stsp if (c != d) {
918 d136cfcb 2019-10-12 stsp long orig_line_len = nchar;
919 d136cfcb 2019-10-12 stsp while (d != '\n') {
920 d136cfcb 2019-10-12 stsp d = getc(d3s->fp[1]);
921 d136cfcb 2019-10-12 stsp if (d == EOF)
923 d136cfcb 2019-10-12 stsp orig_line_len++;
925 d136cfcb 2019-10-12 stsp if (orig_line_len > nchar &&
926 d136cfcb 2019-10-12 stsp fseek(d3s->fp[1], -(orig_line_len - nchar),
927 d136cfcb 2019-10-12 stsp SEEK_CUR) == -1)
928 d136cfcb 2019-10-12 stsp return got_ferror(d3s->fp[1],
929 d136cfcb 2019-10-12 stsp GOT_ERR_IO);
930 abc59930 2021-09-05 naddy /* original lines end here */
931 d136cfcb 2019-10-12 stsp d3s->de[j + 1].oldo.to = off + orig_line_len;
932 d136cfcb 2019-10-12 stsp err = repos(nchar, d3s);
934 d136cfcb 2019-10-12 stsp return err;
935 d136cfcb 2019-10-12 stsp return NULL;
937 74b37681 2019-02-07 stsp } while (c != '\n');
940 d27f8617 2021-10-17 thomas /* original lines end here */
941 d27f8617 2021-10-17 thomas d3s->de[j + 1].oldo.to = off + nchar;
943 f571bb85 2019-10-06 stsp err = repos(nchar, d3s);
945 f571bb85 2019-10-06 stsp return err;
947 180dce26 2019-10-06 stsp return NULL;
950 f571bb85 2019-10-06 stsp static const struct got_error *
951 078e971d 2019-02-08 stsp repos(int nchar, struct diff3_state *d3s)
955 f571bb85 2019-10-06 stsp for (i = 0; i < 2; i++) {
956 f571bb85 2019-10-06 stsp if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
957 f571bb85 2019-10-06 stsp return got_ferror(d3s->fp[i], GOT_ERR_IO);
960 f571bb85 2019-10-06 stsp return NULL;
964 74b37681 2019-02-07 stsp * collect an editing script for later regurgitation
966 02b87977 2019-10-06 stsp static const struct got_error *
967 02b87977 2019-10-06 stsp edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
969 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
970 88775814 2019-10-09 stsp size_t nskipped;
972 18b9ebab 2019-10-06 stsp if (((fdup + 1) & 3) == 0)
973 02b87977 2019-10-06 stsp return NULL;
975 02b87977 2019-10-06 stsp d3s->overlap[*j] = !fdup;
977 078e971d 2019-02-08 stsp d3s->overlapcnt++;
978 02b87977 2019-10-06 stsp d3s->de[*j].old.from = diff->old.from;
979 02b87977 2019-10-06 stsp d3s->de[*j].old.to = diff->old.to;
981 50351dee 2019-10-09 stsp err = skip(&nskipped, 2, diff->new.from, d3s);
983 02b87977 2019-10-06 stsp return err;
984 b2338eff 2019-10-09 stsp d3s->de[*j].newo.from = d3s->de[*j - 1].newo.to + nskipped;
986 50351dee 2019-10-09 stsp err = skip(&nskipped, 2, diff->new.to, d3s);
988 b2338eff 2019-10-09 stsp return err;
989 b2338eff 2019-10-09 stsp d3s->de[*j].newo.to = d3s->de[*j].newo.from + nskipped;
990 02b87977 2019-10-06 stsp return NULL;
993 74b37681 2019-02-07 stsp /* regurgitate */
994 180dce26 2019-10-06 stsp static const struct got_error *
995 078e971d 2019-02-08 stsp edscript(int n, struct diff3_state *d3s)
997 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
998 461f6aed 2021-10-12 thomas off_t len;
999 461f6aed 2021-10-12 thomas char *line = NULL;
1000 461f6aed 2021-10-12 thomas size_t linesize = 0;
1001 b6c8e5e0 2021-10-12 thomas ssize_t linelen = 0, k;
1003 74b37681 2019-02-07 stsp for (; n > 0; n--) {
1004 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
1005 ce09ab8d 2019-10-06 stsp err = prange(&d3s->de[n].old, d3s);
1007 ce09ab8d 2019-10-06 stsp return err;
1008 d136cfcb 2019-10-12 stsp } else if (d3s->de[n].oldo.from < d3s->de[n].oldo.to) {
1009 d136cfcb 2019-10-12 stsp /* Output a block of 3-way diff base file content. */
1010 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, "%da\n:%s\n",
1011 f69721c3 2019-10-21 stsp d3s->de[n].old.to - 1, d3s->f2mark);
1013 d136cfcb 2019-10-12 stsp return err;
1014 d136cfcb 2019-10-12 stsp if (fseeko(d3s->fp[1], d3s->de[n].oldo.from, SEEK_SET)
1016 d136cfcb 2019-10-12 stsp return got_error_from_errno("fseeko");
1017 461f6aed 2021-10-12 thomas len = (d3s->de[n].oldo.to - d3s->de[n].oldo.from);
1018 461f6aed 2021-10-12 thomas for (k = 0; k < (ssize_t)len; k += linelen) {
1019 461f6aed 2021-10-12 thomas linelen = getline(&line, &linesize, d3s->fp[1]);
1020 461f6aed 2021-10-12 thomas if (linelen == -1) {
1021 21c17f12 2020-06-26 stsp if (feof(d3s->fp[1]))
1023 461f6aed 2021-10-12 thomas err = got_ferror(d3s->fp[1],
1024 d136cfcb 2019-10-12 stsp GOT_ERR_IO);
1025 461f6aed 2021-10-12 thomas goto done;
1027 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, ":%s", line);
1029 461f6aed 2021-10-12 thomas goto done;
1031 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, "%s%s\n",
1032 b6c8e5e0 2021-10-12 thomas linelen > 0 && line[linelen] == '\n' ? ":" : "",
1033 d136cfcb 2019-10-12 stsp GOT_DIFF_CONFLICT_MARKER_SEP);
1035 461f6aed 2021-10-12 thomas goto done;
1037 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, "%da\n:%s\n",
1038 01a44956 2019-03-27 stsp d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
1040 461f6aed 2021-10-12 thomas goto done;
1042 b2338eff 2019-10-09 stsp if (fseeko(d3s->fp[2], d3s->de[n].newo.from, SEEK_SET)
1043 461f6aed 2021-10-12 thomas == -1) {
1044 461f6aed 2021-10-12 thomas err = got_error_from_errno("fseek");
1045 461f6aed 2021-10-12 thomas goto done;
1047 461f6aed 2021-10-12 thomas len = (d3s->de[n].newo.to - d3s->de[n].newo.from);
1048 461f6aed 2021-10-12 thomas for (k = 0; k < (ssize_t)len; k += linelen) {
1049 461f6aed 2021-10-12 thomas linelen = getline(&line, &linesize, d3s->fp[2]);
1050 461f6aed 2021-10-12 thomas if (linelen == -1) {
1051 21c17f12 2020-06-26 stsp if (feof(d3s->fp[2]))
1053 461f6aed 2021-10-12 thomas err = got_ferror(d3s->fp[2], GOT_ERR_IO);
1054 461f6aed 2021-10-12 thomas goto done;
1056 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, ":%s", line);
1058 461f6aed 2021-10-12 thomas goto done;
1061 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
1062 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ".\n");
1064 461f6aed 2021-10-12 thomas goto done;
1066 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, "%s%s\n.\n",
1067 3c7939fe 2021-10-17 thomas linelen > 0 && line[linelen] == '\n' ? ":" : "",
1068 461f6aed 2021-10-12 thomas d3s->f3mark);
1070 461f6aed 2021-10-12 thomas goto done;
1071 461f6aed 2021-10-12 thomas err = diff_output(d3s->diffbuf, "%da\n:%s\n.\n",
1072 5176f942 2019-02-08 stsp d3s->de[n].old.from - 1, d3s->f1mark);
1074 461f6aed 2021-10-12 thomas goto done;
1078 461f6aed 2021-10-12 thomas free(line);
1079 461f6aed 2021-10-12 thomas return err;
1082 c03c6cb3 2019-02-08 stsp static const struct got_error *
1083 078e971d 2019-02-08 stsp increase(struct diff3_state *d3s)
1085 74b37681 2019-02-07 stsp size_t newsz, incr;
1086 c03c6cb3 2019-02-08 stsp struct diff *d;
1089 74b37681 2019-02-07 stsp /* are the memset(3) calls needed? */
1090 078e971d 2019-02-08 stsp newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
1091 078e971d 2019-02-08 stsp incr = newsz - d3s->szchanges;
1093 078e971d 2019-02-08 stsp d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
1094 c03c6cb3 2019-02-08 stsp if (d == NULL)
1095 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1096 078e971d 2019-02-08 stsp d3s->d13 = d;
1097 078e971d 2019-02-08 stsp memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
1099 078e971d 2019-02-08 stsp d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
1100 c03c6cb3 2019-02-08 stsp if (d == NULL)
1101 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1102 078e971d 2019-02-08 stsp d3s->d23 = d;
1103 078e971d 2019-02-08 stsp memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1105 078e971d 2019-02-08 stsp d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1106 c03c6cb3 2019-02-08 stsp if (d == NULL)
1107 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1108 078e971d 2019-02-08 stsp d3s->de = d;
1109 078e971d 2019-02-08 stsp memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1111 078e971d 2019-02-08 stsp s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1112 c03c6cb3 2019-02-08 stsp if (s == NULL)
1113 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1114 078e971d 2019-02-08 stsp d3s->overlap = s;
1115 078e971d 2019-02-08 stsp memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1116 078e971d 2019-02-08 stsp d3s->szchanges = newsz;
1118 c03c6cb3 2019-02-08 stsp return NULL;
