Head

GCC Code Coverage Report

Directory:	./		Exec	Total	Coverage
File:	usr.bin/diff3/diff3prog.c	Lines:	0	254	0.0 %
Date:	2017-11-13	Branches:	0	154	0.0 %


/*	$OpenBSD: diff3prog.c,v 1.19 2016/10/18 21:06:52 millert Exp $	*/

/*
 * Copyright (C) Caldera International Inc.  2001-2002.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code and documentation must retain the above
 *    copyright notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. All advertising materials mentioning features or use of this software
 *    must display the following acknowledgement:
 *	This product includes software developed or owned by Caldera
 *	International, Inc.
 * 4. Neither the name of Caldera International, Inc. nor the names of other
 *    contributors may be used to endorse or promote products derived from
 *    this software without specific prior written permission.
 *
 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
/*-
 * Copyright (c) 1991, 1993
 *	The Regents of the University of California.  All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 * 1. Redistributions of source code must retain the above copyright
 *    notice, this list of conditions and the following disclaimer.
 * 2. Redistributions in binary form must reproduce the above copyright
 *    notice, this list of conditions and the following disclaimer in the
 *    documentation and/or other materials provided with the distribution.
 * 3. Neither the name of the University nor the names of its contributors
 *    may be used to endorse or promote products derived from this software
 *    without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 * SUCH DAMAGE.
 *
 *	@(#)diff3.c	8.1 (Berkeley) 6/6/93
 */

#include <ctype.h>
#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>

/* diff3 - 3-way differential file comparison */

/* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
 *
 * d13 = diff report on f1 vs f3
 * d23 = diff report on f2 vs f3
 * f1, f2, f3 the 3 files
 * if changes in f1 overlap with changes in f3, m1 and m3 are used
 * to mark the overlaps; otherwise, the file names f1 and f3 are used
 * (only for options E and X).
 */

/*
 * "from" is first in range of changed lines; "to" is last+1
 * from=to=line after point of insertion for added lines.
 */
struct  range {
	int from;
	int to;
};
struct diff {
	struct range old;
	struct range new;
};

size_t szchanges;

struct diff *d13;
struct diff *d23;
/*
 * "de" is used to gather editing scripts.  These are later spewed out in
 * reverse order.  Its first element must be all zero, the "new" component
 * of "de" contains line positions or byte positions depending on when you
 * look (!?).  Array overlap indicates which sections in "de" correspond to
 * lines that are different in all three files.
 */
struct diff *de;
char *overlap;
int  overlapcnt;
FILE *fp[3];
int cline[3];		/* # of the last-read line in each file (0-2) */
/*
 * the latest known correspondence between line numbers of the 3 files
 * is stored in last[1-3];
 */
int last[4];
int eflag;
int oflag;		/* indicates whether to mark overlaps (-E or -X)*/
int debug  = 0;
char f1mark[40], f3mark[40];	/* markers for -E and -X */

int duplicate(struct range *, struct range *);
int edit(struct diff *, int, int);
char *getchange(FILE *);
char *get_line(FILE *, size_t *);
int number(char **);
int readin(char *, struct diff **);
int skip(int, int, char *);
void change(int, struct range *, int);
void keep(int, struct range *);
void merge(int, int);
void prange(struct range *);
void repos(int);
void separate(const char *);
__dead void edscript(int);
__dead void trouble(void);
void increase(void);
__dead void usage(void);

