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 115d458eb8dSTom Jones #define EFLAG_NONE 0 116d458eb8dSTom Jones #define EFLAG_OVERLAP 1 117d458eb8dSTom Jones #define EFLAG_NOOVERLAP 2 118d458eb8dSTom Jones #define EFLAG_UNMERGED 3 119d458eb8dSTom Jones 120e1910ebdSBaptiste Daroussin static size_t szchanges; 121e1910ebdSBaptiste Daroussin 122e1910ebdSBaptiste Daroussin static struct diff *d13; 123e1910ebdSBaptiste Daroussin static struct diff *d23; 124e1910ebdSBaptiste Daroussin /* 125e1910ebdSBaptiste Daroussin * "de" is used to gather editing scripts. These are later spewed out in 1262184ca3fSTom Jones * reverse order. Its first element must be all zero, the "old" and "new" 1272184ca3fSTom Jones * components of "de" contain line positions. Array overlap indicates which 1282184ca3fSTom Jones * sections in "de" correspond to lines that are different in all three files. 129e1910ebdSBaptiste Daroussin */ 130e1910ebdSBaptiste Daroussin static struct diff *de; 131e1910ebdSBaptiste Daroussin static char *overlap; 132e1910ebdSBaptiste Daroussin static int overlapcnt; 133e1910ebdSBaptiste Daroussin static FILE *fp[3]; 134e1910ebdSBaptiste Daroussin static int cline[3]; /* # of the last-read line in each file (0-2) */ 135e1910ebdSBaptiste Daroussin /* 136e1910ebdSBaptiste Daroussin * The latest known correspondence between line numbers of the 3 files 137e1910ebdSBaptiste Daroussin * is stored in last[1-3]; 138e1910ebdSBaptiste Daroussin */ 139e1910ebdSBaptiste Daroussin static int last[4]; 140e1910ebdSBaptiste Daroussin static int Aflag, eflag, iflag, mflag, Tflag; 141e1910ebdSBaptiste Daroussin static int oflag; /* indicates whether to mark overlaps (-E or -X) */ 142e1910ebdSBaptiste Daroussin static int strip_cr; 143e1910ebdSBaptiste Daroussin static char *f1mark, *f2mark, *f3mark; 144df092859STom Jones static const char *oldmark = "<<<<<<<"; 1459ab079c5STom Jones static const char *orgmark = "|||||||"; 146df092859STom Jones static const char *newmark = ">>>>>>>"; 147ca53a844STom Jones static const char *divider = "======="; 148e1910ebdSBaptiste Daroussin 149e1910ebdSBaptiste Daroussin static bool duplicate(struct range *, struct range *); 1509ab079c5STom Jones static int edit(struct diff *, bool, int, int); 151e1910ebdSBaptiste Daroussin static char *getchange(FILE *); 152e1910ebdSBaptiste Daroussin static char *get_line(FILE *, size_t *); 153e1910ebdSBaptiste Daroussin static int readin(int fd, struct diff **); 154e1910ebdSBaptiste Daroussin static int skip(int, int, const char *); 155e1910ebdSBaptiste Daroussin static void change(int, struct range *, bool); 156e1910ebdSBaptiste Daroussin static void keep(int, struct range *); 157e1910ebdSBaptiste Daroussin static void merge(int, int); 1587c03df68STom Jones static void prange(struct range *, bool); 159e1910ebdSBaptiste Daroussin static void repos(int); 160e1910ebdSBaptiste Daroussin static void edscript(int) __dead2; 1619ab079c5STom Jones static void Ascript(int) __dead2; 162034dd2d5STom Jones static void mergescript(int) __dead2; 163e1910ebdSBaptiste Daroussin static void increase(void); 1643ddd6eb6STom Jones static void usage(void); 1652184ca3fSTom Jones static void printrange(FILE *, struct range *); 166e1910ebdSBaptiste Daroussin 1673ddd6eb6STom Jones static const char diff3_version[] = "FreeBSD diff3 20220517"; 1683ddd6eb6STom Jones 169e1910ebdSBaptiste Daroussin enum { 170e1910ebdSBaptiste Daroussin DIFFPROG_OPT, 171e1910ebdSBaptiste Daroussin STRIPCR_OPT, 1723ddd6eb6STom Jones HELP_OPT, 1733ddd6eb6STom Jones VERSION_OPT 174e1910ebdSBaptiste Daroussin }; 175e1910ebdSBaptiste Daroussin 176e1910ebdSBaptiste Daroussin #define DIFF_PATH "/usr/bin/diff" 177e1910ebdSBaptiste Daroussin 178e1910ebdSBaptiste Daroussin #define OPTIONS "3aAeEiL:mTxX" 179e1910ebdSBaptiste Daroussin static struct option longopts[] = { 180e1910ebdSBaptiste Daroussin { "ed", no_argument, NULL, 'e' }, 181e1910ebdSBaptiste Daroussin { "show-overlap", no_argument, NULL, 'E' }, 182e1910ebdSBaptiste Daroussin { "overlap-only", no_argument, NULL, 'x' }, 183e1910ebdSBaptiste Daroussin { "initial-tab", no_argument, NULL, 'T' }, 184e1910ebdSBaptiste Daroussin { "text", no_argument, NULL, 'a' }, 185e1910ebdSBaptiste Daroussin { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, 186e1910ebdSBaptiste Daroussin { "show-all", no_argument, NULL, 'A' }, 187e1910ebdSBaptiste Daroussin { "easy-only", no_argument, NULL, '3' }, 188e1910ebdSBaptiste Daroussin { "merge", no_argument, NULL, 'm' }, 189e1910ebdSBaptiste Daroussin { "label", required_argument, NULL, 'L' }, 190e1910ebdSBaptiste Daroussin { "diff-program", required_argument, NULL, DIFFPROG_OPT }, 1913ddd6eb6STom Jones { "help", no_argument, NULL, HELP_OPT}, 1923ddd6eb6STom Jones { "version", no_argument, NULL, VERSION_OPT} 193e1910ebdSBaptiste Daroussin }; 194e1910ebdSBaptiste Daroussin 195e1910ebdSBaptiste Daroussin static void 196e1910ebdSBaptiste Daroussin usage(void) 197e1910ebdSBaptiste Daroussin { 198702dda43SPiotr Pawel Stefaniak fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] " 199e1910ebdSBaptiste Daroussin "[-L label3] file1 file2 file3\n"); 200e1910ebdSBaptiste Daroussin } 201e1910ebdSBaptiste Daroussin 202e1910ebdSBaptiste Daroussin static int 203e1910ebdSBaptiste Daroussin readin(int fd, struct diff **dd) 204e1910ebdSBaptiste Daroussin { 205e1910ebdSBaptiste Daroussin int a, b, c, d; 206e1910ebdSBaptiste Daroussin size_t i; 207e1910ebdSBaptiste Daroussin char kind, *p; 208e1910ebdSBaptiste Daroussin FILE *f; 209e1910ebdSBaptiste Daroussin 210e1910ebdSBaptiste Daroussin f = fdopen(fd, "r"); 211e1910ebdSBaptiste Daroussin if (f == NULL) 212e1910ebdSBaptiste Daroussin err(2, "fdopen"); 213e1910ebdSBaptiste Daroussin for (i = 0; (p = getchange(f)); i++) { 2149ab079c5STom Jones #if DEBUG 2159ab079c5STom Jones (*dd)[i].line = strdup(p); 2169ab079c5STom Jones #endif /* DEBUG */ 2179ab079c5STom Jones 218e1910ebdSBaptiste Daroussin if (i >= szchanges - 1) 219e1910ebdSBaptiste Daroussin increase(); 2209520071fSBaptiste Daroussin a = b = (int)strtoimax(p, &p, 10); 221e1910ebdSBaptiste Daroussin if (*p == ',') { 222e1910ebdSBaptiste Daroussin p++; 2239520071fSBaptiste Daroussin b = (int)strtoimax(p, &p, 10); 224e1910ebdSBaptiste Daroussin } 225e1910ebdSBaptiste Daroussin kind = *p++; 2269520071fSBaptiste Daroussin c = d = (int)strtoimax(p, &p, 10); 227e1910ebdSBaptiste Daroussin if (*p == ',') { 228e1910ebdSBaptiste Daroussin p++; 2299520071fSBaptiste Daroussin d = (int)strtoimax(p, &p, 10); 230e1910ebdSBaptiste Daroussin } 231e1910ebdSBaptiste Daroussin if (kind == 'a') 232e1910ebdSBaptiste Daroussin a++; 233e1910ebdSBaptiste Daroussin if (kind == 'd') 234e1910ebdSBaptiste Daroussin c++; 235e1910ebdSBaptiste Daroussin b++; 236e1910ebdSBaptiste Daroussin d++; 237e1910ebdSBaptiste Daroussin (*dd)[i].old.from = a; 238e1910ebdSBaptiste Daroussin (*dd)[i].old.to = b; 239e1910ebdSBaptiste Daroussin (*dd)[i].new.from = c; 240e1910ebdSBaptiste Daroussin (*dd)[i].new.to = d; 241e1910ebdSBaptiste Daroussin } 242e1910ebdSBaptiste Daroussin if (i) { 243e1910ebdSBaptiste Daroussin (*dd)[i].old.from = (*dd)[i - 1].old.to; 244e1910ebdSBaptiste Daroussin (*dd)[i].new.from = (*dd)[i - 1].new.to; 245e1910ebdSBaptiste Daroussin } 246e1910ebdSBaptiste Daroussin fclose(f); 247e1910ebdSBaptiste Daroussin return (i); 248e1910ebdSBaptiste Daroussin } 249e1910ebdSBaptiste Daroussin 250e1910ebdSBaptiste Daroussin static int 251e1910ebdSBaptiste Daroussin diffexec(const char *diffprog, char **diffargv, int fd[]) 252e1910ebdSBaptiste Daroussin { 253702dda43SPiotr Pawel Stefaniak int pd; 254e1910ebdSBaptiste Daroussin 255702dda43SPiotr Pawel Stefaniak switch (pdfork(&pd, PD_CLOEXEC)) { 256e1910ebdSBaptiste Daroussin case 0: 257e1910ebdSBaptiste Daroussin close(fd[0]); 258e1910ebdSBaptiste Daroussin if (dup2(fd[1], STDOUT_FILENO) == -1) 259e1910ebdSBaptiste Daroussin err(2, "child could not duplicate descriptor"); 260e1910ebdSBaptiste Daroussin close(fd[1]); 261e1910ebdSBaptiste Daroussin execvp(diffprog, diffargv); 262e1910ebdSBaptiste Daroussin err(2, "could not execute diff: %s", diffprog); 263e1910ebdSBaptiste Daroussin break; 264e1910ebdSBaptiste Daroussin case -1: 265e1910ebdSBaptiste Daroussin err(2, "could not fork"); 266e1910ebdSBaptiste Daroussin break; 267e1910ebdSBaptiste Daroussin } 268e1910ebdSBaptiste Daroussin close(fd[1]); 269e1910ebdSBaptiste Daroussin return (pd); 270e1910ebdSBaptiste Daroussin } 271e1910ebdSBaptiste Daroussin 272e1910ebdSBaptiste Daroussin static char * 273e1910ebdSBaptiste Daroussin getchange(FILE *b) 274e1910ebdSBaptiste Daroussin { 275e1910ebdSBaptiste Daroussin char *line; 276e1910ebdSBaptiste Daroussin 277e1910ebdSBaptiste Daroussin while ((line = get_line(b, NULL))) { 278e1910ebdSBaptiste Daroussin if (isdigit((unsigned char)line[0])) 279e1910ebdSBaptiste Daroussin return (line); 280e1910ebdSBaptiste Daroussin } 281e1910ebdSBaptiste Daroussin return (NULL); 282e1910ebdSBaptiste Daroussin } 283e1910ebdSBaptiste Daroussin 284e1910ebdSBaptiste Daroussin 285e1910ebdSBaptiste Daroussin static char * 286e1910ebdSBaptiste Daroussin get_line(FILE *b, size_t *n) 287e1910ebdSBaptiste Daroussin { 28894678ee6SBaptiste Daroussin ssize_t len; 28994678ee6SBaptiste Daroussin static char *buf = NULL; 29094678ee6SBaptiste Daroussin static size_t bufsize = 0; 291e1910ebdSBaptiste Daroussin 29294678ee6SBaptiste Daroussin if ((len = getline(&buf, &bufsize, b)) < 0) 293e1910ebdSBaptiste Daroussin return (NULL); 294e1910ebdSBaptiste Daroussin 29554a3415cSPiotr Pawel Stefaniak if (strip_cr && len >= 2 && strcmp("\r\n", &(buf[len - 2])) == 0) { 29654a3415cSPiotr Pawel Stefaniak buf[len - 2] = '\n'; 29754a3415cSPiotr Pawel Stefaniak buf[len - 1] = '\0'; 29854a3415cSPiotr Pawel Stefaniak len--; 29954a3415cSPiotr Pawel Stefaniak } 30054a3415cSPiotr Pawel Stefaniak 301e1910ebdSBaptiste Daroussin if (n != NULL) 302e1910ebdSBaptiste Daroussin *n = len; 30394678ee6SBaptiste Daroussin 304e1910ebdSBaptiste Daroussin return (buf); 305e1910ebdSBaptiste Daroussin } 306e1910ebdSBaptiste Daroussin 307e1910ebdSBaptiste Daroussin static void 308e1910ebdSBaptiste Daroussin merge(int m1, int m2) 309e1910ebdSBaptiste Daroussin { 310e1910ebdSBaptiste Daroussin struct diff *d1, *d2, *d3; 311e1910ebdSBaptiste Daroussin int j, t1, t2; 312e1910ebdSBaptiste Daroussin bool dup = false; 313e1910ebdSBaptiste Daroussin 314e1910ebdSBaptiste Daroussin d1 = d13; 315e1910ebdSBaptiste Daroussin d2 = d23; 316e1910ebdSBaptiste Daroussin j = 0; 317e1910ebdSBaptiste Daroussin 3187d975c7fSTom Jones while (t1 = d1 < d13 + m1, t2 = d2 < d23 + m2, t1 || t2) { 319e1910ebdSBaptiste Daroussin /* first file is different from the others */ 320e1910ebdSBaptiste Daroussin if (!t2 || (t1 && d1->new.to < d2->new.from)) { 321e1910ebdSBaptiste Daroussin /* stuff peculiar to 1st file */ 322d458eb8dSTom Jones if (eflag == EFLAG_NONE) { 323e1910ebdSBaptiste Daroussin printf("====1\n"); 324e1910ebdSBaptiste Daroussin change(1, &d1->old, false); 325e1910ebdSBaptiste Daroussin keep(2, &d1->new); 326e1910ebdSBaptiste Daroussin change(3, &d1->new, false); 327e1910ebdSBaptiste Daroussin } 328e1910ebdSBaptiste Daroussin d1++; 329e1910ebdSBaptiste Daroussin continue; 330e1910ebdSBaptiste Daroussin } 331e1910ebdSBaptiste Daroussin /* second file is different from others */ 332e1910ebdSBaptiste Daroussin if (!t1 || (t2 && d2->new.to < d1->new.from)) { 333d458eb8dSTom Jones if (eflag == EFLAG_NONE) { 334e1910ebdSBaptiste Daroussin printf("====2\n"); 335e1910ebdSBaptiste Daroussin keep(1, &d2->new); 336e1910ebdSBaptiste Daroussin change(3, &d2->new, false); 337e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 3389ab079c5STom Jones } else if (Aflag || mflag) { 3399ab079c5STom Jones // XXX-THJ: What does it mean for the second file to differ? 3409ab079c5STom Jones j = edit(d2, dup, j, DIFF_TYPE2); 341e1910ebdSBaptiste Daroussin } 342e1910ebdSBaptiste Daroussin d2++; 343e1910ebdSBaptiste Daroussin continue; 344e1910ebdSBaptiste Daroussin } 345e1910ebdSBaptiste Daroussin /* 346e1910ebdSBaptiste Daroussin * Merge overlapping changes in first file 347e1910ebdSBaptiste Daroussin * this happens after extension (see below). 348e1910ebdSBaptiste Daroussin */ 349e1910ebdSBaptiste Daroussin if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { 350e1910ebdSBaptiste Daroussin d1[1].old.from = d1->old.from; 351e1910ebdSBaptiste Daroussin d1[1].new.from = d1->new.from; 352e1910ebdSBaptiste Daroussin d1++; 353e1910ebdSBaptiste Daroussin continue; 354e1910ebdSBaptiste Daroussin } 355e1910ebdSBaptiste Daroussin 356e1910ebdSBaptiste Daroussin /* merge overlapping changes in second */ 357e1910ebdSBaptiste Daroussin if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) { 358e1910ebdSBaptiste Daroussin d2[1].old.from = d2->old.from; 359e1910ebdSBaptiste Daroussin d2[1].new.from = d2->new.from; 360e1910ebdSBaptiste Daroussin d2++; 361e1910ebdSBaptiste Daroussin continue; 362e1910ebdSBaptiste Daroussin } 363e1910ebdSBaptiste Daroussin /* stuff peculiar to third file or different in all */ 364e1910ebdSBaptiste Daroussin if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { 365e1910ebdSBaptiste Daroussin dup = duplicate(&d1->old, &d2->old); 366e1910ebdSBaptiste Daroussin /* 367e1910ebdSBaptiste Daroussin * dup = 0 means all files differ 368e1910ebdSBaptiste Daroussin * dup = 1 means files 1 and 2 identical 369e1910ebdSBaptiste Daroussin */ 370d458eb8dSTom Jones if (eflag == EFLAG_NONE) { 371e1910ebdSBaptiste Daroussin printf("====%s\n", dup ? "3" : ""); 372e1910ebdSBaptiste Daroussin change(1, &d1->old, dup); 373e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 374e1910ebdSBaptiste Daroussin d3 = d1->old.to > d1->old.from ? d1 : d2; 375e1910ebdSBaptiste Daroussin change(3, &d3->new, false); 3769ab079c5STom Jones } else { 3779ab079c5STom Jones j = edit(d1, dup, j, DIFF_TYPE3); 3789ab079c5STom Jones } 3799ab079c5STom Jones dup = false; 380e1910ebdSBaptiste Daroussin d1++; 381e1910ebdSBaptiste Daroussin d2++; 382e1910ebdSBaptiste Daroussin continue; 383e1910ebdSBaptiste Daroussin } 384e1910ebdSBaptiste Daroussin /* 385e1910ebdSBaptiste Daroussin * Overlapping changes from file 1 and 2; extend changes 386e1910ebdSBaptiste Daroussin * appropriately to make them coincide. 387e1910ebdSBaptiste Daroussin */ 388e1910ebdSBaptiste Daroussin if (d1->new.from < d2->new.from) { 389e1910ebdSBaptiste Daroussin d2->old.from -= d2->new.from - d1->new.from; 390e1910ebdSBaptiste Daroussin d2->new.from = d1->new.from; 391e1910ebdSBaptiste Daroussin } else if (d2->new.from < d1->new.from) { 392e1910ebdSBaptiste Daroussin d1->old.from -= d1->new.from - d2->new.from; 393e1910ebdSBaptiste Daroussin d1->new.from = d2->new.from; 394e1910ebdSBaptiste Daroussin } 395e1910ebdSBaptiste Daroussin if (d1->new.to > d2->new.to) { 396e1910ebdSBaptiste Daroussin d2->old.to += d1->new.to - d2->new.to; 397e1910ebdSBaptiste Daroussin d2->new.to = d1->new.to; 398e1910ebdSBaptiste Daroussin } else if (d2->new.to > d1->new.to) { 399e1910ebdSBaptiste Daroussin d1->old.to += d2->new.to - d1->new.to; 400e1910ebdSBaptiste Daroussin d1->new.to = d2->new.to; 401e1910ebdSBaptiste Daroussin } 402e1910ebdSBaptiste Daroussin } 4039ab079c5STom Jones 404034dd2d5STom Jones if (mflag) 405034dd2d5STom Jones mergescript(j); 406034dd2d5STom Jones else if (Aflag) 4079ab079c5STom Jones Ascript(j); 4089ab079c5STom Jones else if (eflag) 409e1910ebdSBaptiste Daroussin edscript(j); 410e1910ebdSBaptiste Daroussin } 411e1910ebdSBaptiste Daroussin 412e1910ebdSBaptiste Daroussin /* 413e1910ebdSBaptiste Daroussin * The range of lines rold.from thru rold.to in file i is to be changed. 414e1910ebdSBaptiste Daroussin * It is to be printed only if it does not duplicate something to be 415e1910ebdSBaptiste Daroussin * printed later. 416e1910ebdSBaptiste Daroussin */ 417e1910ebdSBaptiste Daroussin static void 418e1910ebdSBaptiste Daroussin change(int i, struct range *rold, bool dup) 419e1910ebdSBaptiste Daroussin { 420e1910ebdSBaptiste Daroussin 421e1910ebdSBaptiste Daroussin printf("%d:", i); 422e1910ebdSBaptiste Daroussin last[i] = rold->to; 4237c03df68STom Jones prange(rold, false); 424e1910ebdSBaptiste Daroussin if (dup) 425e1910ebdSBaptiste Daroussin return; 426e1910ebdSBaptiste Daroussin i--; 427e1910ebdSBaptiste Daroussin skip(i, rold->from, NULL); 428e1910ebdSBaptiste Daroussin skip(i, rold->to, " "); 429e1910ebdSBaptiste Daroussin } 430e1910ebdSBaptiste Daroussin 431e1910ebdSBaptiste Daroussin /* 432e1910ebdSBaptiste Daroussin * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or 433e1910ebdSBaptiste Daroussin * n1. 434e1910ebdSBaptiste Daroussin */ 435e1910ebdSBaptiste Daroussin static void 4367c03df68STom Jones prange(struct range *rold, bool delete) 437e1910ebdSBaptiste Daroussin { 438e1910ebdSBaptiste Daroussin 439e1910ebdSBaptiste Daroussin if (rold->to <= rold->from) 440e1910ebdSBaptiste Daroussin printf("%da\n", rold->from - 1); 441e1910ebdSBaptiste Daroussin else { 442e1910ebdSBaptiste Daroussin printf("%d", rold->from); 443e1910ebdSBaptiste Daroussin if (rold->to > rold->from + 1) 444e1910ebdSBaptiste Daroussin printf(",%d", rold->to - 1); 4457c03df68STom Jones if (delete) 4467c03df68STom Jones printf("d\n"); 4477c03df68STom Jones else 448e1910ebdSBaptiste Daroussin printf("c\n"); 449e1910ebdSBaptiste Daroussin } 450e1910ebdSBaptiste Daroussin } 451e1910ebdSBaptiste Daroussin 452e1910ebdSBaptiste Daroussin /* 453e1910ebdSBaptiste Daroussin * No difference was reported by diff between file 1 (or 2) and file 3, 454e1910ebdSBaptiste Daroussin * and an artificial dummy difference (trange) must be ginned up to 455e1910ebdSBaptiste Daroussin * correspond to the change reported in the other file. 456e1910ebdSBaptiste Daroussin */ 457e1910ebdSBaptiste Daroussin static void 458e1910ebdSBaptiste Daroussin keep(int i, struct range *rnew) 459e1910ebdSBaptiste Daroussin { 460e1910ebdSBaptiste Daroussin int delta; 461e1910ebdSBaptiste Daroussin struct range trange; 462e1910ebdSBaptiste Daroussin 463e1910ebdSBaptiste Daroussin delta = last[3] - last[i]; 464e1910ebdSBaptiste Daroussin trange.from = rnew->from - delta; 465e1910ebdSBaptiste Daroussin trange.to = rnew->to - delta; 466e1910ebdSBaptiste Daroussin change(i, &trange, true); 467e1910ebdSBaptiste Daroussin } 468e1910ebdSBaptiste Daroussin 469e1910ebdSBaptiste Daroussin /* 470e1910ebdSBaptiste Daroussin * skip to just before line number from in file "i". If "pr" is non-NULL, 471e1910ebdSBaptiste Daroussin * print all skipped stuff with string pr as a prefix. 472e1910ebdSBaptiste Daroussin */ 473e1910ebdSBaptiste Daroussin static int 474e1910ebdSBaptiste Daroussin skip(int i, int from, const char *pr) 475e1910ebdSBaptiste Daroussin { 476e1910ebdSBaptiste Daroussin size_t j, n; 477e1910ebdSBaptiste Daroussin char *line; 478e1910ebdSBaptiste Daroussin 479e1910ebdSBaptiste Daroussin for (n = 0; cline[i] < from - 1; n += j) { 480e1910ebdSBaptiste Daroussin if ((line = get_line(fp[i], &j)) == NULL) 481e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 482e1910ebdSBaptiste Daroussin if (pr != NULL) 483e1910ebdSBaptiste Daroussin printf("%s%s", Tflag == 1 ? "\t" : pr, line); 484e1910ebdSBaptiste Daroussin cline[i]++; 485e1910ebdSBaptiste Daroussin } 486e1910ebdSBaptiste Daroussin return ((int) n); 487e1910ebdSBaptiste Daroussin } 488e1910ebdSBaptiste Daroussin 489e1910ebdSBaptiste Daroussin /* 490e1910ebdSBaptiste Daroussin * Return 1 or 0 according as the old range (in file 1) contains exactly 491e1910ebdSBaptiste Daroussin * the same data as the new range (in file 2). 492e1910ebdSBaptiste Daroussin */ 493e1910ebdSBaptiste Daroussin static bool 494e1910ebdSBaptiste Daroussin duplicate(struct range *r1, struct range *r2) 495e1910ebdSBaptiste Daroussin { 496e1910ebdSBaptiste Daroussin int c, d; 497e1910ebdSBaptiste Daroussin int nchar; 498e1910ebdSBaptiste Daroussin int nline; 499e1910ebdSBaptiste Daroussin 500e1910ebdSBaptiste Daroussin if (r1->to-r1->from != r2->to-r2->from) 501e1910ebdSBaptiste Daroussin return (0); 502e1910ebdSBaptiste Daroussin skip(0, r1->from, NULL); 503e1910ebdSBaptiste Daroussin skip(1, r2->from, NULL); 504e1910ebdSBaptiste Daroussin nchar = 0; 505e1910ebdSBaptiste Daroussin for (nline = 0; nline < r1->to - r1->from; nline++) { 506e1910ebdSBaptiste Daroussin do { 507e1910ebdSBaptiste Daroussin c = getc(fp[0]); 508e1910ebdSBaptiste Daroussin d = getc(fp[1]); 5097f7b03f3SPiotr Pawel Stefaniak if (c == -1 && d == -1) 5107f7b03f3SPiotr Pawel Stefaniak break; 511e1910ebdSBaptiste Daroussin if (c == -1 || d == -1) 512e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 513e1910ebdSBaptiste Daroussin nchar++; 514e1910ebdSBaptiste Daroussin if (c != d) { 515e1910ebdSBaptiste Daroussin repos(nchar); 516e1910ebdSBaptiste Daroussin return (0); 517e1910ebdSBaptiste Daroussin } 518e1910ebdSBaptiste Daroussin } while (c != '\n'); 519e1910ebdSBaptiste Daroussin } 520e1910ebdSBaptiste Daroussin repos(nchar); 521e1910ebdSBaptiste Daroussin return (1); 522e1910ebdSBaptiste Daroussin } 523e1910ebdSBaptiste Daroussin 524e1910ebdSBaptiste Daroussin static void 525e1910ebdSBaptiste Daroussin repos(int nchar) 526e1910ebdSBaptiste Daroussin { 527e1910ebdSBaptiste Daroussin int i; 528e1910ebdSBaptiste Daroussin 529e1910ebdSBaptiste Daroussin for (i = 0; i < 2; i++) 530e1910ebdSBaptiste Daroussin (void)fseek(fp[i], (long)-nchar, SEEK_CUR); 531e1910ebdSBaptiste Daroussin } 532702dda43SPiotr Pawel Stefaniak 533e1910ebdSBaptiste Daroussin /* 534e1910ebdSBaptiste Daroussin * collect an editing script for later regurgitation 535e1910ebdSBaptiste Daroussin */ 536e1910ebdSBaptiste Daroussin static int 5379ab079c5STom Jones edit(struct diff *diff, bool dup, int j, int difftype) 538e1910ebdSBaptiste Daroussin { 539d458eb8dSTom Jones if (!(eflag == EFLAG_UNMERGED || 540d458eb8dSTom Jones (!dup && eflag == EFLAG_OVERLAP ) || 541d458eb8dSTom Jones (dup && eflag == EFLAG_NOOVERLAP))) { 542e1910ebdSBaptiste Daroussin return (j); 543d458eb8dSTom Jones } 544e1910ebdSBaptiste Daroussin j++; 545e1910ebdSBaptiste Daroussin overlap[j] = !dup; 546e1910ebdSBaptiste Daroussin if (!dup) 547e1910ebdSBaptiste Daroussin overlapcnt++; 5489ab079c5STom Jones 5499ab079c5STom Jones de[j].type = difftype; 5509ab079c5STom Jones #if DEBUG 55159f6408dSTom Jones de[j].line = strdup(diff->line); 5529ab079c5STom Jones #endif /* DEBUG */ 5539ab079c5STom Jones 554e1910ebdSBaptiste Daroussin de[j].old.from = diff->old.from; 555e1910ebdSBaptiste Daroussin de[j].old.to = diff->old.to; 5562184ca3fSTom Jones de[j].new.from = diff->new.from; 5572184ca3fSTom Jones de[j].new.to = diff->new.to; 558e1910ebdSBaptiste Daroussin return (j); 559e1910ebdSBaptiste Daroussin } 560e1910ebdSBaptiste Daroussin 5612184ca3fSTom Jones static void 5622184ca3fSTom Jones printrange(FILE *p, struct range *r) 5632184ca3fSTom Jones { 5642184ca3fSTom Jones char *line = NULL; 5652184ca3fSTom Jones size_t len = 0; 5662184ca3fSTom Jones int i = 1; 5672184ca3fSTom Jones ssize_t rlen = 0; 5682184ca3fSTom Jones 5692184ca3fSTom Jones /* We haven't been asked to print anything */ 5702184ca3fSTom Jones if (r->from == r->to) 5712184ca3fSTom Jones return; 5722184ca3fSTom Jones 5732184ca3fSTom Jones if (r->from > r->to) 5742184ca3fSTom Jones errx(EXIT_FAILURE, "invalid print range"); 5752184ca3fSTom Jones 5762184ca3fSTom Jones /* 5772184ca3fSTom Jones * XXX-THJ: We read through all of the file for each range printed. 5782184ca3fSTom Jones * This duplicates work and will probably impact performance on large 5792184ca3fSTom Jones * files with lots of ranges. 5802184ca3fSTom Jones */ 5812184ca3fSTom Jones fseek(p, 0L, SEEK_SET); 5822184ca3fSTom Jones while ((rlen = getline(&line, &len, p)) > 0) { 5832184ca3fSTom Jones if (i >= r->from) 5842184ca3fSTom Jones printf("%s", line); 5852184ca3fSTom Jones if (++i > r->to - 1) 5862184ca3fSTom Jones break; 5872184ca3fSTom Jones } 5882184ca3fSTom Jones free(line); 5892184ca3fSTom Jones } 5902184ca3fSTom Jones 591e1910ebdSBaptiste Daroussin /* regurgitate */ 592e1910ebdSBaptiste Daroussin static void 593e1910ebdSBaptiste Daroussin edscript(int n) 594e1910ebdSBaptiste Daroussin { 5957c03df68STom Jones bool delete; 596e1910ebdSBaptiste Daroussin 597e1910ebdSBaptiste Daroussin for (; n > 0; n--) { 5987c03df68STom Jones delete = (de[n].new.from == de[n].new.to); 599e1910ebdSBaptiste Daroussin if (!oflag || !overlap[n]) { 6007c03df68STom Jones prange(&de[n].old, delete); 601e1910ebdSBaptiste Daroussin } else { 602e1910ebdSBaptiste Daroussin printf("%da\n", de[n].old.to - 1); 603ca53a844STom Jones printf("%s\n", divider); 604e1910ebdSBaptiste Daroussin } 6052184ca3fSTom Jones printrange(fp[2], &de[n].new); 6067c03df68STom Jones if (!oflag || !overlap[n]) { 6077c03df68STom Jones if (!delete) 608e1910ebdSBaptiste Daroussin printf(".\n"); 6097c03df68STom Jones } else { 610df092859STom Jones printf("%s %s\n.\n", newmark, f3mark); 611df092859STom Jones printf("%da\n%s %s\n.\n", de[n].old.from - 1, 612df092859STom Jones oldmark, f1mark); 613e1910ebdSBaptiste Daroussin } 614e1910ebdSBaptiste Daroussin } 615e1910ebdSBaptiste Daroussin if (iflag) 616e1910ebdSBaptiste Daroussin printf("w\nq\n"); 617e1910ebdSBaptiste Daroussin 618d458eb8dSTom Jones exit(eflag == EFLAG_NONE ? overlapcnt : 0); 619e1910ebdSBaptiste Daroussin } 620e1910ebdSBaptiste Daroussin 6219ab079c5STom Jones /* 6229ab079c5STom Jones * Output an edit script to turn mine into yours, when there is a conflict 6239ab079c5STom Jones * between the 3 files bracket the changes. Regurgitate the diffs in reverse 6249ab079c5STom Jones * order to allow the ed script to track down where the lines are as changes 6259ab079c5STom Jones * are made. 6269ab079c5STom Jones */ 6279ab079c5STom Jones static void 6289ab079c5STom Jones Ascript(int n) 6299ab079c5STom Jones { 6309ab079c5STom Jones int startmark; 6319ab079c5STom Jones bool deletenew; 6329ab079c5STom Jones bool deleteold; 6339ab079c5STom Jones 6342c4276aaSTom Jones struct range *new, *old; 6359ab079c5STom Jones 6362c4276aaSTom Jones for (; n > 0; n--) { 6372c4276aaSTom Jones new = &de[n].new; 6382c4276aaSTom Jones old = &de[n].old; 6392c4276aaSTom Jones deletenew = (new->from == new->to); 6402c4276aaSTom Jones deleteold = (old->from == old->to); 6419ab079c5STom Jones 6429ab079c5STom Jones if (de[n].type == DIFF_TYPE2) { 6439ab079c5STom Jones if (!oflag || !overlap[n]) { 6442c4276aaSTom Jones prange(old, deletenew); 6452c4276aaSTom Jones printrange(fp[2], new); 6469ab079c5STom Jones } else { 647*264a559aSTom Jones startmark = new->to; 6489ab079c5STom Jones 6499ab079c5STom Jones if (!deletenew) 6509ab079c5STom Jones startmark--; 6519ab079c5STom Jones 6529ab079c5STom Jones printf("%da\n", startmark); 6539ab079c5STom Jones printf("%s %s\n", newmark, f3mark); 6549ab079c5STom Jones 6559ab079c5STom Jones printf(".\n"); 6569ab079c5STom Jones 6579ab079c5STom Jones printf("%da\n", startmark - 6582c4276aaSTom Jones (new->to - new->from)); 6599ab079c5STom Jones printf("%s %s\n", oldmark, f2mark); 6609ab079c5STom Jones if (!deleteold) 6612c4276aaSTom Jones printrange(fp[1], old); 662ca53a844STom Jones printf("%s\n.\n", divider); 6639ab079c5STom Jones } 6649ab079c5STom Jones 6659ab079c5STom Jones } else if (de[n].type == DIFF_TYPE3) { 666*264a559aSTom Jones startmark = old->to - 1; 667*264a559aSTom Jones 6689ab079c5STom Jones if (!oflag || !overlap[n]) { 6692c4276aaSTom Jones prange(old, deletenew); 6702c4276aaSTom Jones printrange(fp[2], new); 6719ab079c5STom Jones } else { 6729ab079c5STom Jones printf("%da\n", startmark); 6739ab079c5STom Jones printf("%s %s\n", orgmark, f2mark); 6749ab079c5STom Jones 6759ab079c5STom Jones if (deleteold) { 6769ab079c5STom Jones struct range r; 6772c4276aaSTom Jones r.from = old->from-1; 6782c4276aaSTom Jones r.to = new->to; 6799ab079c5STom Jones printrange(fp[1], &r); 6809ab079c5STom Jones } else 6812c4276aaSTom Jones printrange(fp[1], old); 6829ab079c5STom Jones 683ca53a844STom Jones printf("%s\n", divider); 6842c4276aaSTom Jones printrange(fp[2], new); 6859ab079c5STom Jones } 6869ab079c5STom Jones 6879ab079c5STom Jones if (!oflag || !overlap[n]) { 6889ab079c5STom Jones if (!deletenew) 6899ab079c5STom Jones printf(".\n"); 6909ab079c5STom Jones } else { 6919ab079c5STom Jones printf("%s %s\n.\n", newmark, f3mark); 6929ab079c5STom Jones 6939ab079c5STom Jones /* 6949ab079c5STom Jones * Go to the start of the conflict in original 6959ab079c5STom Jones * file and append lines 6969ab079c5STom Jones */ 6979ab079c5STom Jones printf("%da\n%s %s\n.\n", 6982c4276aaSTom Jones startmark - (old->to - old->from), 6999ab079c5STom Jones oldmark, f1mark); 7009ab079c5STom Jones } 7019ab079c5STom Jones } 7029ab079c5STom Jones } 7039ab079c5STom Jones if (iflag) 7049ab079c5STom Jones printf("w\nq\n"); 7059ab079c5STom Jones 7069ab079c5STom Jones exit(overlapcnt > 0); 7079ab079c5STom Jones } 7089ab079c5STom Jones 709034dd2d5STom Jones /* 710034dd2d5STom Jones * Output the merged file directly (don't generate an ed script). When 711034dd2d5STom Jones * regurgitating diffs we need to walk forward through the file and print any 712034dd2d5STom Jones * inbetween lines. 713034dd2d5STom Jones */ 714034dd2d5STom Jones static void 715034dd2d5STom Jones mergescript(int i) 716034dd2d5STom Jones { 717034dd2d5STom Jones struct range r; 718034dd2d5STom Jones int n; 719034dd2d5STom Jones 720034dd2d5STom Jones r.from = 1; 721034dd2d5STom Jones r.to = 1; 722034dd2d5STom Jones 723034dd2d5STom Jones for (n = 1; n < i+1; n++) { 724034dd2d5STom Jones /* print any lines leading up to here */ 725034dd2d5STom Jones r.to = de[n].old.from; 726034dd2d5STom Jones printrange(fp[0], &r); 727034dd2d5STom Jones 728034dd2d5STom Jones if (de[n].type == DIFF_TYPE2) { 729034dd2d5STom Jones printf("%s %s\n", oldmark, f2mark); 730034dd2d5STom Jones printrange(fp[1], &de[n].old); 731ca53a844STom Jones printf("%s\n", divider); 732034dd2d5STom Jones printrange(fp[2], &de[n].new); 733034dd2d5STom Jones printf("%s %s\n", newmark, f3mark); 734034dd2d5STom Jones } else if (de[n].type == DIFF_TYPE3) { 735034dd2d5STom Jones if (!oflag || !overlap[n]) { 736034dd2d5STom Jones printrange(fp[2], &de[n].new); 737034dd2d5STom Jones } else { 738034dd2d5STom Jones 739034dd2d5STom Jones printf("%s %s\n", oldmark, f1mark); 740034dd2d5STom Jones printrange(fp[0], &de[n].old); 741034dd2d5STom Jones 742034dd2d5STom Jones printf("%s %s\n", orgmark, f2mark); 743034dd2d5STom Jones if (de[n].old.from == de[n].old.to) { 744034dd2d5STom Jones struct range or; 745034dd2d5STom Jones or.from = de[n].old.from -1; 746034dd2d5STom Jones or.to = de[n].new.to; 747034dd2d5STom Jones printrange(fp[1], &or); 748034dd2d5STom Jones } else 749034dd2d5STom Jones printrange(fp[1], &de[n].old); 750034dd2d5STom Jones 751ca53a844STom Jones printf("%s\n", divider); 752034dd2d5STom Jones 753034dd2d5STom Jones printrange(fp[2], &de[n].new); 754034dd2d5STom Jones printf("%s %s\n", newmark, f3mark); 755034dd2d5STom Jones } 756034dd2d5STom Jones } 757034dd2d5STom Jones 758034dd2d5STom Jones if (de[n].old.from == de[n].old.to) 759034dd2d5STom Jones r.from = de[n].new.to; 760034dd2d5STom Jones else 761034dd2d5STom Jones r.from = de[n].old.to; 762034dd2d5STom Jones } 763034dd2d5STom Jones /* 764034dd2d5STom Jones * Print from the final range to the end of 'myfile'. Any deletions or 765034dd2d5STom Jones * additions to this file should have been handled by now. 766034dd2d5STom Jones * 767034dd2d5STom Jones * If the ranges are the same we need to rewind a line. 768034dd2d5STom Jones * If the new range is 0 length (from == to), we need to use the old 769034dd2d5STom Jones * range. 770034dd2d5STom Jones */ 771034dd2d5STom Jones if ((de[n-1].old.from == de[n-1].new.from) && 772034dd2d5STom Jones (de[n-1].old.to == de[n-1].new.to)) 773034dd2d5STom Jones r.from--; 774034dd2d5STom Jones else if (de[n-1].new.from == de[n-1].new.to) 775034dd2d5STom Jones r.from = de[n-1].old.from; 776034dd2d5STom Jones 777034dd2d5STom Jones /* 778034dd2d5STom Jones * If the range is a 3 way merge then we need to skip a line in the 779034dd2d5STom Jones * trailing output. 780034dd2d5STom Jones */ 781034dd2d5STom Jones if (de[n-1].type == DIFF_TYPE3) 782034dd2d5STom Jones r.from++; 783034dd2d5STom Jones 784034dd2d5STom Jones r.to = INT_MAX; 785034dd2d5STom Jones printrange(fp[0], &r); 786034dd2d5STom Jones exit(overlapcnt > 0); 787034dd2d5STom Jones } 788034dd2d5STom Jones 789e1910ebdSBaptiste Daroussin static void 790e1910ebdSBaptiste Daroussin increase(void) 791e1910ebdSBaptiste Daroussin { 792e1910ebdSBaptiste Daroussin struct diff *p; 793e1910ebdSBaptiste Daroussin char *q; 794e1910ebdSBaptiste Daroussin size_t newsz, incr; 795e1910ebdSBaptiste Daroussin 796e1910ebdSBaptiste Daroussin /* are the memset(3) calls needed? */ 797e1910ebdSBaptiste Daroussin newsz = szchanges == 0 ? 64 : 2 * szchanges; 798e1910ebdSBaptiste Daroussin incr = newsz - szchanges; 799e1910ebdSBaptiste Daroussin 8007f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d13, newsz, sizeof(struct diff)); 801e1910ebdSBaptiste Daroussin if (p == NULL) 802e1910ebdSBaptiste Daroussin err(1, NULL); 803e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 804e1910ebdSBaptiste Daroussin d13 = p; 8057f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d23, newsz, sizeof(struct diff)); 806e1910ebdSBaptiste Daroussin if (p == NULL) 807e1910ebdSBaptiste Daroussin err(1, NULL); 808e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 809e1910ebdSBaptiste Daroussin d23 = p; 8107f7b03f3SPiotr Pawel Stefaniak p = reallocarray(de, newsz, sizeof(struct diff)); 811e1910ebdSBaptiste Daroussin if (p == NULL) 812e1910ebdSBaptiste Daroussin err(1, NULL); 813e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 814e1910ebdSBaptiste Daroussin de = p; 8157f7b03f3SPiotr Pawel Stefaniak q = reallocarray(overlap, newsz, sizeof(char)); 816e1910ebdSBaptiste Daroussin if (q == NULL) 817e1910ebdSBaptiste Daroussin err(1, NULL); 818e1910ebdSBaptiste Daroussin memset(q + szchanges, 0, incr * sizeof(char)); 819e1910ebdSBaptiste Daroussin overlap = q; 820e1910ebdSBaptiste Daroussin szchanges = newsz; 821e1910ebdSBaptiste Daroussin } 822e1910ebdSBaptiste Daroussin 823e1910ebdSBaptiste Daroussin 824e1910ebdSBaptiste Daroussin int 825e1910ebdSBaptiste Daroussin main(int argc, char **argv) 826e1910ebdSBaptiste Daroussin { 827e1910ebdSBaptiste Daroussin int ch, nblabels, status, m, n, kq, nke, nleft, i; 828e1910ebdSBaptiste Daroussin char *labels[] = { NULL, NULL, NULL }; 829e1910ebdSBaptiste Daroussin const char *diffprog = DIFF_PATH; 830e1910ebdSBaptiste Daroussin char *file1, *file2, *file3; 83154a3415cSPiotr Pawel Stefaniak char *diffargv[7]; 832e1910ebdSBaptiste Daroussin int diffargc = 0; 833e1910ebdSBaptiste Daroussin int fd13[2], fd23[2]; 834e1910ebdSBaptiste Daroussin int pd13, pd23; 835e1910ebdSBaptiste Daroussin cap_rights_t rights_ro; 836e1910ebdSBaptiste Daroussin struct kevent *e; 837e1910ebdSBaptiste Daroussin 838e1910ebdSBaptiste Daroussin nblabels = 0; 839d458eb8dSTom Jones eflag = EFLAG_NONE; 840e1910ebdSBaptiste Daroussin oflag = 0; 841e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, diffprog); 842e1910ebdSBaptiste Daroussin while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 843e1910ebdSBaptiste Daroussin switch (ch) { 844e1910ebdSBaptiste Daroussin case '3': 845d458eb8dSTom Jones eflag = EFLAG_NOOVERLAP; 846e1910ebdSBaptiste Daroussin break; 847e1910ebdSBaptiste Daroussin case 'a': 848e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, "-a"); 849e1910ebdSBaptiste Daroussin break; 850e1910ebdSBaptiste Daroussin case 'A': 851e1910ebdSBaptiste Daroussin Aflag = 1; 852e1910ebdSBaptiste Daroussin break; 853e1910ebdSBaptiste Daroussin case 'e': 854d458eb8dSTom Jones eflag = EFLAG_UNMERGED; 855e1910ebdSBaptiste Daroussin break; 856e1910ebdSBaptiste Daroussin case 'E': 857d458eb8dSTom Jones eflag = EFLAG_UNMERGED; 858e1910ebdSBaptiste Daroussin oflag = 1; 859e1910ebdSBaptiste Daroussin break; 860e1910ebdSBaptiste Daroussin case 'i': 861e1910ebdSBaptiste Daroussin iflag = 1; 862e1910ebdSBaptiste Daroussin break; 863e1910ebdSBaptiste Daroussin case 'L': 864e1910ebdSBaptiste Daroussin oflag = 1; 865e1910ebdSBaptiste Daroussin if (nblabels >= 3) 866e1910ebdSBaptiste Daroussin errx(2, "too many file label options"); 867e1910ebdSBaptiste Daroussin labels[nblabels++] = optarg; 868e1910ebdSBaptiste Daroussin break; 869e1910ebdSBaptiste Daroussin case 'm': 870e1910ebdSBaptiste Daroussin Aflag = 1; 871e1910ebdSBaptiste Daroussin oflag = 1; 872e1910ebdSBaptiste Daroussin mflag = 1; 873e1910ebdSBaptiste Daroussin break; 874e1910ebdSBaptiste Daroussin case 'T': 875e1910ebdSBaptiste Daroussin Tflag = 1; 876e1910ebdSBaptiste Daroussin break; 877e1910ebdSBaptiste Daroussin case 'x': 878d458eb8dSTom Jones eflag = EFLAG_OVERLAP; 879e1910ebdSBaptiste Daroussin break; 880e1910ebdSBaptiste Daroussin case 'X': 881e1910ebdSBaptiste Daroussin oflag = 1; 882d458eb8dSTom Jones eflag = EFLAG_OVERLAP; 883e1910ebdSBaptiste Daroussin break; 884e1910ebdSBaptiste Daroussin case DIFFPROG_OPT: 885e1910ebdSBaptiste Daroussin diffprog = optarg; 886e1910ebdSBaptiste Daroussin break; 887e1910ebdSBaptiste Daroussin case STRIPCR_OPT: 888e1910ebdSBaptiste Daroussin strip_cr = 1; 88954a3415cSPiotr Pawel Stefaniak diffargv[diffargc++] = __DECONST(char *, "--strip-trailing-cr"); 890e1910ebdSBaptiste Daroussin break; 8913ddd6eb6STom Jones case HELP_OPT: 8923ddd6eb6STom Jones usage(); 8933ddd6eb6STom Jones exit(0); 8943ddd6eb6STom Jones case VERSION_OPT: 8953ddd6eb6STom Jones printf("%s\n", diff3_version); 8963ddd6eb6STom Jones exit(0); 897e1910ebdSBaptiste Daroussin } 898e1910ebdSBaptiste Daroussin } 899e1910ebdSBaptiste Daroussin argc -= optind; 900e1910ebdSBaptiste Daroussin argv += optind; 901e1910ebdSBaptiste Daroussin 902e1910ebdSBaptiste Daroussin if (Aflag) { 903d458eb8dSTom Jones eflag = EFLAG_UNMERGED; 904e1910ebdSBaptiste Daroussin oflag = 1; 905e1910ebdSBaptiste Daroussin } 906e1910ebdSBaptiste Daroussin 9073ddd6eb6STom Jones if (argc != 3) { 908e1910ebdSBaptiste Daroussin usage(); 9093ddd6eb6STom Jones exit(2); 9103ddd6eb6STom Jones } 911e1910ebdSBaptiste Daroussin 912e1910ebdSBaptiste Daroussin if (caph_limit_stdio() == -1) 913e1910ebdSBaptiste Daroussin err(2, "unable to limit stdio"); 914e1910ebdSBaptiste Daroussin 915e1910ebdSBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 916e1910ebdSBaptiste Daroussin 917e1910ebdSBaptiste Daroussin kq = kqueue(); 918e1910ebdSBaptiste Daroussin if (kq == -1) 919e1910ebdSBaptiste Daroussin err(2, "kqueue"); 920e1910ebdSBaptiste Daroussin 921e1910ebdSBaptiste Daroussin e = malloc(2 * sizeof(struct kevent)); 922e1910ebdSBaptiste Daroussin if (e == NULL) 923e1910ebdSBaptiste Daroussin err(2, "malloc"); 924e1910ebdSBaptiste Daroussin 925e1910ebdSBaptiste Daroussin /* TODO stdio */ 926e1910ebdSBaptiste Daroussin file1 = argv[0]; 927e1910ebdSBaptiste Daroussin file2 = argv[1]; 928e1910ebdSBaptiste Daroussin file3 = argv[2]; 929e1910ebdSBaptiste Daroussin 930e1910ebdSBaptiste Daroussin if (oflag) { 931df092859STom Jones asprintf(&f1mark, "%s", 932e1910ebdSBaptiste Daroussin labels[0] != NULL ? labels[0] : file1); 933e1910ebdSBaptiste Daroussin if (f1mark == NULL) 934e1910ebdSBaptiste Daroussin err(2, "asprintf"); 935df092859STom Jones asprintf(&f2mark, "%s", 936e1910ebdSBaptiste Daroussin labels[1] != NULL ? labels[1] : file2); 937e1910ebdSBaptiste Daroussin if (f2mark == NULL) 938e1910ebdSBaptiste Daroussin err(2, "asprintf"); 939df092859STom Jones asprintf(&f3mark, "%s", 940e1910ebdSBaptiste Daroussin labels[2] != NULL ? labels[2] : file3); 941e1910ebdSBaptiste Daroussin if (f3mark == NULL) 942e1910ebdSBaptiste Daroussin err(2, "asprintf"); 943e1910ebdSBaptiste Daroussin } 944e1910ebdSBaptiste Daroussin fp[0] = fopen(file1, "r"); 945e1910ebdSBaptiste Daroussin if (fp[0] == NULL) 946e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file1); 947377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) 948e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 949e1910ebdSBaptiste Daroussin 950e1910ebdSBaptiste Daroussin fp[1] = fopen(file2, "r"); 951e1910ebdSBaptiste Daroussin if (fp[1] == NULL) 952e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file2); 953377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) 954e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 955e1910ebdSBaptiste Daroussin 956e1910ebdSBaptiste Daroussin fp[2] = fopen(file3, "r"); 957e1910ebdSBaptiste Daroussin if (fp[2] == NULL) 958e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file3); 959377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) 960e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file3); 961e1910ebdSBaptiste Daroussin 962e1910ebdSBaptiste Daroussin if (pipe(fd13)) 963e1910ebdSBaptiste Daroussin err(2, "pipe"); 964e1910ebdSBaptiste Daroussin if (pipe(fd23)) 965e1910ebdSBaptiste Daroussin err(2, "pipe"); 966e1910ebdSBaptiste Daroussin 967e1910ebdSBaptiste Daroussin diffargv[diffargc] = file1; 968e1910ebdSBaptiste Daroussin diffargv[diffargc + 1] = file3; 969e1910ebdSBaptiste Daroussin diffargv[diffargc + 2] = NULL; 970e1910ebdSBaptiste Daroussin 971e1910ebdSBaptiste Daroussin nleft = 0; 972e1910ebdSBaptiste Daroussin pd13 = diffexec(diffprog, diffargv, fd13); 973e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 974e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 975e1910ebdSBaptiste Daroussin err(2, "kevent1"); 976e1910ebdSBaptiste Daroussin nleft++; 977e1910ebdSBaptiste Daroussin 978e1910ebdSBaptiste Daroussin diffargv[diffargc] = file2; 979e1910ebdSBaptiste Daroussin pd23 = diffexec(diffprog, diffargv, fd23); 980e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 981e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 982e1910ebdSBaptiste Daroussin err(2, "kevent2"); 983e1910ebdSBaptiste Daroussin nleft++; 984e1910ebdSBaptiste Daroussin 985e1910ebdSBaptiste Daroussin caph_cache_catpages(); 9867672a014SMariusz Zaborski if (caph_enter() < 0) 987e1910ebdSBaptiste Daroussin err(2, "unable to enter capability mode"); 988e1910ebdSBaptiste Daroussin 989e1910ebdSBaptiste Daroussin /* parse diffs */ 990e1910ebdSBaptiste Daroussin increase(); 991e1910ebdSBaptiste Daroussin m = readin(fd13[0], &d13); 992e1910ebdSBaptiste Daroussin n = readin(fd23[0], &d23); 993e1910ebdSBaptiste Daroussin 994e1910ebdSBaptiste Daroussin /* waitpid cooked over pdforks */ 995e1910ebdSBaptiste Daroussin while (nleft > 0) { 996e1910ebdSBaptiste Daroussin nke = kevent(kq, NULL, 0, e, nleft, NULL); 997e1910ebdSBaptiste Daroussin if (nke == -1) 998e1910ebdSBaptiste Daroussin err(2, "kevent"); 999e1910ebdSBaptiste Daroussin for (i = 0; i < nke; i++) { 1000e1910ebdSBaptiste Daroussin status = e[i].data; 1001e1910ebdSBaptiste Daroussin if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) 1002702dda43SPiotr Pawel Stefaniak errx(2, "diff exited abnormally"); 1003e1910ebdSBaptiste Daroussin else if (WIFSIGNALED(status)) 1004e1910ebdSBaptiste Daroussin errx(2, "diff killed by signal %d", 1005e1910ebdSBaptiste Daroussin WTERMSIG(status)); 1006e1910ebdSBaptiste Daroussin } 1007e1910ebdSBaptiste Daroussin nleft -= nke; 1008e1910ebdSBaptiste Daroussin } 1009e1910ebdSBaptiste Daroussin merge(m, n); 1010e1910ebdSBaptiste Daroussin 1011e1910ebdSBaptiste Daroussin return (EXIT_SUCCESS); 1012e1910ebdSBaptiste Daroussin } 1013