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];
143 078e971d 2019-02-08 stsp char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
147 5176f942 2019-02-08 stsp BUF *diffbuf;
151 180dce26 2019-10-06 stsp static const struct got_error *duplicate(int *, struct range *, struct range *,
152 180dce26 2019-10-06 stsp struct diff3_state *);
153 02b87977 2019-10-06 stsp static const struct got_error *edit(struct diff *, int, int *,
154 02b87977 2019-10-06 stsp struct diff3_state *);
155 02b87977 2019-10-06 stsp static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
156 02b87977 2019-10-06 stsp static const struct got_error *get_line(char **, FILE *, size_t *,
157 02b87977 2019-10-06 stsp 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 02b87977 2019-10-06 stsp static const struct got_error *skip(int *, int, int, char *,
163 02b87977 2019-10-06 stsp struct diff3_state *);
164 180dce26 2019-10-06 stsp static const struct got_error *edscript(int, struct diff3_state *);
165 180dce26 2019-10-06 stsp static const struct got_error *merge(size_t, size_t, struct diff3_state *);
166 ce09ab8d 2019-10-06 stsp static const struct got_error *prange(struct range *, struct diff3_state *);
167 f571bb85 2019-10-06 stsp static const struct got_error *repos(int, struct diff3_state *);
168 078e971d 2019-02-08 stsp static const struct got_error *increase(struct diff3_state *);
169 c03c6cb3 2019-02-08 stsp static const struct got_error *diff3_internal(char *, char *, char *,
170 a551f215 2019-02-08 stsp char *, char *, const char *, const char *, struct diff3_state *,
171 a551f215 2019-02-08 stsp const char *, const char *);
173 c03c6cb3 2019-02-08 stsp static const struct got_error *
174 5176f942 2019-02-08 stsp diff_output(BUF *diffbuf, const char *fmt, ...)
176 c03c6cb3 2019-02-08 stsp va_list vap;
179 c03c6cb3 2019-02-08 stsp size_t newsize;
181 c03c6cb3 2019-02-08 stsp va_start(vap, fmt);
182 c03c6cb3 2019-02-08 stsp i = vasprintf(&str, fmt, vap);
183 c03c6cb3 2019-02-08 stsp va_end(vap);
184 c03c6cb3 2019-02-08 stsp if (i == -1)
185 638f9024 2019-05-13 stsp return got_error_from_errno("vasprintf");
186 5176f942 2019-02-08 stsp buf_append(&newsize, diffbuf, str, strlen(str));
188 c03c6cb3 2019-02-08 stsp return NULL;
191 c03c6cb3 2019-02-08 stsp static const struct got_error*
192 c03c6cb3 2019-02-08 stsp diffreg(BUF **d, const char *path1, const char *path2)
194 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
195 c03c6cb3 2019-02-08 stsp FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
196 c03c6cb3 2019-02-08 stsp char *outpath = NULL;
197 c03c6cb3 2019-02-08 stsp struct got_diff_state ds;
198 c03c6cb3 2019-02-08 stsp struct got_diff_args args;
203 c03c6cb3 2019-02-08 stsp f1 = fopen(path1, "r");
204 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
205 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path1);
208 c03c6cb3 2019-02-08 stsp f2 = fopen(path2, "r");
209 c03c6cb3 2019-02-08 stsp if (f1 == NULL) {
210 638f9024 2019-05-13 stsp err = got_error_from_errno2("fopen", path2);
214 a551f215 2019-02-08 stsp err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
218 c03c6cb3 2019-02-08 stsp memset(&ds, 0, sizeof(ds));
219 c03c6cb3 2019-02-08 stsp /* XXX should stat buffers be passed in args instead of ds? */
220 c03c6cb3 2019-02-08 stsp if (stat(path1, &ds.stb1) == -1) {
221 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path1);
224 c03c6cb3 2019-02-08 stsp if (stat(path2, &ds.stb2) == -1) {
225 638f9024 2019-05-13 stsp err = got_error_from_errno2("stat", path2);
229 c03c6cb3 2019-02-08 stsp memset(&args, 0, sizeof(args));
230 c03c6cb3 2019-02-08 stsp args.diff_format = D_NORMAL;
231 c03c6cb3 2019-02-08 stsp args.label[0] = "";
232 c03c6cb3 2019-02-08 stsp args.label[1] = "";
233 c03c6cb3 2019-02-08 stsp args.diff_context = 0;
235 c03c6cb3 2019-02-08 stsp err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
236 c03c6cb3 2019-02-08 stsp outfile, NULL);
240 cbe7f848 2019-02-11 stsp if (fflush(outfile) != 0) {
241 638f9024 2019-05-13 stsp err = got_error_from_errno2("fflush", outpath);
245 c03c6cb3 2019-02-08 stsp *d = buf_load(outpath);
246 c03c6cb3 2019-02-08 stsp if (*d == NULL)
247 638f9024 2019-05-13 stsp err = got_error_from_errno("buf_load");
249 a551f215 2019-02-08 stsp if (outpath) {
250 a551f215 2019-02-08 stsp unlink(outpath);
251 a551f215 2019-02-08 stsp free(outpath);
253 fb43ecf1 2019-02-11 stsp if (outfile && fclose(outfile) != 0 && err == NULL)
254 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
255 fb43ecf1 2019-02-11 stsp if (f1 && fclose(f1) != 0 && err == NULL)
256 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
257 fb43ecf1 2019-02-11 stsp if (f2 && fclose(f2) != 0 && err == NULL)
258 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
259 c03c6cb3 2019-02-08 stsp return err;
263 74b37681 2019-02-07 stsp * For merge(1).
265 c03c6cb3 2019-02-08 stsp const struct got_error *
266 57ee5d50 2019-02-08 stsp got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
267 57ee5d50 2019-02-08 stsp const char *p3, const char *label1, const char *label3)
269 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
270 c03c6cb3 2019-02-08 stsp char *dp13, *dp23, *path1, *path2, *path3;
271 74b37681 2019-02-07 stsp BUF *b1, *b2, *b3, *d1, *d2, *diffb;
272 74b37681 2019-02-07 stsp u_char *data, *patch;
273 74b37681 2019-02-07 stsp size_t dlen, plen;
274 c03c6cb3 2019-02-08 stsp struct wklhead temp_files;
275 078e971d 2019-02-08 stsp struct diff3_state *d3s;
278 57ee5d50 2019-02-08 stsp *overlapcnt = 0;
280 5d731149 2019-02-08 stsp SLIST_INIT(&temp_files);
282 078e971d 2019-02-08 stsp d3s = calloc(1, sizeof(*d3s));
283 078e971d 2019-02-08 stsp if (d3s == NULL)
284 638f9024 2019-05-13 stsp return got_error_from_errno("calloc");
286 74b37681 2019-02-07 stsp b1 = b2 = b3 = d1 = d2 = diffb = NULL;
287 74b37681 2019-02-07 stsp dp13 = dp23 = path1 = path2 = path3 = NULL;
288 74b37681 2019-02-07 stsp data = patch = NULL;
290 0ec6f014 2019-02-08 stsp if ((b1 = buf_load(p1)) == NULL)
292 0ec6f014 2019-02-08 stsp if ((b2 = buf_load(p2)) == NULL)
294 0ec6f014 2019-02-08 stsp if ((b3 = buf_load(p3)) == NULL)
297 74b37681 2019-02-07 stsp diffb = buf_alloc(128);
299 c03c6cb3 2019-02-08 stsp if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
300 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
303 c03c6cb3 2019-02-08 stsp if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
304 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
307 c03c6cb3 2019-02-08 stsp if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
308 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
312 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b1, path1, &temp_files);
315 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b2, path2, &temp_files);
318 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(b3, path3, &temp_files);
322 74b37681 2019-02-07 stsp buf_free(b2);
325 c03c6cb3 2019-02-08 stsp err = diffreg(&d1, path1, path3);
327 74b37681 2019-02-07 stsp buf_free(diffb);
328 74b37681 2019-02-07 stsp diffb = NULL;
332 c03c6cb3 2019-02-08 stsp err = diffreg(&d2, path2, path3);
334 c03c6cb3 2019-02-08 stsp buf_free(diffb);
335 c03c6cb3 2019-02-08 stsp diffb = NULL;
339 c03c6cb3 2019-02-08 stsp if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
340 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
343 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(d1, dp13, &temp_files);
347 74b37681 2019-02-07 stsp buf_free(d1);
350 c03c6cb3 2019-02-08 stsp if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
351 638f9024 2019-05-13 stsp err = got_error_from_errno("asprintf");
354 c03c6cb3 2019-02-08 stsp err = buf_write_stmp(d2, dp23, &temp_files);
358 74b37681 2019-02-07 stsp buf_free(d2);
361 5176f942 2019-02-08 stsp d3s->diffbuf = diffb;
362 a551f215 2019-02-08 stsp err = diff3_internal(dp13, dp23, path1, path2, path3,
363 a551f215 2019-02-08 stsp label1, label3, d3s, label1, label3);
365 74b37681 2019-02-07 stsp buf_free(diffb);
366 74b37681 2019-02-07 stsp diffb = NULL;
370 74b37681 2019-02-07 stsp plen = buf_len(diffb);
371 74b37681 2019-02-07 stsp patch = buf_release(diffb);
372 74b37681 2019-02-07 stsp dlen = buf_len(b1);
373 74b37681 2019-02-07 stsp data = buf_release(b1);
375 5a3ad9e0 2019-02-08 stsp diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
377 74b37681 2019-02-07 stsp buf_free(b2);
378 74b37681 2019-02-07 stsp buf_free(b3);
379 74b37681 2019-02-07 stsp buf_free(d1);
380 74b37681 2019-02-07 stsp buf_free(d2);
382 74b37681 2019-02-07 stsp (void)unlink(path1);
383 74b37681 2019-02-07 stsp (void)unlink(path2);
384 74b37681 2019-02-07 stsp (void)unlink(path3);
385 74b37681 2019-02-07 stsp (void)unlink(dp13);
386 74b37681 2019-02-07 stsp (void)unlink(dp23);
388 74b37681 2019-02-07 stsp free(path1);
389 74b37681 2019-02-07 stsp free(path2);
390 74b37681 2019-02-07 stsp free(path3);
391 74b37681 2019-02-07 stsp free(dp13);
392 74b37681 2019-02-07 stsp free(dp23);
393 74b37681 2019-02-07 stsp free(data);
394 74b37681 2019-02-07 stsp free(patch);
396 c03c6cb3 2019-02-08 stsp worklist_clean(&temp_files, worklist_unlink);
398 0d26ce36 2019-02-08 stsp for (i = 0; i < nitems(d3s->fp); i++) {
399 fb43ecf1 2019-02-11 stsp if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
400 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
402 5a3ad9e0 2019-02-08 stsp if (err == NULL && diffb) {
403 62f59172 2019-02-08 stsp if (buf_write_fd(diffb, outfd) < 0)
404 638f9024 2019-05-13 stsp err = got_error_from_errno("buf_write_fd");
405 57ee5d50 2019-02-08 stsp *overlapcnt = d3s->overlapcnt;
408 62f59172 2019-02-08 stsp buf_free(diffb);
409 c03c6cb3 2019-02-08 stsp return err;
412 c03c6cb3 2019-02-08 stsp static const struct got_error *
413 c03c6cb3 2019-02-08 stsp diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
414 a551f215 2019-02-08 stsp const char *fmark, const char *rmark, struct diff3_state *d3s,
415 a551f215 2019-02-08 stsp const char *label1, const char *label3)
417 c03c6cb3 2019-02-08 stsp const struct got_error *err = NULL;
418 74b37681 2019-02-07 stsp ssize_t m, n;
421 01a44956 2019-03-27 stsp i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
422 01a44956 2019-03-27 stsp "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
423 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f1mark))
424 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
426 01a44956 2019-03-27 stsp i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
427 01a44956 2019-03-27 stsp "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
428 078e971d 2019-02-08 stsp if (i < 0 || i >= (int)sizeof(d3s->f3mark))
429 c03c6cb3 2019-02-08 stsp return got_error(GOT_ERR_NO_SPACE);
431 078e971d 2019-02-08 stsp err = increase(d3s);
433 c03c6cb3 2019-02-08 stsp return err;
435 b90524b1 2019-02-08 stsp err = readin(&m, dp13, &d3s->d13, d3s);
437 b90524b1 2019-02-08 stsp return err;
438 b90524b1 2019-02-08 stsp err = readin(&n, dp23, &d3s->d23, d3s);
440 b90524b1 2019-02-08 stsp return err;
442 078e971d 2019-02-08 stsp if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
443 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path1);
444 078e971d 2019-02-08 stsp if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
445 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path2);
446 078e971d 2019-02-08 stsp if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
447 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", path3);
449 180dce26 2019-10-06 stsp return merge(m, n, d3s);
453 74b37681 2019-02-07 stsp ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
455 74b37681 2019-02-07 stsp char op, *ep;
456 74b37681 2019-02-07 stsp struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
457 74b37681 2019-02-07 stsp int start, end, i, lineno;
458 74b37681 2019-02-07 stsp u_char tmp;
460 74b37681 2019-02-07 stsp dlp = TAILQ_FIRST(&(dlines->l_lines));
461 74b37681 2019-02-07 stsp lp = TAILQ_FIRST(&(plines->l_lines));
464 74b37681 2019-02-07 stsp for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
465 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list)) {
466 74b37681 2019-02-07 stsp /* Skip blank lines */
467 74b37681 2019-02-07 stsp if (lp->l_len < 2)
470 74b37681 2019-02-07 stsp /* NUL-terminate line buffer for strtol() safety. */
471 74b37681 2019-02-07 stsp tmp = lp->l_line[lp->l_len - 1];
472 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = '\0';
474 74b37681 2019-02-07 stsp /* len - 1 is NUL terminator so we use len - 2 for 'op' */
475 74b37681 2019-02-07 stsp op = lp->l_line[lp->l_len - 2];
476 74b37681 2019-02-07 stsp start = (int)strtol(lp->l_line, &ep, 10);
478 74b37681 2019-02-07 stsp /* Restore the last byte of the buffer */
479 74b37681 2019-02-07 stsp lp->l_line[lp->l_len - 1] = tmp;
481 74b37681 2019-02-07 stsp if (op == 'a') {
482 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
483 74b37681 2019-02-07 stsp start < 0 || *ep != 'a')
485 74b37681 2019-02-07 stsp } else if (op == 'c') {
486 74b37681 2019-02-07 stsp if (start > dlines->l_nblines ||
487 74b37681 2019-02-07 stsp start < 0 || (*ep != ',' && *ep != 'c'))
490 74b37681 2019-02-07 stsp if (*ep == ',') {
492 74b37681 2019-02-07 stsp end = (int)strtol(ep, &ep, 10);
493 74b37681 2019-02-07 stsp if (end < 0 || *ep != 'c')
496 74b37681 2019-02-07 stsp end = start;
502 74b37681 2019-02-07 stsp if (dlp == NULL)
504 74b37681 2019-02-07 stsp if (dlp->l_lineno == start)
506 74b37681 2019-02-07 stsp if (dlp->l_lineno > start) {
507 74b37681 2019-02-07 stsp dlp = TAILQ_PREV(dlp, tqh, l_list);
508 74b37681 2019-02-07 stsp } else if (dlp->l_lineno < start) {
509 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
510 74b37681 2019-02-07 stsp if (ndlp->l_lineno > start)
512 74b37681 2019-02-07 stsp dlp = ndlp;
516 74b37681 2019-02-07 stsp if (dlp == NULL)
520 74b37681 2019-02-07 stsp if (op == 'c') {
521 74b37681 2019-02-07 stsp insert_after = TAILQ_PREV(dlp, tqh, l_list);
522 74b37681 2019-02-07 stsp for (i = 0; i <= (end - start); i++) {
523 74b37681 2019-02-07 stsp ndlp = TAILQ_NEXT(dlp, l_list);
524 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
525 74b37681 2019-02-07 stsp dlp = ndlp;
527 74b37681 2019-02-07 stsp dlp = insert_after;
530 74b37681 2019-02-07 stsp if (op == 'a' || op == 'c') {
533 74b37681 2019-02-07 stsp lp = TAILQ_NEXT(lp, l_list);
534 74b37681 2019-02-07 stsp if (lp == NULL)
537 acb4e1d1 2019-08-10 stsp if (lp->l_len == 2 &&
538 acb4e1d1 2019-08-10 stsp lp->l_line[0] == '.' &&
539 acb4e1d1 2019-08-10 stsp lp->l_line[1] == '\n')
542 74b37681 2019-02-07 stsp TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
543 74b37681 2019-02-07 stsp TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
544 74b37681 2019-02-07 stsp lp, l_list);
547 74b37681 2019-02-07 stsp lp->l_lineno = start;
553 74b37681 2019-02-07 stsp * always resort lines as the markers might be put at the
554 74b37681 2019-02-07 stsp * same line as we first started editing.
556 74b37681 2019-02-07 stsp lineno = 0;
557 74b37681 2019-02-07 stsp TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
558 74b37681 2019-02-07 stsp sort->l_lineno = lineno++;
559 74b37681 2019-02-07 stsp dlines->l_nblines = lineno - 1;
562 74b37681 2019-02-07 stsp return (0);
566 74b37681 2019-02-07 stsp * Pick up the line numbers of all changes from one change file.
567 74b37681 2019-02-07 stsp * (This puts the numbers in a vector, which is not strictly necessary,
568 74b37681 2019-02-07 stsp * since the vector is processed in one sequential pass.
569 74b37681 2019-02-07 stsp * The vector could be optimized out of existence)
571 b90524b1 2019-02-08 stsp static const struct got_error *
572 b90524b1 2019-02-08 stsp readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
574 b90524b1 2019-02-08 stsp const struct got_error *err = NULL;
575 74b37681 2019-02-07 stsp int a, b, c, d;
576 74b37681 2019-02-07 stsp char kind, *p;
581 078e971d 2019-02-08 stsp d3s->fp[0] = fopen(name, "r");
582 078e971d 2019-02-08 stsp if (d3s->fp[0] == NULL)
583 638f9024 2019-05-13 stsp return got_error_from_errno2("fopen", name);
584 02b87977 2019-10-06 stsp err = getchange(&p, d3s->fp[0], d3s);
586 02b87977 2019-10-06 stsp return err;
587 02b87977 2019-10-06 stsp for (i = 0; p; i++) {
588 b90524b1 2019-02-08 stsp if (i >= d3s->szchanges - 1) {
589 b90524b1 2019-02-08 stsp err = increase(d3s);
591 b90524b1 2019-02-08 stsp return err;
593 74b37681 2019-02-07 stsp a = b = number(&p);
594 74b37681 2019-02-07 stsp if (*p == ',') {
596 74b37681 2019-02-07 stsp b = number(&p);
598 74b37681 2019-02-07 stsp kind = *p++;
599 74b37681 2019-02-07 stsp c = d = number(&p);
600 74b37681 2019-02-07 stsp if (*p==',') {
602 74b37681 2019-02-07 stsp d = number(&p);
604 74b37681 2019-02-07 stsp if (kind == 'a')
606 74b37681 2019-02-07 stsp if (kind == 'd')
610 74b37681 2019-02-07 stsp (*dd)[i].old.from = a;
611 74b37681 2019-02-07 stsp (*dd)[i].old.to = b;
612 74b37681 2019-02-07 stsp (*dd)[i].new.from = c;
613 74b37681 2019-02-07 stsp (*dd)[i].new.to = d;
615 02b87977 2019-10-06 stsp err = getchange(&p, d3s->fp[0], d3s);
617 02b87977 2019-10-06 stsp return err;
621 74b37681 2019-02-07 stsp (*dd)[i].old.from = (*dd)[i-1].old.to;
622 74b37681 2019-02-07 stsp (*dd)[i].new.from = (*dd)[i-1].new.to;
625 fb43ecf1 2019-02-11 stsp if (fclose(d3s->fp[0]) != 0)
626 638f9024 2019-05-13 stsp err = got_error_from_errno("fclose");
629 fb43ecf1 2019-02-11 stsp return err;
633 74b37681 2019-02-07 stsp number(char **lc)
638 74b37681 2019-02-07 stsp while (isdigit((unsigned char)(**lc)))
639 74b37681 2019-02-07 stsp nn = nn*10 + *(*lc)++ - '0';
641 74b37681 2019-02-07 stsp return (nn);
644 02b87977 2019-10-06 stsp static const struct got_error *
645 02b87977 2019-10-06 stsp getchange(char **line, FILE *b, struct diff3_state *d3s)
647 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
649 02b87977 2019-10-06 stsp *line = NULL;
651 02b87977 2019-10-06 stsp if (*line && isdigit((unsigned char)(*line)[0]))
652 02b87977 2019-10-06 stsp return NULL;
653 02b87977 2019-10-06 stsp err = get_line(line, b, NULL, d3s);
655 02b87977 2019-10-06 stsp return err;
656 02b87977 2019-10-06 stsp } while (*line);
658 02b87977 2019-10-06 stsp return NULL;
661 02b87977 2019-10-06 stsp static const struct got_error *
662 02b87977 2019-10-06 stsp get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
664 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
665 6dea73df 2019-09-23 stsp char *cp = NULL;
666 500467ff 2019-09-25 hiltjo size_t size;
667 500467ff 2019-09-25 hiltjo ssize_t len;
670 02b87977 2019-10-06 stsp *ret = NULL;
672 6dea73df 2019-09-23 stsp len = getline(&cp, &size, b);
673 02b87977 2019-10-06 stsp if (len == -1) {
674 02b87977 2019-10-06 stsp if (ferror(b))
675 02b87977 2019-10-06 stsp err = got_error_from_errno("getline");
679 6dea73df 2019-09-23 stsp if (cp[len - 1] != '\n') {
681 6dea73df 2019-09-23 stsp if (len + 1 > size) {
682 6dea73df 2019-09-23 stsp new = realloc(cp, len + 1);
683 02b87977 2019-10-06 stsp if (new == NULL) {
684 02b87977 2019-10-06 stsp err = got_error_from_errno("realloc");
689 6dea73df 2019-09-23 stsp cp[len - 1] = '\n';
690 6dea73df 2019-09-23 stsp cp[len] = '\0';
693 6dea73df 2019-09-23 stsp free(d3s->buf);
694 02b87977 2019-10-06 stsp *ret = d3s->buf = cp;
696 74b37681 2019-02-07 stsp if (n != NULL)
700 02b87977 2019-10-06 stsp return err;
703 180dce26 2019-10-06 stsp static const struct got_error *
704 078e971d 2019-02-08 stsp merge(size_t m1, size_t m2, struct diff3_state *d3s)
706 180dce26 2019-10-06 stsp const struct got_error *err = NULL;
707 18b9ebab 2019-10-06 stsp struct diff *d1, *d2;
708 74b37681 2019-02-07 stsp int dpl, j, t1, t2;
710 078e971d 2019-02-08 stsp d1 = d3s->d13;
711 078e971d 2019-02-08 stsp d2 = d3s->d23;
714 078e971d 2019-02-08 stsp t1 = (d1 < d3s->d13 + m1);
715 078e971d 2019-02-08 stsp t2 = (d2 < d3s->d23 + m2);
716 74b37681 2019-02-07 stsp if (!t1 && !t2)
719 74b37681 2019-02-07 stsp /* first file is different from others */
720 74b37681 2019-02-07 stsp if (!t2 || (t1 && d1->new.to < d2->new.from)) {
721 74b37681 2019-02-07 stsp /* stuff peculiar to 1st file */
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)) {
733 74b37681 2019-02-07 stsp * Merge overlapping changes in first file
734 74b37681 2019-02-07 stsp * this happens after extension (see below).
736 078e971d 2019-02-08 stsp if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
737 74b37681 2019-02-07 stsp d1[1].old.from = d1->old.from;
738 74b37681 2019-02-07 stsp d1[1].new.from = d1->new.from;
743 74b37681 2019-02-07 stsp /* merge overlapping changes in second */
744 078e971d 2019-02-08 stsp if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
745 74b37681 2019-02-07 stsp d2[1].old.from = d2->old.from;
746 74b37681 2019-02-07 stsp d2[1].new.from = d2->new.from;
750 74b37681 2019-02-07 stsp /* stuff peculiar to third file or different in all */
751 74b37681 2019-02-07 stsp if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
752 180dce26 2019-10-06 stsp err = duplicate(&dpl, &d1->old, &d2->old, d3s);
754 180dce26 2019-10-06 stsp return err;
757 74b37681 2019-02-07 stsp * dpl = 0 means all files differ
758 74b37681 2019-02-07 stsp * dpl = 1 means files 1 and 2 identical
760 18b9ebab 2019-10-06 stsp err = edit(d1, dpl, &j, d3s);
762 18b9ebab 2019-10-06 stsp return err;
769 74b37681 2019-02-07 stsp * Overlapping changes from file 1 and 2; extend changes
770 74b37681 2019-02-07 stsp * appropriately to make them coincide.
772 74b37681 2019-02-07 stsp if (d1->new.from < d2->new.from) {
773 74b37681 2019-02-07 stsp d2->old.from -= d2->new.from-d1->new.from;
774 74b37681 2019-02-07 stsp d2->new.from = d1->new.from;
775 74b37681 2019-02-07 stsp } else if (d2->new.from < d1->new.from) {
776 74b37681 2019-02-07 stsp d1->old.from -= d1->new.from-d2->new.from;
777 74b37681 2019-02-07 stsp d1->new.from = d2->new.from;
779 74b37681 2019-02-07 stsp if (d1->new.to > d2->new.to) {
780 74b37681 2019-02-07 stsp d2->old.to += d1->new.to - d2->new.to;
781 74b37681 2019-02-07 stsp d2->new.to = d1->new.to;
782 74b37681 2019-02-07 stsp } else if (d2->new.to > d1->new.to) {
783 74b37681 2019-02-07 stsp d1->old.to += d2->new.to - d1->new.to;
784 74b37681 2019-02-07 stsp d1->new.to = d2->new.to;
788 078e971d 2019-02-08 stsp return (edscript(j, d3s));
792 74b37681 2019-02-07 stsp * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
794 ce09ab8d 2019-10-06 stsp static const struct got_error *
795 5176f942 2019-02-08 stsp prange(struct range *rold, struct diff3_state *d3s)
797 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
799 ce09ab8d 2019-10-06 stsp if (rold->to <= rold->from) {
800 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
802 ce09ab8d 2019-10-06 stsp return err;
804 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%d", rold->from);
806 ce09ab8d 2019-10-06 stsp return err;
807 ce09ab8d 2019-10-06 stsp if (rold->to > rold->from + 1) {
808 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
810 ce09ab8d 2019-10-06 stsp return err;
812 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "c\n");
814 ce09ab8d 2019-10-06 stsp return err;
817 ce09ab8d 2019-10-06 stsp return NULL;
821 74b37681 2019-02-07 stsp * skip to just before line number from in file "i". If "pr" is non-NULL,
822 74b37681 2019-02-07 stsp * print all skipped stuff with string pr as a prefix.
824 02b87977 2019-10-06 stsp static const struct got_error *
825 02b87977 2019-10-06 stsp skip(int *nskipped, int i, int from, char *pr, struct diff3_state *d3s)
827 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
828 74b37681 2019-02-07 stsp size_t j, n;
829 74b37681 2019-02-07 stsp char *line;
831 02b87977 2019-10-06 stsp *nskipped = 0;
832 078e971d 2019-02-08 stsp for (n = 0; d3s->cline[i] < from - 1; n += j) {
833 02b87977 2019-10-06 stsp err = get_line(&line, d3s->fp[i], &j, d3s);
835 02b87977 2019-10-06 stsp return err;
836 ce09ab8d 2019-10-06 stsp if (pr != NULL) {
837 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%s%s", pr, line);
839 ce09ab8d 2019-10-06 stsp return err;
841 078e971d 2019-02-08 stsp d3s->cline[i]++;
843 02b87977 2019-10-06 stsp *nskipped = n;
844 02b87977 2019-10-06 stsp return NULL;
848 180dce26 2019-10-06 stsp * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
849 74b37681 2019-02-07 stsp * the same data as the new range (in file 2).
851 180dce26 2019-10-06 stsp static const struct got_error *
852 180dce26 2019-10-06 stsp duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
854 f571bb85 2019-10-06 stsp const struct got_error *err = NULL;
857 02b87977 2019-10-06 stsp int nline, nskipped;
861 74b37681 2019-02-07 stsp if (r1->to-r1->from != r2->to-r2->from)
862 180dce26 2019-10-06 stsp return NULL;
864 02b87977 2019-10-06 stsp err = skip(&nskipped, 0, r1->from, NULL, d3s);
866 02b87977 2019-10-06 stsp return err;
867 02b87977 2019-10-06 stsp err = skip(&nskipped, 1, r2->from, NULL, d3s);
869 02b87977 2019-10-06 stsp return err;
871 74b37681 2019-02-07 stsp for (nline=0; nline < r1->to - r1->from; nline++) {
873 078e971d 2019-02-08 stsp c = getc(d3s->fp[0]);
874 180dce26 2019-10-06 stsp if (c == EOF)
875 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[0], GOT_ERR_EOF);
876 078e971d 2019-02-08 stsp d = getc(d3s->fp[1]);
877 180dce26 2019-10-06 stsp if (d == EOF)
878 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[1], GOT_ERR_EOF);
880 f571bb85 2019-10-06 stsp if (c != d)
881 f571bb85 2019-10-06 stsp return repos(nchar, d3s);
882 74b37681 2019-02-07 stsp } while (c != '\n');
884 f571bb85 2019-10-06 stsp err = repos(nchar, d3s);
886 f571bb85 2019-10-06 stsp return err;
888 180dce26 2019-10-06 stsp return NULL;
891 f571bb85 2019-10-06 stsp static const struct got_error *
892 078e971d 2019-02-08 stsp repos(int nchar, struct diff3_state *d3s)
896 f571bb85 2019-10-06 stsp for (i = 0; i < 2; i++) {
897 f571bb85 2019-10-06 stsp if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
898 f571bb85 2019-10-06 stsp return got_ferror(d3s->fp[i], GOT_ERR_IO);
901 f571bb85 2019-10-06 stsp return NULL;
905 74b37681 2019-02-07 stsp * collect an editing script for later regurgitation
907 02b87977 2019-10-06 stsp static const struct got_error *
908 02b87977 2019-10-06 stsp edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
910 02b87977 2019-10-06 stsp const struct got_error *err = NULL;
911 02b87977 2019-10-06 stsp int nskipped;
913 18b9ebab 2019-10-06 stsp if (((fdup + 1) & 3) == 0)
914 02b87977 2019-10-06 stsp return NULL;
916 02b87977 2019-10-06 stsp d3s->overlap[*j] = !fdup;
918 078e971d 2019-02-08 stsp d3s->overlapcnt++;
919 02b87977 2019-10-06 stsp d3s->de[*j].old.from = diff->old.from;
920 02b87977 2019-10-06 stsp d3s->de[*j].old.to = diff->old.to;
921 02b87977 2019-10-06 stsp err = skip(&nskipped, 2, diff->new.from, NULL, d3s);
923 02b87977 2019-10-06 stsp return err;
924 02b87977 2019-10-06 stsp d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
925 02b87977 2019-10-06 stsp err = skip(&nskipped, 2, diff->new.to, NULL, d3s);
926 02b87977 2019-10-06 stsp d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
927 02b87977 2019-10-06 stsp return NULL;
930 74b37681 2019-02-07 stsp /* regurgitate */
931 180dce26 2019-10-06 stsp static const struct got_error *
932 078e971d 2019-02-08 stsp edscript(int n, struct diff3_state *d3s)
934 ce09ab8d 2019-10-06 stsp const struct got_error *err = NULL;
936 74b37681 2019-02-07 stsp char block[BUFSIZ+1];
938 74b37681 2019-02-07 stsp for (; n > 0; n--) {
939 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
940 ce09ab8d 2019-10-06 stsp err = prange(&d3s->de[n].old, d3s);
942 ce09ab8d 2019-10-06 stsp return err;
944 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n%s\n",
945 01a44956 2019-03-27 stsp d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
947 ce09ab8d 2019-10-06 stsp return err;
949 e9dabdfb 2019-10-06 stsp if (fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET)
951 e9dabdfb 2019-10-06 stsp return got_error_from_errno("fseek");
952 078e971d 2019-02-08 stsp k = d3s->de[n].new.to - d3s->de[n].new.from;
953 078e971d 2019-02-08 stsp for (; k > 0; k-= j) {
954 74b37681 2019-02-07 stsp j = k > BUFSIZ ? BUFSIZ : k;
955 078e971d 2019-02-08 stsp if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
956 180dce26 2019-10-06 stsp return got_ferror(d3s->fp[2], GOT_ERR_IO);
957 74b37681 2019-02-07 stsp block[j] = '\0';
958 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%s", block);
960 ce09ab8d 2019-10-06 stsp return err;
963 ce09ab8d 2019-10-06 stsp if (!d3s->overlap[n]) {
964 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, ".\n");
966 ce09ab8d 2019-10-06 stsp return err;
968 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
970 ce09ab8d 2019-10-06 stsp return err;
971 ce09ab8d 2019-10-06 stsp err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
972 5176f942 2019-02-08 stsp d3s->de[n].old.from - 1, d3s->f1mark);
974 ce09ab8d 2019-10-06 stsp return err;
978 180dce26 2019-10-06 stsp return NULL;
981 c03c6cb3 2019-02-08 stsp static const struct got_error *
982 078e971d 2019-02-08 stsp increase(struct diff3_state *d3s)
984 74b37681 2019-02-07 stsp size_t newsz, incr;
985 c03c6cb3 2019-02-08 stsp struct diff *d;
988 74b37681 2019-02-07 stsp /* are the memset(3) calls needed? */
989 078e971d 2019-02-08 stsp newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
990 078e971d 2019-02-08 stsp incr = newsz - d3s->szchanges;
992 078e971d 2019-02-08 stsp d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
993 c03c6cb3 2019-02-08 stsp if (d == NULL)
994 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
995 078e971d 2019-02-08 stsp d3s->d13 = d;
996 078e971d 2019-02-08 stsp memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
998 078e971d 2019-02-08 stsp d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
999 c03c6cb3 2019-02-08 stsp if (d == NULL)
1000 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1001 078e971d 2019-02-08 stsp d3s->d23 = d;
1002 078e971d 2019-02-08 stsp memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
1004 078e971d 2019-02-08 stsp d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1005 c03c6cb3 2019-02-08 stsp if (d == NULL)
1006 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1007 078e971d 2019-02-08 stsp d3s->de = d;
1008 078e971d 2019-02-08 stsp memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1010 078e971d 2019-02-08 stsp s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1011 c03c6cb3 2019-02-08 stsp if (s == NULL)
1012 638f9024 2019-05-13 stsp return got_error_from_errno("reallocarray");
1013 078e971d 2019-02-08 stsp d3s->overlap = s;
1014 078e971d 2019-02-08 stsp memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1015 078e971d 2019-02-08 stsp d3s->szchanges = newsz;
1017 c03c6cb3 2019-02-08 stsp return NULL;
