1e1910ebdSBaptiste Daroussin /* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */
2e1910ebdSBaptiste Daroussin
3e1910ebdSBaptiste Daroussin /*
4e1910ebdSBaptiste Daroussin * Copyright (C) Caldera International Inc. 2001-2002.
5e1910ebdSBaptiste Daroussin * All rights reserved.
6e1910ebdSBaptiste Daroussin *
7e1910ebdSBaptiste Daroussin * Redistribution and use in source and binary forms, with or without
8e1910ebdSBaptiste Daroussin * modification, are permitted provided that the following conditions
9e1910ebdSBaptiste Daroussin * are met:
10e1910ebdSBaptiste Daroussin * 1. Redistributions of source code and documentation must retain the above
11e1910ebdSBaptiste Daroussin * copyright notice, this list of conditions and the following disclaimer.
12e1910ebdSBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright
13e1910ebdSBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the
14e1910ebdSBaptiste Daroussin * documentation and/or other materials provided with the distribution.
15e1910ebdSBaptiste Daroussin * 3. All advertising materials mentioning features or use of this software
16e1910ebdSBaptiste Daroussin * must display the following acknowledgement:
17e1910ebdSBaptiste Daroussin * This product includes software developed or owned by Caldera
18e1910ebdSBaptiste Daroussin * International, Inc.
19e1910ebdSBaptiste Daroussin * 4. Neither the name of Caldera International, Inc. nor the names of other
20e1910ebdSBaptiste Daroussin * contributors may be used to endorse or promote products derived from
21e1910ebdSBaptiste Daroussin * this software without specific prior written permission.
22e1910ebdSBaptiste Daroussin *
23e1910ebdSBaptiste Daroussin * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24e1910ebdSBaptiste Daroussin * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25e1910ebdSBaptiste Daroussin * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26e1910ebdSBaptiste Daroussin * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27e1910ebdSBaptiste Daroussin * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28e1910ebdSBaptiste Daroussin * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29e1910ebdSBaptiste Daroussin * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30e1910ebdSBaptiste Daroussin * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31e1910ebdSBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32e1910ebdSBaptiste Daroussin * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33e1910ebdSBaptiste Daroussin * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34e1910ebdSBaptiste Daroussin * POSSIBILITY OF SUCH DAMAGE.
35e1910ebdSBaptiste Daroussin */
36e1910ebdSBaptiste Daroussin /*-
37e1910ebdSBaptiste Daroussin * Copyright (c) 1991, 1993
38e1910ebdSBaptiste Daroussin * The Regents of the University of California. All rights reserved.
39e1910ebdSBaptiste Daroussin *
40e1910ebdSBaptiste Daroussin * Redistribution and use in source and binary forms, with or without
41e1910ebdSBaptiste Daroussin * modification, are permitted provided that the following conditions
42e1910ebdSBaptiste Daroussin * are met:
43e1910ebdSBaptiste Daroussin * 1. Redistributions of source code must retain the above copyright
44e1910ebdSBaptiste Daroussin * notice, this list of conditions and the following disclaimer.
45e1910ebdSBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright
46e1910ebdSBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the
47e1910ebdSBaptiste Daroussin * documentation and/or other materials provided with the distribution.
48e1910ebdSBaptiste Daroussin * 3. Neither the name of the University nor the names of its contributors
49e1910ebdSBaptiste Daroussin * may be used to endorse or promote products derived from this software
50e1910ebdSBaptiste Daroussin * without specific prior written permission.
51e1910ebdSBaptiste Daroussin *
52e1910ebdSBaptiste Daroussin * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53e1910ebdSBaptiste Daroussin * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54e1910ebdSBaptiste Daroussin * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55e1910ebdSBaptiste Daroussin * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56e1910ebdSBaptiste Daroussin * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57e1910ebdSBaptiste Daroussin * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58e1910ebdSBaptiste Daroussin * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59e1910ebdSBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60e1910ebdSBaptiste Daroussin * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61e1910ebdSBaptiste Daroussin * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62e1910ebdSBaptiste Daroussin * SUCH DAMAGE.
63e1910ebdSBaptiste Daroussin *
64e1910ebdSBaptiste Daroussin * @(#)diff3.c 8.1 (Berkeley) 6/6/93
65e1910ebdSBaptiste Daroussin */
66e1910ebdSBaptiste Daroussin
67e1910ebdSBaptiste Daroussin #if 0
68e1910ebdSBaptiste Daroussin #ifndef lint
69e1910ebdSBaptiste Daroussin static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93";
70e1910ebdSBaptiste Daroussin #endif
71e1910ebdSBaptiste Daroussin #endif /* not lint */
72e1910ebdSBaptiste Daroussin #include <sys/cdefs.h>
73e1910ebdSBaptiste Daroussin #include <sys/capsicum.h>
74e1910ebdSBaptiste Daroussin #include <sys/procdesc.h>
75e1910ebdSBaptiste Daroussin #include <sys/types.h>
76e1910ebdSBaptiste Daroussin #include <sys/event.h>
77e1910ebdSBaptiste Daroussin #include <sys/wait.h>
78e1910ebdSBaptiste Daroussin
79e1910ebdSBaptiste Daroussin #include <capsicum_helpers.h>
80e1910ebdSBaptiste Daroussin #include <ctype.h>
81e1910ebdSBaptiste Daroussin #include <err.h>
82e1910ebdSBaptiste Daroussin #include <getopt.h>
83e1910ebdSBaptiste Daroussin #include <stdio.h>
84e1910ebdSBaptiste Daroussin #include <stdlib.h>
859520071fSBaptiste Daroussin #include <limits.h>
869520071fSBaptiste Daroussin #include <inttypes.h>
87e1910ebdSBaptiste Daroussin #include <string.h>
88e1910ebdSBaptiste Daroussin #include <unistd.h>
89e1910ebdSBaptiste Daroussin
90e1910ebdSBaptiste Daroussin
91e1910ebdSBaptiste Daroussin /*
92e1910ebdSBaptiste Daroussin * "from" is first in range of changed lines; "to" is last+1
93e1910ebdSBaptiste Daroussin * from=to=line after point of insertion for added lines.
94e1910ebdSBaptiste Daroussin */
95e1910ebdSBaptiste Daroussin struct range {
96e1910ebdSBaptiste Daroussin int from;
97e1910ebdSBaptiste Daroussin int to;
98e1910ebdSBaptiste Daroussin };
99e1910ebdSBaptiste Daroussin
100e1910ebdSBaptiste Daroussin struct diff {
1019ab079c5STom Jones #define DIFF_TYPE2 2
1029ab079c5STom Jones #define DIFF_TYPE3 3
1039ab079c5STom Jones int type;
1049ab079c5STom Jones #if DEBUG
1059ab079c5STom Jones char *line;
1069ab079c5STom Jones #endif /* DEBUG */
1079ab079c5STom Jones
1089ab079c5STom Jones /* Ranges as lines */
109e1910ebdSBaptiste Daroussin struct range old;
110e1910ebdSBaptiste Daroussin struct range new;
111e1910ebdSBaptiste Daroussin };
112e1910ebdSBaptiste Daroussin
113d458eb8dSTom Jones #define EFLAG_NONE 0
114d458eb8dSTom Jones #define EFLAG_OVERLAP 1
115d458eb8dSTom Jones #define EFLAG_NOOVERLAP 2
116d458eb8dSTom Jones #define EFLAG_UNMERGED 3
117d458eb8dSTom Jones
118e1910ebdSBaptiste Daroussin static size_t szchanges;
119e1910ebdSBaptiste Daroussin
120e1910ebdSBaptiste Daroussin static struct diff *d13;
121e1910ebdSBaptiste Daroussin static struct diff *d23;
122e1910ebdSBaptiste Daroussin /*
123e1910ebdSBaptiste Daroussin * "de" is used to gather editing scripts. These are later spewed out in
1242184ca3fSTom Jones * reverse order. Its first element must be all zero, the "old" and "new"
1252184ca3fSTom Jones * components of "de" contain line positions. Array overlap indicates which
1262184ca3fSTom Jones * sections in "de" correspond to lines that are different in all three files.
127e1910ebdSBaptiste Daroussin */
128e1910ebdSBaptiste Daroussin static struct diff *de;
129e1910ebdSBaptiste Daroussin static char *overlap;
130e1910ebdSBaptiste Daroussin static int overlapcnt;
131e1910ebdSBaptiste Daroussin static FILE *fp[3];
132e1910ebdSBaptiste Daroussin static int cline[3]; /* # of the last-read line in each file (0-2) */
133e1910ebdSBaptiste Daroussin /*
134e1910ebdSBaptiste Daroussin * The latest known correspondence between line numbers of the 3 files
135e1910ebdSBaptiste Daroussin * is stored in last[1-3];
136e1910ebdSBaptiste Daroussin */
137e1910ebdSBaptiste Daroussin static int last[4];
138e1910ebdSBaptiste Daroussin static int Aflag, eflag, iflag, mflag, Tflag;
139e1910ebdSBaptiste Daroussin static int oflag; /* indicates whether to mark overlaps (-E or -X) */
140e1910ebdSBaptiste Daroussin static int strip_cr;
141e1910ebdSBaptiste Daroussin static char *f1mark, *f2mark, *f3mark;
142df092859STom Jones static const char *oldmark = "<<<<<<<";
1439ab079c5STom Jones static const char *orgmark = "|||||||";
144df092859STom Jones static const char *newmark = ">>>>>>>";
145ca53a844STom Jones static const char *divider = "=======";
146e1910ebdSBaptiste Daroussin
147e1910ebdSBaptiste Daroussin static bool duplicate(struct range *, struct range *);
1489ab079c5STom Jones static int edit(struct diff *, bool, int, int);
149e1910ebdSBaptiste Daroussin static char *getchange(FILE *);
150e1910ebdSBaptiste Daroussin static char *get_line(FILE *, size_t *);
151e1910ebdSBaptiste Daroussin static int readin(int fd, struct diff **);
152e1910ebdSBaptiste Daroussin static int skip(int, int, const char *);
153e1910ebdSBaptiste Daroussin static void change(int, struct range *, bool);
154e1910ebdSBaptiste Daroussin static void keep(int, struct range *);
155e1910ebdSBaptiste Daroussin static void merge(int, int);
1567c03df68STom Jones static void prange(struct range *, bool);
157e1910ebdSBaptiste Daroussin static void repos(int);
158e1910ebdSBaptiste Daroussin static void edscript(int) __dead2;
1599ab079c5STom Jones static void Ascript(int) __dead2;
160034dd2d5STom Jones static void mergescript(int) __dead2;
161e1910ebdSBaptiste Daroussin static void increase(void);
1623ddd6eb6STom Jones static void usage(void);
1632184ca3fSTom Jones static void printrange(FILE *, struct range *);
164e1910ebdSBaptiste Daroussin
1653ddd6eb6STom Jones static const char diff3_version[] = "FreeBSD diff3 20220517";
1663ddd6eb6STom Jones
167e1910ebdSBaptiste Daroussin enum {
168e1910ebdSBaptiste Daroussin DIFFPROG_OPT,
169e1910ebdSBaptiste Daroussin STRIPCR_OPT,
1703ddd6eb6STom Jones HELP_OPT,
1713ddd6eb6STom Jones VERSION_OPT
172e1910ebdSBaptiste Daroussin };
173e1910ebdSBaptiste Daroussin
174e1910ebdSBaptiste Daroussin #define DIFF_PATH "/usr/bin/diff"
175e1910ebdSBaptiste Daroussin
176e1910ebdSBaptiste Daroussin #define OPTIONS "3aAeEiL:mTxX"
177e1910ebdSBaptiste Daroussin static struct option longopts[] = {
178e1910ebdSBaptiste Daroussin { "ed", no_argument, NULL, 'e' },
179e1910ebdSBaptiste Daroussin { "show-overlap", no_argument, NULL, 'E' },
180e1910ebdSBaptiste Daroussin { "overlap-only", no_argument, NULL, 'x' },
181e1910ebdSBaptiste Daroussin { "initial-tab", no_argument, NULL, 'T' },
182e1910ebdSBaptiste Daroussin { "text", no_argument, NULL, 'a' },
183e1910ebdSBaptiste Daroussin { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT },
184e1910ebdSBaptiste Daroussin { "show-all", no_argument, NULL, 'A' },
185e1910ebdSBaptiste Daroussin { "easy-only", no_argument, NULL, '3' },
186e1910ebdSBaptiste Daroussin { "merge", no_argument, NULL, 'm' },
187e1910ebdSBaptiste Daroussin { "label", required_argument, NULL, 'L' },
188e1910ebdSBaptiste Daroussin { "diff-program", required_argument, NULL, DIFFPROG_OPT },
1893ddd6eb6STom Jones { "help", no_argument, NULL, HELP_OPT},
1903ddd6eb6STom Jones { "version", no_argument, NULL, VERSION_OPT}
191e1910ebdSBaptiste Daroussin };
192e1910ebdSBaptiste Daroussin
193e1910ebdSBaptiste Daroussin static void
usage(void)194e1910ebdSBaptiste Daroussin usage(void)
195e1910ebdSBaptiste Daroussin {
196702dda43SPiotr Pawel Stefaniak fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] "
197e1910ebdSBaptiste Daroussin "[-L label3] file1 file2 file3\n");
198e1910ebdSBaptiste Daroussin }
199e1910ebdSBaptiste Daroussin
200e1910ebdSBaptiste Daroussin static int
readin(int fd,struct diff ** dd)201e1910ebdSBaptiste Daroussin readin(int fd, struct diff **dd)
202e1910ebdSBaptiste Daroussin {
203e1910ebdSBaptiste Daroussin int a, b, c, d;
204e1910ebdSBaptiste Daroussin size_t i;
205e1910ebdSBaptiste Daroussin char kind, *p;
206e1910ebdSBaptiste Daroussin FILE *f;
207e1910ebdSBaptiste Daroussin
208e1910ebdSBaptiste Daroussin f = fdopen(fd, "r");
209e1910ebdSBaptiste Daroussin if (f == NULL)
210e1910ebdSBaptiste Daroussin err(2, "fdopen");
211e1910ebdSBaptiste Daroussin for (i = 0; (p = getchange(f)); i++) {
2129ab079c5STom Jones #if DEBUG
2139ab079c5STom Jones (*dd)[i].line = strdup(p);
2149ab079c5STom Jones #endif /* DEBUG */
2159ab079c5STom Jones
216e1910ebdSBaptiste Daroussin if (i >= szchanges - 1)
217e1910ebdSBaptiste Daroussin increase();
2189520071fSBaptiste Daroussin a = b = (int)strtoimax(p, &p, 10);
219e1910ebdSBaptiste Daroussin if (*p == ',') {
220e1910ebdSBaptiste Daroussin p++;
2219520071fSBaptiste Daroussin b = (int)strtoimax(p, &p, 10);
222e1910ebdSBaptiste Daroussin }
223e1910ebdSBaptiste Daroussin kind = *p++;
2249520071fSBaptiste Daroussin c = d = (int)strtoimax(p, &p, 10);
225e1910ebdSBaptiste Daroussin if (*p == ',') {
226e1910ebdSBaptiste Daroussin p++;
2279520071fSBaptiste Daroussin d = (int)strtoimax(p, &p, 10);
228e1910ebdSBaptiste Daroussin }
229e1910ebdSBaptiste Daroussin if (kind == 'a')
230e1910ebdSBaptiste Daroussin a++;
231e1910ebdSBaptiste Daroussin if (kind == 'd')
232e1910ebdSBaptiste Daroussin c++;
233e1910ebdSBaptiste Daroussin b++;
234e1910ebdSBaptiste Daroussin d++;
235e1910ebdSBaptiste Daroussin (*dd)[i].old.from = a;
236e1910ebdSBaptiste Daroussin (*dd)[i].old.to = b;
237e1910ebdSBaptiste Daroussin (*dd)[i].new.from = c;
238e1910ebdSBaptiste Daroussin (*dd)[i].new.to = d;
239e1910ebdSBaptiste Daroussin }
240e1910ebdSBaptiste Daroussin if (i) {
241e1910ebdSBaptiste Daroussin (*dd)[i].old.from = (*dd)[i - 1].old.to;
242e1910ebdSBaptiste Daroussin (*dd)[i].new.from = (*dd)[i - 1].new.to;
243e1910ebdSBaptiste Daroussin }
244e1910ebdSBaptiste Daroussin fclose(f);
245e1910ebdSBaptiste Daroussin return (i);
246e1910ebdSBaptiste Daroussin }
247e1910ebdSBaptiste Daroussin
248e1910ebdSBaptiste Daroussin static int
diffexec(const char * diffprog,char ** diffargv,int fd[])249e1910ebdSBaptiste Daroussin diffexec(const char *diffprog, char **diffargv, int fd[])
250e1910ebdSBaptiste Daroussin {
251702dda43SPiotr Pawel Stefaniak int pd;
252e1910ebdSBaptiste Daroussin
253702dda43SPiotr Pawel Stefaniak switch (pdfork(&pd, PD_CLOEXEC)) {
254e1910ebdSBaptiste Daroussin case 0:
255e1910ebdSBaptiste Daroussin close(fd[0]);
256e1910ebdSBaptiste Daroussin if (dup2(fd[1], STDOUT_FILENO) == -1)
257e1910ebdSBaptiste Daroussin err(2, "child could not duplicate descriptor");
258e1910ebdSBaptiste Daroussin close(fd[1]);
259e1910ebdSBaptiste Daroussin execvp(diffprog, diffargv);
260e1910ebdSBaptiste Daroussin err(2, "could not execute diff: %s", diffprog);
261e1910ebdSBaptiste Daroussin break;
262e1910ebdSBaptiste Daroussin case -1:
263e1910ebdSBaptiste Daroussin err(2, "could not fork");
264e1910ebdSBaptiste Daroussin break;
265e1910ebdSBaptiste Daroussin }
266e1910ebdSBaptiste Daroussin close(fd[1]);
267e1910ebdSBaptiste Daroussin return (pd);
268e1910ebdSBaptiste Daroussin }
269e1910ebdSBaptiste Daroussin
270e1910ebdSBaptiste Daroussin static char *
getchange(FILE * b)271e1910ebdSBaptiste Daroussin getchange(FILE *b)
272e1910ebdSBaptiste Daroussin {
273e1910ebdSBaptiste Daroussin char *line;
274e1910ebdSBaptiste Daroussin
275e1910ebdSBaptiste Daroussin while ((line = get_line(b, NULL))) {
276e1910ebdSBaptiste Daroussin if (isdigit((unsigned char)line[0]))
277e1910ebdSBaptiste Daroussin return (line);
278e1910ebdSBaptiste Daroussin }
279e1910ebdSBaptiste Daroussin return (NULL);
280e1910ebdSBaptiste Daroussin }
281e1910ebdSBaptiste Daroussin
282e1910ebdSBaptiste Daroussin
283e1910ebdSBaptiste Daroussin static char *
get_line(FILE * b,size_t * n)284e1910ebdSBaptiste Daroussin get_line(FILE *b, size_t *n)
285e1910ebdSBaptiste Daroussin {
28694678ee6SBaptiste Daroussin ssize_t len;
28794678ee6SBaptiste Daroussin static char *buf = NULL;
28894678ee6SBaptiste Daroussin static size_t bufsize = 0;
289e1910ebdSBaptiste Daroussin
29094678ee6SBaptiste Daroussin if ((len = getline(&buf, &bufsize, b)) < 0)
291e1910ebdSBaptiste Daroussin return (NULL);
292e1910ebdSBaptiste Daroussin
29354a3415cSPiotr Pawel Stefaniak if (strip_cr && len >= 2 && strcmp("\r\n", &(buf[len - 2])) == 0) {
29454a3415cSPiotr Pawel Stefaniak buf[len - 2] = '\n';
29554a3415cSPiotr Pawel Stefaniak buf[len - 1] = '\0';
29654a3415cSPiotr Pawel Stefaniak len--;
29754a3415cSPiotr Pawel Stefaniak }
29854a3415cSPiotr Pawel Stefaniak
299e1910ebdSBaptiste Daroussin if (n != NULL)
300e1910ebdSBaptiste Daroussin *n = len;
30194678ee6SBaptiste Daroussin
302e1910ebdSBaptiste Daroussin return (buf);
303e1910ebdSBaptiste Daroussin }
304e1910ebdSBaptiste Daroussin
305e1910ebdSBaptiste Daroussin static void
merge(int m1,int m2)306e1910ebdSBaptiste Daroussin merge(int m1, int m2)
307e1910ebdSBaptiste Daroussin {
308e1910ebdSBaptiste Daroussin struct diff *d1, *d2, *d3;
309e1910ebdSBaptiste Daroussin int j, t1, t2;
310e1910ebdSBaptiste Daroussin bool dup = false;
311e1910ebdSBaptiste Daroussin
312e1910ebdSBaptiste Daroussin d1 = d13;
313e1910ebdSBaptiste Daroussin d2 = d23;
314e1910ebdSBaptiste Daroussin j = 0;
315e1910ebdSBaptiste Daroussin
3167d975c7fSTom Jones while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) {
317e1910ebdSBaptiste Daroussin /* first file is different from the others */
318e1910ebdSBaptiste Daroussin if (!t2 || (t1 && d1->new.to < d2->new.from)) {
319e1910ebdSBaptiste Daroussin /* stuff peculiar to 1st file */
320d458eb8dSTom Jones if (eflag == EFLAG_NONE) {
321e1910ebdSBaptiste Daroussin printf("====1\n");
322e1910ebdSBaptiste Daroussin change(1, &d1->old, false);
323e1910ebdSBaptiste Daroussin keep(2, &d1->new);
324e1910ebdSBaptiste Daroussin change(3, &d1->new, false);
325e1910ebdSBaptiste Daroussin }
326e1910ebdSBaptiste Daroussin d1++;
327e1910ebdSBaptiste Daroussin continue;
328e1910ebdSBaptiste Daroussin }
329e1910ebdSBaptiste Daroussin /* second file is different from others */
330e1910ebdSBaptiste Daroussin if (!t1 || (t2 && d2->new.to < d1->new.from)) {
331d458eb8dSTom Jones if (eflag == EFLAG_NONE) {
332e1910ebdSBaptiste Daroussin printf("====2\n");
333e1910ebdSBaptiste Daroussin keep(1, &d2->new);
334e1910ebdSBaptiste Daroussin change(3, &d2->new, false);
335e1910ebdSBaptiste Daroussin change(2, &d2->old, false);
3369ab079c5STom Jones } else if (Aflag || mflag) {
3379ab079c5STom Jones // XXX-THJ: What does it mean for the second file to differ?
3389ab079c5STom Jones j = edit(d2, dup, j, DIFF_TYPE2);
339e1910ebdSBaptiste Daroussin }
340e1910ebdSBaptiste Daroussin d2++;
341e1910ebdSBaptiste Daroussin continue;
342e1910ebdSBaptiste Daroussin }
343e1910ebdSBaptiste Daroussin /*
344e1910ebdSBaptiste Daroussin * Merge overlapping changes in first file
345e1910ebdSBaptiste Daroussin * this happens after extension (see below).
346e1910ebdSBaptiste Daroussin */
347e1910ebdSBaptiste Daroussin if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) {
348e1910ebdSBaptiste Daroussin d1[1].old.from = d1->old.from;
349e1910ebdSBaptiste Daroussin d1[1].new.from = d1->new.from;
350e1910ebdSBaptiste Daroussin d1++;
351e1910ebdSBaptiste Daroussin continue;
352e1910ebdSBaptiste Daroussin }
353e1910ebdSBaptiste Daroussin
354e1910ebdSBaptiste Daroussin /* merge overlapping changes in second */
355e1910ebdSBaptiste Daroussin if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) {
356e1910ebdSBaptiste Daroussin d2[1].old.from = d2->old.from;
357e1910ebdSBaptiste Daroussin d2[1].new.from = d2->new.from;
358e1910ebdSBaptiste Daroussin d2++;
359e1910ebdSBaptiste Daroussin continue;
360e1910ebdSBaptiste Daroussin }
361e1910ebdSBaptiste Daroussin /* stuff peculiar to third file or different in all */
362e1910ebdSBaptiste Daroussin if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
363e1910ebdSBaptiste Daroussin dup = duplicate(&d1->old, &d2->old);
364e1910ebdSBaptiste Daroussin /*
365e1910ebdSBaptiste Daroussin * dup = 0 means all files differ
366e1910ebdSBaptiste Daroussin * dup = 1 means files 1 and 2 identical
367e1910ebdSBaptiste Daroussin */
368d458eb8dSTom Jones if (eflag == EFLAG_NONE) {
369e1910ebdSBaptiste Daroussin printf("====%s\n", dup ? "3" : "");
370e1910ebdSBaptiste Daroussin change(1, &d1->old, dup);
371e1910ebdSBaptiste Daroussin change(2, &d2->old, false);
372e1910ebdSBaptiste Daroussin d3 = d1->old.to > d1->old.from ? d1 : d2;
373e1910ebdSBaptiste Daroussin change(3, &d3->new, false);
3749ab079c5STom Jones } else {
3759ab079c5STom Jones j = edit(d1, dup, j, DIFF_TYPE3);
3769ab079c5STom Jones }
3779ab079c5STom Jones dup = false;
378e1910ebdSBaptiste Daroussin d1++;
379e1910ebdSBaptiste Daroussin d2++;
380e1910ebdSBaptiste Daroussin continue;
381e1910ebdSBaptiste Daroussin }
382e1910ebdSBaptiste Daroussin /*
383e1910ebdSBaptiste Daroussin * Overlapping changes from file 1 and 2; extend changes
384e1910ebdSBaptiste Daroussin * appropriately to make them coincide.
385e1910ebdSBaptiste Daroussin */
386e1910ebdSBaptiste Daroussin if (d1->new.from < d2->new.from) {
387e1910ebdSBaptiste Daroussin d2->old.from -= d2->new.from - d1->new.from;
388e1910ebdSBaptiste Daroussin d2->new.from = d1->new.from;
389e1910ebdSBaptiste Daroussin } else if (d2->new.from < d1->new.from) {
390e1910ebdSBaptiste Daroussin d1->old.from -= d1->new.from - d2->new.from;
391e1910ebdSBaptiste Daroussin d1->new.from = d2->new.from;
392e1910ebdSBaptiste Daroussin }
393e1910ebdSBaptiste Daroussin if (d1->new.to > d2->new.to) {
394e1910ebdSBaptiste Daroussin d2->old.to += d1->new.to - d2->new.to;
395e1910ebdSBaptiste Daroussin d2->new.to = d1->new.to;
396e1910ebdSBaptiste Daroussin } else if (d2->new.to > d1->new.to) {
397e1910ebdSBaptiste Daroussin d1->old.to += d2->new.to - d1->new.to;
398e1910ebdSBaptiste Daroussin d1->new.to = d2->new.to;
399e1910ebdSBaptiste Daroussin }
400e1910ebdSBaptiste Daroussin }
4019ab079c5STom Jones
402034dd2d5STom Jones if (mflag)
403034dd2d5STom Jones mergescript(j);
404034dd2d5STom Jones else if (Aflag)
4059ab079c5STom Jones Ascript(j);
4069ab079c5STom Jones else if (eflag)
407e1910ebdSBaptiste Daroussin edscript(j);
408e1910ebdSBaptiste Daroussin }
409e1910ebdSBaptiste Daroussin
410e1910ebdSBaptiste Daroussin /*
411e1910ebdSBaptiste Daroussin * The range of lines rold.from thru rold.to in file i is to be changed.
412e1910ebdSBaptiste Daroussin * It is to be printed only if it does not duplicate something to be
413e1910ebdSBaptiste Daroussin * printed later.
414e1910ebdSBaptiste Daroussin */
415e1910ebdSBaptiste Daroussin static void
change(int i,struct range * rold,bool dup)416e1910ebdSBaptiste Daroussin change(int i, struct range *rold, bool dup)
417e1910ebdSBaptiste Daroussin {
418e1910ebdSBaptiste Daroussin
419e1910ebdSBaptiste Daroussin printf("%d:", i);
420e1910ebdSBaptiste Daroussin last[i] = rold->to;
4217c03df68STom Jones prange(rold, false);
422e1910ebdSBaptiste Daroussin if (dup)
423e1910ebdSBaptiste Daroussin return;
424e1910ebdSBaptiste Daroussin i--;
425e1910ebdSBaptiste Daroussin skip(i, rold->from, NULL);
426e1910ebdSBaptiste Daroussin skip(i, rold->to, " ");
427e1910ebdSBaptiste Daroussin }
428e1910ebdSBaptiste Daroussin
429e1910ebdSBaptiste Daroussin /*
430e1910ebdSBaptiste Daroussin * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or
431e1910ebdSBaptiste Daroussin * n1.
432e1910ebdSBaptiste Daroussin */
433e1910ebdSBaptiste Daroussin static void
prange(struct range * rold,bool delete)4347c03df68STom Jones prange(struct range *rold, bool delete)
435e1910ebdSBaptiste Daroussin {
436e1910ebdSBaptiste Daroussin
437e1910ebdSBaptiste Daroussin if (rold->to <= rold->from)
438e1910ebdSBaptiste Daroussin printf("%da\n", rold->from - 1);
439e1910ebdSBaptiste Daroussin else {
440e1910ebdSBaptiste Daroussin printf("%d", rold->from);
441e1910ebdSBaptiste Daroussin if (rold->to > rold->from + 1)
442e1910ebdSBaptiste Daroussin printf(",%d", rold->to - 1);
4437c03df68STom Jones if (delete)
4447c03df68STom Jones printf("d\n");
4457c03df68STom Jones else
446e1910ebdSBaptiste Daroussin printf("c\n");
447e1910ebdSBaptiste Daroussin }
448e1910ebdSBaptiste Daroussin }
449e1910ebdSBaptiste Daroussin
450e1910ebdSBaptiste Daroussin /*
451e1910ebdSBaptiste Daroussin * No difference was reported by diff between file 1 (or 2) and file 3,
452e1910ebdSBaptiste Daroussin * and an artificial dummy difference (trange) must be ginned up to
453e1910ebdSBaptiste Daroussin * correspond to the change reported in the other file.
454e1910ebdSBaptiste Daroussin */
455e1910ebdSBaptiste Daroussin static void
keep(int i,struct range * rnew)456e1910ebdSBaptiste Daroussin keep(int i, struct range *rnew)
457e1910ebdSBaptiste Daroussin {
458e1910ebdSBaptiste Daroussin int delta;
459e1910ebdSBaptiste Daroussin struct range trange;
460e1910ebdSBaptiste Daroussin
461e1910ebdSBaptiste Daroussin delta = last[3] - last[i];
462e1910ebdSBaptiste Daroussin trange.from = rnew->from - delta;
463e1910ebdSBaptiste Daroussin trange.to = rnew->to - delta;
464e1910ebdSBaptiste Daroussin change(i, &trange, true);
465e1910ebdSBaptiste Daroussin }
466e1910ebdSBaptiste Daroussin
467e1910ebdSBaptiste Daroussin /*
468e1910ebdSBaptiste Daroussin * skip to just before line number from in file "i". If "pr" is non-NULL,
469e1910ebdSBaptiste Daroussin * print all skipped stuff with string pr as a prefix.
470e1910ebdSBaptiste Daroussin */
471e1910ebdSBaptiste Daroussin static int
skip(int i,int from,const char * pr)472e1910ebdSBaptiste Daroussin skip(int i, int from, const char *pr)
473e1910ebdSBaptiste Daroussin {
474e1910ebdSBaptiste Daroussin size_t j, n;
475e1910ebdSBaptiste Daroussin char *line;
476e1910ebdSBaptiste Daroussin
477e1910ebdSBaptiste Daroussin for (n = 0; cline[i] < from - 1; n += j) {
478e1910ebdSBaptiste Daroussin if ((line = get_line(fp[i], &j)) == NULL)
479e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error");
480e1910ebdSBaptiste Daroussin if (pr != NULL)
481e1910ebdSBaptiste Daroussin printf("%s%s", Tflag == 1 ? "\t" : pr, line);
482e1910ebdSBaptiste Daroussin cline[i]++;
483e1910ebdSBaptiste Daroussin }
484e1910ebdSBaptiste Daroussin return ((int) n);
485e1910ebdSBaptiste Daroussin }
486e1910ebdSBaptiste Daroussin
487e1910ebdSBaptiste Daroussin /*
488e1910ebdSBaptiste Daroussin * Return 1 or 0 according as the old range (in file 1) contains exactly
489e1910ebdSBaptiste Daroussin * the same data as the new range (in file 2).
490e1910ebdSBaptiste Daroussin */
491e1910ebdSBaptiste Daroussin static bool
duplicate(struct range * r1,struct range * r2)492e1910ebdSBaptiste Daroussin duplicate(struct range *r1, struct range *r2)
493e1910ebdSBaptiste Daroussin {
494e1910ebdSBaptiste Daroussin int c, d;
495e1910ebdSBaptiste Daroussin int nchar;
496e1910ebdSBaptiste Daroussin int nline;
497e1910ebdSBaptiste Daroussin
498e1910ebdSBaptiste Daroussin if (r1->to-r1->from != r2->to-r2->from)
499e1910ebdSBaptiste Daroussin return (0);
500e1910ebdSBaptiste Daroussin skip(0, r1->from, NULL);
501e1910ebdSBaptiste Daroussin skip(1, r2->from, NULL);
502e1910ebdSBaptiste Daroussin nchar = 0;
503e1910ebdSBaptiste Daroussin for (nline = 0; nline < r1->to - r1->from; nline++) {
504e1910ebdSBaptiste Daroussin do {
505e1910ebdSBaptiste Daroussin c = getc(fp[0]);
506e1910ebdSBaptiste Daroussin d = getc(fp[1]);
5077f7b03f3SPiotr Pawel Stefaniak if (c == -1 && d == -1)
5087f7b03f3SPiotr Pawel Stefaniak break;
509e1910ebdSBaptiste Daroussin if (c == -1 || d == -1)
510e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error");
511e1910ebdSBaptiste Daroussin nchar++;
512e1910ebdSBaptiste Daroussin if (c != d) {
513e1910ebdSBaptiste Daroussin repos(nchar);
514e1910ebdSBaptiste Daroussin return (0);
515e1910ebdSBaptiste Daroussin }
516e1910ebdSBaptiste Daroussin } while (c != '\n');
517e1910ebdSBaptiste Daroussin }
518e1910ebdSBaptiste Daroussin repos(nchar);
519e1910ebdSBaptiste Daroussin return (1);
520e1910ebdSBaptiste Daroussin }
521e1910ebdSBaptiste Daroussin
522e1910ebdSBaptiste Daroussin static void
repos(int nchar)523e1910ebdSBaptiste Daroussin repos(int nchar)
524e1910ebdSBaptiste Daroussin {
525e1910ebdSBaptiste Daroussin int i;
526e1910ebdSBaptiste Daroussin
527e1910ebdSBaptiste Daroussin for (i = 0; i < 2; i++)
528e1910ebdSBaptiste Daroussin (void)fseek(fp[i], (long)-nchar, SEEK_CUR);
529e1910ebdSBaptiste Daroussin }
530702dda43SPiotr Pawel Stefaniak
531e1910ebdSBaptiste Daroussin /*
532e1910ebdSBaptiste Daroussin * collect an editing script for later regurgitation
533e1910ebdSBaptiste Daroussin */
534e1910ebdSBaptiste Daroussin static int
edit(struct diff * diff,bool dup,int j,int difftype)5359ab079c5STom Jones edit(struct diff *diff, bool dup, int j, int difftype)
536e1910ebdSBaptiste Daroussin {
537d458eb8dSTom Jones if (!(eflag == EFLAG_UNMERGED ||
538d458eb8dSTom Jones (!dup && eflag == EFLAG_OVERLAP ) ||
539d458eb8dSTom Jones (dup && eflag == EFLAG_NOOVERLAP))) {
540e1910ebdSBaptiste Daroussin return (j);
541d458eb8dSTom Jones }
542e1910ebdSBaptiste Daroussin j++;
543e1910ebdSBaptiste Daroussin overlap[j] = !dup;
544e1910ebdSBaptiste Daroussin if (!dup)
545e1910ebdSBaptiste Daroussin overlapcnt++;
5469ab079c5STom Jones
5479ab079c5STom Jones de[j].type = difftype;
5489ab079c5STom Jones #if DEBUG
54959f6408dSTom Jones de[j].line = strdup(diff->line);
5509ab079c5STom Jones #endif /* DEBUG */
5519ab079c5STom Jones
552e1910ebdSBaptiste Daroussin de[j].old.from = diff->old.from;
553e1910ebdSBaptiste Daroussin de[j].old.to = diff->old.to;
5542184ca3fSTom Jones de[j].new.from = diff->new.from;
5552184ca3fSTom Jones de[j].new.to = diff->new.to;
556e1910ebdSBaptiste Daroussin return (j);
557e1910ebdSBaptiste Daroussin }
558e1910ebdSBaptiste Daroussin
5592184ca3fSTom Jones static void
printrange(FILE * p,struct range * r)5602184ca3fSTom Jones printrange(FILE *p, struct range *r)
5612184ca3fSTom Jones {
5622184ca3fSTom Jones char *line = NULL;
5632184ca3fSTom Jones size_t len = 0;
5642184ca3fSTom Jones int i = 1;
5652184ca3fSTom Jones ssize_t rlen = 0;
5662184ca3fSTom Jones
5672184ca3fSTom Jones /* We haven't been asked to print anything */
5682184ca3fSTom Jones if (r->from == r->to)
5692184ca3fSTom Jones return;
5702184ca3fSTom Jones
5712184ca3fSTom Jones if (r->from > r->to)
5722184ca3fSTom Jones errx(EXIT_FAILURE, "invalid print range");
5732184ca3fSTom Jones
5742184ca3fSTom Jones /*
5752184ca3fSTom Jones * XXX-THJ: We read through all of the file for each range printed.
5762184ca3fSTom Jones * This duplicates work and will probably impact performance on large
5772184ca3fSTom Jones * files with lots of ranges.
5782184ca3fSTom Jones */
5792184ca3fSTom Jones fseek(p, 0L, SEEK_SET);
5802184ca3fSTom Jones while ((rlen = getline(&line, &len, p)) > 0) {
5812184ca3fSTom Jones if (i >= r->from)
5822184ca3fSTom Jones printf("%s", line);
5832184ca3fSTom Jones if (++i > r->to - 1)
5842184ca3fSTom Jones break;
5852184ca3fSTom Jones }
5862184ca3fSTom Jones free(line);
5872184ca3fSTom Jones }
5882184ca3fSTom Jones
589e1910ebdSBaptiste Daroussin /* regurgitate */
590e1910ebdSBaptiste Daroussin static void
edscript(int n)591e1910ebdSBaptiste Daroussin edscript(int n)
592e1910ebdSBaptiste Daroussin {
5937c03df68STom Jones bool delete;
594*190c4c24STom Jones struct range *new, *old;
595e1910ebdSBaptiste Daroussin
596e1910ebdSBaptiste Daroussin for (; n > 0; n--) {
597*190c4c24STom Jones new = &de[n].new;
598*190c4c24STom Jones old = &de[n].old;
599*190c4c24STom Jones
600*190c4c24STom Jones delete = (new->from == new->to);
601e1910ebdSBaptiste Daroussin if (!oflag || !overlap[n]) {
602*190c4c24STom Jones prange(old, delete);
603e1910ebdSBaptiste Daroussin } else {
604*190c4c24STom Jones printf("%da\n", old->to - 1);
605ca53a844STom Jones printf("%s\n", divider);
606e1910ebdSBaptiste Daroussin }
607*190c4c24STom Jones printrange(fp[2], new);
6087c03df68STom Jones if (!oflag || !overlap[n]) {
6097c03df68STom Jones if (!delete)
610e1910ebdSBaptiste Daroussin printf(".\n");
6117c03df68STom Jones } else {
612df092859STom Jones printf("%s %s\n.\n", newmark, f3mark);
613*190c4c24STom Jones printf("%da\n%s %s\n.\n", old->from - 1,
614df092859STom Jones oldmark, f1mark);
615e1910ebdSBaptiste Daroussin }
616e1910ebdSBaptiste Daroussin }
617e1910ebdSBaptiste Daroussin if (iflag)
618e1910ebdSBaptiste Daroussin printf("w\nq\n");
619e1910ebdSBaptiste Daroussin
620d458eb8dSTom Jones exit(eflag == EFLAG_NONE ? overlapcnt : 0);
621e1910ebdSBaptiste Daroussin }
622e1910ebdSBaptiste Daroussin
6239ab079c5STom Jones /*
6249ab079c5STom Jones * Output an edit script to turn mine into yours, when there is a conflict
6259ab079c5STom Jones * between the 3 files bracket the changes. Regurgitate the diffs in reverse
6269ab079c5STom Jones * order to allow the ed script to track down where the lines are as changes
6279ab079c5STom Jones * are made.
6289ab079c5STom Jones */
6299ab079c5STom Jones static void
Ascript(int n)6309ab079c5STom Jones Ascript(int n)
6319ab079c5STom Jones {
6329ab079c5STom Jones int startmark;
6339ab079c5STom Jones bool deletenew;
6349ab079c5STom Jones bool deleteold;
6359ab079c5STom Jones
6362c4276aaSTom Jones struct range *new, *old;
6379ab079c5STom Jones
6382c4276aaSTom Jones for (; n > 0; n--) {
6392c4276aaSTom Jones new = &de[n].new;
6402c4276aaSTom Jones old = &de[n].old;
6412c4276aaSTom Jones deletenew = (new->from == new->to);
6422c4276aaSTom Jones deleteold = (old->from == old->to);
6439ab079c5STom Jones
6449ab079c5STom Jones if (de[n].type == DIFF_TYPE2) {
6459ab079c5STom Jones if (!oflag || !overlap[n]) {
6462c4276aaSTom Jones prange(old, deletenew);
6472c4276aaSTom Jones printrange(fp[2], new);
6489ab079c5STom Jones } else {
649264a559aSTom Jones startmark = new->to;
6509ab079c5STom Jones
6519ab079c5STom Jones if (!deletenew)
6529ab079c5STom Jones startmark--;
6539ab079c5STom Jones
6549ab079c5STom Jones printf("%da\n", startmark);
6559ab079c5STom Jones printf("%s %s\n", newmark, f3mark);
6569ab079c5STom Jones
6579ab079c5STom Jones printf(".\n");
6589ab079c5STom Jones
6599ab079c5STom Jones printf("%da\n", startmark -
6602c4276aaSTom Jones (new->to - new->from));
6619ab079c5STom Jones printf("%s %s\n", oldmark, f2mark);
6629ab079c5STom Jones if (!deleteold)
6632c4276aaSTom Jones printrange(fp[1], old);
664ca53a844STom Jones printf("%s\n.\n", divider);
6659ab079c5STom Jones }
6669ab079c5STom Jones
6679ab079c5STom Jones } else if (de[n].type == DIFF_TYPE3) {
668264a559aSTom Jones startmark = old->to - 1;
669264a559aSTom Jones
6709ab079c5STom Jones if (!oflag || !overlap[n]) {
6712c4276aaSTom Jones prange(old, deletenew);
6722c4276aaSTom Jones printrange(fp[2], new);
6739ab079c5STom Jones } else {
6749ab079c5STom Jones printf("%da\n", startmark);
6759ab079c5STom Jones printf("%s %s\n", orgmark, f2mark);
6769ab079c5STom Jones
6779ab079c5STom Jones if (deleteold) {
6789ab079c5STom Jones struct range r;
6792c4276aaSTom Jones r.from = old->from-1;
6802c4276aaSTom Jones r.to = new->to;
6819ab079c5STom Jones printrange(fp[1], &r);
6829ab079c5STom Jones } else
6832c4276aaSTom Jones printrange(fp[1], old);
6849ab079c5STom Jones
685ca53a844STom Jones printf("%s\n", divider);
6862c4276aaSTom Jones printrange(fp[2], new);
6879ab079c5STom Jones }
6889ab079c5STom Jones
6899ab079c5STom Jones if (!oflag || !overlap[n]) {
6909ab079c5STom Jones if (!deletenew)
6919ab079c5STom Jones printf(".\n");
6929ab079c5STom Jones } else {
6939ab079c5STom Jones printf("%s %s\n.\n", newmark, f3mark);
6949ab079c5STom Jones
6959ab079c5STom Jones /*
6969ab079c5STom Jones * Go to the start of the conflict in original
6979ab079c5STom Jones * file and append lines
6989ab079c5STom Jones */
6999ab079c5STom Jones printf("%da\n%s %s\n.\n",
7002c4276aaSTom Jones startmark - (old->to - old->from),
7019ab079c5STom Jones oldmark, f1mark);
7029ab079c5STom Jones }
7039ab079c5STom Jones }
7049ab079c5STom Jones }
7059ab079c5STom Jones if (iflag)
7069ab079c5STom Jones printf("w\nq\n");
7079ab079c5STom Jones
7089ab079c5STom Jones exit(overlapcnt > 0);
7099ab079c5STom Jones }
7109ab079c5STom Jones
711034dd2d5STom Jones /*
712034dd2d5STom Jones * Output the merged file directly (don't generate an ed script). When
713034dd2d5STom Jones * regurgitating diffs we need to walk forward through the file and print any
714034dd2d5STom Jones * inbetween lines.
715034dd2d5STom Jones */
716034dd2d5STom Jones static void
mergescript(int i)717034dd2d5STom Jones mergescript(int i)
718034dd2d5STom Jones {
719c0e6ccb1STom Jones struct range r, *new, *old;
720034dd2d5STom Jones int n;
721034dd2d5STom Jones
722034dd2d5STom Jones r.from = 1;
723034dd2d5STom Jones r.to = 1;
724034dd2d5STom Jones
725034dd2d5STom Jones for (n = 1; n < i+1; n++) {
726c0e6ccb1STom Jones new = &de[n].new;
727c0e6ccb1STom Jones old = &de[n].old;
728c0e6ccb1STom Jones
729034dd2d5STom Jones /* print any lines leading up to here */
730c0e6ccb1STom Jones r.to = old->from;
731034dd2d5STom Jones printrange(fp[0], &r);
732034dd2d5STom Jones
733034dd2d5STom Jones if (de[n].type == DIFF_TYPE2) {
734034dd2d5STom Jones printf("%s %s\n", oldmark, f2mark);
735c0e6ccb1STom Jones printrange(fp[1], old);
736ca53a844STom Jones printf("%s\n", divider);
737c0e6ccb1STom Jones printrange(fp[2], new);
738034dd2d5STom Jones printf("%s %s\n", newmark, f3mark);
739034dd2d5STom Jones } else if (de[n].type == DIFF_TYPE3) {
740034dd2d5STom Jones if (!oflag || !overlap[n]) {
741c0e6ccb1STom Jones printrange(fp[2], new);
742034dd2d5STom Jones } else {
743034dd2d5STom Jones
744034dd2d5STom Jones printf("%s %s\n", oldmark, f1mark);
745c0e6ccb1STom Jones printrange(fp[0], old);
746034dd2d5STom Jones
747034dd2d5STom Jones printf("%s %s\n", orgmark, f2mark);
748c0e6ccb1STom Jones if (old->from == old->to) {
749034dd2d5STom Jones struct range or;
750c0e6ccb1STom Jones or.from = old->from - 1;
751c0e6ccb1STom Jones or.to = new->to;
752034dd2d5STom Jones printrange(fp[1], &or);
753034dd2d5STom Jones } else
754c0e6ccb1STom Jones printrange(fp[1], old);
755034dd2d5STom Jones
756ca53a844STom Jones printf("%s\n", divider);
757034dd2d5STom Jones
758c0e6ccb1STom Jones printrange(fp[2], new);
759034dd2d5STom Jones printf("%s %s\n", newmark, f3mark);
760034dd2d5STom Jones }
761034dd2d5STom Jones }
762034dd2d5STom Jones
763c0e6ccb1STom Jones if (old->from == old->to)
764c0e6ccb1STom Jones r.from = new->to;
765034dd2d5STom Jones else
766c0e6ccb1STom Jones r.from = old->to;
767034dd2d5STom Jones }
768034dd2d5STom Jones /*
769034dd2d5STom Jones * Print from the final range to the end of 'myfile'. Any deletions or
770034dd2d5STom Jones * additions to this file should have been handled by now.
771034dd2d5STom Jones *
772034dd2d5STom Jones * If the ranges are the same we need to rewind a line.
773034dd2d5STom Jones * If the new range is 0 length (from == to), we need to use the old
774034dd2d5STom Jones * range.
775034dd2d5STom Jones */
776c0e6ccb1STom Jones new = &de[n-1].new;
777c0e6ccb1STom Jones old = &de[n-1].old;
778c0e6ccb1STom Jones if ((old->from == new->from) &&
779c0e6ccb1STom Jones (old->to == new->to))
780034dd2d5STom Jones r.from--;
781c0e6ccb1STom Jones else if (new->from == new->to)
782c0e6ccb1STom Jones r.from = old->from;
783034dd2d5STom Jones
784034dd2d5STom Jones /*
785034dd2d5STom Jones * If the range is a 3 way merge then we need to skip a line in the
786034dd2d5STom Jones * trailing output.
787034dd2d5STom Jones */
788034dd2d5STom Jones if (de[n-1].type == DIFF_TYPE3)
789034dd2d5STom Jones r.from++;
790034dd2d5STom Jones
791034dd2d5STom Jones r.to = INT_MAX;
792034dd2d5STom Jones printrange(fp[0], &r);
793034dd2d5STom Jones exit(overlapcnt > 0);
794034dd2d5STom Jones }
795034dd2d5STom Jones
796e1910ebdSBaptiste Daroussin static void
increase(void)797e1910ebdSBaptiste Daroussin increase(void)
798e1910ebdSBaptiste Daroussin {
799e1910ebdSBaptiste Daroussin struct diff *p;
800e1910ebdSBaptiste Daroussin char *q;
801e1910ebdSBaptiste Daroussin size_t newsz, incr;
802e1910ebdSBaptiste Daroussin
803e1910ebdSBaptiste Daroussin /* are the memset(3) calls needed? */
804e1910ebdSBaptiste Daroussin newsz = szchanges == 0 ? 64 : 2 * szchanges;
805e1910ebdSBaptiste Daroussin incr = newsz - szchanges;
806e1910ebdSBaptiste Daroussin
8077f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d13, newsz, sizeof(struct diff));
808e1910ebdSBaptiste Daroussin if (p == NULL)
809e1910ebdSBaptiste Daroussin err(1, NULL);
810e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff));
811e1910ebdSBaptiste Daroussin d13 = p;
8127f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d23, newsz, sizeof(struct diff));
813e1910ebdSBaptiste Daroussin if (p == NULL)
814e1910ebdSBaptiste Daroussin err(1, NULL);
815e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff));
816e1910ebdSBaptiste Daroussin d23 = p;
8177f7b03f3SPiotr Pawel Stefaniak p = reallocarray(de, newsz, sizeof(struct diff));
818e1910ebdSBaptiste Daroussin if (p == NULL)
819e1910ebdSBaptiste Daroussin err(1, NULL);
820e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff));
821e1910ebdSBaptiste Daroussin de = p;
8227f7b03f3SPiotr Pawel Stefaniak q = reallocarray(overlap, newsz, sizeof(char));
823e1910ebdSBaptiste Daroussin if (q == NULL)
824e1910ebdSBaptiste Daroussin err(1, NULL);
825e1910ebdSBaptiste Daroussin memset(q + szchanges, 0, incr * sizeof(char));
826e1910ebdSBaptiste Daroussin overlap = q;
827e1910ebdSBaptiste Daroussin szchanges = newsz;
828e1910ebdSBaptiste Daroussin }
829e1910ebdSBaptiste Daroussin
830e1910ebdSBaptiste Daroussin
831e1910ebdSBaptiste Daroussin int
main(int argc,char ** argv)832e1910ebdSBaptiste Daroussin main(int argc, char **argv)
833e1910ebdSBaptiste Daroussin {
834e1910ebdSBaptiste Daroussin int ch, nblabels, status, m, n, kq, nke, nleft, i;
835e1910ebdSBaptiste Daroussin char *labels[] = { NULL, NULL, NULL };
836e1910ebdSBaptiste Daroussin const char *diffprog = DIFF_PATH;
837e1910ebdSBaptiste Daroussin char *file1, *file2, *file3;
83854a3415cSPiotr Pawel Stefaniak char *diffargv[7];
839e1910ebdSBaptiste Daroussin int diffargc = 0;
840e1910ebdSBaptiste Daroussin int fd13[2], fd23[2];
841e1910ebdSBaptiste Daroussin int pd13, pd23;
842e1910ebdSBaptiste Daroussin cap_rights_t rights_ro;
843e1910ebdSBaptiste Daroussin struct kevent *e;
844e1910ebdSBaptiste Daroussin
845e1910ebdSBaptiste Daroussin nblabels = 0;
846d458eb8dSTom Jones eflag = EFLAG_NONE;
847e1910ebdSBaptiste Daroussin oflag = 0;
848e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, diffprog);
849e1910ebdSBaptiste Daroussin while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) {
850e1910ebdSBaptiste Daroussin switch (ch) {
851e1910ebdSBaptiste Daroussin case '3':
852d458eb8dSTom Jones eflag = EFLAG_NOOVERLAP;
853e1910ebdSBaptiste Daroussin break;
854e1910ebdSBaptiste Daroussin case 'a':
855e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, "-a");
856e1910ebdSBaptiste Daroussin break;
857e1910ebdSBaptiste Daroussin case 'A':
858e1910ebdSBaptiste Daroussin Aflag = 1;
859e1910ebdSBaptiste Daroussin break;
860e1910ebdSBaptiste Daroussin case 'e':
861d458eb8dSTom Jones eflag = EFLAG_UNMERGED;
862e1910ebdSBaptiste Daroussin break;
863e1910ebdSBaptiste Daroussin case 'E':
864d458eb8dSTom Jones eflag = EFLAG_UNMERGED;
865e1910ebdSBaptiste Daroussin oflag = 1;
866e1910ebdSBaptiste Daroussin break;
867e1910ebdSBaptiste Daroussin case 'i':
868e1910ebdSBaptiste Daroussin iflag = 1;
869e1910ebdSBaptiste Daroussin break;
870e1910ebdSBaptiste Daroussin case 'L':
871e1910ebdSBaptiste Daroussin oflag = 1;
872e1910ebdSBaptiste Daroussin if (nblabels >= 3)
873e1910ebdSBaptiste Daroussin errx(2, "too many file label options");
874e1910ebdSBaptiste Daroussin labels[nblabels++] = optarg;
875e1910ebdSBaptiste Daroussin break;
876e1910ebdSBaptiste Daroussin case 'm':
877e1910ebdSBaptiste Daroussin Aflag = 1;
878e1910ebdSBaptiste Daroussin oflag = 1;
879e1910ebdSBaptiste Daroussin mflag = 1;
880e1910ebdSBaptiste Daroussin break;
881e1910ebdSBaptiste Daroussin case 'T':
882e1910ebdSBaptiste Daroussin Tflag = 1;
883e1910ebdSBaptiste Daroussin break;
884e1910ebdSBaptiste Daroussin case 'x':
885d458eb8dSTom Jones eflag = EFLAG_OVERLAP;
886e1910ebdSBaptiste Daroussin break;
887e1910ebdSBaptiste Daroussin case 'X':
888e1910ebdSBaptiste Daroussin oflag = 1;
889d458eb8dSTom Jones eflag = EFLAG_OVERLAP;
890e1910ebdSBaptiste Daroussin break;
891e1910ebdSBaptiste Daroussin case DIFFPROG_OPT:
892e1910ebdSBaptiste Daroussin diffprog = optarg;
893e1910ebdSBaptiste Daroussin break;
894e1910ebdSBaptiste Daroussin case STRIPCR_OPT:
895e1910ebdSBaptiste Daroussin strip_cr = 1;
89654a3415cSPiotr Pawel Stefaniak diffargv[diffargc++] = __DECONST(char *, "--strip-trailing-cr");
897e1910ebdSBaptiste Daroussin break;
8983ddd6eb6STom Jones case HELP_OPT:
8993ddd6eb6STom Jones usage();
9003ddd6eb6STom Jones exit(0);
9013ddd6eb6STom Jones case VERSION_OPT:
9023ddd6eb6STom Jones printf("%s\n", diff3_version);
9033ddd6eb6STom Jones exit(0);
904e1910ebdSBaptiste Daroussin }
905e1910ebdSBaptiste Daroussin }
906e1910ebdSBaptiste Daroussin argc -= optind;
907e1910ebdSBaptiste Daroussin argv += optind;
908e1910ebdSBaptiste Daroussin
909e1910ebdSBaptiste Daroussin if (Aflag) {
910d458eb8dSTom Jones eflag = EFLAG_UNMERGED;
911e1910ebdSBaptiste Daroussin oflag = 1;
912e1910ebdSBaptiste Daroussin }
913e1910ebdSBaptiste Daroussin
9143ddd6eb6STom Jones if (argc != 3) {
915e1910ebdSBaptiste Daroussin usage();
9163ddd6eb6STom Jones exit(2);
9173ddd6eb6STom Jones }
918e1910ebdSBaptiste Daroussin
919e1910ebdSBaptiste Daroussin if (caph_limit_stdio() == -1)
920e1910ebdSBaptiste Daroussin err(2, "unable to limit stdio");
921e1910ebdSBaptiste Daroussin
922e1910ebdSBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK);
923e1910ebdSBaptiste Daroussin
924e1910ebdSBaptiste Daroussin kq = kqueue();
925e1910ebdSBaptiste Daroussin if (kq == -1)
926e1910ebdSBaptiste Daroussin err(2, "kqueue");
927e1910ebdSBaptiste Daroussin
928e1910ebdSBaptiste Daroussin e = malloc(2 * sizeof(struct kevent));
929e1910ebdSBaptiste Daroussin if (e == NULL)
930e1910ebdSBaptiste Daroussin err(2, "malloc");
931e1910ebdSBaptiste Daroussin
932e1910ebdSBaptiste Daroussin /* TODO stdio */
933e1910ebdSBaptiste Daroussin file1 = argv[0];
934e1910ebdSBaptiste Daroussin file2 = argv[1];
935e1910ebdSBaptiste Daroussin file3 = argv[2];
936e1910ebdSBaptiste Daroussin
937e1910ebdSBaptiste Daroussin if (oflag) {
938df092859STom Jones asprintf(&f1mark, "%s",
939e1910ebdSBaptiste Daroussin labels[0] != NULL ? labels[0] : file1);
940e1910ebdSBaptiste Daroussin if (f1mark == NULL)
941e1910ebdSBaptiste Daroussin err(2, "asprintf");
942df092859STom Jones asprintf(&f2mark, "%s",
943e1910ebdSBaptiste Daroussin labels[1] != NULL ? labels[1] : file2);
944e1910ebdSBaptiste Daroussin if (f2mark == NULL)
945e1910ebdSBaptiste Daroussin err(2, "asprintf");
946df092859STom Jones asprintf(&f3mark, "%s",
947e1910ebdSBaptiste Daroussin labels[2] != NULL ? labels[2] : file3);
948e1910ebdSBaptiste Daroussin if (f3mark == NULL)
949e1910ebdSBaptiste Daroussin err(2, "asprintf");
950e1910ebdSBaptiste Daroussin }
951e1910ebdSBaptiste Daroussin fp[0] = fopen(file1, "r");
952e1910ebdSBaptiste Daroussin if (fp[0] == NULL)
953e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file1);
954377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0)
955e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file1);
956e1910ebdSBaptiste Daroussin
957e1910ebdSBaptiste Daroussin fp[1] = fopen(file2, "r");
958e1910ebdSBaptiste Daroussin if (fp[1] == NULL)
959e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file2);
960377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0)
961e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file2);
962e1910ebdSBaptiste Daroussin
963e1910ebdSBaptiste Daroussin fp[2] = fopen(file3, "r");
964e1910ebdSBaptiste Daroussin if (fp[2] == NULL)
965e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file3);
966377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0)
967e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file3);
968e1910ebdSBaptiste Daroussin
969e1910ebdSBaptiste Daroussin if (pipe(fd13))
970e1910ebdSBaptiste Daroussin err(2, "pipe");
971e1910ebdSBaptiste Daroussin if (pipe(fd23))
972e1910ebdSBaptiste Daroussin err(2, "pipe");
973e1910ebdSBaptiste Daroussin
974e1910ebdSBaptiste Daroussin diffargv[diffargc] = file1;
975e1910ebdSBaptiste Daroussin diffargv[diffargc + 1] = file3;
976e1910ebdSBaptiste Daroussin diffargv[diffargc + 2] = NULL;
977e1910ebdSBaptiste Daroussin
978e1910ebdSBaptiste Daroussin nleft = 0;
979e1910ebdSBaptiste Daroussin pd13 = diffexec(diffprog, diffargv, fd13);
980e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL);
981e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1)
982e1910ebdSBaptiste Daroussin err(2, "kevent1");
983e1910ebdSBaptiste Daroussin nleft++;
984e1910ebdSBaptiste Daroussin
985e1910ebdSBaptiste Daroussin diffargv[diffargc] = file2;
986e1910ebdSBaptiste Daroussin pd23 = diffexec(diffprog, diffargv, fd23);
987e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL);
988e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1)
989e1910ebdSBaptiste Daroussin err(2, "kevent2");
990e1910ebdSBaptiste Daroussin nleft++;
991e1910ebdSBaptiste Daroussin
992e1910ebdSBaptiste Daroussin caph_cache_catpages();
9937672a014SMariusz Zaborski if (caph_enter() < 0)
994e1910ebdSBaptiste Daroussin err(2, "unable to enter capability mode");
995e1910ebdSBaptiste Daroussin
996e1910ebdSBaptiste Daroussin /* parse diffs */
997e1910ebdSBaptiste Daroussin increase();
998e1910ebdSBaptiste Daroussin m = readin(fd13[0], &d13);
999e1910ebdSBaptiste Daroussin n = readin(fd23[0], &d23);
1000e1910ebdSBaptiste Daroussin
1001e1910ebdSBaptiste Daroussin /* waitpid cooked over pdforks */
1002e1910ebdSBaptiste Daroussin while (nleft > 0) {
1003e1910ebdSBaptiste Daroussin nke = kevent(kq, NULL, 0, e, nleft, NULL);
1004e1910ebdSBaptiste Daroussin if (nke == -1)
1005e1910ebdSBaptiste Daroussin err(2, "kevent");
1006e1910ebdSBaptiste Daroussin for (i = 0; i < nke; i++) {
1007e1910ebdSBaptiste Daroussin status = e[i].data;
1008e1910ebdSBaptiste Daroussin if (WIFEXITED(status) && WEXITSTATUS(status) >= 2)
1009702dda43SPiotr Pawel Stefaniak errx(2, "diff exited abnormally");
1010e1910ebdSBaptiste Daroussin else if (WIFSIGNALED(status))
1011e1910ebdSBaptiste Daroussin errx(2, "diff killed by signal %d",
1012e1910ebdSBaptiste Daroussin WTERMSIG(status));
1013e1910ebdSBaptiste Daroussin }
1014e1910ebdSBaptiste Daroussin nleft -= nke;
1015e1910ebdSBaptiste Daroussin }
1016e1910ebdSBaptiste Daroussin merge(m, n);
1017e1910ebdSBaptiste Daroussin
1018e1910ebdSBaptiste Daroussin return (EXIT_SUCCESS);
1019e1910ebdSBaptiste Daroussin }
1020