op public repos

Blob

Date:: Sat Aug 10 16:43:09 2019 UTC
Message:: sync merge(1) fix diff from OpenRCS/OpenCVS
Actions:: History | Blame | Raw File
1 /*	$OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $	*/
2 
3 /*
4  * Copyright (C) Caldera International Inc.  2001-2002.
5  * All rights reserved.
6  *
7  * Redistribution and use in source and binary forms, with or without
8  * modification, are permitted provided that the following conditions
9  * are met:
10  * 1. Redistributions of source code and documentation must retain the above
11  *    copyright notice, this list of conditions and the following disclaimer.
12  * 2. Redistributions in binary form must reproduce the above copyright
13  *    notice, this list of conditions and the following disclaimer in the
14  *    documentation and/or other materials provided with the distribution.
15  * 3. All advertising materials mentioning features or use of this software
16  *    must display the following acknowledgement:
17  *	This product includes software developed or owned by Caldera
18  *	International, Inc.
19  * 4. Neither the name of Caldera International, Inc. nor the names of other
20  *    contributors may be used to endorse or promote products derived from
21  *    this software without specific prior written permission.
22  *
23  * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24  * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27  * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28  * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34  * POSSIBILITY OF SUCH DAMAGE.
35  */
36 /*-
37  * Copyright (c) 1991, 1993
38  *	The Regents of the University of California.  All rights reserved.
39  *
40  * Redistribution and use in source and binary forms, with or without
41  * modification, are permitted provided that the following conditions
42  * are met:
43  * 1. Redistributions of source code must retain the above copyright
44  *    notice, this list of conditions and the following disclaimer.
45  * 2. Redistributions in binary form must reproduce the above copyright
46  *    notice, this list of conditions and the following disclaimer in the
47  *    documentation and/or other materials provided with the distribution.
48  * 3. Neither the name of the University nor the names of its contributors
49  *    may be used to endorse or promote products derived from this software
50  *    without specific prior written permission.
51  *
52  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62  * SUCH DAMAGE.
63  *
64  *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
65  */
66 
67 #include <sys/stat.h>
68 #include <sys/queue.h>
69 
70 #include <ctype.h>
71 #include <limits.h>
72 #include <stdio.h>
73 #include <stdarg.h>
74 #include <stdlib.h>
75 #include <string.h>
76 #include <time.h>
77 #include <unistd.h>
78 
79 #include "got_error.h"
80 #include "got_opentemp.h"
81 #include "got_object.h"
82 
83 #include "buf.h"
84 #include "rcsutil.h"
85 #include "got_lib_diff.h"
86 #include "worklist.h"
87 
88 #ifndef nitems
89 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
90 #endif
91 
92 /* diff3 - 3-way differential file comparison */
93 
94 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
95  *
96  * d13 = diff report on f1 vs f3
97  * d23 = diff report on f2 vs f3
98  * f1, f2, f3 the 3 files
99  * if changes in f1 overlap with changes in f3, m1 and m3 are used
100  * to mark the overlaps; otherwise, the file names f1 and f3 are used
101  * (only for options E and X).
102  */
103 
104 /*
105  * "from" is first in range of changed lines; "to" is last+1
106  * from=to=line after point of insertion for added lines.
107  */
108 struct range {
109 	int from;
110 	int to;
111 };
112 
113 struct diff {
114 	struct range old;
115 	struct range new;
116 };
117 
118 struct diff3_state {
119 	size_t szchanges;
120 
121 	struct diff *d13;
122 	struct diff *d23;
123 
124 	/*
125 	 * "de" is used to gather editing scripts.  These are later spewed out
126 	 * in reverse order.  Its first element must be all zero, the "new"
127 	 * component of "de" contains line positions or byte positions
128 	 * depending on when you look (!?).  Array overlap indicates which
129 	 * sections in "de" correspond to lines that are different in all
130 	 * three files.
131 	 */
132 	struct diff *de;
133 	char *overlap;
134 	int overlapcnt;
135 	FILE *fp[3];
136 	int cline[3];		/* # of the last-read line in each file (0-2) */
137 
138 	/*
139 	 * the latest known correspondence between line numbers of the 3 files
140 	 * is stored in last[1-3];
141 	 */
142 	int last[4];
143 	int eflag;
144 	int oflag;
145 	int debug;
146 	char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
147 
148 	char *buf;
149 	size_t bufsize;
150 
151 	BUF *diffbuf;
152 };
153 
154 
155 static int duplicate(struct range *, struct range *, struct diff3_state *);
156 static int edit(struct diff *, int, int, struct diff3_state *);
157 static char *getchange(FILE *, struct diff3_state *);
158 static char *get_line(FILE *, size_t *, struct diff3_state *);
159 static int number(char **);
160 static const struct got_error *readin(size_t *, char *, struct diff **,
161     struct diff3_state *);
162 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
163 static int skip(int, int, char *, struct diff3_state *);
164 static int edscript(int, struct diff3_state *);
165 static int merge(size_t, size_t, struct diff3_state *);
166 static void change(int, struct range *, int, struct diff3_state *);
167 static void keep(int, struct range *, struct diff3_state *);
168 static void prange(struct range *, struct diff3_state *);
169 static void repos(int, struct diff3_state *);
170 static void separate(const char *, struct diff3_state *);
171 static const struct got_error *increase(struct diff3_state *);
172 static const struct got_error *diff3_internal(char *, char *, char *,
173     char *, char *, const char *, const char *, struct diff3_state *,
174     const char *, const char *);
175 
176 static const struct got_error *
177 diff_output(BUF *diffbuf, const char *fmt, ...)
178 {
179 	va_list vap;
180 	int i;
181 	char *str;
182 	size_t newsize;
183 
184 	va_start(vap, fmt);
185 	i = vasprintf(&str, fmt, vap);
186 	va_end(vap);
187 	if (i == -1)
188 		return got_error_from_errno("vasprintf");
189 	buf_append(&newsize, diffbuf, str, strlen(str));
190 	free(str);
191 	return NULL;
192 }
193 
194 static const struct got_error*
195 diffreg(BUF **d, const char *path1, const char *path2)
196 {
197 	const struct got_error *err = NULL;
198 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
199 	char *outpath = NULL;
200 	struct got_diff_state ds;
201 	struct got_diff_args args;
202 	int res;
203 
204 	*d = NULL;
205 
206 	f1 = fopen(path1, "r");
207 	if (f1 == NULL) {
208 		err = got_error_from_errno2("fopen", path1);
209 		goto done;
210 	}
211 	f2 = fopen(path2, "r");
212 	if (f1 == NULL) {
213 		err = got_error_from_errno2("fopen", path2);
214 		goto done;
215 	}
216 
217 	err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
218 	if (err)
219 		goto done;
220 
221 	memset(&ds, 0, sizeof(ds));
222 	/* XXX should stat buffers be passed in args instead of ds? */
223 	if (stat(path1, &ds.stb1) == -1) {
224 		err = got_error_from_errno2("stat", path1);
225 		goto done;
226 	}
227 	if (stat(path2, &ds.stb2) == -1) {
228 		err = got_error_from_errno2("stat", path2);
229 		goto done;
230 	}
231 
232 	memset(&args, 0, sizeof(args));
233 	args.diff_format = D_NORMAL;
234 	args.label[0] = "";
235 	args.label[1] = "";
236 	args.diff_context = 0;
237 
238 	err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
239 	    outfile, NULL);
240 	if (err)
241 		goto done;
242 
243 	if (fflush(outfile) != 0) {
244 		err = got_error_from_errno2("fflush", outpath);
245 		goto done;
246 	}
247 
248 	*d = buf_load(outpath);
249 	if (*d == NULL)
250 		err = got_error_from_errno("buf_load");
251 done:
252 	if (outpath) {
253 		unlink(outpath);
254 		free(outpath);
255 	}
256 	if (outfile && fclose(outfile) != 0 && err == NULL)
257 		err = got_error_from_errno("fclose");
258 	if (f1 && fclose(f1) != 0 && err == NULL)
259 		err = got_error_from_errno("fclose");
260 	if (f2 && fclose(f2) != 0 && err == NULL)
261 		err = got_error_from_errno("fclose");
262 	return err;
263 }
264 
265 /*
266  * For merge(1).
267  */
268 const struct got_error *
269 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
270     const char *p3, const char *label1, const char *label3)
271 {
272 	const struct got_error *err = NULL;
273 	char *dp13, *dp23, *path1, *path2, *path3;
274 	BUF *b1, *b2, *b3, *d1, *d2, *diffb;
275 	u_char *data, *patch;
276 	size_t dlen, plen;
277 	struct wklhead temp_files;
278 	struct diff3_state *d3s;
279 	int i;
280 
281 	*overlapcnt = 0;
282 
283 	SLIST_INIT(&temp_files);
284 
285 	d3s = calloc(1, sizeof(*d3s));
286 	if (d3s == NULL)
287 		return got_error_from_errno("calloc");
288 	d3s->eflag = 3; /* default -E for compatibility with former RCS */
289 	d3s->oflag = 1; /* default -E for compatibility with former RCS */
290 
291 	b1 = b2 = b3 = d1 = d2 = diffb = NULL;
292 	dp13 = dp23 = path1 = path2 = path3 = NULL;
293 	data = patch = NULL;
294 
295 	if ((b1 = buf_load(p1)) == NULL)
296 		goto out;
297 	if ((b2 = buf_load(p2)) == NULL)
298 		goto out;
299 	if ((b3 = buf_load(p3)) == NULL)
300 		goto out;
301 
302 	diffb = buf_alloc(128);
303 
304 	if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
305 		err = got_error_from_errno("asprintf");
306 		goto out;
307 	}
308 	if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
309 		err = got_error_from_errno("asprintf");
310 		goto out;
311 	}
312 	if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
313 		err = got_error_from_errno("asprintf");
314 		goto out;
315 	}
316 
317 	err = buf_write_stmp(b1, path1, &temp_files);
318 	if (err)
319 		goto out;
320 	err = buf_write_stmp(b2, path2, &temp_files);
321 	if (err)
322 		goto out;
323 	err = buf_write_stmp(b3, path3, &temp_files);
324 	if (err)
325 		goto out;
326 
327 	buf_free(b2);
328 	b2 = NULL;
329 
330 	err = diffreg(&d1, path1, path3);
331 	if (err) {
332 		buf_free(diffb);
333 		diffb = NULL;
334 		goto out;
335 
336 	}
337 	err = diffreg(&d2, path2, path3);
338 	if (err) {
339 		buf_free(diffb);
340 		diffb = NULL;
341 		goto out;
342 	}
343 
344 	if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
345 		err = got_error_from_errno("asprintf");
346 		goto out;
347 	}
348 	err = buf_write_stmp(d1, dp13, &temp_files);
349 	if (err)
350 		goto out;
351 
352 	buf_free(d1);
353 	d1 = NULL;
354 
355 	if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
356 		err = got_error_from_errno("asprintf");
357 		goto out;
358 	}
359 	err = buf_write_stmp(d2, dp23, &temp_files);
360 	if (err)
361 		goto out;
362 
363 	buf_free(d2);
364 	d2 = NULL;
365 
366 	d3s->diffbuf = diffb;
367 	err = diff3_internal(dp13, dp23, path1, path2, path3,
368 	    label1, label3, d3s, label1, label3);
369 	if (err) {
370 		buf_free(diffb);
371 		diffb = NULL;
372 		goto out;
373 	}
374 
375 	plen = buf_len(diffb);
376 	patch = buf_release(diffb);
377 	dlen = buf_len(b1);
378 	data = buf_release(b1);
379 
380 	diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
381 out:
382 	buf_free(b2);
383 	buf_free(b3);
384 	buf_free(d1);
385 	buf_free(d2);
386 
387 	(void)unlink(path1);
388 	(void)unlink(path2);
389 	(void)unlink(path3);
390 	(void)unlink(dp13);
391 	(void)unlink(dp23);
392 
393 	free(path1);
394 	free(path2);
395 	free(path3);
396 	free(dp13);
397 	free(dp23);
398 	free(data);
399 	free(patch);
400 
401 	worklist_clean(&temp_files, worklist_unlink);
402 
403 	for (i = 0; i < nitems(d3s->fp); i++) {
404 		if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
405 			err = got_error_from_errno("fclose");
406 	}
407 	if (err == NULL && diffb) {
408 		if (buf_write_fd(diffb, outfd) < 0)
409 			err = got_error_from_errno("buf_write_fd");
410 		*overlapcnt = d3s->overlapcnt;
411 	}
412 	free(d3s);
413 	buf_free(diffb);
414 	return err;
415 }
416 
417 static const struct got_error *
418 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
419     const char *fmark, const char *rmark, struct diff3_state *d3s,
420     const char *label1, const char *label3)
421 {
422 	const struct got_error *err = NULL;
423 	ssize_t m, n;
424 	int i;
425 
426 	i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
427 	    "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
428 	if (i < 0 || i >= (int)sizeof(d3s->f1mark))
429 		return got_error(GOT_ERR_NO_SPACE);
430 
431 	i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
432 	    "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
433 	if (i < 0 || i >= (int)sizeof(d3s->f3mark))
434 		return got_error(GOT_ERR_NO_SPACE);
435 
436 	err = increase(d3s);
437 	if (err)
438 		return err;
439 
440 	err = readin(&m, dp13, &d3s->d13, d3s);
441 	if (err)
442 		return err;
443 	err = readin(&n, dp23, &d3s->d23, d3s);
444 	if (err)
445 		return err;
446 
447 	if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
448 		return got_error_from_errno2("fopen", path1);
449 	if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
450 		return got_error_from_errno2("fopen", path2);
451 	if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
452 		return got_error_from_errno2("fopen", path3);
453 
454 	if (merge(m, n, d3s) < 0)
455 		return got_error_from_errno("merge");
456 	return NULL;
457 }
458 
459 static int
460 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
461 {
462 	char op, *ep;
463 	struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
464 	int start, end, i, lineno;
465 	u_char tmp;
466 
467 	dlp = TAILQ_FIRST(&(dlines->l_lines));
468 	lp = TAILQ_FIRST(&(plines->l_lines));
469 
470 	end = 0;
471 	for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
472 	    lp = TAILQ_NEXT(lp, l_list)) {
473 		/* Skip blank lines */
474 		if (lp->l_len < 2)
475 			continue;
476 
477 		/* NUL-terminate line buffer for strtol() safety. */
478 		tmp = lp->l_line[lp->l_len - 1];
479 		lp->l_line[lp->l_len - 1] = '\0';
480 
481 		/* len - 1 is NUL terminator so we use len - 2 for 'op' */
482 		op = lp->l_line[lp->l_len - 2];
483 		start = (int)strtol(lp->l_line, &ep, 10);
484 
485 		/* Restore the last byte of the buffer */
486 		lp->l_line[lp->l_len - 1] = tmp;
487 
488 		if (op == 'a') {
489 			if (start > dlines->l_nblines ||
490 			    start < 0 || *ep != 'a')
491 				return -1;
492 		} else if (op == 'c') {
493 			if (start > dlines->l_nblines ||
494 			    start < 0 || (*ep != ',' && *ep != 'c'))
495 				return -1;
496 
497 			if (*ep == ',') {
498 				ep++;
499 				end = (int)strtol(ep, &ep, 10);
500 				if (end < 0 || *ep != 'c')
501 					return -1;
502 			} else {
503 				end = start;
504 			}
505 		}
506 
507 
508 		for (;;) {
509 			if (dlp == NULL)
510 				break;
511 			if (dlp->l_lineno == start)
512 				break;
513 			if (dlp->l_lineno > start) {
514 				dlp = TAILQ_PREV(dlp, tqh, l_list);
515 			} else if (dlp->l_lineno < start) {
516 				ndlp = TAILQ_NEXT(dlp, l_list);
517 				if (ndlp->l_lineno > start)
518 					break;
519 				dlp = ndlp;
520 			}
521 		}
522 
523 		if (dlp == NULL)
524 			return -1;
525 
526 
527 		if (op == 'c') {
528 			insert_after = TAILQ_PREV(dlp, tqh, l_list);
529 			for (i = 0; i <= (end - start); i++) {
530 				ndlp = TAILQ_NEXT(dlp, l_list);
531 				TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
532 				dlp = ndlp;
533 			}
534 			dlp = insert_after;
535 		}
536 
537 		if (op == 'a' || op == 'c') {
538 			for (;;) {
539 				ndlp = lp;
540 				lp = TAILQ_NEXT(lp, l_list);
541 				if (lp == NULL)
542 					return -1;
543 
544 				if (lp->l_len == 2 &&
545 				    lp->l_line[0] == '.' &&
546 				    lp->l_line[1] == '\n')
547 					break;
548 
549 				TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
550 				TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
551 				    lp, l_list);
552 				dlp = lp;
553 
554 				lp->l_lineno = start;
555 				lp = ndlp;
556 			}
557 		}
558 
559 		/*
560 		 * always resort lines as the markers might be put at the
561 		 * same line as we first started editing.
562 		 */
563 		lineno = 0;
564 		TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
565 			sort->l_lineno = lineno++;
566 		dlines->l_nblines = lineno - 1;
567 	}
568 
569 	return (0);
570 }
571 
572 /*
573  * Pick up the line numbers of all changes from one change file.
574  * (This puts the numbers in a vector, which is not strictly necessary,
575  * since the vector is processed in one sequential pass.
576  * The vector could be optimized out of existence)
577  */
578 static const struct got_error *
579 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
580 {
581 	const struct got_error *err = NULL;
582 	int a, b, c, d;
583 	char kind, *p;
584 	size_t i;
585 
586 	*n = 0;
587 
588 	d3s->fp[0] = fopen(name, "r");
589 	if (d3s->fp[0] == NULL)
590 		return got_error_from_errno2("fopen", name);
591 	for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
592 		if (i >= d3s->szchanges - 1) {
593 			err = increase(d3s);
594 			if (err)
595 				return err;
596 		}
597 		a = b = number(&p);
598 		if (*p == ',') {
599 			p++;
600 			b = number(&p);
601 		}
602 		kind = *p++;
603 		c = d = number(&p);
604 		if (*p==',') {
605 			p++;
606 			d = number(&p);
607 		}
608 		if (kind == 'a')
609 			a++;
610 		if (kind == 'd')
611 			c++;
612 		b++;
613 		d++;
614 		(*dd)[i].old.from = a;
615 		(*dd)[i].old.to = b;
616 		(*dd)[i].new.from = c;
617 		(*dd)[i].new.to = d;
618 	}
619 
620 	if (i) {
621 		(*dd)[i].old.from = (*dd)[i-1].old.to;
622 		(*dd)[i].new.from = (*dd)[i-1].new.to;
623 	}
624 
625 	if (fclose(d3s->fp[0]) != 0)
626 		err = got_error_from_errno("fclose");
627 
628 	*n = i;
629 	return err;
630 }
631 
632 static int
633 number(char **lc)
634 {
635 	int nn;
636 
637 	nn = 0;
638 	while (isdigit((unsigned char)(**lc)))
639 		nn = nn*10 + *(*lc)++ - '0';
640 
641 	return (nn);
642 }
643 
644 static char *
645 getchange(FILE *b, struct diff3_state *d3s)
646 {
647 	char *line;
648 
649 	while ((line = get_line(b, NULL, d3s))) {
650 		if (isdigit((unsigned char)line[0]))
651 			return (line);
652 	}
653 
654 	return (NULL);
655 }
656 
657 static char *
658 get_line(FILE *b, size_t *n, struct diff3_state *d3s)
659 {
660 	char *cp;
661 	size_t len;
662 	char *new;
663 
664 	if ((cp = fgetln(b, &len)) == NULL)
665 		return (NULL);
666 
667 	if (cp[len - 1] != '\n')
668 		len++;
669 	if (len + 1 > d3s->bufsize) {
670 		do {
671 			d3s->bufsize += 1024;
672 		} while (len + 1 > d3s->bufsize);
673 		new = reallocarray(d3s->buf, 1, d3s->bufsize);
674 		if (new == NULL)
675 			return NULL;
676 		d3s->buf = new;
677 	}
678 	memcpy(d3s->buf, cp, len - 1);
679 	d3s->buf[len - 1] = '\n';
680 	d3s->buf[len] = '\0';
681 	if (n != NULL)
682 		*n = len;
683 
684 	return (d3s->buf);
685 }
686 
687 static int
688 merge(size_t m1, size_t m2, struct diff3_state *d3s)
689 {
690 	struct diff *d1, *d2, *d3;
691 	int dpl, j, t1, t2;
692 
693 	d1 = d3s->d13;
694 	d2 = d3s->d23;
695 	j = 0;
696 	for (;;) {
697 		t1 = (d1 < d3s->d13 + m1);
698 		t2 = (d2 < d3s->d23 + m2);
699 		if (!t1 && !t2)
700 			break;
701 
702 		if (d3s->debug) {
703 			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
704 			d1->old.from, d1->old.to,
705 			d1->new.from, d1->new.to,
706 			d2->old.from, d2->old.to,
707 			d2->new.from, d2->new.to);
708 		}
709 
710 		/* first file is different from others */
711 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
712 			/* stuff peculiar to 1st file */
713 			if (d3s->eflag == 0) {
714 				separate("1", d3s);
715 				change(1, &d1->old, 0, d3s);
716 				keep(2, &d1->new, d3s);
717 				change(3, &d1->new, 0, d3s);
718 			}
719 			d1++;
720 			continue;
721 		}
722 
723 		/* second file is different from others */
724 		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
725 			if (d3s->eflag == 0) {
726 				separate("2", d3s);
727 				keep(1, &d2->new, d3s);
728 				change(2, &d2->old, 0, d3s);
729 				change(3, &d2->new, 0, d3s);
730 			}
731 			d2++;
732 			continue;
733 		}
734 
735 		/*
736 		 * Merge overlapping changes in first file
737 		 * this happens after extension (see below).
738 		 */
739 		if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
740 			d1[1].old.from = d1->old.from;
741 			d1[1].new.from = d1->new.from;
742 			d1++;
743 			continue;
744 		}
745 
746 		/* merge overlapping changes in second */
747 		if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
748 			d2[1].old.from = d2->old.from;
749 			d2[1].new.from = d2->new.from;
750 			d2++;
751 			continue;
752 		}
753 		/* stuff peculiar to third file or different in all */
754 		if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
755 			dpl = duplicate(&d1->old, &d2->old, d3s);
756 			if (dpl == -1)
757 				return (-1);
758 
759 			/*
760 			 * dpl = 0 means all files differ
761 			 * dpl = 1 means files 1 and 2 identical
762 			 */
763 			if (d3s->eflag == 0) {
764 				separate(dpl ? "3" : "", d3s);
765 				change(1, &d1->old, dpl, d3s);
766 				change(2, &d2->old, 0, d3s);
767 				d3 = d1->old.to > d1->old.from ? d1 : d2;
768 				change(3, &d3->new, 0, d3s);
769 			} else
770 				j = edit(d1, dpl, j, d3s);
771 			d1++;
772 			d2++;
773 			continue;
774 		}
775 
776 		/*
777 		 * Overlapping changes from file 1 and 2; extend changes
778 		 * appropriately to make them coincide.
779 		 */
780 		if (d1->new.from < d2->new.from) {
781 			d2->old.from -= d2->new.from-d1->new.from;
782 			d2->new.from = d1->new.from;
783 		} else if (d2->new.from < d1->new.from) {
784 			d1->old.from -= d1->new.from-d2->new.from;
785 			d1->new.from = d2->new.from;
786 		}
787 		if (d1->new.to > d2->new.to) {
788 			d2->old.to += d1->new.to - d2->new.to;
789 			d2->new.to = d1->new.to;
790 		} else if (d2->new.to > d1->new.to) {
791 			d1->old.to += d2->new.to - d1->new.to;
792 			d1->new.to = d2->new.to;
793 		}
794 	}
795 
796 	return (edscript(j, d3s));
797 }
798 
799 static void
800 separate(const char *s, struct diff3_state *d3s)
801 {
802 	diff_output(d3s->diffbuf, "====%s\n", s);
803 }
804 
805 /*
806  * The range of lines rold.from thru rold.to in file i is to be changed.
807  * It is to be printed only if it does not duplicate something to be
808  * printed later.
809  */
810 static void
811 change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
812 {
813 	diff_output(d3s->diffbuf, "%d:", i);
814 	d3s->last[i] = rold->to;
815 	prange(rold, d3s);
816 	if (fdup || d3s->debug)
817 		return;
818 	i--;
819 	(void)skip(i, rold->from, NULL, d3s);
820 	(void)skip(i, rold->to, "  ", d3s);
821 }
822 
823 /*
824  * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
825  */
826 static void
827 prange(struct range *rold, struct diff3_state *d3s)
828 {
829 	if (rold->to <= rold->from)
830 		diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
831 	else {
832 		diff_output(d3s->diffbuf, "%d", rold->from);
833 		if (rold->to > rold->from+1)
834 			diff_output(d3s->diffbuf, ",%d", rold->to - 1);
835 		diff_output(d3s->diffbuf, "c\n");
836 	}
837 }
838 
839 /*
840  * No difference was reported by diff between file 1 (or 2) and file 3,
841  * and an artificial dummy difference (trange) must be ginned up to
842  * correspond to the change reported in the other file.
843  */
844 static void
845 keep(int i, struct range *rnew, struct diff3_state *d3s)
846 {
847 	int delta;
848 	struct range trange;
849 
850 	delta = d3s->last[3] - d3s->last[i];
851 	trange.from = rnew->from - delta;
852 	trange.to = rnew->to - delta;
853 	change(i, &trange, 1, d3s);
854 }
855 
856 /*
857  * skip to just before line number from in file "i".  If "pr" is non-NULL,
858  * print all skipped stuff with string pr as a prefix.
859  */
860 static int
861 skip(int i, int from, char *pr, struct diff3_state *d3s)
862 {
863 	size_t j, n;
864 	char *line;
865 
866 	for (n = 0; d3s->cline[i] < from - 1; n += j) {
867 		if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
868 			return (-1);
869 		if (pr != NULL)
870 			diff_output(d3s->diffbuf, "%s%s", pr, line);
871 		d3s->cline[i]++;
872 	}
873 	return ((int) n);
874 }
875 
876 /*
877  * Return 1 or 0 according as the old range (in file 1) contains exactly
878  * the same data as the new range (in file 2).
879  */
880 static int
881 duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
882 {
883 	int c,d;
884 	int nchar;
885 	int nline;
886 
887 	if (r1->to-r1->from != r2->to-r2->from)
888 		return (0);
889 	(void)skip(0, r1->from, NULL, d3s);
890 	(void)skip(1, r2->from, NULL, d3s);
891 	nchar = 0;
892 	for (nline=0; nline < r1->to - r1->from; nline++) {
893 		do {
894 			c = getc(d3s->fp[0]);
895 			d = getc(d3s->fp[1]);
896 			if (c == -1 || d== -1)
897 				return (-1);
898 			nchar++;
899 			if (c != d) {
900 				repos(nchar, d3s);
901 				return (0);
902 			}
903 		} while (c != '\n');
904 	}
905 	repos(nchar, d3s);
906 	return (1);
907 }
908 
909 static void
910 repos(int nchar, struct diff3_state *d3s)
911 {
912 	int i;
913 
914 	for (i = 0; i < 2; i++)
915 		(void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
916 }
917 
918 /*
919  * collect an editing script for later regurgitation
920  */
921 static int
922 edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
923 {
924 	if (((fdup + 1) & d3s->eflag) == 0)
925 		return (j);
926 	j++;
927 	d3s->overlap[j] = !fdup;
928 	if (!fdup)
929 		d3s->overlapcnt++;
930 	d3s->de[j].old.from = diff->old.from;
931 	d3s->de[j].old.to = diff->old.to;
932 	d3s->de[j].new.from =
933 	    d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
934 	d3s->de[j].new.to =
935 	    d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
936 	return (j);
937 }
938 
939 /* regurgitate */
940 static int
941 edscript(int n, struct diff3_state *d3s)
942 {
943 	int j, k;
944 	char block[BUFSIZ+1];
945 
946 	for (; n > 0; n--) {
947 		if (!d3s->oflag || !d3s->overlap[n])
948 			prange(&d3s->de[n].old, d3s);
949 		else
950 			diff_output(d3s->diffbuf, "%da\n%s\n",
951 			    d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
952 		(void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
953 		k = d3s->de[n].new.to - d3s->de[n].new.from;
954 		for (; k > 0; k-= j) {
955 			j = k > BUFSIZ ? BUFSIZ : k;
956 			if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
957 				return (-1);
958 			block[j] = '\0';
959 			diff_output(d3s->diffbuf, "%s", block);
960 		}
961 
962 		if (!d3s->oflag || !d3s->overlap[n])
963 			diff_output(d3s->diffbuf, ".\n");
964 		else {
965 			diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
966 			diff_output(d3s->diffbuf, "%da\n%s\n.\n",
967 			    d3s->de[n].old.from - 1, d3s->f1mark);
968 		}
969 	}
970 
971 	return (d3s->overlapcnt);
972 }
973 
974 static const struct got_error *
975 increase(struct diff3_state *d3s)
976 {
977 	size_t newsz, incr;
978 	struct diff *d;
979 	char *s;
980 
981 	/* are the memset(3) calls needed? */
982 	newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
983 	incr = newsz - d3s->szchanges;
984 
985 	d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
986 	if (d == NULL)
987 		return got_error_from_errno("reallocarray");
988 	d3s->d13 = d;
989 	memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
990 
991 	d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
992 	if (d == NULL)
993 		return got_error_from_errno("reallocarray");
994 	d3s->d23 = d;
995 	memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
996 
997 	d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
998 	if (d == NULL)
999 		return got_error_from_errno("reallocarray");
1000 	d3s->de = d;
1001 	memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1002 
1003 	s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1004 	if (s == NULL)
1005 		return got_error_from_errno("reallocarray");
1006 	d3s->overlap = s;
1007 	memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1008 	d3s->szchanges = newsz;
1009 
1010 	return NULL;
1011 }