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 "new" component 114 * of "de" contains line positions or byte positions depending on when you 115 * look (!?). Array overlap indicates which sections in "de" correspond to 116 * lines that are different in all three files. 117 */ 118 static struct diff *de; 119 static char *overlap; 120 static int overlapcnt; 121 static FILE *fp[3]; 122 static int cline[3]; /* # of the last-read line in each file (0-2) */ 123 /* 124 * The latest known correspondence between line numbers of the 3 files 125 * is stored in last[1-3]; 126 */ 127 static int last[4]; 128 static int Aflag, eflag, iflag, mflag, Tflag; 129 static int oflag; /* indicates whether to mark overlaps (-E or -X)*/ 130 static int strip_cr; 131 static char *f1mark, *f2mark, *f3mark; 132 133 static bool duplicate(struct range *, struct range *); 134 static int edit(struct diff *, bool, int); 135 static char *getchange(FILE *); 136 static char *get_line(FILE *, size_t *); 137 static int readin(int fd, struct diff **); 138 static int skip(int, int, const char *); 139 static void change(int, struct range *, bool); 140 static void keep(int, struct range *); 141 static void merge(int, int); 142 static void prange(struct range *); 143 static void repos(int); 144 static void edscript(int) __dead2; 145 static void increase(void); 146 static void usage(void) __dead2; 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 lable1] [-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 pid, pd; 226 227 switch (pid = 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 (n != NULL) 268 *n = len; 269 270 return (buf); 271 } 272 273 static void 274 merge(int m1, int m2) 275 { 276 struct diff *d1, *d2, *d3; 277 int j, t1, t2; 278 bool dup = false; 279 280 d1 = d13; 281 d2 = d23; 282 j = 0; 283 284 while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) { 285 /* first file is different from the others */ 286 if (!t2 || (t1 && d1->new.to < d2->new.from)) { 287 /* stuff peculiar to 1st file */ 288 if (eflag == 0) { 289 printf("====1\n"); 290 change(1, &d1->old, false); 291 keep(2, &d1->new); 292 change(3, &d1->new, false); 293 } 294 d1++; 295 continue; 296 } 297 /* second file is different from others */ 298 if (!t1 || (t2 && d2->new.to < d1->new.from)) { 299 if (eflag == 0) { 300 printf("====2\n"); 301 keep(1, &d2->new); 302 change(3, &d2->new, false); 303 change(2, &d2->old, false); 304 } 305 d2++; 306 continue; 307 } 308 /* 309 * Merge overlapping changes in first file 310 * this happens after extension (see below). 311 */ 312 if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) { 313 d1[1].old.from = d1->old.from; 314 d1[1].new.from = d1->new.from; 315 d1++; 316 continue; 317 } 318 319 /* merge overlapping changes in second */ 320 if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) { 321 d2[1].old.from = d2->old.from; 322 d2[1].new.from = d2->new.from; 323 d2++; 324 continue; 325 } 326 /* stuff peculiar to third file or different in all */ 327 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { 328 dup = duplicate(&d1->old, &d2->old); 329 /* 330 * dup = 0 means all files differ 331 * dup = 1 means files 1 and 2 identical 332 */ 333 if (eflag == 0) { 334 printf("====%s\n", dup ? "3" : ""); 335 change(1, &d1->old, dup); 336 change(2, &d2->old, false); 337 d3 = d1->old.to > d1->old.from ? d1 : d2; 338 change(3, &d3->new, false); 339 } else 340 j = edit(d1, dup, j); 341 d1++; 342 d2++; 343 continue; 344 } 345 /* 346 * Overlapping changes from file 1 and 2; extend changes 347 * appropriately to make them coincide. 348 */ 349 if (d1->new.from < d2->new.from) { 350 d2->old.from -= d2->new.from - d1->new.from; 351 d2->new.from = d1->new.from; 352 } else if (d2->new.from < d1->new.from) { 353 d1->old.from -= d1->new.from - d2->new.from; 354 d1->new.from = d2->new.from; 355 } 356 if (d1->new.to > d2->new.to) { 357 d2->old.to += d1->new.to - d2->new.to; 358 d2->new.to = d1->new.to; 359 } else if (d2->new.to > d1->new.to) { 360 d1->old.to += d2->new.to - d1->new.to; 361 d1->new.to = d2->new.to; 362 } 363 } 364 if (eflag) 365 edscript(j); 366 } 367 368 /* 369 * The range of lines rold.from thru rold.to in file i is to be changed. 370 * It is to be printed only if it does not duplicate something to be 371 * printed later. 372 */ 373 static void 374 change(int i, struct range *rold, bool dup) 375 { 376 377 printf("%d:", i); 378 last[i] = rold->to; 379 prange(rold); 380 if (dup) 381 return; 382 i--; 383 skip(i, rold->from, NULL); 384 skip(i, rold->to, " "); 385 } 386 387 /* 388 * Print the range of line numbers, rold.from thru rold.to, as n1,n2 or 389 * n1. 390 */ 391 static void 392 prange(struct range *rold) 393 { 394 395 if (rold->to <= rold->from) 396 printf("%da\n", rold->from - 1); 397 else { 398 printf("%d", rold->from); 399 if (rold->to > rold->from+1) 400 printf(",%d", rold->to - 1); 401 printf("c\n"); 402 } 403 } 404 405 /* 406 * No difference was reported by diff between file 1 (or 2) and file 3, 407 * and an artificial dummy difference (trange) must be ginned up to 408 * correspond to the change reported in the other file. 409 */ 410 static void 411 keep(int i, struct range *rnew) 412 { 413 int delta; 414 struct range trange; 415 416 delta = last[3] - last[i]; 417 trange.from = rnew->from - delta; 418 trange.to = rnew->to - delta; 419 change(i, &trange, true); 420 } 421 422 /* 423 * skip to just before line number from in file "i". If "pr" is non-NULL, 424 * print all skipped stuff with string pr as a prefix. 425 */ 426 static int 427 skip(int i, int from, const char *pr) 428 { 429 size_t j, n; 430 char *line; 431 432 for (n = 0; cline[i] < from - 1; n += j) { 433 if ((line = get_line(fp[i], &j)) == NULL) 434 errx(EXIT_FAILURE, "logic error"); 435 if (pr != NULL) 436 printf("%s%s", Tflag == 1? "\t" : pr, line); 437 cline[i]++; 438 } 439 return ((int) n); 440 } 441 442 /* 443 * Return 1 or 0 according as the old range (in file 1) contains exactly 444 * the same data as the new range (in file 2). 445 */ 446 static bool 447 duplicate(struct range *r1, struct range *r2) 448 { 449 int c, d; 450 int nchar; 451 int nline; 452 453 if (r1->to-r1->from != r2->to-r2->from) 454 return (0); 455 skip(0, r1->from, NULL); 456 skip(1, r2->from, NULL); 457 nchar = 0; 458 for (nline=0; nline < r1->to - r1->from; nline++) { 459 do { 460 c = getc(fp[0]); 461 d = getc(fp[1]); 462 if (c == -1 && d == -1) 463 break; 464 if (c == -1 || d== -1) 465 errx(EXIT_FAILURE, "logic error"); 466 nchar++; 467 if (c != d) { 468 repos(nchar); 469 return (0); 470 } 471 } while (c != '\n'); 472 } 473 repos(nchar); 474 return (1); 475 } 476 477 static void 478 repos(int nchar) 479 { 480 int i; 481 482 for (i = 0; i < 2; i++) 483 (void)fseek(fp[i], (long)-nchar, SEEK_CUR); 484 } 485 /* 486 * collect an editing script for later regurgitation 487 */ 488 static int 489 edit(struct diff *diff, bool dup, int j) 490 { 491 492 if (((dup + 1) & eflag) == 0) 493 return (j); 494 j++; 495 overlap[j] = !dup; 496 if (!dup) 497 overlapcnt++; 498 de[j].old.from = diff->old.from; 499 de[j].old.to = diff->old.to; 500 de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL); 501 de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL); 502 return (j); 503 } 504 505 /* regurgitate */ 506 static void 507 edscript(int n) 508 { 509 int k; 510 size_t j; 511 char block[BUFSIZ]; 512 513 for (; n > 0; n--) { 514 if (!oflag || !overlap[n]) { 515 prange(&de[n].old); 516 } else { 517 printf("%da\n", de[n].old.to -1); 518 if (Aflag) { 519 printf("%s\n", f2mark); 520 fseek(fp[1], de[n].old.from, SEEK_SET); 521 for (k = de[n].old.to - de[n].old.from; k > 0; k -= j) { 522 j = k > BUFSIZ ? BUFSIZ : k; 523 if (fread(block, 1, j, fp[1]) != j) 524 errx(2, "logic error"); 525 fwrite(block, 1, j, stdout); 526 } 527 printf("\n"); 528 } 529 printf("=======\n"); 530 } 531 fseek(fp[2], (long)de[n].new.from, SEEK_SET); 532 for (k = de[n].new.to - de[n].new.from; k > 0; k-= j) { 533 size_t r; 534 j = k > BUFSIZ ? BUFSIZ : k; 535 r = fread(block, 1, j, fp[2]); 536 if (r == 0) { 537 if (feof(fp[2])) 538 break; 539 errx(2, "logic error"); 540 } 541 if (r != j) 542 j = r; 543 (void)fwrite(block, 1, j, stdout); 544 } 545 if (!oflag || !overlap[n]) 546 printf(".\n"); 547 else { 548 printf("%s\n.\n", f3mark); 549 printf("%da\n%s\n.\n", de[n].old.from - 1, f1mark); 550 } 551 } 552 if (iflag) 553 printf("w\nq\n"); 554 555 exit(eflag == 0 ? overlapcnt : 0); 556 } 557 558 static void 559 increase(void) 560 { 561 struct diff *p; 562 char *q; 563 size_t newsz, incr; 564 565 /* are the memset(3) calls needed? */ 566 newsz = szchanges == 0 ? 64 : 2 * szchanges; 567 incr = newsz - szchanges; 568 569 p = reallocarray(d13, newsz, sizeof(struct diff)); 570 if (p == NULL) 571 err(1, NULL); 572 memset(p + szchanges, 0, incr * sizeof(struct diff)); 573 d13 = p; 574 p = reallocarray(d23, newsz, sizeof(struct diff)); 575 if (p == NULL) 576 err(1, NULL); 577 memset(p + szchanges, 0, incr * sizeof(struct diff)); 578 d23 = p; 579 p = reallocarray(de, newsz, sizeof(struct diff)); 580 if (p == NULL) 581 err(1, NULL); 582 memset(p + szchanges, 0, incr * sizeof(struct diff)); 583 de = p; 584 q = reallocarray(overlap, newsz, sizeof(char)); 585 if (q == NULL) 586 err(1, NULL); 587 memset(q + szchanges, 0, incr * sizeof(char)); 588 overlap = q; 589 szchanges = newsz; 590 } 591 592 593 int 594 main(int argc, char **argv) 595 { 596 int ch, nblabels, status, m, n, kq, nke, nleft, i; 597 char *labels[] = { NULL, NULL, NULL }; 598 const char *diffprog = DIFF_PATH; 599 char *file1, *file2, *file3; 600 char *diffargv[6]; 601 int diffargc = 0; 602 int fd13[2], fd23[2]; 603 int pd13, pd23; 604 cap_rights_t rights_ro; 605 struct kevent *e; 606 607 nblabels = 0; 608 eflag = 0; 609 oflag = 0; 610 diffargv[diffargc++] = __DECONST(char *, diffprog); 611 while ((ch = getopt_long(argc, argv, OPTIONS, longopts, NULL)) != -1) { 612 switch (ch) { 613 case '3': 614 eflag = 2; 615 break; 616 case 'a': 617 diffargv[diffargc++] = __DECONST(char *, "-a"); 618 break; 619 case 'A': 620 Aflag = 1; 621 break; 622 case 'e': 623 eflag = 3; 624 break; 625 case 'E': 626 eflag = 3; 627 oflag = 1; 628 break; 629 case 'i': 630 iflag = 1; 631 break; 632 case 'L': 633 oflag = 1; 634 if (nblabels >= 3) 635 errx(2, "too many file label options"); 636 labels[nblabels++] = optarg; 637 break; 638 case 'm': 639 Aflag = 1; 640 oflag = 1; 641 mflag = 1; 642 break; 643 case 'T': 644 Tflag = 1; 645 break; 646 case 'x': 647 eflag = 1; 648 break; 649 case 'X': 650 oflag = 1; 651 eflag = 1; 652 break; 653 case DIFFPROG_OPT: 654 diffprog = optarg; 655 break; 656 case STRIPCR_OPT: 657 strip_cr = 1; 658 break; 659 } 660 } 661 argc -= optind; 662 argv += optind; 663 664 if (Aflag) { 665 eflag = 3; 666 oflag = 1; 667 } 668 669 if (argc != 3) 670 usage(); 671 672 if (caph_limit_stdio() == -1) 673 err(2, "unable to limit stdio"); 674 675 cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 676 677 kq = kqueue(); 678 if (kq == -1) 679 err(2, "kqueue"); 680 681 e = malloc(2 * sizeof(struct kevent)); 682 if (e == NULL) 683 err(2, "malloc"); 684 685 /* TODO stdio */ 686 file1 = argv[0]; 687 file2 = argv[1]; 688 file3 = argv[2]; 689 690 if (oflag) { 691 asprintf(&f1mark, "<<<<<<< %s", 692 labels[0] != NULL ? labels[0] : file1); 693 if (f1mark == NULL) 694 err(2, "asprintf"); 695 asprintf(&f2mark, "||||||| %s", 696 labels[1] != NULL ? labels[1] : file2); 697 if (f2mark == NULL) 698 err(2, "asprintf"); 699 asprintf(&f3mark, ">>>>>>> %s", 700 labels[2] != NULL ? labels[2] : file3); 701 if (f3mark == NULL) 702 err(2, "asprintf"); 703 } 704 fp[0] = fopen(file1, "r"); 705 if (fp[0] == NULL) 706 err(2, "Can't open %s", file1); 707 if (caph_rights_limit(fileno(fp[0]), &rights_ro) < 0) 708 err(2, "unable to limit rights on: %s", file1); 709 710 fp[1] = fopen(file2, "r"); 711 if (fp[1] == NULL) 712 err(2, "Can't open %s", file2); 713 if (caph_rights_limit(fileno(fp[1]), &rights_ro) < 0) 714 err(2, "unable to limit rights on: %s", file2); 715 716 fp[2] = fopen(file3, "r"); 717 if (fp[2] == NULL) 718 err(2, "Can't open %s", file3); 719 if (caph_rights_limit(fileno(fp[2]), &rights_ro) < 0) 720 err(2, "unable to limit rights on: %s", file3); 721 722 if (pipe(fd13)) 723 err(2, "pipe"); 724 if (pipe(fd23)) 725 err(2, "pipe"); 726 727 diffargv[diffargc] = file1; 728 diffargv[diffargc + 1] = file3; 729 diffargv[diffargc + 2] = NULL; 730 731 nleft = 0; 732 pd13 = diffexec(diffprog, diffargv, fd13); 733 EV_SET(e + nleft , pd13, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 734 if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 735 err(2, "kevent1"); 736 nleft++; 737 738 diffargv[diffargc] = file2; 739 pd23 = diffexec(diffprog, diffargv, fd23); 740 EV_SET(e + nleft , pd23, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, NULL); 741 if (kevent(kq, e + nleft, 1, NULL, 0, NULL) == -1) 742 err(2, "kevent2"); 743 nleft++; 744 745 caph_cache_catpages(); 746 if (caph_enter() < 0) 747 err(2, "unable to enter capability mode"); 748 749 /* parse diffs */ 750 increase(); 751 m = readin(fd13[0], &d13); 752 n = readin(fd23[0], &d23); 753 754 /* waitpid cooked over pdforks */ 755 while (nleft > 0) { 756 nke = kevent(kq, NULL, 0, e, nleft, NULL); 757 if (nke == -1) 758 err(2, "kevent"); 759 for (i = 0; i < nke; i++) { 760 status = e[i].data; 761 if (WIFEXITED(status) && WEXITSTATUS(status) >= 2) 762 errx(2, "diff exited abormally"); 763 else if (WIFSIGNALED(status)) 764 errx(2, "diff killed by signal %d", 765 WTERMSIG(status)); 766 } 767 nleft -= nke; 768 } 769 merge(m, n); 770 771 return (EXIT_SUCCESS); 772 } 773