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 
175 static const struct got_error *
176 diff_output(BUF *diffbuf, const char *fmt, ...)
177 {
178 	va_list vap;
179 	int i;
180 	char *str;
181 	size_t newsize;
182 
183 	va_start(vap, fmt);
184 	i = vasprintf(&str, fmt, vap);
185 	va_end(vap);
186 	if (i == -1)
187 		return got_error_from_errno();
188 	buf_append(&newsize, diffbuf, str, strlen(str));
189 	free(str);
190 	return NULL;
191 }
192 
193 static const struct got_error*
194 diffreg(BUF **d, const char *path1, const char *path2)
195 {
196 	const struct got_error *err = NULL;
197 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
198 	char *outpath = NULL;
199 	struct got_diff_state ds;
200 	struct got_diff_args args;
201 	int res;
202 
203 	*d = NULL;
204 
205 	f1 = fopen(path1, "r");
206 	if (f1 == NULL) {
207 		err = got_error_from_errno();
208 		goto done;
209 	}
210 	f2 = fopen(path2, "r");
211 	if (f1 == NULL) {
212 		err = got_error_from_errno();
213 		goto done;
214 	}
215 
216 	err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diff");
217 	if (err)
218 		goto done;
219 
220 	memset(&ds, 0, sizeof(ds));
221 	/* XXX should stat buffers be passed in args instead of ds? */
222 	if (stat(path1, &ds.stb1) == -1) {
223 		err = got_error_from_errno();
224 		goto done;
225 	}
226 	if (stat(path2, &ds.stb2) == -1) {
227 		err = got_error_from_errno();
228 		goto done;
229 	}
230 
231 	memset(&args, 0, sizeof(args));
232 	args.diff_format = D_NORMAL;
233 	args.label[0] = "";
234 	args.label[1] = "";
235 	args.diff_context = 0;
236 
237 	err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
238 	    outfile, NULL);
239 	if (err)
240 		goto done;
241 
242 	*d = buf_load(outpath);
243 	if (*d == NULL)
244 		err = got_error_from_errno();
245 done:
246 	free(outpath);
247 	if (outfile)
248 		fclose(outfile);
249 	if (f1)
250 		fclose(f1);
251 	if (f2)
252 		fclose(f2);
253 	return err;
254 }
255 
256 /*
257  * For merge(1).
258  */
259 const struct got_error *
260 got_merge_diff3(int outfd, const char *p1, const char *p2, const char *p3)
261 {
262 	const struct got_error *err = NULL;
263 	char *dp13, *dp23, *path1, *path2, *path3;
264 	BUF *b1, *b2, *b3, *d1, *d2, *diffb;
265 	u_char *data, *patch;
266 	size_t dlen, plen;
267 	struct wklhead temp_files;
268 	struct diff3_state *d3s;
269 	int i;
270 
271 	d3s = calloc(1, sizeof(*d3s));
272 	if (d3s == NULL)
273 		return got_error_from_errno();
274 	d3s->eflag = 3; /* default -E for compatibility with former RCS */
275 	d3s->oflag = 1; /* default -E for compatibility with former RCS */
276 
277 	b1 = b2 = b3 = d1 = d2 = diffb = NULL;
278 	dp13 = dp23 = path1 = path2 = path3 = NULL;
279 	data = patch = NULL;
280 
281 	if ((b1 = buf_load(p1)) == NULL)
282 		goto out;
283 	if ((b2 = buf_load(p2)) == NULL)
284 		goto out;
285 	if ((b3 = buf_load(p3)) == NULL)
286 		goto out;
287 
288 	diffb = buf_alloc(128);
289 
290 	if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
291 		err = got_error_from_errno();
292 		goto out;
293 	}
294 	if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
295 		err = got_error_from_errno();
296 		goto out;
297 	}
298 	if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
299 		err = got_error_from_errno();
300 		goto out;
301 	}
302 
303 	err = buf_write_stmp(b1, path1, &temp_files);
304 	if (err)
305 		goto out;
306 	err = buf_write_stmp(b2, path2, &temp_files);
307 	if (err)
308 		goto out;
309 	err = buf_write_stmp(b3, path3, &temp_files);
310 	if (err)
311 		goto out;
312 
313 	buf_free(b2);
314 	b2 = NULL;
315 
316 	err = diffreg(&d1, path1, path3);
317 	if (err) {
318 		buf_free(diffb);
319 		diffb = NULL;
320 		goto out;
321 
322 	}
323 	err = diffreg(&d2, path2, path3);
324 	if (err) {
325 		buf_free(diffb);
326 		diffb = NULL;
327 		goto out;
328 	}
329 
330 	if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
331 		err = got_error_from_errno();
332 		goto out;
333 	}
334 	err = buf_write_stmp(d1, dp13, &temp_files);
335 	if (err)
336 		goto out;
337 
338 	buf_free(d1);
339 	d1 = NULL;
340 
341 	if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
342 		err = got_error_from_errno();
343 		goto out;
344 	}
345 	err = buf_write_stmp(d2, dp23, &temp_files);
346 	if (err)
347 		goto out;
348 
349 	buf_free(d2);
350 	d2 = NULL;
351 
352 	d3s->diffbuf = diffb;
353 	err = diff3_internal(dp13, dp23, path1, path2, path3, p1, p3,
354 	    d3s);
355 	if (err) {
356 		buf_free(diffb);
357 		diffb = NULL;
358 		goto out;
359 	}
360 
361 	plen = buf_len(diffb);
362 	patch = buf_release(diffb);
363 	dlen = buf_len(b1);
364 	data = buf_release(b1);
365 
366 	diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
367 out:
368 	buf_free(b2);
369 	buf_free(b3);
370 	buf_free(d1);
371 	buf_free(d2);
372 
373 	(void)unlink(path1);
374 	(void)unlink(path2);
375 	(void)unlink(path3);
376 	(void)unlink(dp13);
377 	(void)unlink(dp23);
378 
379 	free(path1);
380 	free(path2);
381 	free(path3);
382 	free(dp13);
383 	free(dp23);
384 	free(data);
385 	free(patch);
386 
387 	worklist_clean(&temp_files, worklist_unlink);
388 
389 	for (i = 0; i < nitems(d3s->fp); i++) {
390 		if (d3s->fp[i])
391 			fclose(d3s->fp[i]);
392 	}
393 	free(d3s);
394 	if (err == NULL && diffb) {
395 		if (buf_write_fd(diffb, outfd) < 0)
396 			err = got_error_from_errno();
397 	}
398 	buf_free(diffb);
399 	return err;
400 }
401 
402 static const struct got_error *
403 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
404     const char *fmark, const char *rmark, struct diff3_state *d3s)
405 {
406 	const struct got_error *err = NULL;
407 	ssize_t m, n;
408 	int i;
409 
410 	i = snprintf(d3s->f1mark, sizeof(d3s->f1mark), "<<<<<<< %s", fmark);
411 	if (i < 0 || i >= (int)sizeof(d3s->f1mark))
412 		return got_error(GOT_ERR_NO_SPACE);
413 
414 	i = snprintf(d3s->f3mark, sizeof(d3s->f3mark), ">>>>>>> %s", rmark);
415 	if (i < 0 || i >= (int)sizeof(d3s->f3mark))
416 		return got_error(GOT_ERR_NO_SPACE);
417 
418 	err = increase(d3s);
419 	if (err)
420 		return err;
421 
422 	err = readin(&m, dp13, &d3s->d13, d3s);
423 	if (err)
424 		return err;
425 	err = readin(&n, dp23, &d3s->d23, d3s);
426 	if (err)
427 		return err;
428 
429 	if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
430 		return got_error_from_errno();
431 	if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
432 		return got_error_from_errno();
433 	if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
434 		return got_error_from_errno();
435 
436 	if (merge(m, n, d3s) < 0)
437 		return got_error_from_errno();
438 	return NULL;
439 }
440 
441 static int
442 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
443 {
444 	char op, *ep;
445 	struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
446 	int start, end, i, lineno;
447 	u_char tmp;
448 
449 	dlp = TAILQ_FIRST(&(dlines->l_lines));
450 	lp = TAILQ_FIRST(&(plines->l_lines));
451 
452 	end = 0;
453 	for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
454 	    lp = TAILQ_NEXT(lp, l_list)) {
455 		/* Skip blank lines */
456 		if (lp->l_len < 2)
457 			continue;
458 
459 		/* NUL-terminate line buffer for strtol() safety. */
460 		tmp = lp->l_line[lp->l_len - 1];
461 		lp->l_line[lp->l_len - 1] = '\0';
462 
463 		/* len - 1 is NUL terminator so we use len - 2 for 'op' */
464 		op = lp->l_line[lp->l_len - 2];
465 		start = (int)strtol(lp->l_line, &ep, 10);
466 
467 		/* Restore the last byte of the buffer */
468 		lp->l_line[lp->l_len - 1] = tmp;
469 
470 		if (op == 'a') {
471 			if (start > dlines->l_nblines ||
472 			    start < 0 || *ep != 'a')
473 				return -1;
474 		} else if (op == 'c') {
475 			if (start > dlines->l_nblines ||
476 			    start < 0 || (*ep != ',' && *ep != 'c'))
477 				return -1;
478 
479 			if (*ep == ',') {
480 				ep++;
481 				end = (int)strtol(ep, &ep, 10);
482 				if (end < 0 || *ep != 'c')
483 					return -1;
484 			} else {
485 				end = start;
486 			}
487 		}
488 
489 
490 		for (;;) {
491 			if (dlp == NULL)
492 				break;
493 			if (dlp->l_lineno == start)
494 				break;
495 			if (dlp->l_lineno > start) {
496 				dlp = TAILQ_PREV(dlp, tqh, l_list);
497 			} else if (dlp->l_lineno < start) {
498 				ndlp = TAILQ_NEXT(dlp, l_list);
499 				if (ndlp->l_lineno > start)
500 					break;
501 				dlp = ndlp;
502 			}
503 		}
504 
505 		if (dlp == NULL)
506 			return -1;
507 
508 
509 		if (op == 'c') {
510 			insert_after = TAILQ_PREV(dlp, tqh, l_list);
511 			for (i = 0; i <= (end - start); i++) {
512 				ndlp = TAILQ_NEXT(dlp, l_list);
513 				TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
514 				dlp = ndlp;
515 			}
516 			dlp = insert_after;
517 		}
518 
519 		if (op == 'a' || op == 'c') {
520 			for (;;) {
521 				ndlp = lp;
522 				lp = TAILQ_NEXT(lp, l_list);
523 				if (lp == NULL)
524 					return -1;
525 
526 				if (!memcmp(lp->l_line, ".", 1))
527 					break;
528 
529 				TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
530 				TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
531 				    lp, l_list);
532 				dlp = lp;
533 
534 				lp->l_lineno = start;
535 				lp = ndlp;
536 			}
537 		}
538 
539 		/*
540 		 * always resort lines as the markers might be put at the
541 		 * same line as we first started editing.
542 		 */
543 		lineno = 0;
544 		TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
545 			sort->l_lineno = lineno++;
546 		dlines->l_nblines = lineno - 1;
547 	}
548 
549 	return (0);
550 }
551 
552 /*
553  * Pick up the line numbers of all changes from one change file.
554  * (This puts the numbers in a vector, which is not strictly necessary,
555  * since the vector is processed in one sequential pass.
556  * The vector could be optimized out of existence)
557  */
558 static const struct got_error *
559 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
560 {
561 	const struct got_error *err = NULL;
562 	int a, b, c, d;
563 	char kind, *p;
564 	size_t i;
565 
566 	d3s->fp[0] = fopen(name, "r");
567 	if (d3s->fp[0] == NULL)
568 		return got_error_from_errno();
569 	for (i = 0; (p = getchange(d3s->fp[0], d3s)); i++) {
570 		if (i >= d3s->szchanges - 1) {
571 			err = increase(d3s);
572 			if (err)
573 				return err;
574 		}
575 		a = b = number(&p);
576 		if (*p == ',') {
577 			p++;
578 			b = number(&p);
579 		}
580 		kind = *p++;
581 		c = d = number(&p);
582 		if (*p==',') {
583 			p++;
584 			d = number(&p);
585 		}
586 		if (kind == 'a')
587 			a++;
588 		if (kind == 'd')
589 			c++;
590 		b++;
591 		d++;
592 		(*dd)[i].old.from = a;
593 		(*dd)[i].old.to = b;
594 		(*dd)[i].new.from = c;
595 		(*dd)[i].new.to = d;
596 	}
597 
598 	if (i) {
599 		(*dd)[i].old.from = (*dd)[i-1].old.to;
600 		(*dd)[i].new.from = (*dd)[i-1].new.to;
601 	}
602 
603 	(void)fclose(d3s->fp[0]);
604 
605 	return NULL;
606 }
607 
608 static int
609 number(char **lc)
610 {
611 	int nn;
612 
613 	nn = 0;
614 	while (isdigit((unsigned char)(**lc)))
615 		nn = nn*10 + *(*lc)++ - '0';
616 
617 	return (nn);
618 }
619 
620 static char *
621 getchange(FILE *b, struct diff3_state *d3s)
622 {
623 	char *line;
624 
625 	while ((line = get_line(b, NULL, d3s))) {
626 		if (isdigit((unsigned char)line[0]))
627 			return (line);
628 	}
629 
630 	return (NULL);
631 }
632 
633 static char *
634 get_line(FILE *b, size_t *n, struct diff3_state *d3s)
635 {
636 	char *cp;
637 	size_t len;
638 	char *new;
639 
640 	if ((cp = fgetln(b, &len)) == NULL)
641 		return (NULL);
642 
643 	if (cp[len - 1] != '\n')
644 		len++;
645 	if (len + 1 > d3s->bufsize) {
646 		do {
647 			d3s->bufsize += 1024;
648 		} while (len + 1 > d3s->bufsize);
649 		new = reallocarray(d3s->buf, 1, d3s->bufsize);
650 		if (new == NULL)
651 			return NULL;
652 		d3s->buf = new;
653 	}
654 	memcpy(d3s->buf, cp, len - 1);
655 	d3s->buf[len - 1] = '\n';
656 	d3s->buf[len] = '\0';
657 	if (n != NULL)
658 		*n = len;
659 
660 	return (d3s->buf);
661 }
662 
663 static int
664 merge(size_t m1, size_t m2, struct diff3_state *d3s)
665 {
666 	struct diff *d1, *d2, *d3;
667 	int dpl, j, t1, t2;
668 
669 	d1 = d3s->d13;
670 	d2 = d3s->d23;
671 	j = 0;
672 	for (;;) {
673 		t1 = (d1 < d3s->d13 + m1);
674 		t2 = (d2 < d3s->d23 + m2);
675 		if (!t1 && !t2)
676 			break;
677 
678 		if (d3s->debug) {
679 			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
680 			d1->old.from, d1->old.to,
681 			d1->new.from, d1->new.to,
682 			d2->old.from, d2->old.to,
683 			d2->new.from, d2->new.to);
684 		}
685 
686 		/* first file is different from others */
687 		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
688 			/* stuff peculiar to 1st file */
689 			if (d3s->eflag == 0) {
690 				separate("1", d3s);
691 				change(1, &d1->old, 0, d3s);
692 				keep(2, &d1->new, d3s);
693 				change(3, &d1->new, 0, d3s);
694 			}
695 			d1++;
696 			continue;
697 		}
698 
699 		/* second file is different from others */
700 		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
701 			if (d3s->eflag == 0) {
702 				separate("2", d3s);
703 				keep(1, &d2->new, d3s);
704 				change(2, &d2->old, 0, d3s);
705 				change(3, &d2->new, 0, d3s);
706 			}
707 			d2++;
708 			continue;
709 		}
710 
711 		/*
712 		 * Merge overlapping changes in first file
713 		 * this happens after extension (see below).
714 		 */
715 		if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
716 			d1[1].old.from = d1->old.from;
717 			d1[1].new.from = d1->new.from;
718 			d1++;
719 			continue;
720 		}
721 
722 		/* merge overlapping changes in second */
723 		if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
724 			d2[1].old.from = d2->old.from;
725 			d2[1].new.from = d2->new.from;
726 			d2++;
727 			continue;
728 		}
729 		/* stuff peculiar to third file or different in all */
730 		if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
731 			dpl = duplicate(&d1->old, &d2->old, d3s);
732 			if (dpl == -1)
733 				return (-1);
734 
735 			/*
736 			 * dpl = 0 means all files differ
737 			 * dpl = 1 means files 1 and 2 identical
738 			 */
739 			if (d3s->eflag == 0) {
740 				separate(dpl ? "3" : "", d3s);
741 				change(1, &d1->old, dpl, d3s);
742 				change(2, &d2->old, 0, d3s);
743 				d3 = d1->old.to > d1->old.from ? d1 : d2;
744 				change(3, &d3->new, 0, d3s);
745 			} else
746 				j = edit(d1, dpl, j, d3s);
747 			d1++;
748 			d2++;
749 			continue;
750 		}
751 
752 		/*
753 		 * Overlapping changes from file 1 and 2; extend changes
754 		 * appropriately to make them coincide.
755 		 */
756 		if (d1->new.from < d2->new.from) {
757 			d2->old.from -= d2->new.from-d1->new.from;
758 			d2->new.from = d1->new.from;
759 		} else if (d2->new.from < d1->new.from) {
760 			d1->old.from -= d1->new.from-d2->new.from;
761 			d1->new.from = d2->new.from;
762 		}
763 		if (d1->new.to > d2->new.to) {
764 			d2->old.to += d1->new.to - d2->new.to;
765 			d2->new.to = d1->new.to;
766 		} else if (d2->new.to > d1->new.to) {
767 			d1->old.to += d2->new.to - d1->new.to;
768 			d1->new.to = d2->new.to;
769 		}
770 	}
771 
772 	return (edscript(j, d3s));
773 }
774 
775 static void
776 separate(const char *s, struct diff3_state *d3s)
777 {
778 	diff_output(d3s->diffbuf, "====%s\n", s);
779 }
780 
781 /*
782  * The range of lines rold.from thru rold.to in file i is to be changed.
783  * It is to be printed only if it does not duplicate something to be
784  * printed later.
785  */
786 static void
787 change(int i, struct range *rold, int fdup, struct diff3_state *d3s)
788 {
789 	diff_output(d3s->diffbuf, "%d:", i);
790 	d3s->last[i] = rold->to;
791 	prange(rold, d3s);
792 	if (fdup || d3s->debug)
793 		return;
794 	i--;
795 	(void)skip(i, rold->from, NULL, d3s);
796 	(void)skip(i, rold->to, "  ", d3s);
797 }
798 
799 /*
800  * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
801  */
802 static void
803 prange(struct range *rold, struct diff3_state *d3s)
804 {
805 	if (rold->to <= rold->from)
806 		diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
807 	else {
808 		diff_output(d3s->diffbuf, "%d", rold->from);
809 		if (rold->to > rold->from+1)
810 			diff_output(d3s->diffbuf, ",%d", rold->to - 1);
811 		diff_output(d3s->diffbuf, "c\n");
812 	}
813 }
814 
815 /*
816  * No difference was reported by diff between file 1 (or 2) and file 3,
817  * and an artificial dummy difference (trange) must be ginned up to
818  * correspond to the change reported in the other file.
819  */
820 static void
821 keep(int i, struct range *rnew, struct diff3_state *d3s)
822 {
823 	int delta;
824 	struct range trange;
825 
826 	delta = d3s->last[3] - d3s->last[i];
827 	trange.from = rnew->from - delta;
828 	trange.to = rnew->to - delta;
829 	change(i, &trange, 1, d3s);
830 }
831 
832 /*
833  * skip to just before line number from in file "i".  If "pr" is non-NULL,
834  * print all skipped stuff with string pr as a prefix.
835  */
836 static int
837 skip(int i, int from, char *pr, struct diff3_state *d3s)
838 {
839 	size_t j, n;
840 	char *line;
841 
842 	for (n = 0; d3s->cline[i] < from - 1; n += j) {
843 		if ((line = get_line(d3s->fp[i], &j, d3s)) == NULL)
844 			return (-1);
845 		if (pr != NULL)
846 			diff_output(d3s->diffbuf, "%s%s", pr, line);
847 		d3s->cline[i]++;
848 	}
849 	return ((int) n);
850 }
851 
852 /*
853  * Return 1 or 0 according as the old range (in file 1) contains exactly
854  * the same data as the new range (in file 2).
855  */
856 static int
857 duplicate(struct range *r1, struct range *r2, struct diff3_state *d3s)
858 {
859 	int c,d;
860 	int nchar;
861 	int nline;
862 
863 	if (r1->to-r1->from != r2->to-r2->from)
864 		return (0);
865 	(void)skip(0, r1->from, NULL, d3s);
866 	(void)skip(1, r2->from, NULL, d3s);
867 	nchar = 0;
868 	for (nline=0; nline < r1->to - r1->from; nline++) {
869 		do {
870 			c = getc(d3s->fp[0]);
871 			d = getc(d3s->fp[1]);
872 			if (c == -1 || d== -1)
873 				return (-1);
874 			nchar++;
875 			if (c != d) {
876 				repos(nchar, d3s);
877 				return (0);
878 			}
879 		} while (c != '\n');
880 	}
881 	repos(nchar, d3s);
882 	return (1);
883 }
884 
885 static void
886 repos(int nchar, struct diff3_state *d3s)
887 {
888 	int i;
889 
890 	for (i = 0; i < 2; i++)
891 		(void)fseek(d3s->fp[i], (long)-nchar, SEEK_CUR);
892 }
893 
894 /*
895  * collect an editing script for later regurgitation
896  */
897 static int
898 edit(struct diff *diff, int fdup, int j, struct diff3_state *d3s)
899 {
900 	if (((fdup + 1) & d3s->eflag) == 0)
901 		return (j);
902 	j++;
903 	d3s->overlap[j] = !fdup;
904 	if (!fdup)
905 		d3s->overlapcnt++;
906 	d3s->de[j].old.from = diff->old.from;
907 	d3s->de[j].old.to = diff->old.to;
908 	d3s->de[j].new.from =
909 	    d3s->de[j-1].new.to + skip(2, diff->new.from, NULL, d3s);
910 	d3s->de[j].new.to =
911 	    d3s->de[j].new.from + skip(2, diff->new.to, NULL, d3s);
912 	return (j);
913 }
914 
915 /* regurgitate */
916 static int
917 edscript(int n, struct diff3_state *d3s)
918 {
919 	int j, k;
920 	char block[BUFSIZ+1];
921 
922 	for (; n > 0; n--) {
923 		if (!d3s->oflag || !d3s->overlap[n])
924 			prange(&d3s->de[n].old, d3s);
925 		else
926 			diff_output(d3s->diffbuf, "%da\n=======\n",
927 			    d3s->de[n].old.to -1);
928 		(void)fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET);
929 		k = d3s->de[n].new.to - d3s->de[n].new.from;
930 		for (; k > 0; k-= j) {
931 			j = k > BUFSIZ ? BUFSIZ : k;
932 			if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
933 				return (-1);
934 			block[j] = '\0';
935 			diff_output(d3s->diffbuf, "%s", block);
936 		}
937 
938 		if (!d3s->oflag || !d3s->overlap[n])
939 			diff_output(d3s->diffbuf, ".\n");
940 		else {
941 			diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
942 			diff_output(d3s->diffbuf, "%da\n%s\n.\n",
943 			    d3s->de[n].old.from - 1, d3s->f1mark);
944 		}
945 	}
946 
947 	return (d3s->overlapcnt);
948 }
949 
950 static const struct got_error *
951 increase(struct diff3_state *d3s)
952 {
953 	size_t newsz, incr;
954 	struct diff *d;
955 	char *s;
956 
957 	/* are the memset(3) calls needed? */
958 	newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
959 	incr = newsz - d3s->szchanges;
960 
961 	d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
962 	if (d == NULL)
963 		return got_error_from_errno();
964 	d3s->d13 = d;
965 	memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
966 
967 	d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
968 	if (d == NULL)
969 		return got_error_from_errno();
970 	d3s->d23 = d;
971 	memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
972 
973 	d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
974 	if (d == NULL)
975 		return got_error_from_errno();
976 	d3s->de = d;
977 	memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
978 
979 	s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
980 	if (s == NULL)
981 		return got_error_from_errno();
982 	d3s->overlap = s;
983 	memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
984 	d3s->szchanges = newsz;
985 
986 	return NULL;
987 }