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 __FBSDID("$FreeBSD$"); 74e1910ebdSBaptiste Daroussin 75e1910ebdSBaptiste Daroussin #include <sys/capsicum.h> 76e1910ebdSBaptiste Daroussin #include <sys/procdesc.h> 77e1910ebdSBaptiste Daroussin #include <sys/types.h> 78e1910ebdSBaptiste Daroussin #include <sys/event.h> 79e1910ebdSBaptiste Daroussin #include <sys/wait.h> 80e1910ebdSBaptiste Daroussin 81e1910ebdSBaptiste Daroussin #include <capsicum_helpers.h> 82e1910ebdSBaptiste Daroussin #include <ctype.h> 83e1910ebdSBaptiste Daroussin #include <err.h> 84e1910ebdSBaptiste Daroussin #include <getopt.h> 85e1910ebdSBaptiste Daroussin #include <stdio.h> 86e1910ebdSBaptiste Daroussin #include <stdlib.h> 879520071fSBaptiste Daroussin #include <limits.h> 889520071fSBaptiste Daroussin #include <inttypes.h> 89e1910ebdSBaptiste Daroussin #include <string.h> 90e1910ebdSBaptiste Daroussin #include <unistd.h> 91e1910ebdSBaptiste Daroussin 92e1910ebdSBaptiste Daroussin 93e1910ebdSBaptiste Daroussin /* 94e1910ebdSBaptiste Daroussin * "from" is first in range of changed lines; "to" is last+1 95e1910ebdSBaptiste Daroussin * from=to=line after point of insertion for added lines. 96e1910ebdSBaptiste Daroussin */ 97e1910ebdSBaptiste Daroussin struct range { 98e1910ebdSBaptiste Daroussin int from; 99e1910ebdSBaptiste Daroussin int to; 100e1910ebdSBaptiste Daroussin }; 101e1910ebdSBaptiste Daroussin 102e1910ebdSBaptiste Daroussin struct diff { 1039ab079c5STom Jones #define DIFF_TYPE2 2 1049ab079c5STom Jones #define DIFF_TYPE3 3 1059ab079c5STom Jones int type; 1069ab079c5STom Jones #if DEBUG 1079ab079c5STom Jones char *line; 1089ab079c5STom Jones #endif /* DEBUG */ 1099ab079c5STom Jones 1109ab079c5STom Jones /* Ranges as lines */ 111e1910ebdSBaptiste Daroussin struct range old; 112e1910ebdSBaptiste Daroussin struct range new; 113e1910ebdSBaptiste Daroussin }; 114e1910ebdSBaptiste Daroussin 115e1910ebdSBaptiste Daroussin static size_t szchanges; 116e1910ebdSBaptiste Daroussin 117e1910ebdSBaptiste Daroussin static struct diff *d13; 118e1910ebdSBaptiste Daroussin static struct diff *d23; 119e1910ebdSBaptiste Daroussin /* 120e1910ebdSBaptiste Daroussin * "de" is used to gather editing scripts. These are later spewed out in 1212184ca3fSTom Jones * reverse order. Its first element must be all zero, the "old" and "new" 1222184ca3fSTom Jones * components of "de" contain line positions. Array overlap indicates which 1232184ca3fSTom Jones * sections in "de" correspond to lines that are different in all three files. 124e1910ebdSBaptiste Daroussin */ 125e1910ebdSBaptiste Daroussin static struct diff *de; 126e1910ebdSBaptiste Daroussin static char *overlap; 127e1910ebdSBaptiste Daroussin static int overlapcnt; 128e1910ebdSBaptiste Daroussin static FILE *fp[3]; 129e1910ebdSBaptiste Daroussin static int cline[3]; /* # of the last-read line in each file (0-2) */ 130e1910ebdSBaptiste Daroussin /* 131e1910ebdSBaptiste Daroussin * The latest known correspondence between line numbers of the 3 files 132e1910ebdSBaptiste Daroussin * is stored in last[1-3]; 133e1910ebdSBaptiste Daroussin */ 134e1910ebdSBaptiste Daroussin static int last[4]; 135e1910ebdSBaptiste Daroussin static int Aflag, eflag, iflag, mflag, Tflag; 136e1910ebdSBaptiste Daroussin static int oflag; /* indicates whether to mark overlaps (-E or -X) */ 137e1910ebdSBaptiste Daroussin static int strip_cr; 138e1910ebdSBaptiste Daroussin static char *f1mark, *f2mark, *f3mark; 139df092859STom Jones static const char *oldmark = "<<<<<<<"; 1409ab079c5STom Jones static const char *orgmark = "|||||||"; 141df092859STom Jones static const char *newmark = ">>>>>>>"; 142e1910ebdSBaptiste Daroussin 143e1910ebdSBaptiste Daroussin static bool duplicate(struct range *, struct range *); 1449ab079c5STom Jones static int edit(struct diff *, bool, int, int); 145e1910ebdSBaptiste Daroussin static char *getchange(FILE *); 146e1910ebdSBaptiste Daroussin static char *get_line(FILE *, size_t *); 147e1910ebdSBaptiste Daroussin static int readin(int fd, struct diff **); 148e1910ebdSBaptiste Daroussin static int skip(int, int, const char *); 149e1910ebdSBaptiste Daroussin static void change(int, struct range *, bool); 150e1910ebdSBaptiste Daroussin static void keep(int, struct range *); 151e1910ebdSBaptiste Daroussin static void merge(int, int); 1527c03df68STom Jones static void prange(struct range *, bool); 153e1910ebdSBaptiste Daroussin static void repos(int); 154e1910ebdSBaptiste Daroussin static void edscript(int) __dead2; 1559ab079c5STom Jones static void Ascript(int) __dead2; 156034dd2d5STom Jones static void mergescript(int) __dead2; 157e1910ebdSBaptiste Daroussin static void increase(void); 158e1910ebdSBaptiste Daroussin static void usage(void) __dead2; 1592184ca3fSTom Jones static void printrange(FILE *, struct range *); 160e1910ebdSBaptiste Daroussin 161e1910ebdSBaptiste Daroussin enum { 162e1910ebdSBaptiste Daroussin DIFFPROG_OPT, 163e1910ebdSBaptiste Daroussin STRIPCR_OPT, 164e1910ebdSBaptiste Daroussin }; 165e1910ebdSBaptiste Daroussin 166e1910ebdSBaptiste Daroussin #define DIFF_PATH "/usr/bin/diff" 167e1910ebdSBaptiste Daroussin 168e1910ebdSBaptiste Daroussin #define OPTIONS "3aAeEiL:mTxX" 169e1910ebdSBaptiste Daroussin static struct option longopts[] = { 170e1910ebdSBaptiste Daroussin { "ed", no_argument, NULL, 'e' }, 171e1910ebdSBaptiste Daroussin { "show-overlap", no_argument, NULL, 'E' }, 172e1910ebdSBaptiste Daroussin { "overlap-only", no_argument, NULL, 'x' }, 173e1910ebdSBaptiste Daroussin { "initial-tab", no_argument, NULL, 'T' }, 174e1910ebdSBaptiste Daroussin { "text", no_argument, NULL, 'a' }, 175e1910ebdSBaptiste Daroussin { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, 176e1910ebdSBaptiste Daroussin { "show-all", no_argument, NULL, 'A' }, 177e1910ebdSBaptiste Daroussin { "easy-only", no_argument, NULL, '3' }, 178e1910ebdSBaptiste Daroussin { "merge", no_argument, NULL, 'm' }, 179e1910ebdSBaptiste Daroussin { "label", required_argument, NULL, 'L' }, 180e1910ebdSBaptiste Daroussin { "diff-program", required_argument, NULL, DIFFPROG_OPT }, 181e1910ebdSBaptiste Daroussin }; 182e1910ebdSBaptiste Daroussin 183e1910ebdSBaptiste Daroussin static void 184e1910ebdSBaptiste Daroussin usage(void) 185e1910ebdSBaptiste Daroussin { 186702dda43SPiotr Pawel Stefaniak fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] " 187e1910ebdSBaptiste Daroussin "[-L label3] file1 file2 file3\n"); 188e1910ebdSBaptiste Daroussin exit(2); 189e1910ebdSBaptiste Daroussin } 190e1910ebdSBaptiste Daroussin 191e1910ebdSBaptiste Daroussin static int 192e1910ebdSBaptiste Daroussin readin(int fd, struct diff **dd) 193e1910ebdSBaptiste Daroussin { 194e1910ebdSBaptiste Daroussin int a, b, c, d; 195e1910ebdSBaptiste Daroussin size_t i; 196e1910ebdSBaptiste Daroussin char kind, *p; 197e1910ebdSBaptiste Daroussin FILE *f; 198e1910ebdSBaptiste Daroussin 199e1910ebdSBaptiste Daroussin f = fdopen(fd, "r"); 200e1910ebdSBaptiste Daroussin if (f == NULL) 201e1910ebdSBaptiste Daroussin err(2, "fdopen"); 202e1910ebdSBaptiste Daroussin for (i = 0; (p = getchange(f)); i++) { 2039ab079c5STom Jones #if DEBUG 2049ab079c5STom Jones (*dd)[i].line = strdup(p); 2059ab079c5STom Jones #endif /* DEBUG */ 2069ab079c5STom Jones 207e1910ebdSBaptiste Daroussin if (i >= szchanges - 1) 208e1910ebdSBaptiste Daroussin increase(); 2099520071fSBaptiste Daroussin a = b = (int)strtoimax(p, &p, 10); 210e1910ebdSBaptiste Daroussin if (*p == ',') { 211e1910ebdSBaptiste Daroussin p++; 2129520071fSBaptiste Daroussin b = (int)strtoimax(p, &p, 10); 213e1910ebdSBaptiste Daroussin } 214e1910ebdSBaptiste Daroussin kind = *p++; 2159520071fSBaptiste Daroussin c = d = (int)strtoimax(p, &p, 10); 216e1910ebdSBaptiste Daroussin if (*p == ',') { 217e1910ebdSBaptiste Daroussin p++; 2189520071fSBaptiste Daroussin d = (int)strtoimax(p, &p, 10); 219e1910ebdSBaptiste Daroussin } 220e1910ebdSBaptiste Daroussin if (kind == 'a') 221e1910ebdSBaptiste Daroussin a++; 222e1910ebdSBaptiste Daroussin if (kind == 'd') 223e1910ebdSBaptiste Daroussin c++; 224e1910ebdSBaptiste Daroussin b++; 225e1910ebdSBaptiste Daroussin d++; 226e1910ebdSBaptiste Daroussin (*dd)[i].old.from = a; 227e1910ebdSBaptiste Daroussin (*dd)[i].old.to = b; 228e1910ebdSBaptiste Daroussin (*dd)[i].new.from = c; 229e1910ebdSBaptiste Daroussin (*dd)[i].new.to = d; 230e1910ebdSBaptiste Daroussin } 231e1910ebdSBaptiste Daroussin if (i) { 232e1910ebdSBaptiste Daroussin (*dd)[i].old.from = (*dd)[i - 1].old.to; 233e1910ebdSBaptiste Daroussin (*dd)[i].new.from = (*dd)[i - 1].new.to; 234e1910ebdSBaptiste Daroussin } 235e1910ebdSBaptiste Daroussin fclose(f); 236e1910ebdSBaptiste Daroussin return (i); 237e1910ebdSBaptiste Daroussin } 238e1910ebdSBaptiste Daroussin 239e1910ebdSBaptiste Daroussin static int 240e1910ebdSBaptiste Daroussin diffexec(const char *diffprog, char **diffargv, int fd[]) 241e1910ebdSBaptiste Daroussin { 242702dda43SPiotr Pawel Stefaniak int pd; 243e1910ebdSBaptiste Daroussin 244702dda43SPiotr Pawel Stefaniak switch (pdfork(&pd, PD_CLOEXEC)) { 245e1910ebdSBaptiste Daroussin case 0: 246e1910ebdSBaptiste Daroussin close(fd[0]); 247e1910ebdSBaptiste Daroussin if (dup2(fd[1], STDOUT_FILENO) == -1) 248e1910ebdSBaptiste Daroussin err(2, "child could not duplicate descriptor"); 249e1910ebdSBaptiste Daroussin close(fd[1]); 250e1910ebdSBaptiste Daroussin execvp(diffprog, diffargv); 251e1910ebdSBaptiste Daroussin err(2, "could not execute diff: %s", diffprog); 252e1910ebdSBaptiste Daroussin break; 253e1910ebdSBaptiste Daroussin case -1: 254e1910ebdSBaptiste Daroussin err(2, "could not fork"); 255e1910ebdSBaptiste Daroussin break; 256e1910ebdSBaptiste Daroussin } 257e1910ebdSBaptiste Daroussin close(fd[1]); 258e1910ebdSBaptiste Daroussin return (pd); 259e1910ebdSBaptiste Daroussin } 260e1910ebdSBaptiste Daroussin 261e1910ebdSBaptiste Daroussin static char * 262e1910ebdSBaptiste Daroussin getchange(FILE *b) 263e1910ebdSBaptiste Daroussin { 264e1910ebdSBaptiste Daroussin char *line; 265e1910ebdSBaptiste Daroussin 266e1910ebdSBaptiste Daroussin while ((line = get_line(b, NULL))) { 267e1910ebdSBaptiste Daroussin if (isdigit((unsigned char)line[0])) 268e1910ebdSBaptiste Daroussin return (line); 269e1910ebdSBaptiste Daroussin } 270e1910ebdSBaptiste Daroussin return (NULL); 271e1910ebdSBaptiste Daroussin } 272e1910ebdSBaptiste Daroussin 273e1910ebdSBaptiste Daroussin 274e1910ebdSBaptiste Daroussin static char * 275e1910ebdSBaptiste Daroussin get_line(FILE *b, size_t *n) 276e1910ebdSBaptiste Daroussin { 27794678ee6SBaptiste Daroussin ssize_t len; 27894678ee6SBaptiste Daroussin static char *buf = NULL; 27994678ee6SBaptiste Daroussin static size_t bufsize = 0; 280e1910ebdSBaptiste Daroussin 28194678ee6SBaptiste Daroussin if ((len = getline(&buf, &bufsize, b)) < 0) 282e1910ebdSBaptiste Daroussin return (NULL); 283e1910ebdSBaptiste Daroussin 28454a3415cSPiotr Pawel Stefaniak if (strip_cr && len >= 2 && strcmp("\r\n", &(buf[len - 2])) == 0) { 28554a3415cSPiotr Pawel Stefaniak buf[len - 2] = '\n'; 28654a3415cSPiotr Pawel Stefaniak buf[len - 1] = '\0'; 28754a3415cSPiotr Pawel Stefaniak len--; 28854a3415cSPiotr Pawel Stefaniak } 28954a3415cSPiotr Pawel Stefaniak 290e1910ebdSBaptiste Daroussin if (n != NULL) 291e1910ebdSBaptiste Daroussin *n = len; 29294678ee6SBaptiste Daroussin 293e1910ebdSBaptiste Daroussin return (buf); 294e1910ebdSBaptiste Daroussin } 295e1910ebdSBaptiste Daroussin 296e1910ebdSBaptiste Daroussin static void 297e1910ebdSBaptiste Daroussin merge(int m1, int m2) 298e1910ebdSBaptiste Daroussin { 299e1910ebdSBaptiste Daroussin struct diff *d1, *d2, *d3; 300e1910ebdSBaptiste Daroussin int j, t1, t2; 301e1910ebdSBaptiste Daroussin bool dup = false; 302e1910ebdSBaptiste Daroussin 303e1910ebdSBaptiste Daroussin d1 = d13; 304e1910ebdSBaptiste Daroussin d2 = d23; 305e1910ebdSBaptiste Daroussin j = 0; 306e1910ebdSBaptiste Daroussin 307*7d975c7fSTom Jones while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) { 308e1910ebdSBaptiste Daroussin /* first file is different from the others */ 309e1910ebdSBaptiste Daroussin if (!t2 || (t1 && d1->new.to < d2->new.from)) { 310e1910ebdSBaptiste Daroussin /* stuff peculiar to 1st file */ 311e1910ebdSBaptiste Daroussin if (eflag == 0) { 312e1910ebdSBaptiste Daroussin printf("====1\n"); 313e1910ebdSBaptiste Daroussin change(1, &d1->old, false); 314e1910ebdSBaptiste Daroussin keep(2, &d1->new); 315e1910ebdSBaptiste Daroussin change(3, &d1->new, false); 316e1910ebdSBaptiste Daroussin } 317e1910ebdSBaptiste Daroussin d1++; 318e1910ebdSBaptiste Daroussin continue; 319e1910ebdSBaptiste Daroussin } 320e1910ebdSBaptiste Daroussin /* second file is different from others */ 321e1910ebdSBaptiste Daroussin if (!t1 || (t2 && d2->new.to < d1->new.from)) { 322e1910ebdSBaptiste Daroussin if (eflag == 0) { 323e1910ebdSBaptiste Daroussin printf("====2\n"); 324e1910ebdSBaptiste Daroussin keep(1, &d2->new); 325e1910ebdSBaptiste Daroussin change(3, &d2->new, false); 326e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 3279ab079c5STom Jones } else if (Aflag || mflag) { 3289ab079c5STom Jones // XXX-THJ: What does it mean for the second file to differ? 3299ab079c5STom Jones j = edit(d2, dup, j, DIFF_TYPE2); 330e1910ebdSBaptiste Daroussin } 331e1910ebdSBaptiste Daroussin d2++; 332e1910ebdSBaptiste Daroussin continue; 333e1910ebdSBaptiste Daroussin } 334e1910ebdSBaptiste Daroussin /* 335e1910ebdSBaptiste Daroussin * Merge overlapping changes in first file 336e1910ebdSBaptiste Daroussin * this happens after extension (see below). 337e1910ebdSBaptiste Daroussin */ 338e1910ebdSBaptiste Daroussin if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { 339e1910ebdSBaptiste Daroussin d1[1].old.from = d1->old.from; 340e1910ebdSBaptiste Daroussin d1[1].new.from = d1->new.from; 341e1910ebdSBaptiste Daroussin d1++; 342e1910ebdSBaptiste Daroussin continue; 343e1910ebdSBaptiste Daroussin } 344e1910ebdSBaptiste Daroussin 345e1910ebdSBaptiste Daroussin /* merge overlapping changes in second */ 346e1910ebdSBaptiste Daroussin if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) { 347e1910ebdSBaptiste Daroussin d2[1].old.from = d2->old.from; 348e1910ebdSBaptiste Daroussin d2[1].new.from = d2->new.from; 349e1910ebdSBaptiste Daroussin d2++; 350e1910ebdSBaptiste Daroussin continue; 351e1910ebdSBaptiste Daroussin } 352e1910ebdSBaptiste Daroussin /* stuff peculiar to third file or different in all */ 353e1910ebdSBaptiste Daroussin if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { 354e1910ebdSBaptiste Daroussin dup = duplicate(&d1->old, &d2->old); 355e1910ebdSBaptiste Daroussin /* 356e1910ebdSBaptiste Daroussin * dup = 0 means all files differ 357e1910ebdSBaptiste Daroussin * dup = 1 means files 1 and 2 identical 358e1910ebdSBaptiste Daroussin */ 359e1910ebdSBaptiste Daroussin if (eflag == 0) { 360e1910ebdSBaptiste Daroussin printf("====%s\n", dup ? "3" : ""); 361e1910ebdSBaptiste Daroussin change(1, &d1->old, dup); 362e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 363e1910ebdSBaptiste Daroussin d3 = d1->old.to > d1->old.from ? d1 : d2; 364e1910ebdSBaptiste Daroussin change(3, &d3->new, false); 3659ab079c5STom Jones } else { 3669ab079c5STom Jones j = edit(d1, dup, j, DIFF_TYPE3); 3679ab079c5STom Jones } 3689ab079c5STom Jones dup = false; 369e1910ebdSBaptiste Daroussin d1++; 370e1910ebdSBaptiste Daroussin d2++; 371e1910ebdSBaptiste Daroussin continue; 372e1910ebdSBaptiste Daroussin } 373e1910ebdSBaptiste Daroussin /* 374e1910ebdSBaptiste Daroussin * Overlapping changes from file 1 and 2; extend changes 375e1910ebdSBaptiste Daroussin * appropriately to make them coincide. 376e1910ebdSBaptiste Daroussin */ 377e1910ebdSBaptiste Daroussin if (d1->new.from < d2->new.from) { 378e1910ebdSBaptiste Daroussin d2->old.from -= d2->new.from - d1->new.from; 379e1910ebdSBaptiste Daroussin d2->new.from = d1->new.from; 380e1910ebdSBaptiste Daroussin } else if (d2->new.from < d1->new.from) { 381e1910ebdSBaptiste Daroussin d1->old.from -= d1->new.from - d2->new.from; 382e1910ebdSBaptiste Daroussin d1->new.from = d2->new.from; 383e1910ebdSBaptiste Daroussin } 384e1910ebdSBaptiste Daroussin if (d1->new.to > d2->new.to) { 385e1910ebdSBaptiste Daroussin d2->old.to += d1->new.to - d2->new.to; 386e1910ebdSBaptiste Daroussin d2->new.to = d1->new.to; 387e1910ebdSBaptiste Daroussin } else if (d2->new.to > d1->new.to) { 388e1910ebdSBaptiste Daroussin d1->old.to += d2->new.to - d1->new.to; 389e1910ebdSBaptiste Daroussin d1->new.to = d2->new.to; 390e1910ebdSBaptiste Daroussin } 391e1910ebdSBaptiste Daroussin } 3929ab079c5STom Jones 393034dd2d5STom Jones if (mflag) 394034dd2d5STom Jones mergescript(j); 395034dd2d5STom Jones else if (Aflag) 3969ab079c5STom Jones Ascript(j); 3979ab079c5STom Jones else if (eflag) 398e1910ebdSBaptiste Daroussin edscript(j); 399e1910ebdSBaptiste Daroussin } 400e1910ebdSBaptiste Daroussin 401e1910ebdSBaptiste Daroussin /* 402e1910ebdSBaptiste Daroussin * The range of lines rold.from thru rold.to in file i is to be changed. 403e1910ebdSBaptiste Daroussin * It is to be printed only if it does not duplicate something to be 404e1910ebdSBaptiste Daroussin * printed later. 405e1910ebdSBaptiste Daroussin */ 406e1910ebdSBaptiste Daroussin static void 407e1910ebdSBaptiste Daroussin change(int i, struct range *rold, bool dup) 408e1910ebdSBaptiste Daroussin { 409e1910ebdSBaptiste Daroussin 410e1910ebdSBaptiste Daroussin printf("%d:", i); 411e1910ebdSBaptiste Daroussin last[i] = rold->to; 4127c03df68STom Jones prange(rold, false); 413e1910ebdSBaptiste Daroussin if (dup) 414e1910ebdSBaptiste Daroussin return; 415e1910ebdSBaptiste Daroussin i--; 416e1910ebdSBaptiste Daroussin skip(i, rold->from, NULL); 417e1910ebdSBaptiste Daroussin skip(i, rold->to, " "); 418e1910ebdSBaptiste Daroussin } 419e1910ebdSBaptiste Daroussin 420e1910ebdSBaptiste Daroussin /* 421e1910ebdSBaptiste Daroussin * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or 422e1910ebdSBaptiste Daroussin * n1. 423e1910ebdSBaptiste Daroussin */ 424e1910ebdSBaptiste Daroussin static void 4257c03df68STom Jones prange(struct range *rold, bool delete) 426e1910ebdSBaptiste Daroussin { 427e1910ebdSBaptiste Daroussin 428e1910ebdSBaptiste Daroussin if (rold->to <= rold->from) 429e1910ebdSBaptiste Daroussin printf("%da\n", rold->from - 1); 430e1910ebdSBaptiste Daroussin else { 431e1910ebdSBaptiste Daroussin printf("%d", rold->from); 432e1910ebdSBaptiste Daroussin if (rold->to > rold->from + 1) 433e1910ebdSBaptiste Daroussin printf(",%d", rold->to - 1); 4347c03df68STom Jones if (delete) 4357c03df68STom Jones printf("d\n"); 4367c03df68STom Jones else 437e1910ebdSBaptiste Daroussin printf("c\n"); 438e1910ebdSBaptiste Daroussin } 439e1910ebdSBaptiste Daroussin } 440e1910ebdSBaptiste Daroussin 441e1910ebdSBaptiste Daroussin /* 442e1910ebdSBaptiste Daroussin * No difference was reported by diff between file 1 (or 2) and file 3, 443e1910ebdSBaptiste Daroussin * and an artificial dummy difference (trange) must be ginned up to 444e1910ebdSBaptiste Daroussin * correspond to the change reported in the other file. 445e1910ebdSBaptiste Daroussin */ 446e1910ebdSBaptiste Daroussin static void 447e1910ebdSBaptiste Daroussin keep(int i, struct range *rnew) 448e1910ebdSBaptiste Daroussin { 449e1910ebdSBaptiste Daroussin int delta; 450e1910ebdSBaptiste Daroussin struct range trange; 451e1910ebdSBaptiste Daroussin 452e1910ebdSBaptiste Daroussin delta = last[3] - last[i]; 453e1910ebdSBaptiste Daroussin trange.from = rnew->from - delta; 454e1910ebdSBaptiste Daroussin trange.to = rnew->to - delta; 455e1910ebdSBaptiste Daroussin change(i, &trange, true); 456e1910ebdSBaptiste Daroussin } 457e1910ebdSBaptiste Daroussin 458e1910ebdSBaptiste Daroussin /* 459e1910ebdSBaptiste Daroussin * skip to just before line number from in file "i". If "pr" is non-NULL, 460e1910ebdSBaptiste Daroussin * print all skipped stuff with string pr as a prefix. 461e1910ebdSBaptiste Daroussin */ 462e1910ebdSBaptiste Daroussin static int 463e1910ebdSBaptiste Daroussin skip(int i, int from, const char *pr) 464e1910ebdSBaptiste Daroussin { 465e1910ebdSBaptiste Daroussin size_t j, n; 466e1910ebdSBaptiste Daroussin char *line; 467e1910ebdSBaptiste Daroussin 468e1910ebdSBaptiste Daroussin for (n = 0; cline[i] < from - 1; n += j) { 469e1910ebdSBaptiste Daroussin if ((line = get_line(fp[i], &j)) == NULL) 470e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 471e1910ebdSBaptiste Daroussin if (pr != NULL) 472e1910ebdSBaptiste Daroussin printf("%s%s", Tflag == 1 ? "\t" : pr, line); 473e1910ebdSBaptiste Daroussin cline[i]++; 474e1910ebdSBaptiste Daroussin } 475e1910ebdSBaptiste Daroussin return ((int) n); 476e1910ebdSBaptiste Daroussin } 477e1910ebdSBaptiste Daroussin 478e1910ebdSBaptiste Daroussin /* 479e1910ebdSBaptiste Daroussin * Return 1 or 0 according as the old range (in file 1) contains exactly 480e1910ebdSBaptiste Daroussin * the same data as the new range (in file 2). 481e1910ebdSBaptiste Daroussin */ 482e1910ebdSBaptiste Daroussin static bool 483e1910ebdSBaptiste Daroussin duplicate(struct range *r1, struct range *r2) 484e1910ebdSBaptiste Daroussin { 485e1910ebdSBaptiste Daroussin int c, d; 486e1910ebdSBaptiste Daroussin int nchar; 487e1910ebdSBaptiste Daroussin int nline; 488e1910ebdSBaptiste Daroussin 489e1910ebdSBaptiste Daroussin if (r1->to-r1->from != r2->to-r2->from) 490e1910ebdSBaptiste Daroussin return (0); 491e1910ebdSBaptiste Daroussin skip(0, r1->from, NULL); 492e1910ebdSBaptiste Daroussin skip(1, r2->from, NULL); 493e1910ebdSBaptiste Daroussin nchar = 0; 494e1910ebdSBaptiste Daroussin for (nline = 0; nline < r1->to - r1->from; nline++) { 495e1910ebdSBaptiste Daroussin do { 496e1910ebdSBaptiste Daroussin c = getc(fp[0]); 497e1910ebdSBaptiste Daroussin d = getc(fp[1]); 4987f7b03f3SPiotr Pawel Stefaniak if (c == -1 && d == -1) 4997f7b03f3SPiotr Pawel Stefaniak break; 500e1910ebdSBaptiste Daroussin if (c == -1 || d == -1) 501e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 502e1910ebdSBaptiste Daroussin nchar++; 503e1910ebdSBaptiste Daroussin if (c != d) { 504e1910ebdSBaptiste Daroussin repos(nchar); 505e1910ebdSBaptiste Daroussin return (0); 506e1910ebdSBaptiste Daroussin } 507e1910ebdSBaptiste Daroussin } while (c != '\n'); 508e1910ebdSBaptiste Daroussin } 509e1910ebdSBaptiste Daroussin repos(nchar); 510e1910ebdSBaptiste Daroussin return (1); 511e1910ebdSBaptiste Daroussin } 512e1910ebdSBaptiste Daroussin 513e1910ebdSBaptiste Daroussin static void 514e1910ebdSBaptiste Daroussin repos(int nchar) 515e1910ebdSBaptiste Daroussin { 516e1910ebdSBaptiste Daroussin int i; 517e1910ebdSBaptiste Daroussin 518e1910ebdSBaptiste Daroussin for (i = 0; i < 2; i++) 519e1910ebdSBaptiste Daroussin (void)fseek(fp[i], (long)-nchar, SEEK_CUR); 520e1910ebdSBaptiste Daroussin } 521702dda43SPiotr Pawel Stefaniak 522e1910ebdSBaptiste Daroussin /* 523e1910ebdSBaptiste Daroussin * collect an editing script for later regurgitation 524e1910ebdSBaptiste Daroussin */ 525e1910ebdSBaptiste Daroussin static int 5269ab079c5STom Jones edit(struct diff *diff, bool dup, int j, int difftype) 527e1910ebdSBaptiste Daroussin { 528e1910ebdSBaptiste Daroussin 529e1910ebdSBaptiste Daroussin if (((dup + 1) & eflag) == 0) 530e1910ebdSBaptiste Daroussin return (j); 531e1910ebdSBaptiste Daroussin j++; 532e1910ebdSBaptiste Daroussin overlap[j] = !dup; 533e1910ebdSBaptiste Daroussin if (!dup) 534e1910ebdSBaptiste Daroussin overlapcnt++; 5359ab079c5STom Jones 5369ab079c5STom Jones de[j].type = difftype; 5379ab079c5STom Jones #if DEBUG 5389ab079c5STom Jones de[j].line = diff->line; 5399ab079c5STom Jones #endif /* DEBUG */ 5409ab079c5STom Jones 541e1910ebdSBaptiste Daroussin de[j].old.from = diff->old.from; 542e1910ebdSBaptiste Daroussin de[j].old.to = diff->old.to; 5432184ca3fSTom Jones de[j].new.from = diff->new.from; 5442184ca3fSTom Jones de[j].new.to = diff->new.to; 545e1910ebdSBaptiste Daroussin return (j); 546e1910ebdSBaptiste Daroussin } 547e1910ebdSBaptiste Daroussin 5482184ca3fSTom Jones static void 5492184ca3fSTom Jones printrange(FILE *p, struct range *r) 5502184ca3fSTom Jones { 5512184ca3fSTom Jones char *line = NULL; 5522184ca3fSTom Jones size_t len = 0; 5532184ca3fSTom Jones int i = 1; 5542184ca3fSTom Jones ssize_t rlen = 0; 5552184ca3fSTom Jones 5562184ca3fSTom Jones /* We haven't been asked to print anything */ 5572184ca3fSTom Jones if (r->from == r->to) 5582184ca3fSTom Jones return; 5592184ca3fSTom Jones 5602184ca3fSTom Jones if (r->from > r->to) 5612184ca3fSTom Jones errx(EXIT_FAILURE, "invalid print range"); 5622184ca3fSTom Jones 5632184ca3fSTom Jones /* 5642184ca3fSTom Jones * XXX-THJ: We read through all of the file for each range printed. 5652184ca3fSTom Jones * This duplicates work and will probably impact performance on large 5662184ca3fSTom Jones * files with lots of ranges. 5672184ca3fSTom Jones */ 5682184ca3fSTom Jones fseek(p, 0L, SEEK_SET); 5692184ca3fSTom Jones while ((rlen = getline(&line, &len, p)) > 0) { 5702184ca3fSTom Jones if (i >= r->from) 5712184ca3fSTom Jones printf("%s", line); 5722184ca3fSTom Jones if (++i > r->to - 1) 5732184ca3fSTom Jones break; 5742184ca3fSTom Jones } 5752184ca3fSTom Jones free(line); 5762184ca3fSTom Jones } 5772184ca3fSTom Jones 578e1910ebdSBaptiste Daroussin /* regurgitate */ 579e1910ebdSBaptiste Daroussin static void 580e1910ebdSBaptiste Daroussin edscript(int n) 581e1910ebdSBaptiste Daroussin { 5827c03df68STom Jones bool delete; 583e1910ebdSBaptiste Daroussin 584e1910ebdSBaptiste Daroussin for (; n > 0; n--) { 5857c03df68STom Jones delete = (de[n].new.from == de[n].new.to); 586e1910ebdSBaptiste Daroussin if (!oflag || !overlap[n]) { 5877c03df68STom Jones prange(&de[n].old, delete); 588e1910ebdSBaptiste Daroussin } else { 589e1910ebdSBaptiste Daroussin printf("%da\n", de[n].old.to - 1); 590e1910ebdSBaptiste Daroussin printf("=======\n"); 591e1910ebdSBaptiste Daroussin } 5922184ca3fSTom Jones printrange(fp[2], &de[n].new); 5937c03df68STom Jones if (!oflag || !overlap[n]) { 5947c03df68STom Jones if (!delete) 595e1910ebdSBaptiste Daroussin printf(".\n"); 5967c03df68STom Jones } else { 597df092859STom Jones printf("%s %s\n.\n", newmark, f3mark); 598df092859STom Jones printf("%da\n%s %s\n.\n", de[n].old.from - 1, 599df092859STom Jones oldmark, f1mark); 600e1910ebdSBaptiste Daroussin } 601e1910ebdSBaptiste Daroussin } 602e1910ebdSBaptiste Daroussin if (iflag) 603e1910ebdSBaptiste Daroussin printf("w\nq\n"); 604e1910ebdSBaptiste Daroussin 605e1910ebdSBaptiste Daroussin exit(eflag == 0 ? overlapcnt : 0); 606e1910ebdSBaptiste Daroussin } 607e1910ebdSBaptiste Daroussin 6089ab079c5STom Jones /* 6099ab079c5STom Jones * Output an edit script to turn mine into yours, when there is a conflict 6109ab079c5STom Jones * between the 3 files bracket the changes. Regurgitate the diffs in reverse 6119ab079c5STom Jones * order to allow the ed script to track down where the lines are as changes 6129ab079c5STom Jones * are made. 6139ab079c5STom Jones */ 6149ab079c5STom Jones static void 6159ab079c5STom Jones Ascript(int n) 6169ab079c5STom Jones { 6179ab079c5STom Jones int startmark; 6189ab079c5STom Jones bool deletenew; 6199ab079c5STom Jones bool deleteold; 6209ab079c5STom Jones 6219ab079c5STom Jones for (; n > 0; n--) { 6229ab079c5STom Jones 6239ab079c5STom Jones deletenew = (de[n].new.from == de[n].new.to); 6249ab079c5STom Jones deleteold = (de[n].old.from == de[n].old.to); 6259ab079c5STom Jones startmark = de[n].old.from + (de[n].old.to - de[n].old.from) - 1; 6269ab079c5STom Jones 6279ab079c5STom Jones if (de[n].type == DIFF_TYPE2) { 6289ab079c5STom Jones if (!oflag || !overlap[n]) { 6299ab079c5STom Jones prange(&de[n].old, deletenew); 6309ab079c5STom Jones printrange(fp[2], &de[n].new); 6319ab079c5STom Jones } else { 6329ab079c5STom Jones startmark = de[n].new.from + 6339ab079c5STom Jones (de[n].new.to - de[n].new.from); 6349ab079c5STom Jones 6359ab079c5STom Jones if (!deletenew) 6369ab079c5STom Jones startmark--; 6379ab079c5STom Jones 6389ab079c5STom Jones printf("%da\n", startmark); 6399ab079c5STom Jones printf("%s %s\n", newmark, f3mark); 6409ab079c5STom Jones 6419ab079c5STom Jones printf(".\n"); 6429ab079c5STom Jones 6439ab079c5STom Jones printf("%da\n", startmark - 6449ab079c5STom Jones (de[n].new.to - de[n].new.from)); 6459ab079c5STom Jones printf("%s %s\n", oldmark, f2mark); 6469ab079c5STom Jones if (!deleteold) 6479ab079c5STom Jones printrange(fp[1], &de[n].old); 6489ab079c5STom Jones printf("=======\n.\n"); 6499ab079c5STom Jones } 6509ab079c5STom Jones 6519ab079c5STom Jones } else if (de[n].type == DIFF_TYPE3) { 6529ab079c5STom Jones if (!oflag || !overlap[n]) { 6539ab079c5STom Jones prange(&de[n].old, deletenew); 6549ab079c5STom Jones printrange(fp[2], &de[n].new); 6559ab079c5STom Jones } else { 6569ab079c5STom Jones printf("%da\n", startmark); 6579ab079c5STom Jones printf("%s %s\n", orgmark, f2mark); 6589ab079c5STom Jones 6599ab079c5STom Jones if (deleteold) { 6609ab079c5STom Jones struct range r; 6619ab079c5STom Jones r.from = de[n].old.from-1; 6629ab079c5STom Jones r.to = de[n].new.to; 6639ab079c5STom Jones printrange(fp[1], &r); 6649ab079c5STom Jones } else 6659ab079c5STom Jones printrange(fp[1], &de[n].old); 6669ab079c5STom Jones 6679ab079c5STom Jones printf("=======\n"); 6689ab079c5STom Jones printrange(fp[2], &de[n].new); 6699ab079c5STom Jones } 6709ab079c5STom Jones 6719ab079c5STom Jones if (!oflag || !overlap[n]) { 6729ab079c5STom Jones if (!deletenew) 6739ab079c5STom Jones printf(".\n"); 6749ab079c5STom Jones } else { 6759ab079c5STom Jones printf("%s %s\n.\n", newmark, f3mark); 6769ab079c5STom Jones 6779ab079c5STom Jones /* 6789ab079c5STom Jones * Go to the start of the conflict in original 6799ab079c5STom Jones * file and append lines 6809ab079c5STom Jones */ 6819ab079c5STom Jones printf("%da\n%s %s\n.\n", 6829ab079c5STom Jones startmark - (de[n].old.to - de[n].old.from), 6839ab079c5STom Jones oldmark, f1mark); 6849ab079c5STom Jones } 6859ab079c5STom Jones } 6869ab079c5STom Jones } 6879ab079c5STom Jones if (iflag) 6889ab079c5STom Jones printf("w\nq\n"); 6899ab079c5STom Jones 6909ab079c5STom Jones exit(overlapcnt > 0); 6919ab079c5STom Jones } 6929ab079c5STom Jones 693034dd2d5STom Jones /* 694034dd2d5STom Jones * Output the merged file directly (don't generate an ed script). When 695034dd2d5STom Jones * regurgitating diffs we need to walk forward through the file and print any 696034dd2d5STom Jones * inbetween lines. 697034dd2d5STom Jones */ 698034dd2d5STom Jones static void 699034dd2d5STom Jones mergescript(int i) 700034dd2d5STom Jones { 701034dd2d5STom Jones struct range r; 702034dd2d5STom Jones int n; 703034dd2d5STom Jones 704034dd2d5STom Jones r.from = 1; 705034dd2d5STom Jones r.to = 1; 706034dd2d5STom Jones 707034dd2d5STom Jones for (n = 1; n < i+1; n++) { 708034dd2d5STom Jones /* print any lines leading up to here */ 709034dd2d5STom Jones r.to = de[n].old.from; 710034dd2d5STom Jones printrange(fp[0], &r); 711034dd2d5STom Jones 712034dd2d5STom Jones if (de[n].type == DIFF_TYPE2) { 713034dd2d5STom Jones printf("%s %s\n", oldmark, f2mark); 714034dd2d5STom Jones printrange(fp[1], &de[n].old); 715034dd2d5STom Jones printf("=======\n"); 716034dd2d5STom Jones printrange(fp[2], &de[n].new); 717034dd2d5STom Jones printf("%s %s\n", newmark, f3mark); 718034dd2d5STom Jones } else if (de[n].type == DIFF_TYPE3) { 719034dd2d5STom Jones if (!oflag || !overlap[n]) { 720034dd2d5STom Jones printrange(fp[2], &de[n].new); 721034dd2d5STom Jones } else { 722034dd2d5STom Jones 723034dd2d5STom Jones printf("%s %s\n", oldmark, f1mark); 724034dd2d5STom Jones printrange(fp[0], &de[n].old); 725034dd2d5STom Jones 726034dd2d5STom Jones printf("%s %s\n", orgmark, f2mark); 727034dd2d5STom Jones if (de[n].old.from == de[n].old.to) { 728034dd2d5STom Jones struct range or; 729034dd2d5STom Jones or.from = de[n].old.from -1; 730034dd2d5STom Jones or.to = de[n].new.to; 731034dd2d5STom Jones printrange(fp[1], &or); 732034dd2d5STom Jones } else 733034dd2d5STom Jones printrange(fp[1], &de[n].old); 734034dd2d5STom Jones 735034dd2d5STom Jones printf("=======\n"); 736034dd2d5STom Jones 737034dd2d5STom Jones printrange(fp[2], &de[n].new); 738034dd2d5STom Jones printf("%s %s\n", newmark, f3mark); 739034dd2d5STom Jones } 740034dd2d5STom Jones } 741034dd2d5STom Jones 742034dd2d5STom Jones if (de[n].old.from == de[n].old.to) 743034dd2d5STom Jones r.from = de[n].new.to; 744034dd2d5STom Jones else 745034dd2d5STom Jones r.from = de[n].old.to; 746034dd2d5STom Jones } 747034dd2d5STom Jones /* 748034dd2d5STom Jones * Print from the final range to the end of 'myfile'. Any deletions or 749034dd2d5STom Jones * additions to this file should have been handled by now. 750034dd2d5STom Jones * 751034dd2d5STom Jones * If the ranges are the same we need to rewind a line. 752034dd2d5STom Jones * If the new range is 0 length (from == to), we need to use the old 753034dd2d5STom Jones * range. 754034dd2d5STom Jones */ 755034dd2d5STom Jones if ((de[n-1].old.from == de[n-1].new.from) && 756034dd2d5STom Jones (de[n-1].old.to == de[n-1].new.to)) 757034dd2d5STom Jones r.from--; 758034dd2d5STom Jones else if (de[n-1].new.from == de[n-1].new.to) 759034dd2d5STom Jones r.from = de[n-1].old.from; 760034dd2d5STom Jones 761034dd2d5STom Jones /* 762034dd2d5STom Jones * If the range is a 3 way merge then we need to skip a line in the 763034dd2d5STom Jones * trailing output. 764034dd2d5STom Jones */ 765034dd2d5STom Jones if (de[n-1].type == DIFF_TYPE3) 766034dd2d5STom Jones r.from++; 767034dd2d5STom Jones 768034dd2d5STom Jones r.to = INT_MAX; 769034dd2d5STom Jones printrange(fp[0], &r); 770034dd2d5STom Jones exit(overlapcnt > 0); 771034dd2d5STom Jones } 772034dd2d5STom Jones 773e1910ebdSBaptiste Daroussin static void 774e1910ebdSBaptiste Daroussin increase(void) 775e1910ebdSBaptiste Daroussin { 776e1910ebdSBaptiste Daroussin struct diff *p; 777e1910ebdSBaptiste Daroussin char *q; 778e1910ebdSBaptiste Daroussin size_t newsz, incr; 779e1910ebdSBaptiste Daroussin 780e1910ebdSBaptiste Daroussin /* are the memset(3) calls needed? */ 781e1910ebdSBaptiste Daroussin newsz = szchanges == 0 ? 64 : 2 * szchanges; 782e1910ebdSBaptiste Daroussin incr = newsz - szchanges; 783e1910ebdSBaptiste Daroussin 7847f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d13, newsz, sizeof(struct diff)); 785e1910ebdSBaptiste Daroussin if (p == NULL) 786e1910ebdSBaptiste Daroussin err(1, NULL); 787e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 788e1910ebdSBaptiste Daroussin d13 = p; 7897f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d23, newsz, sizeof(struct diff)); 790e1910ebdSBaptiste Daroussin if (p == NULL) 791e1910ebdSBaptiste Daroussin err(1, NULL); 792e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 793e1910ebdSBaptiste Daroussin d23 = p; 7947f7b03f3SPiotr Pawel Stefaniak p = reallocarray(de, newsz, sizeof(struct diff)); 795e1910ebdSBaptiste Daroussin if (p == NULL) 796e1910ebdSBaptiste Daroussin err(1, NULL); 797e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 798e1910ebdSBaptiste Daroussin de = p; 7997f7b03f3SPiotr Pawel Stefaniak q = reallocarray(overlap, newsz, sizeof(char)); 800e1910ebdSBaptiste Daroussin if (q == NULL) 801e1910ebdSBaptiste Daroussin err(1, NULL); 802e1910ebdSBaptiste Daroussin memset(q + szchanges, 0, incr * sizeof(char)); 803e1910ebdSBaptiste Daroussin overlap = q; 804e1910ebdSBaptiste Daroussin szchanges = newsz; 805e1910ebdSBaptiste Daroussin } 806e1910ebdSBaptiste Daroussin 807e1910ebdSBaptiste Daroussin 808e1910ebdSBaptiste Daroussin int 809e1910ebdSBaptiste Daroussin main(int argc, char **argv) 810e1910ebdSBaptiste Daroussin { 811e1910ebdSBaptiste Daroussin int ch, nblabels, status, m, n, kq, nke, nleft, i; 812e1910ebdSBaptiste Daroussin char *labels[] = { NULL, NULL, NULL }; 813e1910ebdSBaptiste Daroussin const char *diffprog = DIFF_PATH; 814e1910ebdSBaptiste Daroussin char *file1, *file2, *file3; 81554a3415cSPiotr Pawel Stefaniak char *diffargv[7]; 816e1910ebdSBaptiste Daroussin int diffargc = 0; 817e1910ebdSBaptiste Daroussin int fd13[2], fd23[2]; 818e1910ebdSBaptiste Daroussin int pd13, pd23; 819e1910ebdSBaptiste Daroussin cap_rights_t rights_ro; 820e1910ebdSBaptiste Daroussin struct kevent *e; 821e1910ebdSBaptiste Daroussin 822e1910ebdSBaptiste Daroussin nblabels = 0; 823e1910ebdSBaptiste Daroussin eflag = 0; 824e1910ebdSBaptiste Daroussin oflag = 0; 825e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, diffprog); 826e1910ebdSBaptiste Daroussin while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 827e1910ebdSBaptiste Daroussin switch (ch) { 828e1910ebdSBaptiste Daroussin case '3': 829e1910ebdSBaptiste Daroussin eflag = 2; 830e1910ebdSBaptiste Daroussin break; 831e1910ebdSBaptiste Daroussin case 'a': 832e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, "-a"); 833e1910ebdSBaptiste Daroussin break; 834e1910ebdSBaptiste Daroussin case 'A': 835e1910ebdSBaptiste Daroussin Aflag = 1; 836e1910ebdSBaptiste Daroussin break; 837e1910ebdSBaptiste Daroussin case 'e': 838e1910ebdSBaptiste Daroussin eflag = 3; 839e1910ebdSBaptiste Daroussin break; 840e1910ebdSBaptiste Daroussin case 'E': 841e1910ebdSBaptiste Daroussin eflag = 3; 842e1910ebdSBaptiste Daroussin oflag = 1; 843e1910ebdSBaptiste Daroussin break; 844e1910ebdSBaptiste Daroussin case 'i': 845e1910ebdSBaptiste Daroussin iflag = 1; 846e1910ebdSBaptiste Daroussin break; 847e1910ebdSBaptiste Daroussin case 'L': 848e1910ebdSBaptiste Daroussin oflag = 1; 849e1910ebdSBaptiste Daroussin if (nblabels >= 3) 850e1910ebdSBaptiste Daroussin errx(2, "too many file label options"); 851e1910ebdSBaptiste Daroussin labels[nblabels++] = optarg; 852e1910ebdSBaptiste Daroussin break; 853e1910ebdSBaptiste Daroussin case 'm': 854e1910ebdSBaptiste Daroussin Aflag = 1; 855e1910ebdSBaptiste Daroussin oflag = 1; 856e1910ebdSBaptiste Daroussin mflag = 1; 857e1910ebdSBaptiste Daroussin break; 858e1910ebdSBaptiste Daroussin case 'T': 859e1910ebdSBaptiste Daroussin Tflag = 1; 860e1910ebdSBaptiste Daroussin break; 861e1910ebdSBaptiste Daroussin case 'x': 862e1910ebdSBaptiste Daroussin eflag = 1; 863e1910ebdSBaptiste Daroussin break; 864e1910ebdSBaptiste Daroussin case 'X': 865e1910ebdSBaptiste Daroussin oflag = 1; 866e1910ebdSBaptiste Daroussin eflag = 1; 867e1910ebdSBaptiste Daroussin break; 868e1910ebdSBaptiste Daroussin case DIFFPROG_OPT: 869e1910ebdSBaptiste Daroussin diffprog = optarg; 870e1910ebdSBaptiste Daroussin break; 871e1910ebdSBaptiste Daroussin case STRIPCR_OPT: 872e1910ebdSBaptiste Daroussin strip_cr = 1; 87354a3415cSPiotr Pawel Stefaniak diffargv[diffargc++] = __DECONST(char *, "--strip-trailing-cr"); 874e1910ebdSBaptiste Daroussin break; 875e1910ebdSBaptiste Daroussin } 876e1910ebdSBaptiste Daroussin } 877e1910ebdSBaptiste Daroussin argc -= optind; 878e1910ebdSBaptiste Daroussin argv += optind; 879e1910ebdSBaptiste Daroussin 880e1910ebdSBaptiste Daroussin if (Aflag) { 881e1910ebdSBaptiste Daroussin eflag = 3; 882e1910ebdSBaptiste Daroussin oflag = 1; 883e1910ebdSBaptiste Daroussin } 884e1910ebdSBaptiste Daroussin 885e1910ebdSBaptiste Daroussin if (argc != 3) 886e1910ebdSBaptiste Daroussin usage(); 887e1910ebdSBaptiste Daroussin 888e1910ebdSBaptiste Daroussin if (caph_limit_stdio() == -1) 889e1910ebdSBaptiste Daroussin err(2, "unable to limit stdio"); 890e1910ebdSBaptiste Daroussin 891e1910ebdSBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 892e1910ebdSBaptiste Daroussin 893e1910ebdSBaptiste Daroussin kq = kqueue(); 894e1910ebdSBaptiste Daroussin if (kq == -1) 895e1910ebdSBaptiste Daroussin err(2, "kqueue"); 896e1910ebdSBaptiste Daroussin 897e1910ebdSBaptiste Daroussin e = malloc(2 * sizeof(struct kevent)); 898e1910ebdSBaptiste Daroussin if (e == NULL) 899e1910ebdSBaptiste Daroussin err(2, "malloc"); 900e1910ebdSBaptiste Daroussin 901e1910ebdSBaptiste Daroussin /* TODO stdio */ 902e1910ebdSBaptiste Daroussin file1 = argv[0]; 903e1910ebdSBaptiste Daroussin file2 = argv[1]; 904e1910ebdSBaptiste Daroussin file3 = argv[2]; 905e1910ebdSBaptiste Daroussin 906e1910ebdSBaptiste Daroussin if (oflag) { 907df092859STom Jones asprintf(&f1mark, "%s", 908e1910ebdSBaptiste Daroussin labels[0] != NULL ? labels[0] : file1); 909e1910ebdSBaptiste Daroussin if (f1mark == NULL) 910e1910ebdSBaptiste Daroussin err(2, "asprintf"); 911df092859STom Jones asprintf(&f2mark, "%s", 912e1910ebdSBaptiste Daroussin labels[1] != NULL ? labels[1] : file2); 913e1910ebdSBaptiste Daroussin if (f2mark == NULL) 914e1910ebdSBaptiste Daroussin err(2, "asprintf"); 915df092859STom Jones asprintf(&f3mark, "%s", 916e1910ebdSBaptiste Daroussin labels[2] != NULL ? labels[2] : file3); 917e1910ebdSBaptiste Daroussin if (f3mark == NULL) 918e1910ebdSBaptiste Daroussin err(2, "asprintf"); 919e1910ebdSBaptiste Daroussin } 920e1910ebdSBaptiste Daroussin fp[0] = fopen(file1, "r"); 921e1910ebdSBaptiste Daroussin if (fp[0] == NULL) 922e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file1); 923377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) 924e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 925e1910ebdSBaptiste Daroussin 926e1910ebdSBaptiste Daroussin fp[1] = fopen(file2, "r"); 927e1910ebdSBaptiste Daroussin if (fp[1] == NULL) 928e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file2); 929377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) 930e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 931e1910ebdSBaptiste Daroussin 932e1910ebdSBaptiste Daroussin fp[2] = fopen(file3, "r"); 933e1910ebdSBaptiste Daroussin if (fp[2] == NULL) 934e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file3); 935377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) 936e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file3); 937e1910ebdSBaptiste Daroussin 938e1910ebdSBaptiste Daroussin if (pipe(fd13)) 939e1910ebdSBaptiste Daroussin err(2, "pipe"); 940e1910ebdSBaptiste Daroussin if (pipe(fd23)) 941e1910ebdSBaptiste Daroussin err(2, "pipe"); 942e1910ebdSBaptiste Daroussin 943e1910ebdSBaptiste Daroussin diffargv[diffargc] = file1; 944e1910ebdSBaptiste Daroussin diffargv[diffargc + 1] = file3; 945e1910ebdSBaptiste Daroussin diffargv[diffargc + 2] = NULL; 946e1910ebdSBaptiste Daroussin 947e1910ebdSBaptiste Daroussin nleft = 0; 948e1910ebdSBaptiste Daroussin pd13 = diffexec(diffprog, diffargv, fd13); 949e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 950e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 951e1910ebdSBaptiste Daroussin err(2, "kevent1"); 952e1910ebdSBaptiste Daroussin nleft++; 953e1910ebdSBaptiste Daroussin 954e1910ebdSBaptiste Daroussin diffargv[diffargc] = file2; 955e1910ebdSBaptiste Daroussin pd23 = diffexec(diffprog, diffargv, fd23); 956e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 957e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 958e1910ebdSBaptiste Daroussin err(2, "kevent2"); 959e1910ebdSBaptiste Daroussin nleft++; 960e1910ebdSBaptiste Daroussin 961e1910ebdSBaptiste Daroussin caph_cache_catpages(); 9627672a014SMariusz Zaborski if (caph_enter() < 0) 963e1910ebdSBaptiste Daroussin err(2, "unable to enter capability mode"); 964e1910ebdSBaptiste Daroussin 965e1910ebdSBaptiste Daroussin /* parse diffs */ 966e1910ebdSBaptiste Daroussin increase(); 967e1910ebdSBaptiste Daroussin m = readin(fd13[0], &d13); 968e1910ebdSBaptiste Daroussin n = readin(fd23[0], &d23); 969e1910ebdSBaptiste Daroussin 970e1910ebdSBaptiste Daroussin /* waitpid cooked over pdforks */ 971e1910ebdSBaptiste Daroussin while (nleft > 0) { 972e1910ebdSBaptiste Daroussin nke = kevent(kq, NULL, 0, e, nleft, NULL); 973e1910ebdSBaptiste Daroussin if (nke == -1) 974e1910ebdSBaptiste Daroussin err(2, "kevent"); 975e1910ebdSBaptiste Daroussin for (i = 0; i < nke; i++) { 976e1910ebdSBaptiste Daroussin status = e[i].data; 977e1910ebdSBaptiste Daroussin if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) 978702dda43SPiotr Pawel Stefaniak errx(2, "diff exited abnormally"); 979e1910ebdSBaptiste Daroussin else if (WIFSIGNALED(status)) 980e1910ebdSBaptiste Daroussin errx(2, "diff killed by signal %d", 981e1910ebdSBaptiste Daroussin WTERMSIG(status)); 982e1910ebdSBaptiste Daroussin } 983e1910ebdSBaptiste Daroussin nleft -= nke; 984e1910ebdSBaptiste Daroussin } 985e1910ebdSBaptiste Daroussin merge(m, n); 986e1910ebdSBaptiste Daroussin 987e1910ebdSBaptiste Daroussin return (EXIT_SUCCESS); 988e1910ebdSBaptiste Daroussin } 989