Gotweb

Blob

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