int
main(int argc, char **argv)
{
	int ch, i, m, n;

	if (pledge("stdio rpath flock cpath wpath", NULL) == -1)
		err(1, "pledge");

	eflag = 0;
	oflag = 0;
	while ((ch = getopt(argc, argv, "EeXx3")) != -1) {
		switch (ch) {
		case 'E':
			eflag = 3;
			oflag = 1;
			break;
		case 'e':
			eflag = 3;
			break;
		case 'X':
			oflag = eflag = 1;
			break;
		case 'x':
			eflag = 1;
			break;
		case '3':
			eflag = 2;
			break;
		}
	}
	argc -= optind;
	argv += optind;
	/* XXX - argc usage seems wrong here */
	if (argc < 5)
		usage();

	if (oflag) {
		(void)snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s",
		    argc >= 6 ? argv[5] : argv[2]);
		(void)snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s",
		    argc >= 7 ? argv[6] : argv[4]);
	}

	increase();
	m = readin(argv[0], &d13);
	n = readin(argv[1], &d23);
	for (i = 0; i <= 2; i++) {
		if ((fp[i] = fopen(argv[i + 2], "r")) == NULL)
			err(EXIT_FAILURE, "can't open %s", argv[i + 2]);
	}
	merge(m, n);
	exit(EXIT_SUCCESS);
}

/*
 * Pick up the line numbers of all changes from one change file.
 * (This puts the numbers in a vector, which is not strictly necessary,
 * since the vector is processed in one sequential pass.
 * The vector could be optimized out of existence)
 */
int
readin(char *name, struct diff **dd)
{
	int a, b, c, d, i;
	char kind, *p;

	fp[0] = fopen(name, "r");
	if (fp[0] == NULL)
		err(EXIT_FAILURE, "can't open %s", name);
	for (i=0; (p = getchange(fp[0])); i++) {
		if (i >= szchanges - 1)
			increase();
		a = b = number(&p);
		if (*p == ',') {
			p++;
			b = number(&p);
		}
		kind = *p++;
		c = d = number(&p);
		if (*p==',') {
			p++;
			d = number(&p);
		}
		if (kind == 'a')
			a++;
		if (kind == 'd')
			c++;
		b++;
		d++;
		(*dd)[i].old.from = a;
		(*dd)[i].old.to = b;
		(*dd)[i].new.from = c;
		(*dd)[i].new.to = d;
	}
	if (i) {
		(*dd)[i].old.from = (*dd)[i-1].old.to;
		(*dd)[i].new.from = (*dd)[i-1].new.to;
	}
	(void)fclose(fp[0]);
	return (i);
}

int
number(char **lc)
{
	int nn;
	nn = 0;
	while (isdigit((unsigned char)(**lc)))
		nn = nn*10 + *(*lc)++ - '0';
	return (nn);
}

char *
getchange(FILE *b)
{
	char *line;

	while ((line = get_line(b, NULL))) {
		if (isdigit((unsigned char)line[0]))
			return (line);
	}
	return (NULL);
}

char *
get_line(FILE *b, size_t *n)
{
	char *cp;
	size_t len;
	static char *buf;
	static size_t bufsize;

	if ((cp = fgetln(b, &len)) == NULL)
		return (NULL);

	if (cp[len - 1] != '\n')
		len++;
	if (len + 1 > bufsize) {
		do {
			bufsize += 1024;
		} while (len + 1 > bufsize);
		if ((buf = realloc(buf, bufsize)) == NULL)
			err(EXIT_FAILURE, NULL);
	}
	memcpy(buf, cp, len - 1);
	buf[len - 1] = '\n';
	buf[len] = '\0';
	if (n != NULL)
		*n = len;
	return (buf);
}

