1 /* $OpenBSD: diff3prog.c,v 1.11 2009/10/27 23:59:37 deraadt Exp $ */ 2 3 /* 4 * Copyright (C) Caldera International Inc. 2001-2002. 5 * All rights reserved. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions 9 * are met: 10 * 1. Redistributions of source code and documentation must retain the above 11 * copyright notice, this list of conditions and the following disclaimer. 12 * 2. Redistributions in binary form must reproduce the above copyright 13 * notice, this list of conditions and the following disclaimer in the 14 * documentation and/or other materials provided with the distribution. 15 * 3. All advertising materials mentioning features or use of this software 16 * must display the following acknowledgement: 17 * This product includes software developed or owned by Caldera 18 * International, Inc. 19 * 4. Neither the name of Caldera International, Inc. nor the names of other 20 * contributors may be used to endorse or promote products derived from 21 * this software without specific prior written permission. 22 * 23 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA 24 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR 25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 27 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT, 28 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 29 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 32 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 33 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 34 * POSSIBILITY OF SUCH DAMAGE. 35 */ 36 /*- 37 * Copyright (c) 1991, 1993 38 * The Regents of the University of California. All rights reserved. 39 * 40 * Redistribution and use in source and binary forms, with or without 41 * modification, are permitted provided that the following conditions 42 * are met: 43 * 1. Redistributions of source code must retain the above copyright 44 * notice, this list of conditions and the following disclaimer. 45 * 2. Redistributions in binary form must reproduce the above copyright 46 * notice, this list of conditions and the following disclaimer in the 47 * documentation and/or other materials provided with the distribution. 48 * 3. Neither the name of the University nor the names of its contributors 49 * may be used to endorse or promote products derived from this software 50 * without specific prior written permission. 51 * 52 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 53 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 54 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 55 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 56 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 62 * SUCH DAMAGE. 63 * 64 * @(#)diff3.c 8.1 (Berkeley) 6/6/93 65 */ 66 67 #if 0 68 #ifndef lint 69 static char sccsid[] = "@(#)diff3.c 8.1 (Berkeley) 6/6/93"; 70 #endif 71 #endif /* not lint */ 72 #include <sys/cdefs.h> 73 __FBSDID("$FreeBSD$"); 74 75 #include <sys/capsicum.h> 76 #include <sys/procdesc.h> 77 #include <sys/types.h> 78 #include <sys/event.h> 79 #include <sys/wait.h> 80 81 #include <capsicum_helpers.h> 82 #include <ctype.h> 83 #include <err.h> 84 #include <getopt.h> 85 #include <stdio.h> 86 #include <stdlib.h> 87 #include <limits.h> 88 #include <inttypes.h> 89 #include <string.h> 90 #include <unistd.h> 91 92 93 /* 94 * "from" is first in range of changed lines; "to" is last+1 95 * from=to=line after point of insertion for added lines. 96 */ 97 struct range { 98 int from; 99 int to; 100 }; 101 102 struct diff { 103 struct range old; 104 struct range new; 105 }; 106 107 static size_t szchanges; 108 109 static struct diff *d13; 110 static struct diff *d23; 111 /* 112 * "de" is used to gather editing scripts. These are later spewed out in 113 * reverse order. Its first element must be all zero, the "old" and "new" 114 * components of "de" contain line positions. Array overlap indicates which 115 * sections in "de" correspond to lines that are different in all three files. 116 */ 117 static struct diff *de; 118 static char *overlap; 119 static int overlapcnt; 120 static FILE *fp[3]; 121 static int cline[3]; /* # of the last-read line in each file (0-2) */ 122 /* 123 * The latest known correspondence between line numbers of the 3 files 124 * is stored in last[1-3]; 125 */ 126 static int last[4]; 127 static int Aflag, eflag, iflag, mflag, Tflag; 128 static int oflag; /* indicates whether to mark overlaps (-E or -X) */ 129 static int strip_cr; 130 static char *f1mark, *f2mark, *f3mark; 131 132 static bool duplicate(struct range *, struct range *); 133 static int edit(struct diff *, bool, int); 134 static char *getchange(FILE *); 135 static char *get_line(FILE *, size_t *); 136 static int readin(int fd, struct diff **); 137 static int skip(int, int, const char *); 138 static void change(int, struct range *, bool); 139 static void keep(int, struct range *); 140 static void merge(int, int); 141 static void prange(struct range *, bool); 142 static void repos(int); 143 static void edscript(int) __dead2; 144 static void increase(void); 145 static void usage(void) __dead2; 146 static void printrange(FILE *, struct range *); 147 148 enum { 149 DIFFPROG_OPT, 150 STRIPCR_OPT, 151 }; 152 153 #define DIFF_PATH "/usr/bin/diff" 154 155 #define OPTIONS "3aAeEiL:mTxX" 156 static struct option longopts[] = { 157 { "ed", no_argument, NULL, 'e' }, 158 { "show-overlap", no_argument, NULL, 'E' }, 159 { "overlap-only", no_argument, NULL, 'x' }, 160 { "initial-tab", no_argument, NULL, 'T' }, 161 { "text", no_argument, NULL, 'a' }, 162 { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, 163 { "show-all", no_argument, NULL, 'A' }, 164 { "easy-only", no_argument, NULL, '3' }, 165 { "merge", no_argument, NULL, 'm' }, 166 { "label", required_argument, NULL, 'L' }, 167 { "diff-program", required_argument, NULL, DIFFPROG_OPT }, 168 }; 169 170 static void 171 usage(void) 172 { 173 fprintf(stderr, "usage: diff3 [-3aAeEimTxX] [-L label1] [-L label2] " 174 "[-L label3] file1 file2 file3\n"); 175 exit(2); 176 } 177 178 static int 179 readin(int fd, struct diff **dd) 180 { 181 int a, b, c, d; 182 size_t i; 183 char kind, *p; 184 FILE *f; 185 186 f = fdopen(fd, "r"); 187 if (f == NULL) 188 err(2, "fdopen"); 189 for (i = 0; (p = getchange(f)); i++) { 190 if (i >= szchanges - 1) 191 increase(); 192 a = b = (int)strtoimax(p, &p, 10); 193 if (*p == ',') { 194 p++; 195 b = (int)strtoimax(p, &p, 10); 196 } 197 kind = *p++; 198 c = d = (int)strtoimax(p, &p, 10); 199 if (*p == ',') { 200 p++; 201 d = (int)strtoimax(p, &p, 10); 202 } 203 if (kind == 'a') 204 a++; 205 if (kind == 'd') 206 c++; 207 b++; 208 d++; 209 (*dd)[i].old.from = a; 210 (*dd)[i].old.to = b; 211 (*dd)[i].new.from = c; 212 (*dd)[i].new.to = d; 213 } 214 if (i) { 215 (*dd)[i].old.from = (*dd)[i - 1].old.to; 216 (*dd)[i].new.from = (*dd)[i - 1].new.to; 217 } 218 fclose(f); 219 return (i); 220 } 221 222 static int 223 diffexec(const char *diffprog, char **diffargv, int fd[]) 224 { 225 int pd; 226 227 switch (pdfork(&pd, PD_CLOEXEC)) { 228 case 0: 229 close(fd[0]); 230 if (dup2(fd[1], STDOUT_FILENO) == -1) 231 err(2, "child could not duplicate descriptor"); 232 close(fd[1]); 233 execvp(diffprog, diffargv); 234 err(2, "could not execute diff: %s", diffprog); 235 break; 236 case -1: 237 err(2, "could not fork"); 238 break; 239 } 240 close(fd[1]); 241 return (pd); 242 } 243 244 static char * 245 getchange(FILE *b) 246 { 247 char *line; 248 249 while ((line = get_line(b, NULL))) { 250 if (isdigit((unsigned char)line[0])) 251 return (line); 252 } 253 return (NULL); 254 } 255 256 257 static char * 258 get_line(FILE *b, size_t *n) 259 { 260 ssize_t len; 261 static char *buf = NULL; 262 static size_t bufsize = 0; 263 264 if ((len = getline(&buf, &bufsize, b)) < 0) 265 return (NULL); 266 267 if (strip_cr && len >= 2 && strcmp("\r\n", &(buf[len - 2])) == 0) { 268 buf[len - 2] = '\n'; 269 buf[len - 1] = '\0'; 270 len--; 271 } 272 273 if (n != NULL) 274 *n = len; 275 276 return (buf); 277 } 278 279 static void 280 merge(int m1, int m2) 281 { 282 struct diff *d1, *d2, *d3; 283 int j, t1, t2; 284 bool dup = false; 285 286 d1 = d13; 287 d2 = d23; 288 j = 0; 289 290 while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) { 291 /* first file is different from the others */ 292 if (!t2 || (t1 && d1->new.to < d2->new.from)) { 293 /* stuff peculiar to 1st file */ 294 if (eflag == 0) { 295 printf("====1\n"); 296 change(1, &d1->old, false); 297 keep(2, &d1->new); 298 change(3, &d1->new, false); 299 } 300 d1++; 301 continue; 302 } 303 /* second file is different from others */ 304 if (!t1 || (t2 && d2->new.to < d1->new.from)) { 305 if (eflag == 0) { 306 printf("====2\n"); 307 keep(1, &d2->new); 308 change(3, &d2->new, false); 309 change(2, &d2->old, false); 310 } 311 d2++; 312 continue; 313 } 314 /* 315 * Merge overlapping changes in first file 316 * this happens after extension (see below). 317 */ 318 if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { 319 d1[1].old.from = d1->old.from; 320 d1[1].new.from = d1->new.from; 321 d1++; 322 continue; 323 } 324 325 /* merge overlapping changes in second */ 326 if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) { 327 d2[1].old.from = d2->old.from; 328 d2[1].new.from = d2->new.from; 329 d2++; 330 continue; 331 } 332 /* stuff peculiar to third file or different in all */ 333 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { 334 dup = duplicate(&d1->old, &d2->old); 335 /* 336 * dup = 0 means all files differ 337 * dup = 1 means files 1 and 2 identical 338 */ 339 if (eflag == 0) { 340 printf("====%s\n", dup ? "3" : ""); 341 change(1, &d1->old, dup); 342 change(2, &d2->old, false); 343 d3 = d1->old.to > d1->old.from ? d1 : d2; 344 change(3, &d3->new, false); 345 } else 346 j = edit(d1, dup, j); 347 d1++; 348 d2++; 349 continue; 350 } 351 /* 352 * Overlapping changes from file 1 and 2; extend changes 353 * appropriately to make them coincide. 354 */ 355 if (d1->new.from < d2->new.from) { 356 d2->old.from -= d2->new.from - d1->new.from; 357 d2->new.from = d1->new.from; 358 } else if (d2->new.from < d1->new.from) { 359 d1->old.from -= d1->new.from - d2->new.from; 360 d1->new.from = d2->new.from; 361 } 362 if (d1->new.to > d2->new.to) { 363 d2->old.to += d1->new.to - d2->new.to; 364 d2->new.to = d1->new.to; 365 } else if (d2->new.to > d1->new.to) { 366 d1->old.to += d2->new.to - d1->new.to; 367 d1->new.to = d2->new.to; 368 } 369 } 370 if (eflag) 371 edscript(j); 372 } 373 374 /* 375 * The range of lines rold.from thru rold.to in file i is to be changed. 376 * It is to be printed only if it does not duplicate something to be 377 * printed later. 378 */ 379 static void 380 change(int i, struct range *rold, bool dup) 381 { 382 383 printf("%d:", i); 384 last[i] = rold->to; 385 prange(rold, false); 386 if (dup) 387 return; 388 i--; 389 skip(i, rold->from, NULL); 390 skip(i, rold->to, " "); 391 } 392 393 /* 394 * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or 395 * n1. 396 */ 397 static void 398 prange(struct range *rold, bool delete) 399 { 400 401 if (rold->to <= rold->from) 402 printf("%da\n", rold->from - 1); 403 else { 404 printf("%d", rold->from); 405 if (rold->to > rold->from + 1) 406 printf(",%d", rold->to - 1); 407 if (delete) 408 printf("d\n"); 409 else 410 printf("c\n"); 411 } 412 } 413 414 /* 415 * No difference was reported by diff between file 1 (or 2) and file 3, 416 * and an artificial dummy difference (trange) must be ginned up to 417 * correspond to the change reported in the other file. 418 */ 419 static void 420 keep(int i, struct range *rnew) 421 { 422 int delta; 423 struct range trange; 424 425 delta = last[3] - last[i]; 426 trange.from = rnew->from - delta; 427 trange.to = rnew->to - delta; 428 change(i, &trange, true); 429 } 430 431 /* 432 * skip to just before line number from in file "i". If "pr" is non-NULL, 433 * print all skipped stuff with string pr as a prefix. 434 */ 435 static int 436 skip(int i, int from, const char *pr) 437 { 438 size_t j, n; 439 char *line; 440 441 for (n = 0; cline[i] < from - 1; n += j) { 442 if ((line = get_line(fp[i], &j)) == NULL) 443 errx(EXIT_FAILURE, "logic error"); 444 if (pr != NULL) 445 printf("%s%s", Tflag == 1 ? "\t" : pr, line); 446 cline[i]++; 447 } 448 return ((int) n); 449 } 450 451 /* 452 * Return 1 or 0 according as the old range (in file 1) contains exactly 453 * the same data as the new range (in file 2). 454 */ 455 static bool 456 duplicate(struct range *r1, struct range *r2) 457 { 458 int c, d; 459 int nchar; 460 int nline; 461 462 if (r1->to-r1->from != r2->to-r2->from) 463 return (0); 464 skip(0, r1->from, NULL); 465 skip(1, r2->from, NULL); 466 nchar = 0; 467 for (nline = 0; nline < r1->to - r1->from; nline++) { 468 do { 469 c = getc(fp[0]); 470 d = getc(fp[1]); 471 if (c == -1 && d == -1) 472 break; 473 if (c == -1 || d == -1) 474 errx(EXIT_FAILURE, "logic error"); 475 nchar++; 476 if (c != d) { 477 repos(nchar); 478 return (0); 479 } 480 } while (c != '\n'); 481 } 482 repos(nchar); 483 return (1); 484 } 485 486 static void 487 repos(int nchar) 488 { 489 int i; 490 491 for (i = 0; i < 2; i++) 492 (void)fseek(fp[i], (long)-nchar, SEEK_CUR); 493 } 494 495 /* 496 * collect an editing script for later regurgitation 497 */ 498 static int 499 edit(struct diff *diff, bool dup, int j) 500 { 501 502 if (((dup + 1) & eflag) == 0) 503 return (j); 504 j++; 505 overlap[j] = !dup; 506 if (!dup) 507 overlapcnt++; 508 de[j].old.from = diff->old.from; 509 de[j].old.to = diff->old.to; 510 de[j].new.from = diff->new.from; 511 de[j].new.to = diff->new.to; 512 return (j); 513 } 514 515 static void 516 printrange(FILE *p, struct range *r) 517 { 518 char *line = NULL; 519 size_t len = 0; 520 int i = 1; 521 ssize_t rlen = 0; 522 523 /* We haven't been asked to print anything */ 524 if (r->from == r->to) 525 return; 526 527 if (r->from > r->to) 528 errx(EXIT_FAILURE, "invalid print range"); 529 530 /* 531 * XXX-THJ: We read through all of the file for each range printed. 532 * This duplicates work and will probably impact performance on large 533 * files with lots of ranges. 534 */ 535 fseek(p, 0L, SEEK_SET); 536 while ((rlen = getline(&line, &len, p)) > 0) { 537 if (i >= r->from) 538 printf("%s", line); 539 if (++i > r->to - 1) 540 break; 541 } 542 free(line); 543 } 544 545 /* regurgitate */ 546 static void 547 edscript(int n) 548 { 549 bool delete; 550 551 for (; n > 0; n--) { 552 delete = (de[n].new.from == de[n].new.to); 553 if (!oflag || !overlap[n]) { 554 prange(&de[n].old, delete); 555 } else { 556 printf("%da\n", de[n].old.to - 1); 557 printf("=======\n"); 558 } 559 printrange(fp[2], &de[n].new); 560 if (!oflag || !overlap[n]) { 561 if (!delete) 562 printf(".\n"); 563 } else { 564 printf("%s\n.\n", f3mark); 565 printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark); 566 } 567 } 568 if (iflag) 569 printf("w\nq\n"); 570 571 exit(eflag == 0 ? overlapcnt : 0); 572 } 573 574 static void 575 increase(void) 576 { 577 struct diff *p; 578 char *q; 579 size_t newsz, incr; 580 581 /* are the memset(3) calls needed? */ 582 newsz = szchanges == 0 ? 64 : 2 * szchanges; 583 incr = newsz - szchanges; 584 585 p = reallocarray(d13, newsz, sizeof(struct diff)); 586 if (p == NULL) 587 err(1, NULL); 588 memset(p + szchanges, 0, incr * sizeof(struct diff)); 589 d13 = p; 590 p = reallocarray(d23, newsz, sizeof(struct diff)); 591 if (p == NULL) 592 err(1, NULL); 593 memset(p + szchanges, 0, incr * sizeof(struct diff)); 594 d23 = p; 595 p = reallocarray(de, newsz, sizeof(struct diff)); 596 if (p == NULL) 597 err(1, NULL); 598 memset(p + szchanges, 0, incr * sizeof(struct diff)); 599 de = p; 600 q = reallocarray(overlap, newsz, sizeof(char)); 601 if (q == NULL) 602 err(1, NULL); 603 memset(q + szchanges, 0, incr * sizeof(char)); 604 overlap = q; 605 szchanges = newsz; 606 } 607 608 609 int 610 main(int argc, char **argv) 611 { 612 int ch, nblabels, status, m, n, kq, nke, nleft, i; 613 char *labels[] = { NULL, NULL, NULL }; 614 const char *diffprog = DIFF_PATH; 615 char *file1, *file2, *file3; 616 char *diffargv[7]; 617 int diffargc = 0; 618 int fd13[2], fd23[2]; 619 int pd13, pd23; 620 cap_rights_t rights_ro; 621 struct kevent *e; 622 623 nblabels = 0; 624 eflag = 0; 625 oflag = 0; 626 diffargv[diffargc++] = __DECONST(char *, diffprog); 627 while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 628 switch (ch) { 629 case '3': 630 eflag = 2; 631 break; 632 case 'a': 633 diffargv[diffargc++] = __DECONST(char *, "-a"); 634 break; 635 case 'A': 636 Aflag = 1; 637 break; 638 case 'e': 639 eflag = 3; 640 break; 641 case 'E': 642 eflag = 3; 643 oflag = 1; 644 break; 645 case 'i': 646 iflag = 1; 647 break; 648 case 'L': 649 oflag = 1; 650 if (nblabels >= 3) 651 errx(2, "too many file label options"); 652 labels[nblabels++] = optarg; 653 break; 654 case 'm': 655 Aflag = 1; 656 oflag = 1; 657 mflag = 1; 658 break; 659 case 'T': 660 Tflag = 1; 661 break; 662 case 'x': 663 eflag = 1; 664 break; 665 case 'X': 666 oflag = 1; 667 eflag = 1; 668 break; 669 case DIFFPROG_OPT: 670 diffprog = optarg; 671 break; 672 case STRIPCR_OPT: 673 strip_cr = 1; 674 diffargv[diffargc++] = __DECONST(char *, "--strip-trailing-cr"); 675 break; 676 } 677 } 678 argc -= optind; 679 argv += optind; 680 681 if (Aflag) { 682 eflag = 3; 683 oflag = 1; 684 } 685 686 if (argc != 3) 687 usage(); 688 689 if (caph_limit_stdio() == -1) 690 err(2, "unable to limit stdio"); 691 692 cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 693 694 kq = kqueue(); 695 if (kq == -1) 696 err(2, "kqueue"); 697 698 e = malloc(2 * sizeof(struct kevent)); 699 if (e == NULL) 700 err(2, "malloc"); 701 702 /* TODO stdio */ 703 file1 = argv[0]; 704 file2 = argv[1]; 705 file3 = argv[2]; 706 707 if (oflag) { 708 asprintf(&f1mark, "<<<<<<< %s", 709 labels[0] != NULL ? labels[0] : file1); 710 if (f1mark == NULL) 711 err(2, "asprintf"); 712 asprintf(&f2mark, "||||||| %s", 713 labels[1] != NULL ? labels[1] : file2); 714 if (f2mark == NULL) 715 err(2, "asprintf"); 716 asprintf(&f3mark, ">>>>>>> %s", 717 labels[2] != NULL ? labels[2] : file3); 718 if (f3mark == NULL) 719 err(2, "asprintf"); 720 } 721 fp[0] = fopen(file1, "r"); 722 if (fp[0] == NULL) 723 err(2, "Can't open %s", file1); 724 if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) 725 err(2, "unable to limit rights on: %s", file1); 726 727 fp[1] = fopen(file2, "r"); 728 if (fp[1] == NULL) 729 err(2, "Can't open %s", file2); 730 if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) 731 err(2, "unable to limit rights on: %s", file2); 732 733 fp[2] = fopen(file3, "r"); 734 if (fp[2] == NULL) 735 err(2, "Can't open %s", file3); 736 if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) 737 err(2, "unable to limit rights on: %s", file3); 738 739 if (pipe(fd13)) 740 err(2, "pipe"); 741 if (pipe(fd23)) 742 err(2, "pipe"); 743 744 diffargv[diffargc] = file1; 745 diffargv[diffargc + 1] = file3; 746 diffargv[diffargc + 2] = NULL; 747 748 nleft = 0; 749 pd13 = diffexec(diffprog, diffargv, fd13); 750 EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 751 if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 752 err(2, "kevent1"); 753 nleft++; 754 755 diffargv[diffargc] = file2; 756 pd23 = diffexec(diffprog, diffargv, fd23); 757 EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 758 if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 759 err(2, "kevent2"); 760 nleft++; 761 762 caph_cache_catpages(); 763 if (caph_enter() < 0) 764 err(2, "unable to enter capability mode"); 765 766 /* parse diffs */ 767 increase(); 768 m = readin(fd13[0], &d13); 769 n = readin(fd23[0], &d23); 770 771 /* waitpid cooked over pdforks */ 772 while (nleft > 0) { 773 nke = kevent(kq, NULL, 0, e, nleft, NULL); 774 if (nke == -1) 775 err(2, "kevent"); 776 for (i = 0; i < nke; i++) { 777 status = e[i].data; 778 if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) 779 errx(2, "diff exited abnormally"); 780 else if (WIFSIGNALED(status)) 781 errx(2, "diff killed by signal %d", 782 WTERMSIG(status)); 783 } 784 nleft -= nke; 785 } 786 merge(m, n); 787 788 return (EXIT_SUCCESS); 789 } 790