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 { 103*9ab079c5STom Jones #define DIFF_TYPE2 2 104*9ab079c5STom Jones #define DIFF_TYPE3 3 105*9ab079c5STom Jones int type; 106*9ab079c5STom Jones #if DEBUG 107*9ab079c5STom Jones char *line; 108*9ab079c5STom Jones #endif /* DEBUG */ 109*9ab079c5STom Jones 110*9ab079c5STom 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 = "<<<<<<<"; 140*9ab079c5STom Jones static const char *orgmark = "|||||||"; 141df092859STom Jones static const char *newmark = ">>>>>>>"; 142e1910ebdSBaptiste Daroussin 143e1910ebdSBaptiste Daroussin static bool duplicate(struct range *, struct range *); 144*9ab079c5STom 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; 155*9ab079c5STom Jones static void Ascript(int) __dead2; 156e1910ebdSBaptiste Daroussin static void increase(void); 157e1910ebdSBaptiste Daroussin static void usage(void) __dead2; 1582184ca3fSTom Jones static void printrange(FILE *, struct range *); 159e1910ebdSBaptiste Daroussin 160e1910ebdSBaptiste Daroussin enum { 161e1910ebdSBaptiste Daroussin DIFFPROG_OPT, 162e1910ebdSBaptiste Daroussin STRIPCR_OPT, 163e1910ebdSBaptiste Daroussin }; 164e1910ebdSBaptiste Daroussin 165e1910ebdSBaptiste Daroussin #define DIFF_PATH "/usr/bin/diff" 166e1910ebdSBaptiste Daroussin 167e1910ebdSBaptiste Daroussin #define OPTIONS "3aAeEiL:mTxX" 168e1910ebdSBaptiste Daroussin static struct option longopts[] = { 169e1910ebdSBaptiste Daroussin { "ed", no_argument, NULL, 'e' }, 170e1910ebdSBaptiste Daroussin { "show-overlap", no_argument, NULL, 'E' }, 171e1910ebdSBaptiste Daroussin { "overlap-only", no_argument, NULL, 'x' }, 172e1910ebdSBaptiste Daroussin { "initial-tab", no_argument, NULL, 'T' }, 173e1910ebdSBaptiste Daroussin { "text", no_argument, NULL, 'a' }, 174e1910ebdSBaptiste Daroussin { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, 175e1910ebdSBaptiste Daroussin { "show-all", no_argument, NULL, 'A' }, 176e1910ebdSBaptiste Daroussin { "easy-only", no_argument, NULL, '3' }, 177e1910ebdSBaptiste Daroussin { "merge", no_argument, NULL, 'm' }, 178e1910ebdSBaptiste Daroussin { "label", required_argument, NULL, 'L' }, 179e1910ebdSBaptiste Daroussin { "diff-program", required_argument, NULL, DIFFPROG_OPT }, 180e1910ebdSBaptiste Daroussin }; 181e1910ebdSBaptiste Daroussin 182e1910ebdSBaptiste Daroussin static void 183e1910ebdSBaptiste Daroussin usage(void) 184e1910ebdSBaptiste Daroussin { 185702dda43SPiotr Pawel Stefaniak fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] " 186e1910ebdSBaptiste Daroussin "[-L label3] file1 file2 file3\n"); 187e1910ebdSBaptiste Daroussin exit(2); 188e1910ebdSBaptiste Daroussin } 189e1910ebdSBaptiste Daroussin 190e1910ebdSBaptiste Daroussin static int 191e1910ebdSBaptiste Daroussin readin(int fd, struct diff **dd) 192e1910ebdSBaptiste Daroussin { 193e1910ebdSBaptiste Daroussin int a, b, c, d; 194e1910ebdSBaptiste Daroussin size_t i; 195e1910ebdSBaptiste Daroussin char kind, *p; 196e1910ebdSBaptiste Daroussin FILE *f; 197e1910ebdSBaptiste Daroussin 198e1910ebdSBaptiste Daroussin f = fdopen(fd, "r"); 199e1910ebdSBaptiste Daroussin if (f == NULL) 200e1910ebdSBaptiste Daroussin err(2, "fdopen"); 201e1910ebdSBaptiste Daroussin for (i = 0; (p = getchange(f)); i++) { 202*9ab079c5STom Jones #if DEBUG 203*9ab079c5STom Jones (*dd)[i].line = strdup(p); 204*9ab079c5STom Jones #endif /* DEBUG */ 205*9ab079c5STom Jones 206e1910ebdSBaptiste Daroussin if (i >= szchanges - 1) 207e1910ebdSBaptiste Daroussin increase(); 2089520071fSBaptiste Daroussin a = b = (int)strtoimax(p, &p, 10); 209e1910ebdSBaptiste Daroussin if (*p == ',') { 210e1910ebdSBaptiste Daroussin p++; 2119520071fSBaptiste Daroussin b = (int)strtoimax(p, &p, 10); 212e1910ebdSBaptiste Daroussin } 213e1910ebdSBaptiste Daroussin kind = *p++; 2149520071fSBaptiste Daroussin c = d = (int)strtoimax(p, &p, 10); 215e1910ebdSBaptiste Daroussin if (*p == ',') { 216e1910ebdSBaptiste Daroussin p++; 2179520071fSBaptiste Daroussin d = (int)strtoimax(p, &p, 10); 218e1910ebdSBaptiste Daroussin } 219e1910ebdSBaptiste Daroussin if (kind == 'a') 220e1910ebdSBaptiste Daroussin a++; 221e1910ebdSBaptiste Daroussin if (kind == 'd') 222e1910ebdSBaptiste Daroussin c++; 223e1910ebdSBaptiste Daroussin b++; 224e1910ebdSBaptiste Daroussin d++; 225e1910ebdSBaptiste Daroussin (*dd)[i].old.from = a; 226e1910ebdSBaptiste Daroussin (*dd)[i].old.to = b; 227e1910ebdSBaptiste Daroussin (*dd)[i].new.from = c; 228e1910ebdSBaptiste Daroussin (*dd)[i].new.to = d; 229e1910ebdSBaptiste Daroussin } 230e1910ebdSBaptiste Daroussin if (i) { 231e1910ebdSBaptiste Daroussin (*dd)[i].old.from = (*dd)[i - 1].old.to; 232e1910ebdSBaptiste Daroussin (*dd)[i].new.from = (*dd)[i - 1].new.to; 233e1910ebdSBaptiste Daroussin } 234e1910ebdSBaptiste Daroussin fclose(f); 235e1910ebdSBaptiste Daroussin return (i); 236e1910ebdSBaptiste Daroussin } 237e1910ebdSBaptiste Daroussin 238e1910ebdSBaptiste Daroussin static int 239e1910ebdSBaptiste Daroussin diffexec(const char *diffprog, char **diffargv, int fd[]) 240e1910ebdSBaptiste Daroussin { 241702dda43SPiotr Pawel Stefaniak int pd; 242e1910ebdSBaptiste Daroussin 243702dda43SPiotr Pawel Stefaniak switch (pdfork(&pd, PD_CLOEXEC)) { 244e1910ebdSBaptiste Daroussin case 0: 245e1910ebdSBaptiste Daroussin close(fd[0]); 246e1910ebdSBaptiste Daroussin if (dup2(fd[1], STDOUT_FILENO) == -1) 247e1910ebdSBaptiste Daroussin err(2, "child could not duplicate descriptor"); 248e1910ebdSBaptiste Daroussin close(fd[1]); 249e1910ebdSBaptiste Daroussin execvp(diffprog, diffargv); 250e1910ebdSBaptiste Daroussin err(2, "could not execute diff: %s", diffprog); 251e1910ebdSBaptiste Daroussin break; 252e1910ebdSBaptiste Daroussin case -1: 253e1910ebdSBaptiste Daroussin err(2, "could not fork"); 254e1910ebdSBaptiste Daroussin break; 255e1910ebdSBaptiste Daroussin } 256e1910ebdSBaptiste Daroussin close(fd[1]); 257e1910ebdSBaptiste Daroussin return (pd); 258e1910ebdSBaptiste Daroussin } 259e1910ebdSBaptiste Daroussin 260e1910ebdSBaptiste Daroussin static char * 261e1910ebdSBaptiste Daroussin getchange(FILE *b) 262e1910ebdSBaptiste Daroussin { 263e1910ebdSBaptiste Daroussin char *line; 264e1910ebdSBaptiste Daroussin 265e1910ebdSBaptiste Daroussin while ((line = get_line(b, NULL))) { 266e1910ebdSBaptiste Daroussin if (isdigit((unsigned char)line[0])) 267e1910ebdSBaptiste Daroussin return (line); 268e1910ebdSBaptiste Daroussin } 269e1910ebdSBaptiste Daroussin return (NULL); 270e1910ebdSBaptiste Daroussin } 271e1910ebdSBaptiste Daroussin 272e1910ebdSBaptiste Daroussin 273e1910ebdSBaptiste Daroussin static char * 274e1910ebdSBaptiste Daroussin get_line(FILE *b, size_t *n) 275e1910ebdSBaptiste Daroussin { 27694678ee6SBaptiste Daroussin ssize_t len; 27794678ee6SBaptiste Daroussin static char *buf = NULL; 27894678ee6SBaptiste Daroussin static size_t bufsize = 0; 279e1910ebdSBaptiste Daroussin 28094678ee6SBaptiste Daroussin if ((len = getline(&buf, &bufsize, b)) < 0) 281e1910ebdSBaptiste Daroussin return (NULL); 282e1910ebdSBaptiste Daroussin 28354a3415cSPiotr Pawel Stefaniak if (strip_cr && len >= 2 && strcmp("\r\n", &(buf[len - 2])) == 0) { 28454a3415cSPiotr Pawel Stefaniak buf[len - 2] = '\n'; 28554a3415cSPiotr Pawel Stefaniak buf[len - 1] = '\0'; 28654a3415cSPiotr Pawel Stefaniak len--; 28754a3415cSPiotr Pawel Stefaniak } 28854a3415cSPiotr Pawel Stefaniak 289e1910ebdSBaptiste Daroussin if (n != NULL) 290e1910ebdSBaptiste Daroussin *n = len; 29194678ee6SBaptiste Daroussin 292e1910ebdSBaptiste Daroussin return (buf); 293e1910ebdSBaptiste Daroussin } 294e1910ebdSBaptiste Daroussin 295e1910ebdSBaptiste Daroussin static void 296e1910ebdSBaptiste Daroussin merge(int m1, int m2) 297e1910ebdSBaptiste Daroussin { 298e1910ebdSBaptiste Daroussin struct diff *d1, *d2, *d3; 299e1910ebdSBaptiste Daroussin int j, t1, t2; 300e1910ebdSBaptiste Daroussin bool dup = false; 301e1910ebdSBaptiste Daroussin 302e1910ebdSBaptiste Daroussin d1 = d13; 303e1910ebdSBaptiste Daroussin d2 = d23; 304e1910ebdSBaptiste Daroussin j = 0; 305e1910ebdSBaptiste Daroussin 306e1910ebdSBaptiste Daroussin while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) { 307e1910ebdSBaptiste Daroussin /* first file is different from the others */ 308e1910ebdSBaptiste Daroussin if (!t2 || (t1 && d1->new.to < d2->new.from)) { 309e1910ebdSBaptiste Daroussin /* stuff peculiar to 1st file */ 310e1910ebdSBaptiste Daroussin if (eflag == 0) { 311e1910ebdSBaptiste Daroussin printf("====1\n"); 312e1910ebdSBaptiste Daroussin change(1, &d1->old, false); 313e1910ebdSBaptiste Daroussin keep(2, &d1->new); 314e1910ebdSBaptiste Daroussin change(3, &d1->new, false); 315e1910ebdSBaptiste Daroussin } 316e1910ebdSBaptiste Daroussin d1++; 317e1910ebdSBaptiste Daroussin continue; 318e1910ebdSBaptiste Daroussin } 319e1910ebdSBaptiste Daroussin /* second file is different from others */ 320e1910ebdSBaptiste Daroussin if (!t1 || (t2 && d2->new.to < d1->new.from)) { 321e1910ebdSBaptiste Daroussin if (eflag == 0) { 322e1910ebdSBaptiste Daroussin printf("====2\n"); 323e1910ebdSBaptiste Daroussin keep(1, &d2->new); 324e1910ebdSBaptiste Daroussin change(3, &d2->new, false); 325e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 326*9ab079c5STom Jones } else if (Aflag || mflag) { 327*9ab079c5STom Jones // XXX-THJ: What does it mean for the second file to differ? 328*9ab079c5STom Jones j = edit(d2, dup, j, DIFF_TYPE2); 329e1910ebdSBaptiste Daroussin } 330e1910ebdSBaptiste Daroussin d2++; 331e1910ebdSBaptiste Daroussin continue; 332e1910ebdSBaptiste Daroussin } 333e1910ebdSBaptiste Daroussin /* 334e1910ebdSBaptiste Daroussin * Merge overlapping changes in first file 335e1910ebdSBaptiste Daroussin * this happens after extension (see below). 336e1910ebdSBaptiste Daroussin */ 337e1910ebdSBaptiste Daroussin if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { 338e1910ebdSBaptiste Daroussin d1[1].old.from = d1->old.from; 339e1910ebdSBaptiste Daroussin d1[1].new.from = d1->new.from; 340e1910ebdSBaptiste Daroussin d1++; 341e1910ebdSBaptiste Daroussin continue; 342e1910ebdSBaptiste Daroussin } 343e1910ebdSBaptiste Daroussin 344e1910ebdSBaptiste Daroussin /* merge overlapping changes in second */ 345e1910ebdSBaptiste Daroussin if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) { 346e1910ebdSBaptiste Daroussin d2[1].old.from = d2->old.from; 347e1910ebdSBaptiste Daroussin d2[1].new.from = d2->new.from; 348e1910ebdSBaptiste Daroussin d2++; 349e1910ebdSBaptiste Daroussin continue; 350e1910ebdSBaptiste Daroussin } 351e1910ebdSBaptiste Daroussin /* stuff peculiar to third file or different in all */ 352e1910ebdSBaptiste Daroussin if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { 353e1910ebdSBaptiste Daroussin dup = duplicate(&d1->old, &d2->old); 354e1910ebdSBaptiste Daroussin /* 355e1910ebdSBaptiste Daroussin * dup = 0 means all files differ 356e1910ebdSBaptiste Daroussin * dup = 1 means files 1 and 2 identical 357e1910ebdSBaptiste Daroussin */ 358e1910ebdSBaptiste Daroussin if (eflag == 0) { 359e1910ebdSBaptiste Daroussin printf("====%s\n", dup ? "3" : ""); 360e1910ebdSBaptiste Daroussin change(1, &d1->old, dup); 361e1910ebdSBaptiste Daroussin change(2, &d2->old, false); 362e1910ebdSBaptiste Daroussin d3 = d1->old.to > d1->old.from ? d1 : d2; 363e1910ebdSBaptiste Daroussin change(3, &d3->new, false); 364*9ab079c5STom Jones } else { 365*9ab079c5STom Jones j = edit(d1, dup, j, DIFF_TYPE3); 366*9ab079c5STom Jones } 367*9ab079c5STom Jones dup = false; 368e1910ebdSBaptiste Daroussin d1++; 369e1910ebdSBaptiste Daroussin d2++; 370e1910ebdSBaptiste Daroussin continue; 371e1910ebdSBaptiste Daroussin } 372e1910ebdSBaptiste Daroussin /* 373e1910ebdSBaptiste Daroussin * Overlapping changes from file 1 and 2; extend changes 374e1910ebdSBaptiste Daroussin * appropriately to make them coincide. 375e1910ebdSBaptiste Daroussin */ 376e1910ebdSBaptiste Daroussin if (d1->new.from < d2->new.from) { 377e1910ebdSBaptiste Daroussin d2->old.from -= d2->new.from - d1->new.from; 378e1910ebdSBaptiste Daroussin d2->new.from = d1->new.from; 379e1910ebdSBaptiste Daroussin } else if (d2->new.from < d1->new.from) { 380e1910ebdSBaptiste Daroussin d1->old.from -= d1->new.from - d2->new.from; 381e1910ebdSBaptiste Daroussin d1->new.from = d2->new.from; 382e1910ebdSBaptiste Daroussin } 383e1910ebdSBaptiste Daroussin if (d1->new.to > d2->new.to) { 384e1910ebdSBaptiste Daroussin d2->old.to += d1->new.to - d2->new.to; 385e1910ebdSBaptiste Daroussin d2->new.to = d1->new.to; 386e1910ebdSBaptiste Daroussin } else if (d2->new.to > d1->new.to) { 387e1910ebdSBaptiste Daroussin d1->old.to += d2->new.to - d1->new.to; 388e1910ebdSBaptiste Daroussin d1->new.to = d2->new.to; 389e1910ebdSBaptiste Daroussin } 390e1910ebdSBaptiste Daroussin } 391*9ab079c5STom Jones 392*9ab079c5STom Jones if (Aflag) 393*9ab079c5STom Jones Ascript(j); 394*9ab079c5STom Jones else if (eflag) 395e1910ebdSBaptiste Daroussin edscript(j); 396e1910ebdSBaptiste Daroussin } 397e1910ebdSBaptiste Daroussin 398e1910ebdSBaptiste Daroussin /* 399e1910ebdSBaptiste Daroussin * The range of lines rold.from thru rold.to in file i is to be changed. 400e1910ebdSBaptiste Daroussin * It is to be printed only if it does not duplicate something to be 401e1910ebdSBaptiste Daroussin * printed later. 402e1910ebdSBaptiste Daroussin */ 403e1910ebdSBaptiste Daroussin static void 404e1910ebdSBaptiste Daroussin change(int i, struct range *rold, bool dup) 405e1910ebdSBaptiste Daroussin { 406e1910ebdSBaptiste Daroussin 407e1910ebdSBaptiste Daroussin printf("%d:", i); 408e1910ebdSBaptiste Daroussin last[i] = rold->to; 4097c03df68STom Jones prange(rold, false); 410e1910ebdSBaptiste Daroussin if (dup) 411e1910ebdSBaptiste Daroussin return; 412e1910ebdSBaptiste Daroussin i--; 413e1910ebdSBaptiste Daroussin skip(i, rold->from, NULL); 414e1910ebdSBaptiste Daroussin skip(i, rold->to, " "); 415e1910ebdSBaptiste Daroussin } 416e1910ebdSBaptiste Daroussin 417e1910ebdSBaptiste Daroussin /* 418e1910ebdSBaptiste Daroussin * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or 419e1910ebdSBaptiste Daroussin * n1. 420e1910ebdSBaptiste Daroussin */ 421e1910ebdSBaptiste Daroussin static void 4227c03df68STom Jones prange(struct range *rold, bool delete) 423e1910ebdSBaptiste Daroussin { 424e1910ebdSBaptiste Daroussin 425e1910ebdSBaptiste Daroussin if (rold->to <= rold->from) 426e1910ebdSBaptiste Daroussin printf("%da\n", rold->from - 1); 427e1910ebdSBaptiste Daroussin else { 428e1910ebdSBaptiste Daroussin printf("%d", rold->from); 429e1910ebdSBaptiste Daroussin if (rold->to > rold->from + 1) 430e1910ebdSBaptiste Daroussin printf(",%d", rold->to - 1); 4317c03df68STom Jones if (delete) 4327c03df68STom Jones printf("d\n"); 4337c03df68STom Jones else 434e1910ebdSBaptiste Daroussin printf("c\n"); 435e1910ebdSBaptiste Daroussin } 436e1910ebdSBaptiste Daroussin } 437e1910ebdSBaptiste Daroussin 438e1910ebdSBaptiste Daroussin /* 439e1910ebdSBaptiste Daroussin * No difference was reported by diff between file 1 (or 2) and file 3, 440e1910ebdSBaptiste Daroussin * and an artificial dummy difference (trange) must be ginned up to 441e1910ebdSBaptiste Daroussin * correspond to the change reported in the other file. 442e1910ebdSBaptiste Daroussin */ 443e1910ebdSBaptiste Daroussin static void 444e1910ebdSBaptiste Daroussin keep(int i, struct range *rnew) 445e1910ebdSBaptiste Daroussin { 446e1910ebdSBaptiste Daroussin int delta; 447e1910ebdSBaptiste Daroussin struct range trange; 448e1910ebdSBaptiste Daroussin 449e1910ebdSBaptiste Daroussin delta = last[3] - last[i]; 450e1910ebdSBaptiste Daroussin trange.from = rnew->from - delta; 451e1910ebdSBaptiste Daroussin trange.to = rnew->to - delta; 452e1910ebdSBaptiste Daroussin change(i, &trange, true); 453e1910ebdSBaptiste Daroussin } 454e1910ebdSBaptiste Daroussin 455e1910ebdSBaptiste Daroussin /* 456e1910ebdSBaptiste Daroussin * skip to just before line number from in file "i". If "pr" is non-NULL, 457e1910ebdSBaptiste Daroussin * print all skipped stuff with string pr as a prefix. 458e1910ebdSBaptiste Daroussin */ 459e1910ebdSBaptiste Daroussin static int 460e1910ebdSBaptiste Daroussin skip(int i, int from, const char *pr) 461e1910ebdSBaptiste Daroussin { 462e1910ebdSBaptiste Daroussin size_t j, n; 463e1910ebdSBaptiste Daroussin char *line; 464e1910ebdSBaptiste Daroussin 465e1910ebdSBaptiste Daroussin for (n = 0; cline[i] < from - 1; n += j) { 466e1910ebdSBaptiste Daroussin if ((line = get_line(fp[i], &j)) == NULL) 467e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 468e1910ebdSBaptiste Daroussin if (pr != NULL) 469e1910ebdSBaptiste Daroussin printf("%s%s", Tflag == 1 ? "\t" : pr, line); 470e1910ebdSBaptiste Daroussin cline[i]++; 471e1910ebdSBaptiste Daroussin } 472e1910ebdSBaptiste Daroussin return ((int) n); 473e1910ebdSBaptiste Daroussin } 474e1910ebdSBaptiste Daroussin 475e1910ebdSBaptiste Daroussin /* 476e1910ebdSBaptiste Daroussin * Return 1 or 0 according as the old range (in file 1) contains exactly 477e1910ebdSBaptiste Daroussin * the same data as the new range (in file 2). 478e1910ebdSBaptiste Daroussin */ 479e1910ebdSBaptiste Daroussin static bool 480e1910ebdSBaptiste Daroussin duplicate(struct range *r1, struct range *r2) 481e1910ebdSBaptiste Daroussin { 482e1910ebdSBaptiste Daroussin int c, d; 483e1910ebdSBaptiste Daroussin int nchar; 484e1910ebdSBaptiste Daroussin int nline; 485e1910ebdSBaptiste Daroussin 486e1910ebdSBaptiste Daroussin if (r1->to-r1->from != r2->to-r2->from) 487e1910ebdSBaptiste Daroussin return (0); 488e1910ebdSBaptiste Daroussin skip(0, r1->from, NULL); 489e1910ebdSBaptiste Daroussin skip(1, r2->from, NULL); 490e1910ebdSBaptiste Daroussin nchar = 0; 491e1910ebdSBaptiste Daroussin for (nline = 0; nline < r1->to - r1->from; nline++) { 492e1910ebdSBaptiste Daroussin do { 493e1910ebdSBaptiste Daroussin c = getc(fp[0]); 494e1910ebdSBaptiste Daroussin d = getc(fp[1]); 4957f7b03f3SPiotr Pawel Stefaniak if (c == -1 && d == -1) 4967f7b03f3SPiotr Pawel Stefaniak break; 497e1910ebdSBaptiste Daroussin if (c == -1 || d == -1) 498e1910ebdSBaptiste Daroussin errx(EXIT_FAILURE, "logic error"); 499e1910ebdSBaptiste Daroussin nchar++; 500e1910ebdSBaptiste Daroussin if (c != d) { 501e1910ebdSBaptiste Daroussin repos(nchar); 502e1910ebdSBaptiste Daroussin return (0); 503e1910ebdSBaptiste Daroussin } 504e1910ebdSBaptiste Daroussin } while (c != '\n'); 505e1910ebdSBaptiste Daroussin } 506e1910ebdSBaptiste Daroussin repos(nchar); 507e1910ebdSBaptiste Daroussin return (1); 508e1910ebdSBaptiste Daroussin } 509e1910ebdSBaptiste Daroussin 510e1910ebdSBaptiste Daroussin static void 511e1910ebdSBaptiste Daroussin repos(int nchar) 512e1910ebdSBaptiste Daroussin { 513e1910ebdSBaptiste Daroussin int i; 514e1910ebdSBaptiste Daroussin 515e1910ebdSBaptiste Daroussin for (i = 0; i < 2; i++) 516e1910ebdSBaptiste Daroussin (void)fseek(fp[i], (long)-nchar, SEEK_CUR); 517e1910ebdSBaptiste Daroussin } 518702dda43SPiotr Pawel Stefaniak 519e1910ebdSBaptiste Daroussin /* 520e1910ebdSBaptiste Daroussin * collect an editing script for later regurgitation 521e1910ebdSBaptiste Daroussin */ 522e1910ebdSBaptiste Daroussin static int 523*9ab079c5STom Jones edit(struct diff *diff, bool dup, int j, int difftype) 524e1910ebdSBaptiste Daroussin { 525e1910ebdSBaptiste Daroussin 526e1910ebdSBaptiste Daroussin if (((dup + 1) & eflag) == 0) 527e1910ebdSBaptiste Daroussin return (j); 528e1910ebdSBaptiste Daroussin j++; 529e1910ebdSBaptiste Daroussin overlap[j] = !dup; 530e1910ebdSBaptiste Daroussin if (!dup) 531e1910ebdSBaptiste Daroussin overlapcnt++; 532*9ab079c5STom Jones 533*9ab079c5STom Jones de[j].type = difftype; 534*9ab079c5STom Jones #if DEBUG 535*9ab079c5STom Jones de[j].line = diff->line; 536*9ab079c5STom Jones #endif /* DEBUG */ 537*9ab079c5STom Jones 538e1910ebdSBaptiste Daroussin de[j].old.from = diff->old.from; 539e1910ebdSBaptiste Daroussin de[j].old.to = diff->old.to; 5402184ca3fSTom Jones de[j].new.from = diff->new.from; 5412184ca3fSTom Jones de[j].new.to = diff->new.to; 542e1910ebdSBaptiste Daroussin return (j); 543e1910ebdSBaptiste Daroussin } 544e1910ebdSBaptiste Daroussin 5452184ca3fSTom Jones static void 5462184ca3fSTom Jones printrange(FILE *p, struct range *r) 5472184ca3fSTom Jones { 5482184ca3fSTom Jones char *line = NULL; 5492184ca3fSTom Jones size_t len = 0; 5502184ca3fSTom Jones int i = 1; 5512184ca3fSTom Jones ssize_t rlen = 0; 5522184ca3fSTom Jones 5532184ca3fSTom Jones /* We haven't been asked to print anything */ 5542184ca3fSTom Jones if (r->from == r->to) 5552184ca3fSTom Jones return; 5562184ca3fSTom Jones 5572184ca3fSTom Jones if (r->from > r->to) 5582184ca3fSTom Jones errx(EXIT_FAILURE, "invalid print range"); 5592184ca3fSTom Jones 5602184ca3fSTom Jones /* 5612184ca3fSTom Jones * XXX-THJ: We read through all of the file for each range printed. 5622184ca3fSTom Jones * This duplicates work and will probably impact performance on large 5632184ca3fSTom Jones * files with lots of ranges. 5642184ca3fSTom Jones */ 5652184ca3fSTom Jones fseek(p, 0L, SEEK_SET); 5662184ca3fSTom Jones while ((rlen = getline(&line, &len, p)) > 0) { 5672184ca3fSTom Jones if (i >= r->from) 5682184ca3fSTom Jones printf("%s", line); 5692184ca3fSTom Jones if (++i > r->to - 1) 5702184ca3fSTom Jones break; 5712184ca3fSTom Jones } 5722184ca3fSTom Jones free(line); 5732184ca3fSTom Jones } 5742184ca3fSTom Jones 575e1910ebdSBaptiste Daroussin /* regurgitate */ 576e1910ebdSBaptiste Daroussin static void 577e1910ebdSBaptiste Daroussin edscript(int n) 578e1910ebdSBaptiste Daroussin { 5797c03df68STom Jones bool delete; 580e1910ebdSBaptiste Daroussin 581e1910ebdSBaptiste Daroussin for (; n > 0; n--) { 5827c03df68STom Jones delete = (de[n].new.from == de[n].new.to); 583e1910ebdSBaptiste Daroussin if (!oflag || !overlap[n]) { 5847c03df68STom Jones prange(&de[n].old, delete); 585e1910ebdSBaptiste Daroussin } else { 586e1910ebdSBaptiste Daroussin printf("%da\n", de[n].old.to - 1); 587e1910ebdSBaptiste Daroussin printf("=======\n"); 588e1910ebdSBaptiste Daroussin } 5892184ca3fSTom Jones printrange(fp[2], &de[n].new); 5907c03df68STom Jones if (!oflag || !overlap[n]) { 5917c03df68STom Jones if (!delete) 592e1910ebdSBaptiste Daroussin printf(".\n"); 5937c03df68STom Jones } else { 594df092859STom Jones printf("%s %s\n.\n", newmark, f3mark); 595df092859STom Jones printf("%da\n%s %s\n.\n", de[n].old.from - 1, 596df092859STom Jones oldmark, f1mark); 597e1910ebdSBaptiste Daroussin } 598e1910ebdSBaptiste Daroussin } 599e1910ebdSBaptiste Daroussin if (iflag) 600e1910ebdSBaptiste Daroussin printf("w\nq\n"); 601e1910ebdSBaptiste Daroussin 602e1910ebdSBaptiste Daroussin exit(eflag == 0 ? overlapcnt : 0); 603e1910ebdSBaptiste Daroussin } 604e1910ebdSBaptiste Daroussin 605*9ab079c5STom Jones /* 606*9ab079c5STom Jones * Output an edit script to turn mine into yours, when there is a conflict 607*9ab079c5STom Jones * between the 3 files bracket the changes. Regurgitate the diffs in reverse 608*9ab079c5STom Jones * order to allow the ed script to track down where the lines are as changes 609*9ab079c5STom Jones * are made. 610*9ab079c5STom Jones */ 611*9ab079c5STom Jones static void 612*9ab079c5STom Jones Ascript(int n) 613*9ab079c5STom Jones { 614*9ab079c5STom Jones int startmark; 615*9ab079c5STom Jones bool deletenew; 616*9ab079c5STom Jones bool deleteold; 617*9ab079c5STom Jones 618*9ab079c5STom Jones for (; n > 0; n--) { 619*9ab079c5STom Jones 620*9ab079c5STom Jones deletenew = (de[n].new.from == de[n].new.to); 621*9ab079c5STom Jones deleteold = (de[n].old.from == de[n].old.to); 622*9ab079c5STom Jones startmark = de[n].old.from + (de[n].old.to - de[n].old.from) - 1; 623*9ab079c5STom Jones 624*9ab079c5STom Jones if (de[n].type == DIFF_TYPE2) { 625*9ab079c5STom Jones if (!oflag || !overlap[n]) { 626*9ab079c5STom Jones prange(&de[n].old, deletenew); 627*9ab079c5STom Jones printrange(fp[2], &de[n].new); 628*9ab079c5STom Jones } else { 629*9ab079c5STom Jones startmark = de[n].new.from + 630*9ab079c5STom Jones (de[n].new.to - de[n].new.from); 631*9ab079c5STom Jones 632*9ab079c5STom Jones if (!deletenew) 633*9ab079c5STom Jones startmark--; 634*9ab079c5STom Jones 635*9ab079c5STom Jones printf("%da\n", startmark); 636*9ab079c5STom Jones printf("%s %s\n", newmark, f3mark); 637*9ab079c5STom Jones 638*9ab079c5STom Jones printf(".\n"); 639*9ab079c5STom Jones 640*9ab079c5STom Jones printf("%da\n", startmark - 641*9ab079c5STom Jones (de[n].new.to - de[n].new.from)); 642*9ab079c5STom Jones printf("%s %s\n", oldmark, f2mark); 643*9ab079c5STom Jones if (!deleteold) 644*9ab079c5STom Jones printrange(fp[1], &de[n].old); 645*9ab079c5STom Jones printf("=======\n.\n"); 646*9ab079c5STom Jones } 647*9ab079c5STom Jones 648*9ab079c5STom Jones } else if (de[n].type == DIFF_TYPE3) { 649*9ab079c5STom Jones if (!oflag || !overlap[n]) { 650*9ab079c5STom Jones prange(&de[n].old, deletenew); 651*9ab079c5STom Jones printrange(fp[2], &de[n].new); 652*9ab079c5STom Jones } else { 653*9ab079c5STom Jones printf("%da\n", startmark); 654*9ab079c5STom Jones printf("%s %s\n", orgmark, f2mark); 655*9ab079c5STom Jones 656*9ab079c5STom Jones if (deleteold) { 657*9ab079c5STom Jones struct range r; 658*9ab079c5STom Jones r.from = de[n].old.from-1; 659*9ab079c5STom Jones r.to = de[n].new.to; 660*9ab079c5STom Jones printrange(fp[1], &r); 661*9ab079c5STom Jones } else 662*9ab079c5STom Jones printrange(fp[1], &de[n].old); 663*9ab079c5STom Jones 664*9ab079c5STom Jones printf("=======\n"); 665*9ab079c5STom Jones printrange(fp[2], &de[n].new); 666*9ab079c5STom Jones } 667*9ab079c5STom Jones 668*9ab079c5STom Jones if (!oflag || !overlap[n]) { 669*9ab079c5STom Jones if (!deletenew) 670*9ab079c5STom Jones printf(".\n"); 671*9ab079c5STom Jones } else { 672*9ab079c5STom Jones printf("%s %s\n.\n", newmark, f3mark); 673*9ab079c5STom Jones 674*9ab079c5STom Jones /* 675*9ab079c5STom Jones * Go to the start of the conflict in original 676*9ab079c5STom Jones * file and append lines 677*9ab079c5STom Jones */ 678*9ab079c5STom Jones printf("%da\n%s %s\n.\n", 679*9ab079c5STom Jones startmark - (de[n].old.to - de[n].old.from), 680*9ab079c5STom Jones oldmark, f1mark); 681*9ab079c5STom Jones } 682*9ab079c5STom Jones } 683*9ab079c5STom Jones } 684*9ab079c5STom Jones if (iflag) 685*9ab079c5STom Jones printf("w\nq\n"); 686*9ab079c5STom Jones 687*9ab079c5STom Jones exit(overlapcnt > 0); 688*9ab079c5STom Jones } 689*9ab079c5STom Jones 690e1910ebdSBaptiste Daroussin static void 691e1910ebdSBaptiste Daroussin increase(void) 692e1910ebdSBaptiste Daroussin { 693e1910ebdSBaptiste Daroussin struct diff *p; 694e1910ebdSBaptiste Daroussin char *q; 695e1910ebdSBaptiste Daroussin size_t newsz, incr; 696e1910ebdSBaptiste Daroussin 697e1910ebdSBaptiste Daroussin /* are the memset(3) calls needed? */ 698e1910ebdSBaptiste Daroussin newsz = szchanges == 0 ? 64 : 2 * szchanges; 699e1910ebdSBaptiste Daroussin incr = newsz - szchanges; 700e1910ebdSBaptiste Daroussin 7017f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d13, newsz, sizeof(struct diff)); 702e1910ebdSBaptiste Daroussin if (p == NULL) 703e1910ebdSBaptiste Daroussin err(1, NULL); 704e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 705e1910ebdSBaptiste Daroussin d13 = p; 7067f7b03f3SPiotr Pawel Stefaniak p = reallocarray(d23, newsz, sizeof(struct diff)); 707e1910ebdSBaptiste Daroussin if (p == NULL) 708e1910ebdSBaptiste Daroussin err(1, NULL); 709e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 710e1910ebdSBaptiste Daroussin d23 = p; 7117f7b03f3SPiotr Pawel Stefaniak p = reallocarray(de, newsz, sizeof(struct diff)); 712e1910ebdSBaptiste Daroussin if (p == NULL) 713e1910ebdSBaptiste Daroussin err(1, NULL); 714e1910ebdSBaptiste Daroussin memset(p + szchanges, 0, incr * sizeof(struct diff)); 715e1910ebdSBaptiste Daroussin de = p; 7167f7b03f3SPiotr Pawel Stefaniak q = reallocarray(overlap, newsz, sizeof(char)); 717e1910ebdSBaptiste Daroussin if (q == NULL) 718e1910ebdSBaptiste Daroussin err(1, NULL); 719e1910ebdSBaptiste Daroussin memset(q + szchanges, 0, incr * sizeof(char)); 720e1910ebdSBaptiste Daroussin overlap = q; 721e1910ebdSBaptiste Daroussin szchanges = newsz; 722e1910ebdSBaptiste Daroussin } 723e1910ebdSBaptiste Daroussin 724e1910ebdSBaptiste Daroussin 725e1910ebdSBaptiste Daroussin int 726e1910ebdSBaptiste Daroussin main(int argc, char **argv) 727e1910ebdSBaptiste Daroussin { 728e1910ebdSBaptiste Daroussin int ch, nblabels, status, m, n, kq, nke, nleft, i; 729e1910ebdSBaptiste Daroussin char *labels[] = { NULL, NULL, NULL }; 730e1910ebdSBaptiste Daroussin const char *diffprog = DIFF_PATH; 731e1910ebdSBaptiste Daroussin char *file1, *file2, *file3; 73254a3415cSPiotr Pawel Stefaniak char *diffargv[7]; 733e1910ebdSBaptiste Daroussin int diffargc = 0; 734e1910ebdSBaptiste Daroussin int fd13[2], fd23[2]; 735e1910ebdSBaptiste Daroussin int pd13, pd23; 736e1910ebdSBaptiste Daroussin cap_rights_t rights_ro; 737e1910ebdSBaptiste Daroussin struct kevent *e; 738e1910ebdSBaptiste Daroussin 739e1910ebdSBaptiste Daroussin nblabels = 0; 740e1910ebdSBaptiste Daroussin eflag = 0; 741e1910ebdSBaptiste Daroussin oflag = 0; 742e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, diffprog); 743e1910ebdSBaptiste Daroussin while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 744e1910ebdSBaptiste Daroussin switch (ch) { 745e1910ebdSBaptiste Daroussin case '3': 746e1910ebdSBaptiste Daroussin eflag = 2; 747e1910ebdSBaptiste Daroussin break; 748e1910ebdSBaptiste Daroussin case 'a': 749e1910ebdSBaptiste Daroussin diffargv[diffargc++] = __DECONST(char *, "-a"); 750e1910ebdSBaptiste Daroussin break; 751e1910ebdSBaptiste Daroussin case 'A': 752e1910ebdSBaptiste Daroussin Aflag = 1; 753e1910ebdSBaptiste Daroussin break; 754e1910ebdSBaptiste Daroussin case 'e': 755e1910ebdSBaptiste Daroussin eflag = 3; 756e1910ebdSBaptiste Daroussin break; 757e1910ebdSBaptiste Daroussin case 'E': 758e1910ebdSBaptiste Daroussin eflag = 3; 759e1910ebdSBaptiste Daroussin oflag = 1; 760e1910ebdSBaptiste Daroussin break; 761e1910ebdSBaptiste Daroussin case 'i': 762e1910ebdSBaptiste Daroussin iflag = 1; 763e1910ebdSBaptiste Daroussin break; 764e1910ebdSBaptiste Daroussin case 'L': 765e1910ebdSBaptiste Daroussin oflag = 1; 766e1910ebdSBaptiste Daroussin if (nblabels >= 3) 767e1910ebdSBaptiste Daroussin errx(2, "too many file label options"); 768e1910ebdSBaptiste Daroussin labels[nblabels++] = optarg; 769e1910ebdSBaptiste Daroussin break; 770e1910ebdSBaptiste Daroussin case 'm': 771e1910ebdSBaptiste Daroussin Aflag = 1; 772e1910ebdSBaptiste Daroussin oflag = 1; 773e1910ebdSBaptiste Daroussin mflag = 1; 774e1910ebdSBaptiste Daroussin break; 775e1910ebdSBaptiste Daroussin case 'T': 776e1910ebdSBaptiste Daroussin Tflag = 1; 777e1910ebdSBaptiste Daroussin break; 778e1910ebdSBaptiste Daroussin case 'x': 779e1910ebdSBaptiste Daroussin eflag = 1; 780e1910ebdSBaptiste Daroussin break; 781e1910ebdSBaptiste Daroussin case 'X': 782e1910ebdSBaptiste Daroussin oflag = 1; 783e1910ebdSBaptiste Daroussin eflag = 1; 784e1910ebdSBaptiste Daroussin break; 785e1910ebdSBaptiste Daroussin case DIFFPROG_OPT: 786e1910ebdSBaptiste Daroussin diffprog = optarg; 787e1910ebdSBaptiste Daroussin break; 788e1910ebdSBaptiste Daroussin case STRIPCR_OPT: 789e1910ebdSBaptiste Daroussin strip_cr = 1; 79054a3415cSPiotr Pawel Stefaniak diffargv[diffargc++] = __DECONST(char *, "--strip-trailing-cr"); 791e1910ebdSBaptiste Daroussin break; 792e1910ebdSBaptiste Daroussin } 793e1910ebdSBaptiste Daroussin } 794e1910ebdSBaptiste Daroussin argc -= optind; 795e1910ebdSBaptiste Daroussin argv += optind; 796e1910ebdSBaptiste Daroussin 797e1910ebdSBaptiste Daroussin if (Aflag) { 798e1910ebdSBaptiste Daroussin eflag = 3; 799e1910ebdSBaptiste Daroussin oflag = 1; 800e1910ebdSBaptiste Daroussin } 801e1910ebdSBaptiste Daroussin 802e1910ebdSBaptiste Daroussin if (argc != 3) 803e1910ebdSBaptiste Daroussin usage(); 804e1910ebdSBaptiste Daroussin 805e1910ebdSBaptiste Daroussin if (caph_limit_stdio() == -1) 806e1910ebdSBaptiste Daroussin err(2, "unable to limit stdio"); 807e1910ebdSBaptiste Daroussin 808e1910ebdSBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 809e1910ebdSBaptiste Daroussin 810e1910ebdSBaptiste Daroussin kq = kqueue(); 811e1910ebdSBaptiste Daroussin if (kq == -1) 812e1910ebdSBaptiste Daroussin err(2, "kqueue"); 813e1910ebdSBaptiste Daroussin 814e1910ebdSBaptiste Daroussin e = malloc(2 * sizeof(struct kevent)); 815e1910ebdSBaptiste Daroussin if (e == NULL) 816e1910ebdSBaptiste Daroussin err(2, "malloc"); 817e1910ebdSBaptiste Daroussin 818e1910ebdSBaptiste Daroussin /* TODO stdio */ 819e1910ebdSBaptiste Daroussin file1 = argv[0]; 820e1910ebdSBaptiste Daroussin file2 = argv[1]; 821e1910ebdSBaptiste Daroussin file3 = argv[2]; 822e1910ebdSBaptiste Daroussin 823e1910ebdSBaptiste Daroussin if (oflag) { 824df092859STom Jones asprintf(&f1mark, "%s", 825e1910ebdSBaptiste Daroussin labels[0] != NULL ? labels[0] : file1); 826e1910ebdSBaptiste Daroussin if (f1mark == NULL) 827e1910ebdSBaptiste Daroussin err(2, "asprintf"); 828df092859STom Jones asprintf(&f2mark, "%s", 829e1910ebdSBaptiste Daroussin labels[1] != NULL ? labels[1] : file2); 830e1910ebdSBaptiste Daroussin if (f2mark == NULL) 831e1910ebdSBaptiste Daroussin err(2, "asprintf"); 832df092859STom Jones asprintf(&f3mark, "%s", 833e1910ebdSBaptiste Daroussin labels[2] != NULL ? labels[2] : file3); 834e1910ebdSBaptiste Daroussin if (f3mark == NULL) 835e1910ebdSBaptiste Daroussin err(2, "asprintf"); 836e1910ebdSBaptiste Daroussin } 837e1910ebdSBaptiste Daroussin fp[0] = fopen(file1, "r"); 838e1910ebdSBaptiste Daroussin if (fp[0] == NULL) 839e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file1); 840377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) 841e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 842e1910ebdSBaptiste Daroussin 843e1910ebdSBaptiste Daroussin fp[1] = fopen(file2, "r"); 844e1910ebdSBaptiste Daroussin if (fp[1] == NULL) 845e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file2); 846377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) 847e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 848e1910ebdSBaptiste Daroussin 849e1910ebdSBaptiste Daroussin fp[2] = fopen(file3, "r"); 850e1910ebdSBaptiste Daroussin if (fp[2] == NULL) 851e1910ebdSBaptiste Daroussin err(2, "Can't open %s", file3); 852377421dfSMariusz Zaborski if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) 853e1910ebdSBaptiste Daroussin err(2, "unable to limit rights on: %s", file3); 854e1910ebdSBaptiste Daroussin 855e1910ebdSBaptiste Daroussin if (pipe(fd13)) 856e1910ebdSBaptiste Daroussin err(2, "pipe"); 857e1910ebdSBaptiste Daroussin if (pipe(fd23)) 858e1910ebdSBaptiste Daroussin err(2, "pipe"); 859e1910ebdSBaptiste Daroussin 860e1910ebdSBaptiste Daroussin diffargv[diffargc] = file1; 861e1910ebdSBaptiste Daroussin diffargv[diffargc + 1] = file3; 862e1910ebdSBaptiste Daroussin diffargv[diffargc + 2] = NULL; 863e1910ebdSBaptiste Daroussin 864e1910ebdSBaptiste Daroussin nleft = 0; 865e1910ebdSBaptiste Daroussin pd13 = diffexec(diffprog, diffargv, fd13); 866e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 867e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 868e1910ebdSBaptiste Daroussin err(2, "kevent1"); 869e1910ebdSBaptiste Daroussin nleft++; 870e1910ebdSBaptiste Daroussin 871e1910ebdSBaptiste Daroussin diffargv[diffargc] = file2; 872e1910ebdSBaptiste Daroussin pd23 = diffexec(diffprog, diffargv, fd23); 873e1910ebdSBaptiste Daroussin EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 874e1910ebdSBaptiste Daroussin if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 875e1910ebdSBaptiste Daroussin err(2, "kevent2"); 876e1910ebdSBaptiste Daroussin nleft++; 877e1910ebdSBaptiste Daroussin 878e1910ebdSBaptiste Daroussin caph_cache_catpages(); 8797672a014SMariusz Zaborski if (caph_enter() < 0) 880e1910ebdSBaptiste Daroussin err(2, "unable to enter capability mode"); 881e1910ebdSBaptiste Daroussin 882e1910ebdSBaptiste Daroussin /* parse diffs */ 883e1910ebdSBaptiste Daroussin increase(); 884e1910ebdSBaptiste Daroussin m = readin(fd13[0], &d13); 885e1910ebdSBaptiste Daroussin n = readin(fd23[0], &d23); 886e1910ebdSBaptiste Daroussin 887e1910ebdSBaptiste Daroussin /* waitpid cooked over pdforks */ 888e1910ebdSBaptiste Daroussin while (nleft > 0) { 889e1910ebdSBaptiste Daroussin nke = kevent(kq, NULL, 0, e, nleft, NULL); 890e1910ebdSBaptiste Daroussin if (nke == -1) 891e1910ebdSBaptiste Daroussin err(2, "kevent"); 892e1910ebdSBaptiste Daroussin for (i = 0; i < nke; i++) { 893e1910ebdSBaptiste Daroussin status = e[i].data; 894e1910ebdSBaptiste Daroussin if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) 895702dda43SPiotr Pawel Stefaniak errx(2, "diff exited abnormally"); 896e1910ebdSBaptiste Daroussin else if (WIFSIGNALED(status)) 897e1910ebdSBaptiste Daroussin errx(2, "diff killed by signal %d", 898e1910ebdSBaptiste Daroussin WTERMSIG(status)); 899e1910ebdSBaptiste Daroussin } 900e1910ebdSBaptiste Daroussin nleft -= nke; 901e1910ebdSBaptiste Daroussin } 902e1910ebdSBaptiste Daroussin merge(m, n); 903e1910ebdSBaptiste Daroussin 904e1910ebdSBaptiste Daroussin return (EXIT_SUCCESS); 905e1910ebdSBaptiste Daroussin } 906