void
merge(int m1, int m2)
{
	struct diff *d1, *d2, *d3;
	int dup, j, t1, t2;

	d1 = d13;
	d2 = d23;
	j = 0;
	for (;;) {
		t1 = (d1 < d13 + m1);
		t2 = (d2 < d23 + m2);
		if (!t1 && !t2)
			break;

		if (debug) {
			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
			d1->old.from,d1->old.to,
			d1->new.from,d1->new.to,
			d2->old.from,d2->old.to,
			d2->new.from,d2->new.to);
		}
		/* first file is different from others */
		if (!t2 || (t1 && d1->new.to < d2->new.from)) {
			/* stuff peculiar to 1st file */
			if (eflag==0) {
				separate("1");
				change(1, &d1->old, 0);
				keep(2, &d1->new);
				change(3, &d1->new, 0);
			}
			d1++;
			continue;
		}
		/* second file is different from others */
		if (!t1 || (t2 && d2->new.to < d1->new.from)) {
			if (eflag==0) {
				separate("2");
				keep(1, &d2->new);
				change(2, &d2->old, 0);
				change(3, &d2->new, 0);
			}
			d2++;
			continue;
		}
		/*
		 * Merge overlapping changes in first file
		 * this happens after extension (see below).
		 */
		if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) {
			d1[1].old.from = d1->old.from;
			d1[1].new.from = d1->new.from;
			d1++;
			continue;
		}

		/* merge overlapping changes in second */
		if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) {
			d2[1].old.from = d2->old.from;
			d2[1].new.from = d2->new.from;
			d2++;
			continue;
		}
		/* stuff peculiar to third file or different in all */
		if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
			dup = duplicate(&d1->old,&d2->old);
			/*
			 * dup = 0 means all files differ
			 * dup = 1 means files 1 and 2 identical
			 */
			if (eflag==0) {
				separate(dup ? "3" : "");
				change(1, &d1->old, dup);
				change(2, &d2->old, 0);
				d3 = d1->old.to > d1->old.from ? d1 : d2;
				change(3, &d3->new, 0);
			} else
				j = edit(d1, dup, j);
			d1++;
			d2++;
			continue;
		}
		/*
		 * Overlapping changes from file 1 and 2; extend changes
		 * appropriately to make them coincide.
		 */
		if (d1->new.from < d2->new.from) {
			d2->old.from -= d2->new.from-d1->new.from;
			d2->new.from = d1->new.from;
		} else if (d2->new.from < d1->new.from) {
			d1->old.from -= d1->new.from-d2->new.from;
			d1->new.from = d2->new.from;
		}
		if (d1->new.to > d2->new.to) {
			d2->old.to += d1->new.to - d2->new.to;
			d2->new.to = d1->new.to;
		} else if (d2->new.to > d1->new.to) {
			d1->old.to += d2->new.to - d1->new.to;
			d1->new.to = d2->new.to;
		}
	}
	if (eflag)
		edscript(j);
}

void
separate(const char *s)
{
	printf("====%s\n", s);
}

/*
 * The range of lines rold.from thru rold.to in file i is to be changed.
 * It is to be printed only if it does not duplicate something to be
 * printed later.
 */
void
change(int i, struct range *rold, int dup)
{
	printf("%d:", i);
	last[i] = rold->to;
	prange(rold);
	if (dup || debug)
		return;
	i--;
	(void)skip(i, rold->from, NULL);
	(void)skip(i, rold->to, "  ");
}

/*
 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
 */
void
prange(struct range *rold)
{
	if (rold->to <= rold->from)
		printf("%da\n", rold->from - 1);
	else {
		printf("%d", rold->from);
		if (rold->to > rold->from+1)
			printf(",%d", rold->to - 1);
		printf("c\n");
	}
}

/*
 * No difference was reported by diff between file 1 (or 2) and file 3,
 * and an artificial dummy difference (trange) must be ginned up to
 * correspond to the change reported in the other file.
 */
void
keep(int i, struct range *rnew)
{
	int delta;
	struct range trange;

	delta = last[3] - last[i];
	trange.from = rnew->from - delta;
	trange.to = rnew->to - delta;
	change(i, &trange, 1);
}

/*
 * skip to just before line number from in file "i".  If "pr" is non-NULL,
 * print all skipped stuff with string pr as a prefix.
 */
int
skip(int i, int from, char *pr)
{
	size_t j, n;
	char *line;

	for (n = 0; cline[i] < from - 1; n += j) {
		if ((line = get_line(fp[i], &j)) == NULL)
			trouble();
		if (pr != NULL)
			printf("%s%s", pr, line);
		cline[i]++;
	}
	return ((int) n);
}

/*
 * Return 1 or 0 according as the old range (in file 1) contains exactly
 * the same data as the new range (in file 2).
 */
int
duplicate(struct range *r1, struct range *r2)
{
	int c,d;
	int nchar;
	int nline;

	if (r1->to-r1->from != r2->to-r2->from)
		return (0);
	(void)skip(0, r1->from, NULL);
	(void)skip(1, r2->from, NULL);
	nchar = 0;
	for (nline=0; nline < r1->to - r1->from; nline++) {
		do {
			c = getc(fp[0]);
			d = getc(fp[1]);
			if (c == -1 || d== -1)
				trouble();
			nchar++;
			if (c != d) {
				repos(nchar);
				return (0);
			}
		} while (c != '\n');
	}
	repos(nchar);
	return (1);
}

void
repos(int nchar)
{
	int i;

	for (i = 0; i < 2; i++)
		(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
}

__dead void
trouble(void)
{
	errx(EXIT_FAILURE, "logic error");
}

/*
 * collect an editing script for later regurgitation
 */
int
edit(struct diff *diff, int dup, int j)
{
	if (((dup + 1) & eflag) == 0)
		return (j);
	j++;
	overlap[j] = !dup;
	if (!dup)
		overlapcnt++;
	de[j].old.from = diff->old.from;
	de[j].old.to = diff->old.to;
	de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL);
	de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL);
	return (j);
}

/* regurgitate */
__dead void
edscript(int n)
{
	int j,k;
	char block[BUFSIZ];

	for (; n > 0; n--) {
		if (!oflag || !overlap[n])
			prange(&de[n].old);
		else
			printf("%da\n=======\n", de[n].old.to -1);
		(void)fseek(fp[2], (long)de[n].new.from, SEEK_SET);
		for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
			j = k > BUFSIZ ? BUFSIZ : k;
			if (fread(block, 1, j, fp[2]) != j)
				trouble();
			(void)fwrite(block, 1, j, stdout);
		}
		if (!oflag || !overlap[n])
			printf(".\n");
		else {
			printf("%s\n.\n", f3mark);
			printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
		}
	}
	exit(overlapcnt);
}

void
increase(void)
{
	struct diff *p;
	char *q;
	size_t newsz, incr;

	/* are the memset(3) calls needed? */
	newsz = szchanges == 0 ? 64 : 2 * szchanges;
	incr = newsz - szchanges;

	p = reallocarray(d13, newsz, sizeof(struct diff));
	if (p == NULL)
		err(1, NULL);
	memset(p + szchanges, 0, incr * sizeof(struct diff));
	d13 = p;
	p = reallocarray(d23, newsz, sizeof(struct diff));
	if (p == NULL)
		err(1, NULL);
	memset(p + szchanges, 0, incr * sizeof(struct diff));
	d23 = p;
	p = reallocarray(de, newsz, sizeof(struct diff));
	if (p == NULL)
		err(1, NULL);
	memset(p + szchanges, 0, incr * sizeof(struct diff));
	de = p;
	q = reallocarray(overlap, newsz, sizeof(char));
	if (q == NULL)
		err(1, NULL);
	memset(q + szchanges, 0, incr * sizeof(char));
	overlap = q;
	szchanges = newsz;
}


__dead void
usage(void)
{
	extern char *__progname;

	fprintf(stderr, "usage: %s [-exEX3] /tmp/d3a.?????????? "
	    "/tmp/d3b.?????????? file1 file2 file3\n", __progname);
	exit(EXIT_FAILURE);
}


Generated by: GCOVR (Version 3.3)

Line	Branch	Exec	Source
1			/* $OpenBSD: diff3prog.c,v 1.19 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 <ctype.h>
68			#include <err.h>
69			#include <stdio.h>
70			#include <stdlib.h>
71			#include <string.h>
72			#include <unistd.h>
73
74			/* diff3 - 3-way differential file comparison */
75
76			/* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
77			*
78			* d13 = diff report on f1 vs f3
79			* d23 = diff report on f2 vs f3
80			* f1, f2, f3 the 3 files
81			* if changes in f1 overlap with changes in f3, m1 and m3 are used
82			* to mark the overlaps; otherwise, the file names f1 and f3 are used
83			* (only for options E and X).
84			*/
85
86			/*
87			* "from" is first in range of changed lines; "to" is last+1
88			* from=to=line after point of insertion for added lines.
89			*/
90			struct range {
91			int from;
92			int to;
93			};
94			struct diff {
95			struct range old;
96			struct range new;
97			};
98
99			size_t szchanges;
100
101			struct diff *d13;
102			struct diff *d23;
103			/*
104			* "de" is used to gather editing scripts. These are later spewed out in
105			* reverse order. Its first element must be all zero, the "new" component
106			* of "de" contains line positions or byte positions depending on when you
107			* look (!?). Array overlap indicates which sections in "de" correspond to
108			* lines that are different in all three files.
109			*/
110			struct diff *de;
111			char *overlap;
112			int overlapcnt;
113			FILE *fp[3];
114			int cline[3]; /* # of the last-read line in each file (0-2) */
115			/*
116			* the latest known correspondence between line numbers of the 3 files
117			* is stored in last[1-3];
118			*/
119			int last[4];
120			int eflag;
121			int oflag; /* indicates whether to mark overlaps (-E or -X)*/
122			int debug = 0;
123			char f1mark[40], f3mark[40]; /* markers for -E and -X */
124
125			int duplicate(struct range , struct range );
126			int edit(struct diff *, int, int);
127			char getchange(FILE );
128			char get_line(FILE , size_t *);
129			int number(char **);
130			int readin(char , struct diff *);
131			int skip(int, int, char *);
132			void change(int, struct range *, int);
133			void keep(int, struct range *);
134			void merge(int, int);
135			void prange(struct range *);
136			void repos(int);
137			void separate(const char *);
138			__dead void edscript(int);
139			__dead void trouble(void);
140			void increase(void);
141			__dead void usage(void);
142
143			int
144			main(int argc, char **argv)
145			{
146			int ch, i, m, n;
147
148			if (pledge("stdio rpath flock cpath wpath", NULL) == -1)
149			err(1, "pledge");
150
151			eflag = 0;
152			oflag = 0;
153			while ((ch = getopt(argc, argv, "EeXx3")) != -1) {
154			switch (ch) {
155			case 'E':
156			eflag = 3;
157			oflag = 1;
158			break;
159			case 'e':
160			eflag = 3;
161			break;
162			case 'X':
163			oflag = eflag = 1;
164			break;
165			case 'x':
166			eflag = 1;
167			break;
168			case '3':
169			eflag = 2;
170			break;
171			}
172			}
173			argc -= optind;
174			argv += optind;
175			/* XXX - argc usage seems wrong here */
176			if (argc < 5)
177			usage();
178
179			if (oflag) {
180			(void)snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s",
181			argc >= 6 ? argv[5] : argv[2]);
182			(void)snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s",
183			argc >= 7 ? argv[6] : argv[4]);
184			}
185
186			increase();
187			m = readin(argv[0], &d13);
188			n = readin(argv[1], &d23);
189			for (i = 0; i <= 2; i++) {
190			if ((fp[i] = fopen(argv[i + 2], "r")) == NULL)
191			err(EXIT_FAILURE, "can't open %s", argv[i + 2]);
192			}
193			merge(m, n);
194			exit(EXIT_SUCCESS);
195			}
196
197			/*
198			* Pick up the line numbers of all changes from one change file.
199			* (This puts the numbers in a vector, which is not strictly necessary,
200			* since the vector is processed in one sequential pass.
201			* The vector could be optimized out of existence)
202			*/
203			int
204			readin(char name, struct diff *dd)
205			{
206			int a, b, c, d, i;
207			char kind, *p;
208
209			fp[0] = fopen(name, "r");
210			if (fp[0] == NULL)
211			err(EXIT_FAILURE, "can't open %s", name);
212			for (i=0; (p = getchange(fp[0])); i++) {
213			if (i >= szchanges - 1)
214			increase();
215			a = b = number(&p);
216			if (*p == ',') {
217			p++;
218			b = number(&p);
219			}
220			kind = *p++;
221			c = d = number(&p);
222			if (*p==',') {
223			p++;
224			d = number(&p);
225			}
226			if (kind == 'a')
227			a++;
228			if (kind == 'd')
229			c++;
230			b++;
231			d++;
232			(*dd)[i].old.from = a;
233			(*dd)[i].old.to = b;
234			(*dd)[i].new.from = c;
235			(*dd)[i].new.to = d;
236			}
237			if (i) {
238			(dd)[i].old.from = (dd)[i-1].old.to;
239			(dd)[i].new.from = (dd)[i-1].new.to;
240			}
241			(void)fclose(fp[0]);
242			return (i);
243			}
244
245			int
246			number(char **lc)
247			{
248			int nn;
249			nn = 0;
250			while (isdigit((unsigned char)(**lc)))
251			nn = nn10 + (*lc)++ - '0';
252			return (nn);
253			}
254
255			char *
256			getchange(FILE *b)
257			{
258			char *line;
259
260			while ((line = get_line(b, NULL))) {
261			if (isdigit((unsigned char)line[0]))
262			return (line);
263			}
264			return (NULL);
265			}
266
267			char *
268			get_line(FILE b, size_t n)
269			{
270			char *cp;
271			size_t len;
272			static char *buf;
273			static size_t bufsize;
274
275			if ((cp = fgetln(b, &len)) == NULL)
276			return (NULL);
277
278			if (cp[len - 1] != '\n')
279			len++;
280			if (len + 1 > bufsize) {
281			do {
282			bufsize += 1024;
283			} while (len + 1 > bufsize);
284			if ((buf = realloc(buf, bufsize)) == NULL)
285			err(EXIT_FAILURE, NULL);
286			}
287			memcpy(buf, cp, len - 1);
288			buf[len - 1] = '\n';
289			buf[len] = '\0';
290			if (n != NULL)
291			*n = len;
292			return (buf);
293			}
294
295			void
296			merge(int m1, int m2)
297			{
298			struct diff d1, d2, *d3;
299			int dup, j, t1, t2;
300
301			d1 = d13;
302			d2 = d23;
303			j = 0;
304			for (;;) {
305			t1 = (d1 < d13 + m1);
306			t2 = (d2 < d23 + m2);
307			if (!t1 && !t2)
308			break;
309
310			if (debug) {
311			printf("%d,%d=%d,%d %d,%d=%d,%d\n",
312			d1->old.from,d1->old.to,
313			d1->new.from,d1->new.to,
314			d2->old.from,d2->old.to,
315			d2->new.from,d2->new.to);
316			}
317			/* first file is different from others */
318			if (!t2 \|\| (t1 && d1->new.to < d2->new.from)) {
319			/* stuff peculiar to 1st file */
320			if (eflag==0) {
321			separate("1");
322			change(1, &d1->old, 0);
323			keep(2, &d1->new);
324			change(3, &d1->new, 0);
325			}
326			d1++;
327			continue;
328			}
329			/* second file is different from others */
330			if (!t1 \|\| (t2 && d2->new.to < d1->new.from)) {
331			if (eflag==0) {
332			separate("2");
333			keep(1, &d2->new);
334			change(2, &d2->old, 0);
335			change(3, &d2->new, 0);
336			}
337			d2++;
338			continue;
339			}
340			/*
341			* Merge overlapping changes in first file
342			* this happens after extension (see below).
343			*/
344			if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) {
345			d1[1].old.from = d1->old.from;
346			d1[1].new.from = d1->new.from;
347			d1++;
348			continue;
349			}
350
351			/* merge overlapping changes in second */
352			if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) {
353			d2[1].old.from = d2->old.from;
354			d2[1].new.from = d2->new.from;
355			d2++;
356			continue;
357			}
358			/* stuff peculiar to third file or different in all */
359			if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
360			dup = duplicate(&d1->old,&d2->old);
361			/*
362			* dup = 0 means all files differ
363			* dup = 1 means files 1 and 2 identical
364			*/
365			if (eflag==0) {
366			separate(dup ? "3" : "");
367			change(1, &d1->old, dup);
368			change(2, &d2->old, 0);
369			d3 = d1->old.to > d1->old.from ? d1 : d2;
370			change(3, &d3->new, 0);
371			} else
372			j = edit(d1, dup, j);
373			d1++;
374			d2++;
375			continue;
376			}
377			/*
378			* Overlapping changes from file 1 and 2; extend changes
379			* appropriately to make them coincide.
380			*/
381			if (d1->new.from < d2->new.from) {
382			d2->old.from -= d2->new.from-d1->new.from;
383			d2->new.from = d1->new.from;
384			} else if (d2->new.from < d1->new.from) {
385			d1->old.from -= d1->new.from-d2->new.from;
386			d1->new.from = d2->new.from;
387			}
388			if (d1->new.to > d2->new.to) {
389			d2->old.to += d1->new.to - d2->new.to;
390			d2->new.to = d1->new.to;
391			} else if (d2->new.to > d1->new.to) {
392			d1->old.to += d2->new.to - d1->new.to;
393			d1->new.to = d2->new.to;
394			}
395			}
396			if (eflag)
397			edscript(j);
398			}
399
400			void
401			separate(const char *s)
402			{
403			printf("====%s\n", s);
404			}
405
406			/*
407			* The range of lines rold.from thru rold.to in file i is to be changed.
408			* It is to be printed only if it does not duplicate something to be
409			* printed later.
410			*/
411			void
412			change(int i, struct range *rold, int dup)
413			{
414			printf("%d:", i);
415			last[i] = rold->to;
416			prange(rold);
417			if (dup \|\| debug)
418			return;
419			i--;
420			(void)skip(i, rold->from, NULL);
421			(void)skip(i, rold->to, " ");
422			}
423
424			/*
425			* print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
426			*/
427			void
428			prange(struct range *rold)
429			{
430			if (rold->to <= rold->from)
431			printf("%da\n", rold->from - 1);
432			else {
433			printf("%d", rold->from);
434			if (rold->to > rold->from+1)
435			printf(",%d", rold->to - 1);
436			printf("c\n");
437			}
438			}
439
440			/*
441			* No difference was reported by diff between file 1 (or 2) and file 3,
442			* and an artificial dummy difference (trange) must be ginned up to
443			* correspond to the change reported in the other file.
444			*/
445			void
446			keep(int i, struct range *rnew)
447			{
448			int delta;
449			struct range trange;
450
451			delta = last[3] - last[i];
452			trange.from = rnew->from - delta;
453			trange.to = rnew->to - delta;
454			change(i, &trange, 1);
455			}
456
457			/*
458			* skip to just before line number from in file "i". If "pr" is non-NULL,
459			* print all skipped stuff with string pr as a prefix.
460			*/
461			int
462			skip(int i, int from, char *pr)
463			{
464			size_t j, n;
465			char *line;
466
467			for (n = 0; cline[i] < from - 1; n += j) {
468			if ((line = get_line(fp[i], &j)) == NULL)
469			trouble();
470			if (pr != NULL)
471			printf("%s%s", pr, line);
472			cline[i]++;
473			}
474			return ((int) n);
475			}
476
477			/*
478			* Return 1 or 0 according as the old range (in file 1) contains exactly
479			* the same data as the new range (in file 2).
480			*/
481			int
482			duplicate(struct range r1, struct range r2)
483			{
484			int c,d;
485			int nchar;
486			int nline;
487
488			if (r1->to-r1->from != r2->to-r2->from)
489			return (0);
490			(void)skip(0, r1->from, NULL);
491			(void)skip(1, r2->from, NULL);
492			nchar = 0;
493			for (nline=0; nline < r1->to - r1->from; nline++) {
494			do {
495			c = getc(fp[0]);
496			d = getc(fp[1]);
497			if (c == -1 \|\| d== -1)
498			trouble();
499			nchar++;
500			if (c != d) {
501			repos(nchar);
502			return (0);
503			}
504			} while (c != '\n');
505			}
506			repos(nchar);
507			return (1);
508			}
509
510			void
511			repos(int nchar)
512			{
513			int i;
514
515			for (i = 0; i < 2; i++)
516			(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
517			}
518
519			__dead void
520			trouble(void)
521			{
522			errx(EXIT_FAILURE, "logic error");
523			}
524
525			/*
526			* collect an editing script for later regurgitation
527			*/
528			int
529			edit(struct diff *diff, int dup, int j)
530			{
531			if (((dup + 1) & eflag) == 0)
532			return (j);
533			j++;
534			overlap[j] = !dup;
535			if (!dup)
536			overlapcnt++;
537			de[j].old.from = diff->old.from;
538			de[j].old.to = diff->old.to;
539			de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL);
540			de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL);
541			return (j);
542			}
543
544			/* regurgitate */
545			__dead void
546			edscript(int n)
547			{
548			int j,k;
549			char block[BUFSIZ];
550
551			for (; n > 0; n--) {
552			if (!oflag \|\| !overlap[n])
553			prange(&de[n].old);
554			else
555			printf("%da\n=======\n", de[n].old.to -1);
556			(void)fseek(fp[2], (long)de[n].new.from, SEEK_SET);
557			for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
558			j = k > BUFSIZ ? BUFSIZ : k;
559			if (fread(block, 1, j, fp[2]) != j)
560			trouble();
561			(void)fwrite(block, 1, j, stdout);
562			}
563			if (!oflag \|\| !overlap[n])
564			printf(".\n");
565			else {
566			printf("%s\n.\n", f3mark);
567			printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
568			}
569			}
570			exit(overlapcnt);
571			}
572
573			void
574			increase(void)
575			{
576			struct diff *p;
577			char *q;
578			size_t newsz, incr;
579
580			/* are the memset(3) calls needed? */
581			newsz = szchanges == 0 ? 64 : 2 * szchanges;
582			incr = newsz - szchanges;
583
584			p = reallocarray(d13, newsz, sizeof(struct diff));
585			if (p == NULL)
586			err(1, NULL);
587			memset(p + szchanges, 0, incr * sizeof(struct diff));
588			d13 = p;
589			p = reallocarray(d23, newsz, sizeof(struct diff));
590			if (p == NULL)
591			err(1, NULL);
592			memset(p + szchanges, 0, incr * sizeof(struct diff));
593			d23 = p;
594			p = reallocarray(de, newsz, sizeof(struct diff));
595			if (p == NULL)
596			err(1, NULL);
597			memset(p + szchanges, 0, incr * sizeof(struct diff));
598			de = p;
599			q = reallocarray(overlap, newsz, sizeof(char));
600			if (q == NULL)
601			err(1, NULL);
602			memset(q + szchanges, 0, incr * sizeof(char));
603			overlap = q;
604			szchanges = newsz;
605			}
606
607
608			__dead void
609			usage(void)
610			{
611			extern char *__progname;
612
613			fprintf(stderr, "usage: %s [-exEX3] /tmp/d3a.?????????? "
614			"/tmp/d3b.?????????? file1 file2 file3\n", __progname);
615			exit(EXIT_FAILURE);
616			}