13bbe3f67SBaptiste Daroussin /* $OpenBSD: diffreg.c,v 1.91 2016/03/01 20:57:35 natano Exp $ */ 23bbe3f67SBaptiste Daroussin 3df57947fSPedro F. Giffuni /*- 4df57947fSPedro F. Giffuni * SPDX-License-Identifier: BSD-4-Clause 5df57947fSPedro F. Giffuni * 63bbe3f67SBaptiste Daroussin * Copyright (C) Caldera International Inc. 2001-2002. 73bbe3f67SBaptiste Daroussin * All rights reserved. 83bbe3f67SBaptiste Daroussin * 93bbe3f67SBaptiste Daroussin * Redistribution and use in source and binary forms, with or without 103bbe3f67SBaptiste Daroussin * modification, are permitted provided that the following conditions 113bbe3f67SBaptiste Daroussin * are met: 123bbe3f67SBaptiste Daroussin * 1. Redistributions of source code and documentation must retain the above 133bbe3f67SBaptiste Daroussin * copyright notice, this list of conditions and the following disclaimer. 143bbe3f67SBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright 153bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the 163bbe3f67SBaptiste Daroussin * documentation and/or other materials provided with the distribution. 173bbe3f67SBaptiste Daroussin * 3. All advertising materials mentioning features or use of this software 183bbe3f67SBaptiste Daroussin * must display the following acknowledgement: 193bbe3f67SBaptiste Daroussin * This product includes software developed or owned by Caldera 203bbe3f67SBaptiste Daroussin * International, Inc. 213bbe3f67SBaptiste Daroussin * 4. Neither the name of Caldera International, Inc. nor the names of other 223bbe3f67SBaptiste Daroussin * contributors may be used to endorse or promote products derived from 233bbe3f67SBaptiste Daroussin * this software without specific prior written permission. 243bbe3f67SBaptiste Daroussin * 253bbe3f67SBaptiste Daroussin * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA 263bbe3f67SBaptiste Daroussin * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR 273bbe3f67SBaptiste Daroussin * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 283bbe3f67SBaptiste Daroussin * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 293bbe3f67SBaptiste Daroussin * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT, 303bbe3f67SBaptiste Daroussin * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 313bbe3f67SBaptiste Daroussin * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 323bbe3f67SBaptiste Daroussin * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 333bbe3f67SBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 343bbe3f67SBaptiste Daroussin * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 353bbe3f67SBaptiste Daroussin * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 363bbe3f67SBaptiste Daroussin * POSSIBILITY OF SUCH DAMAGE. 373bbe3f67SBaptiste Daroussin */ 383bbe3f67SBaptiste Daroussin /*- 393bbe3f67SBaptiste Daroussin * Copyright (c) 1991, 1993 403bbe3f67SBaptiste Daroussin * The Regents of the University of California. All rights reserved. 413bbe3f67SBaptiste Daroussin * 423bbe3f67SBaptiste Daroussin * Redistribution and use in source and binary forms, with or without 433bbe3f67SBaptiste Daroussin * modification, are permitted provided that the following conditions 443bbe3f67SBaptiste Daroussin * are met: 453bbe3f67SBaptiste Daroussin * 1. Redistributions of source code must retain the above copyright 463bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer. 473bbe3f67SBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright 483bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the 493bbe3f67SBaptiste Daroussin * documentation and/or other materials provided with the distribution. 503bbe3f67SBaptiste Daroussin * 3. Neither the name of the University nor the names of its contributors 513bbe3f67SBaptiste Daroussin * may be used to endorse or promote products derived from this software 523bbe3f67SBaptiste Daroussin * without specific prior written permission. 533bbe3f67SBaptiste Daroussin * 543bbe3f67SBaptiste Daroussin * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 553bbe3f67SBaptiste Daroussin * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 563bbe3f67SBaptiste Daroussin * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 573bbe3f67SBaptiste Daroussin * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 583bbe3f67SBaptiste Daroussin * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 593bbe3f67SBaptiste Daroussin * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 603bbe3f67SBaptiste Daroussin * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 613bbe3f67SBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 623bbe3f67SBaptiste Daroussin * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 633bbe3f67SBaptiste Daroussin * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 643bbe3f67SBaptiste Daroussin * SUCH DAMAGE. 653bbe3f67SBaptiste Daroussin * 663bbe3f67SBaptiste Daroussin * @(#)diffreg.c 8.1 (Berkeley) 6/6/93 673bbe3f67SBaptiste Daroussin */ 683bbe3f67SBaptiste Daroussin 693bbe3f67SBaptiste Daroussin #include <sys/cdefs.h> 703bbe3f67SBaptiste Daroussin __FBSDID("$FreeBSD$"); 713bbe3f67SBaptiste Daroussin 723bbe3f67SBaptiste Daroussin #include <sys/capsicum.h> 733bbe3f67SBaptiste Daroussin #include <sys/stat.h> 743bbe3f67SBaptiste Daroussin 753bbe3f67SBaptiste Daroussin #include <capsicum_helpers.h> 763bbe3f67SBaptiste Daroussin #include <ctype.h> 773bbe3f67SBaptiste Daroussin #include <err.h> 783bbe3f67SBaptiste Daroussin #include <errno.h> 793bbe3f67SBaptiste Daroussin #include <fcntl.h> 803bbe3f67SBaptiste Daroussin #include <paths.h> 817752043cSBaptiste Daroussin #include <regex.h> 82*e68edb8cSKyle Evans #include <stdbool.h> 833bbe3f67SBaptiste Daroussin #include <stddef.h> 843bbe3f67SBaptiste Daroussin #include <stdint.h> 853bbe3f67SBaptiste Daroussin #include <stdio.h> 863bbe3f67SBaptiste Daroussin #include <stdlib.h> 873bbe3f67SBaptiste Daroussin #include <string.h> 883bbe3f67SBaptiste Daroussin 896fa5bf08SBaptiste Daroussin #include "pr.h" 903bbe3f67SBaptiste Daroussin #include "diff.h" 913bbe3f67SBaptiste Daroussin #include "xmalloc.h" 923bbe3f67SBaptiste Daroussin 933bbe3f67SBaptiste Daroussin /* 943bbe3f67SBaptiste Daroussin * diff - compare two files. 953bbe3f67SBaptiste Daroussin */ 963bbe3f67SBaptiste Daroussin 973bbe3f67SBaptiste Daroussin /* 983bbe3f67SBaptiste Daroussin * Uses an algorithm due to Harold Stone, which finds 993bbe3f67SBaptiste Daroussin * a pair of longest identical subsequences in the two 1003bbe3f67SBaptiste Daroussin * files. 1013bbe3f67SBaptiste Daroussin * 1023bbe3f67SBaptiste Daroussin * The major goal is to generate the match vector J. 1033bbe3f67SBaptiste Daroussin * J[i] is the index of the line in file1 corresponding 1043bbe3f67SBaptiste Daroussin * to line i file0. J[i] = 0 if there is no 1053bbe3f67SBaptiste Daroussin * such line in file1. 1063bbe3f67SBaptiste Daroussin * 1073bbe3f67SBaptiste Daroussin * Lines are hashed so as to work in core. All potential 1083bbe3f67SBaptiste Daroussin * matches are located by sorting the lines of each file 1093bbe3f67SBaptiste Daroussin * on the hash (called ``value''). In particular, this 1103bbe3f67SBaptiste Daroussin * collects the equivalence classes in file1 together. 1113bbe3f67SBaptiste Daroussin * Subroutine equiv replaces the value of each line in 1123bbe3f67SBaptiste Daroussin * file0 by the index of the first element of its 1133bbe3f67SBaptiste Daroussin * matching equivalence in (the reordered) file1. 1143bbe3f67SBaptiste Daroussin * To save space equiv squeezes file1 into a single 1153bbe3f67SBaptiste Daroussin * array member in which the equivalence classes 1163bbe3f67SBaptiste Daroussin * are simply concatenated, except that their first 1173bbe3f67SBaptiste Daroussin * members are flagged by changing sign. 1183bbe3f67SBaptiste Daroussin * 1193bbe3f67SBaptiste Daroussin * Next the indices that point into member are unsorted into 1203bbe3f67SBaptiste Daroussin * array class according to the original order of file0. 1213bbe3f67SBaptiste Daroussin * 1223bbe3f67SBaptiste Daroussin * The cleverness lies in routine stone. This marches 1233bbe3f67SBaptiste Daroussin * through the lines of file0, developing a vector klist 1243bbe3f67SBaptiste Daroussin * of "k-candidates". At step i a k-candidate is a matched 1253bbe3f67SBaptiste Daroussin * pair of lines x,y (x in file0 y in file1) such that 1263bbe3f67SBaptiste Daroussin * there is a common subsequence of length k 1273bbe3f67SBaptiste Daroussin * between the first i lines of file0 and the first y 1283bbe3f67SBaptiste Daroussin * lines of file1, but there is no such subsequence for 1293bbe3f67SBaptiste Daroussin * any smaller y. x is the earliest possible mate to y 1303bbe3f67SBaptiste Daroussin * that occurs in such a subsequence. 1313bbe3f67SBaptiste Daroussin * 1323bbe3f67SBaptiste Daroussin * Whenever any of the members of the equivalence class of 1333bbe3f67SBaptiste Daroussin * lines in file1 matable to a line in file0 has serial number 1343bbe3f67SBaptiste Daroussin * less than the y of some k-candidate, that k-candidate 1353bbe3f67SBaptiste Daroussin * with the smallest such y is replaced. The new 1363bbe3f67SBaptiste Daroussin * k-candidate is chained (via pred) to the current 1373bbe3f67SBaptiste Daroussin * k-1 candidate so that the actual subsequence can 1383bbe3f67SBaptiste Daroussin * be recovered. When a member has serial number greater 1393bbe3f67SBaptiste Daroussin * that the y of all k-candidates, the klist is extended. 1403bbe3f67SBaptiste Daroussin * At the end, the longest subsequence is pulled out 1413bbe3f67SBaptiste Daroussin * and placed in the array J by unravel 1423bbe3f67SBaptiste Daroussin * 1433bbe3f67SBaptiste Daroussin * With J in hand, the matches there recorded are 1443bbe3f67SBaptiste Daroussin * check'ed against reality to assure that no spurious 1453bbe3f67SBaptiste Daroussin * matches have crept in due to hashing. If they have, 1463bbe3f67SBaptiste Daroussin * they are broken, and "jackpot" is recorded--a harmless 1473bbe3f67SBaptiste Daroussin * matter except that a true match for a spuriously 1483bbe3f67SBaptiste Daroussin * mated line may now be unnecessarily reported as a change. 1493bbe3f67SBaptiste Daroussin * 1503bbe3f67SBaptiste Daroussin * Much of the complexity of the program comes simply 1513bbe3f67SBaptiste Daroussin * from trying to minimize core utilization and 1523bbe3f67SBaptiste Daroussin * maximize the range of doable problems by dynamically 1533bbe3f67SBaptiste Daroussin * allocating what is needed and reusing what is not. 1543bbe3f67SBaptiste Daroussin * The core requirements for problems larger than somewhat 1553bbe3f67SBaptiste Daroussin * are (in words) 2*length(file0) + length(file1) + 1563bbe3f67SBaptiste Daroussin * 3*(number of k-candidates installed), typically about 1573bbe3f67SBaptiste Daroussin * 6n words for files of length n. 1583bbe3f67SBaptiste Daroussin */ 1593bbe3f67SBaptiste Daroussin 1603bbe3f67SBaptiste Daroussin struct cand { 1613bbe3f67SBaptiste Daroussin int x; 1623bbe3f67SBaptiste Daroussin int y; 1633bbe3f67SBaptiste Daroussin int pred; 1643bbe3f67SBaptiste Daroussin }; 1653bbe3f67SBaptiste Daroussin 1663bbe3f67SBaptiste Daroussin static struct line { 1673bbe3f67SBaptiste Daroussin int serial; 1683bbe3f67SBaptiste Daroussin int value; 1693bbe3f67SBaptiste Daroussin } *file[2]; 1703bbe3f67SBaptiste Daroussin 1713bbe3f67SBaptiste Daroussin /* 1723bbe3f67SBaptiste Daroussin * The following struct is used to record change information when 1733bbe3f67SBaptiste Daroussin * doing a "context" or "unified" diff. (see routine "change" to 1743bbe3f67SBaptiste Daroussin * understand the highly mnemonic field names) 1753bbe3f67SBaptiste Daroussin */ 1763bbe3f67SBaptiste Daroussin struct context_vec { 1773bbe3f67SBaptiste Daroussin int a; /* start line in old file */ 1783bbe3f67SBaptiste Daroussin int b; /* end line in old file */ 1793bbe3f67SBaptiste Daroussin int c; /* start line in new file */ 1803bbe3f67SBaptiste Daroussin int d; /* end line in new file */ 1813bbe3f67SBaptiste Daroussin }; 1823bbe3f67SBaptiste Daroussin 1833bbe3f67SBaptiste Daroussin #define diff_output printf 184ff807815SBaptiste Daroussin static FILE *opentemp(const char *); 1853bbe3f67SBaptiste Daroussin static void output(char *, FILE *, char *, FILE *, int); 1863bbe3f67SBaptiste Daroussin static void check(FILE *, FILE *, int); 1873bbe3f67SBaptiste Daroussin static void range(int, int, const char *); 1883bbe3f67SBaptiste Daroussin static void uni_range(int, int); 1893bbe3f67SBaptiste Daroussin static void dump_context_vec(FILE *, FILE *, int); 1903bbe3f67SBaptiste Daroussin static void dump_unified_vec(FILE *, FILE *, int); 191d5b187aeSBaptiste Daroussin static void prepare(int, FILE *, size_t, int); 1923bbe3f67SBaptiste Daroussin static void prune(void); 1933bbe3f67SBaptiste Daroussin static void equiv(struct line *, int, struct line *, int, int *); 1943bbe3f67SBaptiste Daroussin static void unravel(int); 1953bbe3f67SBaptiste Daroussin static void unsort(struct line *, int, int *); 1963bbe3f67SBaptiste Daroussin static void change(char *, FILE *, char *, FILE *, int, int, int, int, int *); 1973bbe3f67SBaptiste Daroussin static void sort(struct line *, int); 1983bbe3f67SBaptiste Daroussin static void print_header(const char *, const char *); 1993bbe3f67SBaptiste Daroussin static int ignoreline(char *); 2003bbe3f67SBaptiste Daroussin static int asciifile(FILE *); 2013bbe3f67SBaptiste Daroussin static int fetch(long *, int, int, FILE *, int, int, int); 2023bbe3f67SBaptiste Daroussin static int newcand(int, int, int); 2033bbe3f67SBaptiste Daroussin static int search(int *, int, int); 2043bbe3f67SBaptiste Daroussin static int skipline(FILE *); 2053bbe3f67SBaptiste Daroussin static int isqrt(int); 2063bbe3f67SBaptiste Daroussin static int stone(int *, int, int *, int *, int); 2073bbe3f67SBaptiste Daroussin static int readhash(FILE *, int); 2083bbe3f67SBaptiste Daroussin static int files_differ(FILE *, FILE *, int); 2093bbe3f67SBaptiste Daroussin static char *match_function(const long *, int, FILE *); 2103bbe3f67SBaptiste Daroussin static char *preadline(int, size_t, off_t); 2113bbe3f67SBaptiste Daroussin 2123bbe3f67SBaptiste Daroussin static int *J; /* will be overlaid on class */ 2133bbe3f67SBaptiste Daroussin static int *class; /* will be overlaid on file[0] */ 2143bbe3f67SBaptiste Daroussin static int *klist; /* will be overlaid on file[0] after class */ 2153bbe3f67SBaptiste Daroussin static int *member; /* will be overlaid on file[1] */ 2163bbe3f67SBaptiste Daroussin static int clen; 2173bbe3f67SBaptiste Daroussin static int inifdef; /* whether or not we are in a #ifdef block */ 2183bbe3f67SBaptiste Daroussin static int len[2]; 2193bbe3f67SBaptiste Daroussin static int pref, suff; /* length of prefix and suffix */ 2203bbe3f67SBaptiste Daroussin static int slen[2]; 2213bbe3f67SBaptiste Daroussin static int anychange; 2223bbe3f67SBaptiste Daroussin static long *ixnew; /* will be overlaid on file[1] */ 2233bbe3f67SBaptiste Daroussin static long *ixold; /* will be overlaid on klist */ 2243bbe3f67SBaptiste Daroussin static struct cand *clist; /* merely a free storage pot for candidates */ 2253bbe3f67SBaptiste Daroussin static int clistlen; /* the length of clist */ 2263bbe3f67SBaptiste Daroussin static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */ 2270118df5eSBaptiste Daroussin static int (*chrtran)(int); /* translation table for case-folding */ 2283bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_start; 2293bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_end; 2303bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_ptr; 2313bbe3f67SBaptiste Daroussin 2323bbe3f67SBaptiste Daroussin #define FUNCTION_CONTEXT_SIZE 55 2333bbe3f67SBaptiste Daroussin static char lastbuf[FUNCTION_CONTEXT_SIZE]; 2343bbe3f67SBaptiste Daroussin static int lastline; 2353bbe3f67SBaptiste Daroussin static int lastmatchline; 2363bbe3f67SBaptiste Daroussin 2370118df5eSBaptiste Daroussin static int 2380118df5eSBaptiste Daroussin clow2low(int c) 2390118df5eSBaptiste Daroussin { 2403bbe3f67SBaptiste Daroussin 2410118df5eSBaptiste Daroussin return (c); 2420118df5eSBaptiste Daroussin } 2433bbe3f67SBaptiste Daroussin 2440118df5eSBaptiste Daroussin static int 2450118df5eSBaptiste Daroussin cup2low(int c) 2460118df5eSBaptiste Daroussin { 2470118df5eSBaptiste Daroussin 2480118df5eSBaptiste Daroussin return tolower(c); 2490118df5eSBaptiste Daroussin } 2503bbe3f67SBaptiste Daroussin 2513bbe3f67SBaptiste Daroussin int 2523bbe3f67SBaptiste Daroussin diffreg(char *file1, char *file2, int flags, int capsicum) 2533bbe3f67SBaptiste Daroussin { 2543bbe3f67SBaptiste Daroussin FILE *f1, *f2; 2553bbe3f67SBaptiste Daroussin int i, rval; 2566fa5bf08SBaptiste Daroussin struct pr *pr = NULL; 2573bbe3f67SBaptiste Daroussin cap_rights_t rights_ro; 2583bbe3f67SBaptiste Daroussin 2593bbe3f67SBaptiste Daroussin f1 = f2 = NULL; 2603bbe3f67SBaptiste Daroussin rval = D_SAME; 2613bbe3f67SBaptiste Daroussin anychange = 0; 2623bbe3f67SBaptiste Daroussin lastline = 0; 2633bbe3f67SBaptiste Daroussin lastmatchline = 0; 2643bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 2653bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 2663bbe3f67SBaptiste Daroussin chrtran = cup2low; 2673bbe3f67SBaptiste Daroussin else 2683bbe3f67SBaptiste Daroussin chrtran = clow2low; 2693bbe3f67SBaptiste Daroussin if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode)) 2703bbe3f67SBaptiste Daroussin return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2); 2713bbe3f67SBaptiste Daroussin if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0) 2723bbe3f67SBaptiste Daroussin goto closem; 2733bbe3f67SBaptiste Daroussin 2743bbe3f67SBaptiste Daroussin if (flags & D_EMPTY1) 2753bbe3f67SBaptiste Daroussin f1 = fopen(_PATH_DEVNULL, "r"); 2763bbe3f67SBaptiste Daroussin else { 277ff807815SBaptiste Daroussin if (!S_ISREG(stb1.st_mode)) { 278ff807815SBaptiste Daroussin if ((f1 = opentemp(file1)) == NULL || 279ff807815SBaptiste Daroussin fstat(fileno(f1), &stb1) < 0) { 280ff807815SBaptiste Daroussin warn("%s", file1); 281ff807815SBaptiste Daroussin status |= 2; 282ff807815SBaptiste Daroussin goto closem; 283ff807815SBaptiste Daroussin } 284ff807815SBaptiste Daroussin } else if (strcmp(file1, "-") == 0) 2853bbe3f67SBaptiste Daroussin f1 = stdin; 2863bbe3f67SBaptiste Daroussin else 2873bbe3f67SBaptiste Daroussin f1 = fopen(file1, "r"); 2883bbe3f67SBaptiste Daroussin } 2893bbe3f67SBaptiste Daroussin if (f1 == NULL) { 2903bbe3f67SBaptiste Daroussin warn("%s", file1); 2913bbe3f67SBaptiste Daroussin status |= 2; 2923bbe3f67SBaptiste Daroussin goto closem; 2933bbe3f67SBaptiste Daroussin } 2943bbe3f67SBaptiste Daroussin 2953bbe3f67SBaptiste Daroussin if (flags & D_EMPTY2) 2963bbe3f67SBaptiste Daroussin f2 = fopen(_PATH_DEVNULL, "r"); 2973bbe3f67SBaptiste Daroussin else { 298ff807815SBaptiste Daroussin if (!S_ISREG(stb2.st_mode)) { 299ff807815SBaptiste Daroussin if ((f2 = opentemp(file2)) == NULL || 300ff807815SBaptiste Daroussin fstat(fileno(f2), &stb2) < 0) { 301ff807815SBaptiste Daroussin warn("%s", file2); 302ff807815SBaptiste Daroussin status |= 2; 303ff807815SBaptiste Daroussin goto closem; 304ff807815SBaptiste Daroussin } 305ff807815SBaptiste Daroussin } else if (strcmp(file2, "-") == 0) 3063bbe3f67SBaptiste Daroussin f2 = stdin; 3073bbe3f67SBaptiste Daroussin else 3083bbe3f67SBaptiste Daroussin f2 = fopen(file2, "r"); 3093bbe3f67SBaptiste Daroussin } 3103bbe3f67SBaptiste Daroussin if (f2 == NULL) { 3113bbe3f67SBaptiste Daroussin warn("%s", file2); 3123bbe3f67SBaptiste Daroussin status |= 2; 3133bbe3f67SBaptiste Daroussin goto closem; 3143bbe3f67SBaptiste Daroussin } 3153bbe3f67SBaptiste Daroussin 3166fa5bf08SBaptiste Daroussin if (lflag) 3176fa5bf08SBaptiste Daroussin pr = start_pr(file1, file2); 3183bbe3f67SBaptiste Daroussin 3193bbe3f67SBaptiste Daroussin if (capsicum) { 3203bbe3f67SBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 32178f6a0c1SBaptiste Daroussin if (cap_rights_limit(fileno(f1), &rights_ro) < 0 32278f6a0c1SBaptiste Daroussin && errno != ENOSYS) 3233bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 32478f6a0c1SBaptiste Daroussin if (cap_rights_limit(fileno(f2), &rights_ro) < 0 && 32578f6a0c1SBaptiste Daroussin errno != ENOSYS) 3263bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 3273bbe3f67SBaptiste Daroussin if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { 3283bbe3f67SBaptiste Daroussin /* stding has already been limited */ 3293bbe3f67SBaptiste Daroussin if (caph_limit_stderr() == -1) 3303bbe3f67SBaptiste Daroussin err(2, "unable to limit stderr"); 3313bbe3f67SBaptiste Daroussin if (caph_limit_stdout() == -1) 3323bbe3f67SBaptiste Daroussin err(2, "unable to limit stdout"); 3333bbe3f67SBaptiste Daroussin } else if (caph_limit_stdio() == -1) 3343bbe3f67SBaptiste Daroussin err(2, "unable to limit stdio"); 3353bbe3f67SBaptiste Daroussin 3363bbe3f67SBaptiste Daroussin caph_cache_catpages(); 3375bbffb00SBaptiste Daroussin caph_cache_tzdata(); 3387672a014SMariusz Zaborski if (caph_enter() < 0) 3393bbe3f67SBaptiste Daroussin err(2, "unable to enter capability mode"); 3403bbe3f67SBaptiste Daroussin } 3413bbe3f67SBaptiste Daroussin 3423bbe3f67SBaptiste Daroussin switch (files_differ(f1, f2, flags)) { 3433bbe3f67SBaptiste Daroussin case 0: 3443bbe3f67SBaptiste Daroussin goto closem; 3453bbe3f67SBaptiste Daroussin case 1: 3463bbe3f67SBaptiste Daroussin break; 3473bbe3f67SBaptiste Daroussin default: 3483bbe3f67SBaptiste Daroussin /* error */ 3493bbe3f67SBaptiste Daroussin status |= 2; 3503bbe3f67SBaptiste Daroussin goto closem; 3513bbe3f67SBaptiste Daroussin } 3523bbe3f67SBaptiste Daroussin 3533bbe3f67SBaptiste Daroussin if ((flags & D_FORCEASCII) == 0 && 3543bbe3f67SBaptiste Daroussin (!asciifile(f1) || !asciifile(f2))) { 3553bbe3f67SBaptiste Daroussin rval = D_BINARY; 3563bbe3f67SBaptiste Daroussin status |= 1; 3573bbe3f67SBaptiste Daroussin goto closem; 3583bbe3f67SBaptiste Daroussin } 3593bbe3f67SBaptiste Daroussin prepare(0, f1, stb1.st_size, flags); 3603bbe3f67SBaptiste Daroussin prepare(1, f2, stb2.st_size, flags); 3613bbe3f67SBaptiste Daroussin 3623bbe3f67SBaptiste Daroussin prune(); 3633bbe3f67SBaptiste Daroussin sort(sfile[0], slen[0]); 3643bbe3f67SBaptiste Daroussin sort(sfile[1], slen[1]); 3653bbe3f67SBaptiste Daroussin 3663bbe3f67SBaptiste Daroussin member = (int *)file[1]; 3673bbe3f67SBaptiste Daroussin equiv(sfile[0], slen[0], sfile[1], slen[1], member); 3683bbe3f67SBaptiste Daroussin member = xreallocarray(member, slen[1] + 2, sizeof(*member)); 3693bbe3f67SBaptiste Daroussin 3703bbe3f67SBaptiste Daroussin class = (int *)file[0]; 3713bbe3f67SBaptiste Daroussin unsort(sfile[0], slen[0], class); 3723bbe3f67SBaptiste Daroussin class = xreallocarray(class, slen[0] + 2, sizeof(*class)); 3733bbe3f67SBaptiste Daroussin 3743bbe3f67SBaptiste Daroussin klist = xcalloc(slen[0] + 2, sizeof(*klist)); 3753bbe3f67SBaptiste Daroussin clen = 0; 3763bbe3f67SBaptiste Daroussin clistlen = 100; 3773bbe3f67SBaptiste Daroussin clist = xcalloc(clistlen, sizeof(*clist)); 3783bbe3f67SBaptiste Daroussin i = stone(class, slen[0], member, klist, flags); 3793bbe3f67SBaptiste Daroussin free(member); 3803bbe3f67SBaptiste Daroussin free(class); 3813bbe3f67SBaptiste Daroussin 3823bbe3f67SBaptiste Daroussin J = xreallocarray(J, len[0] + 2, sizeof(*J)); 3833bbe3f67SBaptiste Daroussin unravel(klist[i]); 3843bbe3f67SBaptiste Daroussin free(clist); 3853bbe3f67SBaptiste Daroussin free(klist); 3863bbe3f67SBaptiste Daroussin 3873bbe3f67SBaptiste Daroussin ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); 3883bbe3f67SBaptiste Daroussin ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); 3893bbe3f67SBaptiste Daroussin check(f1, f2, flags); 3903bbe3f67SBaptiste Daroussin output(file1, f1, file2, f2, flags); 3916fa5bf08SBaptiste Daroussin if (pr != NULL) 3926fa5bf08SBaptiste Daroussin stop_pr(pr); 3933bbe3f67SBaptiste Daroussin 3943bbe3f67SBaptiste Daroussin closem: 3953bbe3f67SBaptiste Daroussin if (anychange) { 3963bbe3f67SBaptiste Daroussin status |= 1; 3973bbe3f67SBaptiste Daroussin if (rval == D_SAME) 3983bbe3f67SBaptiste Daroussin rval = D_DIFFER; 3993bbe3f67SBaptiste Daroussin } 4003bbe3f67SBaptiste Daroussin if (f1 != NULL) 4013bbe3f67SBaptiste Daroussin fclose(f1); 4023bbe3f67SBaptiste Daroussin if (f2 != NULL) 4033bbe3f67SBaptiste Daroussin fclose(f2); 4043bbe3f67SBaptiste Daroussin 4053bbe3f67SBaptiste Daroussin return (rval); 4063bbe3f67SBaptiste Daroussin } 4073bbe3f67SBaptiste Daroussin 4083bbe3f67SBaptiste Daroussin /* 4093bbe3f67SBaptiste Daroussin * Check to see if the given files differ. 4103bbe3f67SBaptiste Daroussin * Returns 0 if they are the same, 1 if different, and -1 on error. 4113bbe3f67SBaptiste Daroussin * XXX - could use code from cmp(1) [faster] 4123bbe3f67SBaptiste Daroussin */ 4133bbe3f67SBaptiste Daroussin static int 4143bbe3f67SBaptiste Daroussin files_differ(FILE *f1, FILE *f2, int flags) 4153bbe3f67SBaptiste Daroussin { 4163bbe3f67SBaptiste Daroussin char buf1[BUFSIZ], buf2[BUFSIZ]; 4173bbe3f67SBaptiste Daroussin size_t i, j; 4183bbe3f67SBaptiste Daroussin 4193bbe3f67SBaptiste Daroussin if ((flags & (D_EMPTY1|D_EMPTY2)) || stb1.st_size != stb2.st_size || 4203bbe3f67SBaptiste Daroussin (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT)) 4213bbe3f67SBaptiste Daroussin return (1); 4223bbe3f67SBaptiste Daroussin for (;;) { 4233bbe3f67SBaptiste Daroussin i = fread(buf1, 1, sizeof(buf1), f1); 4243bbe3f67SBaptiste Daroussin j = fread(buf2, 1, sizeof(buf2), f2); 4253bbe3f67SBaptiste Daroussin if ((!i && ferror(f1)) || (!j && ferror(f2))) 4263bbe3f67SBaptiste Daroussin return (-1); 4273bbe3f67SBaptiste Daroussin if (i != j) 4283bbe3f67SBaptiste Daroussin return (1); 4293bbe3f67SBaptiste Daroussin if (i == 0) 4303bbe3f67SBaptiste Daroussin return (0); 4313bbe3f67SBaptiste Daroussin if (memcmp(buf1, buf2, i) != 0) 4323bbe3f67SBaptiste Daroussin return (1); 4333bbe3f67SBaptiste Daroussin } 4343bbe3f67SBaptiste Daroussin } 4353bbe3f67SBaptiste Daroussin 436ff807815SBaptiste Daroussin static FILE * 437ff807815SBaptiste Daroussin opentemp(const char *f) 438ff807815SBaptiste Daroussin { 439ff807815SBaptiste Daroussin char buf[BUFSIZ], tempfile[PATH_MAX]; 440ff807815SBaptiste Daroussin ssize_t nread; 441ff807815SBaptiste Daroussin int ifd, ofd; 442ff807815SBaptiste Daroussin 443ff807815SBaptiste Daroussin if (strcmp(f, "-") == 0) 444ff807815SBaptiste Daroussin ifd = STDIN_FILENO; 445ff807815SBaptiste Daroussin else if ((ifd = open(f, O_RDONLY, 0644)) < 0) 446ff807815SBaptiste Daroussin return (NULL); 447ff807815SBaptiste Daroussin 448ff807815SBaptiste Daroussin (void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile)); 449ff807815SBaptiste Daroussin 450ff807815SBaptiste Daroussin if ((ofd = mkstemp(tempfile)) < 0) { 451ff807815SBaptiste Daroussin close(ifd); 452ff807815SBaptiste Daroussin return (NULL); 453ff807815SBaptiste Daroussin } 454ff807815SBaptiste Daroussin unlink(tempfile); 455ff807815SBaptiste Daroussin while ((nread = read(ifd, buf, BUFSIZ)) > 0) { 456ff807815SBaptiste Daroussin if (write(ofd, buf, nread) != nread) { 457ff807815SBaptiste Daroussin close(ifd); 458ff807815SBaptiste Daroussin close(ofd); 459ff807815SBaptiste Daroussin return (NULL); 460ff807815SBaptiste Daroussin } 461ff807815SBaptiste Daroussin } 462ff807815SBaptiste Daroussin close(ifd); 463ff807815SBaptiste Daroussin lseek(ofd, (off_t)0, SEEK_SET); 464ff807815SBaptiste Daroussin return (fdopen(ofd, "r")); 465ff807815SBaptiste Daroussin } 466ff807815SBaptiste Daroussin 4673bbe3f67SBaptiste Daroussin char * 4683bbe3f67SBaptiste Daroussin splice(char *dir, char *path) 4693bbe3f67SBaptiste Daroussin { 4703bbe3f67SBaptiste Daroussin char *tail, *buf; 4713bbe3f67SBaptiste Daroussin size_t dirlen; 4723bbe3f67SBaptiste Daroussin 4733bbe3f67SBaptiste Daroussin dirlen = strlen(dir); 4743bbe3f67SBaptiste Daroussin while (dirlen != 0 && dir[dirlen - 1] == '/') 4753bbe3f67SBaptiste Daroussin dirlen--; 4763bbe3f67SBaptiste Daroussin if ((tail = strrchr(path, '/')) == NULL) 4773bbe3f67SBaptiste Daroussin tail = path; 4783bbe3f67SBaptiste Daroussin else 4793bbe3f67SBaptiste Daroussin tail++; 4803bbe3f67SBaptiste Daroussin xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail); 4813bbe3f67SBaptiste Daroussin return (buf); 4823bbe3f67SBaptiste Daroussin } 4833bbe3f67SBaptiste Daroussin 4843bbe3f67SBaptiste Daroussin static void 485d5b187aeSBaptiste Daroussin prepare(int i, FILE *fd, size_t filesize, int flags) 4863bbe3f67SBaptiste Daroussin { 4873bbe3f67SBaptiste Daroussin struct line *p; 4883bbe3f67SBaptiste Daroussin int h; 4893bbe3f67SBaptiste Daroussin size_t sz, j; 4903bbe3f67SBaptiste Daroussin 4913bbe3f67SBaptiste Daroussin rewind(fd); 4923bbe3f67SBaptiste Daroussin 4936b8059c4SBaptiste Daroussin sz = MIN(filesize, SIZE_MAX) / 25; 4943bbe3f67SBaptiste Daroussin if (sz < 100) 4953bbe3f67SBaptiste Daroussin sz = 100; 4963bbe3f67SBaptiste Daroussin 4973bbe3f67SBaptiste Daroussin p = xcalloc(sz + 3, sizeof(*p)); 4983bbe3f67SBaptiste Daroussin for (j = 0; (h = readhash(fd, flags));) { 4993bbe3f67SBaptiste Daroussin if (j == sz) { 5003bbe3f67SBaptiste Daroussin sz = sz * 3 / 2; 5013bbe3f67SBaptiste Daroussin p = xreallocarray(p, sz + 3, sizeof(*p)); 5023bbe3f67SBaptiste Daroussin } 5033bbe3f67SBaptiste Daroussin p[++j].value = h; 5043bbe3f67SBaptiste Daroussin } 5053bbe3f67SBaptiste Daroussin len[i] = j; 5063bbe3f67SBaptiste Daroussin file[i] = p; 5073bbe3f67SBaptiste Daroussin } 5083bbe3f67SBaptiste Daroussin 5093bbe3f67SBaptiste Daroussin static void 5103bbe3f67SBaptiste Daroussin prune(void) 5113bbe3f67SBaptiste Daroussin { 5123bbe3f67SBaptiste Daroussin int i, j; 5133bbe3f67SBaptiste Daroussin 5143bbe3f67SBaptiste Daroussin for (pref = 0; pref < len[0] && pref < len[1] && 5153bbe3f67SBaptiste Daroussin file[0][pref + 1].value == file[1][pref + 1].value; 5163bbe3f67SBaptiste Daroussin pref++) 5173bbe3f67SBaptiste Daroussin ; 5183bbe3f67SBaptiste Daroussin for (suff = 0; suff < len[0] - pref && suff < len[1] - pref && 5193bbe3f67SBaptiste Daroussin file[0][len[0] - suff].value == file[1][len[1] - suff].value; 5203bbe3f67SBaptiste Daroussin suff++) 5213bbe3f67SBaptiste Daroussin ; 5223bbe3f67SBaptiste Daroussin for (j = 0; j < 2; j++) { 5233bbe3f67SBaptiste Daroussin sfile[j] = file[j] + pref; 5243bbe3f67SBaptiste Daroussin slen[j] = len[j] - pref - suff; 5253bbe3f67SBaptiste Daroussin for (i = 0; i <= slen[j]; i++) 5263bbe3f67SBaptiste Daroussin sfile[j][i].serial = i; 5273bbe3f67SBaptiste Daroussin } 5283bbe3f67SBaptiste Daroussin } 5293bbe3f67SBaptiste Daroussin 5303bbe3f67SBaptiste Daroussin static void 5313bbe3f67SBaptiste Daroussin equiv(struct line *a, int n, struct line *b, int m, int *c) 5323bbe3f67SBaptiste Daroussin { 5333bbe3f67SBaptiste Daroussin int i, j; 5343bbe3f67SBaptiste Daroussin 5353bbe3f67SBaptiste Daroussin i = j = 1; 5363bbe3f67SBaptiste Daroussin while (i <= n && j <= m) { 5373bbe3f67SBaptiste Daroussin if (a[i].value < b[j].value) 5383bbe3f67SBaptiste Daroussin a[i++].value = 0; 5393bbe3f67SBaptiste Daroussin else if (a[i].value == b[j].value) 5403bbe3f67SBaptiste Daroussin a[i++].value = j; 5413bbe3f67SBaptiste Daroussin else 5423bbe3f67SBaptiste Daroussin j++; 5433bbe3f67SBaptiste Daroussin } 5443bbe3f67SBaptiste Daroussin while (i <= n) 5453bbe3f67SBaptiste Daroussin a[i++].value = 0; 5463bbe3f67SBaptiste Daroussin b[m + 1].value = 0; 5473bbe3f67SBaptiste Daroussin j = 0; 5483bbe3f67SBaptiste Daroussin while (++j <= m) { 5493bbe3f67SBaptiste Daroussin c[j] = -b[j].serial; 5503bbe3f67SBaptiste Daroussin while (b[j + 1].value == b[j].value) { 5513bbe3f67SBaptiste Daroussin j++; 5523bbe3f67SBaptiste Daroussin c[j] = b[j].serial; 5533bbe3f67SBaptiste Daroussin } 5543bbe3f67SBaptiste Daroussin } 5553bbe3f67SBaptiste Daroussin c[j] = -1; 5563bbe3f67SBaptiste Daroussin } 5573bbe3f67SBaptiste Daroussin 5583bbe3f67SBaptiste Daroussin /* Code taken from ping.c */ 5593bbe3f67SBaptiste Daroussin static int 5603bbe3f67SBaptiste Daroussin isqrt(int n) 5613bbe3f67SBaptiste Daroussin { 5623bbe3f67SBaptiste Daroussin int y, x = 1; 5633bbe3f67SBaptiste Daroussin 5643bbe3f67SBaptiste Daroussin if (n == 0) 5653bbe3f67SBaptiste Daroussin return (0); 5663bbe3f67SBaptiste Daroussin 5673bbe3f67SBaptiste Daroussin do { /* newton was a stinker */ 5683bbe3f67SBaptiste Daroussin y = x; 5693bbe3f67SBaptiste Daroussin x = n / x; 5703bbe3f67SBaptiste Daroussin x += y; 5713bbe3f67SBaptiste Daroussin x /= 2; 5723bbe3f67SBaptiste Daroussin } while ((x - y) > 1 || (x - y) < -1); 5733bbe3f67SBaptiste Daroussin 5743bbe3f67SBaptiste Daroussin return (x); 5753bbe3f67SBaptiste Daroussin } 5763bbe3f67SBaptiste Daroussin 5773bbe3f67SBaptiste Daroussin static int 5783bbe3f67SBaptiste Daroussin stone(int *a, int n, int *b, int *c, int flags) 5793bbe3f67SBaptiste Daroussin { 5803bbe3f67SBaptiste Daroussin int i, k, y, j, l; 5813bbe3f67SBaptiste Daroussin int oldc, tc, oldl, sq; 5823bbe3f67SBaptiste Daroussin u_int numtries, bound; 5833bbe3f67SBaptiste Daroussin 5843bbe3f67SBaptiste Daroussin if (flags & D_MINIMAL) 5853bbe3f67SBaptiste Daroussin bound = UINT_MAX; 5863bbe3f67SBaptiste Daroussin else { 5873bbe3f67SBaptiste Daroussin sq = isqrt(n); 58842c88c41SBaptiste Daroussin bound = MAX(256, sq); 5893bbe3f67SBaptiste Daroussin } 5903bbe3f67SBaptiste Daroussin 5913bbe3f67SBaptiste Daroussin k = 0; 5923bbe3f67SBaptiste Daroussin c[0] = newcand(0, 0, 0); 5933bbe3f67SBaptiste Daroussin for (i = 1; i <= n; i++) { 5943bbe3f67SBaptiste Daroussin j = a[i]; 5953bbe3f67SBaptiste Daroussin if (j == 0) 5963bbe3f67SBaptiste Daroussin continue; 5973bbe3f67SBaptiste Daroussin y = -b[j]; 5983bbe3f67SBaptiste Daroussin oldl = 0; 5993bbe3f67SBaptiste Daroussin oldc = c[0]; 6003bbe3f67SBaptiste Daroussin numtries = 0; 6013bbe3f67SBaptiste Daroussin do { 6023bbe3f67SBaptiste Daroussin if (y <= clist[oldc].y) 6033bbe3f67SBaptiste Daroussin continue; 6043bbe3f67SBaptiste Daroussin l = search(c, k, y); 6053bbe3f67SBaptiste Daroussin if (l != oldl + 1) 6063bbe3f67SBaptiste Daroussin oldc = c[l - 1]; 6073bbe3f67SBaptiste Daroussin if (l <= k) { 6083bbe3f67SBaptiste Daroussin if (clist[c[l]].y <= y) 6093bbe3f67SBaptiste Daroussin continue; 6103bbe3f67SBaptiste Daroussin tc = c[l]; 6113bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6123bbe3f67SBaptiste Daroussin oldc = tc; 6133bbe3f67SBaptiste Daroussin oldl = l; 6143bbe3f67SBaptiste Daroussin numtries++; 6153bbe3f67SBaptiste Daroussin } else { 6163bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6173bbe3f67SBaptiste Daroussin k++; 6183bbe3f67SBaptiste Daroussin break; 6193bbe3f67SBaptiste Daroussin } 6203bbe3f67SBaptiste Daroussin } while ((y = b[++j]) > 0 && numtries < bound); 6213bbe3f67SBaptiste Daroussin } 6223bbe3f67SBaptiste Daroussin return (k); 6233bbe3f67SBaptiste Daroussin } 6243bbe3f67SBaptiste Daroussin 6253bbe3f67SBaptiste Daroussin static int 6263bbe3f67SBaptiste Daroussin newcand(int x, int y, int pred) 6273bbe3f67SBaptiste Daroussin { 6283bbe3f67SBaptiste Daroussin struct cand *q; 6293bbe3f67SBaptiste Daroussin 6303bbe3f67SBaptiste Daroussin if (clen == clistlen) { 6313bbe3f67SBaptiste Daroussin clistlen = clistlen * 11 / 10; 6323bbe3f67SBaptiste Daroussin clist = xreallocarray(clist, clistlen, sizeof(*clist)); 6333bbe3f67SBaptiste Daroussin } 6343bbe3f67SBaptiste Daroussin q = clist + clen; 6353bbe3f67SBaptiste Daroussin q->x = x; 6363bbe3f67SBaptiste Daroussin q->y = y; 6373bbe3f67SBaptiste Daroussin q->pred = pred; 6383bbe3f67SBaptiste Daroussin return (clen++); 6393bbe3f67SBaptiste Daroussin } 6403bbe3f67SBaptiste Daroussin 6413bbe3f67SBaptiste Daroussin static int 6423bbe3f67SBaptiste Daroussin search(int *c, int k, int y) 6433bbe3f67SBaptiste Daroussin { 6443bbe3f67SBaptiste Daroussin int i, j, l, t; 6453bbe3f67SBaptiste Daroussin 6463bbe3f67SBaptiste Daroussin if (clist[c[k]].y < y) /* quick look for typical case */ 6473bbe3f67SBaptiste Daroussin return (k + 1); 6483bbe3f67SBaptiste Daroussin i = 0; 6493bbe3f67SBaptiste Daroussin j = k + 1; 6503bbe3f67SBaptiste Daroussin for (;;) { 6513bbe3f67SBaptiste Daroussin l = (i + j) / 2; 6523bbe3f67SBaptiste Daroussin if (l <= i) 6533bbe3f67SBaptiste Daroussin break; 6543bbe3f67SBaptiste Daroussin t = clist[c[l]].y; 6553bbe3f67SBaptiste Daroussin if (t > y) 6563bbe3f67SBaptiste Daroussin j = l; 6573bbe3f67SBaptiste Daroussin else if (t < y) 6583bbe3f67SBaptiste Daroussin i = l; 6593bbe3f67SBaptiste Daroussin else 6603bbe3f67SBaptiste Daroussin return (l); 6613bbe3f67SBaptiste Daroussin } 6623bbe3f67SBaptiste Daroussin return (l + 1); 6633bbe3f67SBaptiste Daroussin } 6643bbe3f67SBaptiste Daroussin 6653bbe3f67SBaptiste Daroussin static void 6663bbe3f67SBaptiste Daroussin unravel(int p) 6673bbe3f67SBaptiste Daroussin { 6683bbe3f67SBaptiste Daroussin struct cand *q; 6693bbe3f67SBaptiste Daroussin int i; 6703bbe3f67SBaptiste Daroussin 6713bbe3f67SBaptiste Daroussin for (i = 0; i <= len[0]; i++) 6723bbe3f67SBaptiste Daroussin J[i] = i <= pref ? i : 6733bbe3f67SBaptiste Daroussin i > len[0] - suff ? i + len[1] - len[0] : 0; 6743bbe3f67SBaptiste Daroussin for (q = clist + p; q->y != 0; q = clist + q->pred) 6753bbe3f67SBaptiste Daroussin J[q->x + pref] = q->y + pref; 6763bbe3f67SBaptiste Daroussin } 6773bbe3f67SBaptiste Daroussin 6783bbe3f67SBaptiste Daroussin /* 6793bbe3f67SBaptiste Daroussin * Check does double duty: 6803bbe3f67SBaptiste Daroussin * 1. ferret out any fortuitous correspondences due 6813bbe3f67SBaptiste Daroussin * to confounding by hashing (which result in "jackpot") 6823bbe3f67SBaptiste Daroussin * 2. collect random access indexes to the two files 6833bbe3f67SBaptiste Daroussin */ 6843bbe3f67SBaptiste Daroussin static void 6853bbe3f67SBaptiste Daroussin check(FILE *f1, FILE *f2, int flags) 6863bbe3f67SBaptiste Daroussin { 6873bbe3f67SBaptiste Daroussin int i, j, jackpot, c, d; 6883bbe3f67SBaptiste Daroussin long ctold, ctnew; 6893bbe3f67SBaptiste Daroussin 6903bbe3f67SBaptiste Daroussin rewind(f1); 6913bbe3f67SBaptiste Daroussin rewind(f2); 6923bbe3f67SBaptiste Daroussin j = 1; 6933bbe3f67SBaptiste Daroussin ixold[0] = ixnew[0] = 0; 6943bbe3f67SBaptiste Daroussin jackpot = 0; 6953bbe3f67SBaptiste Daroussin ctold = ctnew = 0; 6963bbe3f67SBaptiste Daroussin for (i = 1; i <= len[0]; i++) { 6973bbe3f67SBaptiste Daroussin if (J[i] == 0) { 6983bbe3f67SBaptiste Daroussin ixold[i] = ctold += skipline(f1); 6993bbe3f67SBaptiste Daroussin continue; 7003bbe3f67SBaptiste Daroussin } 7013bbe3f67SBaptiste Daroussin while (j < J[i]) { 7023bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 7033bbe3f67SBaptiste Daroussin j++; 7043bbe3f67SBaptiste Daroussin } 7053bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE|D_STRIPCR)) { 7063bbe3f67SBaptiste Daroussin for (;;) { 7073bbe3f67SBaptiste Daroussin c = getc(f1); 7083bbe3f67SBaptiste Daroussin d = getc(f2); 7093bbe3f67SBaptiste Daroussin /* 7103bbe3f67SBaptiste Daroussin * GNU diff ignores a missing newline 7113bbe3f67SBaptiste Daroussin * in one file for -b or -w. 7123bbe3f67SBaptiste Daroussin */ 7133bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) { 7143bbe3f67SBaptiste Daroussin if (c == EOF && d == '\n') { 7153bbe3f67SBaptiste Daroussin ctnew++; 7163bbe3f67SBaptiste Daroussin break; 7173bbe3f67SBaptiste Daroussin } else if (c == '\n' && d == EOF) { 7183bbe3f67SBaptiste Daroussin ctold++; 7193bbe3f67SBaptiste Daroussin break; 7203bbe3f67SBaptiste Daroussin } 7213bbe3f67SBaptiste Daroussin } 7223bbe3f67SBaptiste Daroussin ctold++; 7233bbe3f67SBaptiste Daroussin ctnew++; 7249977c7b5SXin LI if (flags & D_STRIPCR && (c == '\r' || d == '\r')) { 7253bbe3f67SBaptiste Daroussin if (c == '\r') { 7263bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == '\n') { 7279977c7b5SXin LI ctold++; 7289977c7b5SXin LI } else { 7299977c7b5SXin LI ungetc(c, f1); 7303bbe3f67SBaptiste Daroussin } 7313bbe3f67SBaptiste Daroussin } 7323bbe3f67SBaptiste Daroussin if (d == '\r') { 7333bbe3f67SBaptiste Daroussin if ((d = getc(f2)) == '\n') { 7349977c7b5SXin LI ctnew++; 7359977c7b5SXin LI } else { 7369977c7b5SXin LI ungetc(d, f2); 7379977c7b5SXin LI } 7389977c7b5SXin LI } 7393bbe3f67SBaptiste Daroussin break; 7403bbe3f67SBaptiste Daroussin } 7413bbe3f67SBaptiste Daroussin if ((flags & D_FOLDBLANKS) && isspace(c) && 7423bbe3f67SBaptiste Daroussin isspace(d)) { 7433bbe3f67SBaptiste Daroussin do { 7443bbe3f67SBaptiste Daroussin if (c == '\n') 7453bbe3f67SBaptiste Daroussin break; 7463bbe3f67SBaptiste Daroussin ctold++; 7473bbe3f67SBaptiste Daroussin } while (isspace(c = getc(f1))); 7483bbe3f67SBaptiste Daroussin do { 7493bbe3f67SBaptiste Daroussin if (d == '\n') 7503bbe3f67SBaptiste Daroussin break; 7513bbe3f67SBaptiste Daroussin ctnew++; 7523bbe3f67SBaptiste Daroussin } while (isspace(d = getc(f2))); 7533bbe3f67SBaptiste Daroussin } else if ((flags & D_IGNOREBLANKS)) { 7543bbe3f67SBaptiste Daroussin while (isspace(c) && c != '\n') { 7553bbe3f67SBaptiste Daroussin c = getc(f1); 7563bbe3f67SBaptiste Daroussin ctold++; 7573bbe3f67SBaptiste Daroussin } 7583bbe3f67SBaptiste Daroussin while (isspace(d) && d != '\n') { 7593bbe3f67SBaptiste Daroussin d = getc(f2); 7603bbe3f67SBaptiste Daroussin ctnew++; 7613bbe3f67SBaptiste Daroussin } 7623bbe3f67SBaptiste Daroussin } 7630118df5eSBaptiste Daroussin if (chrtran(c) != chrtran(d)) { 7643bbe3f67SBaptiste Daroussin jackpot++; 7653bbe3f67SBaptiste Daroussin J[i] = 0; 7663bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 7673bbe3f67SBaptiste Daroussin ctold += skipline(f1); 7683bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 7693bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 7703bbe3f67SBaptiste Daroussin break; 7713bbe3f67SBaptiste Daroussin } 7723bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 7733bbe3f67SBaptiste Daroussin break; 7743bbe3f67SBaptiste Daroussin } 7753bbe3f67SBaptiste Daroussin } else { 7763bbe3f67SBaptiste Daroussin for (;;) { 7773bbe3f67SBaptiste Daroussin ctold++; 7783bbe3f67SBaptiste Daroussin ctnew++; 7793bbe3f67SBaptiste Daroussin if ((c = getc(f1)) != (d = getc(f2))) { 7803bbe3f67SBaptiste Daroussin /* jackpot++; */ 7813bbe3f67SBaptiste Daroussin J[i] = 0; 7823bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 7833bbe3f67SBaptiste Daroussin ctold += skipline(f1); 7843bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 7853bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 7863bbe3f67SBaptiste Daroussin break; 7873bbe3f67SBaptiste Daroussin } 7883bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 7893bbe3f67SBaptiste Daroussin break; 7903bbe3f67SBaptiste Daroussin } 7913bbe3f67SBaptiste Daroussin } 7923bbe3f67SBaptiste Daroussin ixold[i] = ctold; 7933bbe3f67SBaptiste Daroussin ixnew[j] = ctnew; 7943bbe3f67SBaptiste Daroussin j++; 7953bbe3f67SBaptiste Daroussin } 7963bbe3f67SBaptiste Daroussin for (; j <= len[1]; j++) { 7973bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 7983bbe3f67SBaptiste Daroussin } 7993bbe3f67SBaptiste Daroussin /* 8003bbe3f67SBaptiste Daroussin * if (jackpot) 8013bbe3f67SBaptiste Daroussin * fprintf(stderr, "jackpot\n"); 8023bbe3f67SBaptiste Daroussin */ 8033bbe3f67SBaptiste Daroussin } 8043bbe3f67SBaptiste Daroussin 8053bbe3f67SBaptiste Daroussin /* shellsort CACM #201 */ 8063bbe3f67SBaptiste Daroussin static void 8073bbe3f67SBaptiste Daroussin sort(struct line *a, int n) 8083bbe3f67SBaptiste Daroussin { 8093bbe3f67SBaptiste Daroussin struct line *ai, *aim, w; 8103bbe3f67SBaptiste Daroussin int j, m = 0, k; 8113bbe3f67SBaptiste Daroussin 8123bbe3f67SBaptiste Daroussin if (n == 0) 8133bbe3f67SBaptiste Daroussin return; 8143bbe3f67SBaptiste Daroussin for (j = 1; j <= n; j *= 2) 8153bbe3f67SBaptiste Daroussin m = 2 * j - 1; 8163bbe3f67SBaptiste Daroussin for (m /= 2; m != 0; m /= 2) { 8173bbe3f67SBaptiste Daroussin k = n - m; 8183bbe3f67SBaptiste Daroussin for (j = 1; j <= k; j++) { 8193bbe3f67SBaptiste Daroussin for (ai = &a[j]; ai > a; ai -= m) { 8203bbe3f67SBaptiste Daroussin aim = &ai[m]; 8213bbe3f67SBaptiste Daroussin if (aim < ai) 8223bbe3f67SBaptiste Daroussin break; /* wraparound */ 8233bbe3f67SBaptiste Daroussin if (aim->value > ai[0].value || 8243bbe3f67SBaptiste Daroussin (aim->value == ai[0].value && 8253bbe3f67SBaptiste Daroussin aim->serial > ai[0].serial)) 8263bbe3f67SBaptiste Daroussin break; 8273bbe3f67SBaptiste Daroussin w.value = ai[0].value; 8283bbe3f67SBaptiste Daroussin ai[0].value = aim->value; 8293bbe3f67SBaptiste Daroussin aim->value = w.value; 8303bbe3f67SBaptiste Daroussin w.serial = ai[0].serial; 8313bbe3f67SBaptiste Daroussin ai[0].serial = aim->serial; 8323bbe3f67SBaptiste Daroussin aim->serial = w.serial; 8333bbe3f67SBaptiste Daroussin } 8343bbe3f67SBaptiste Daroussin } 8353bbe3f67SBaptiste Daroussin } 8363bbe3f67SBaptiste Daroussin } 8373bbe3f67SBaptiste Daroussin 8383bbe3f67SBaptiste Daroussin static void 8393bbe3f67SBaptiste Daroussin unsort(struct line *f, int l, int *b) 8403bbe3f67SBaptiste Daroussin { 8413bbe3f67SBaptiste Daroussin int *a, i; 8423bbe3f67SBaptiste Daroussin 8433bbe3f67SBaptiste Daroussin a = xcalloc(l + 1, sizeof(*a)); 8443bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 8453bbe3f67SBaptiste Daroussin a[f[i].serial] = f[i].value; 8463bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 8473bbe3f67SBaptiste Daroussin b[i] = a[i]; 8483bbe3f67SBaptiste Daroussin free(a); 8493bbe3f67SBaptiste Daroussin } 8503bbe3f67SBaptiste Daroussin 8513bbe3f67SBaptiste Daroussin static int 8523bbe3f67SBaptiste Daroussin skipline(FILE *f) 8533bbe3f67SBaptiste Daroussin { 8543bbe3f67SBaptiste Daroussin int i, c; 8553bbe3f67SBaptiste Daroussin 8563bbe3f67SBaptiste Daroussin for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++) 8573bbe3f67SBaptiste Daroussin continue; 8583bbe3f67SBaptiste Daroussin return (i); 8593bbe3f67SBaptiste Daroussin } 8603bbe3f67SBaptiste Daroussin 8613bbe3f67SBaptiste Daroussin static void 8623bbe3f67SBaptiste Daroussin output(char *file1, FILE *f1, char *file2, FILE *f2, int flags) 8633bbe3f67SBaptiste Daroussin { 8643bbe3f67SBaptiste Daroussin int m, i0, i1, j0, j1; 8653bbe3f67SBaptiste Daroussin 8663bbe3f67SBaptiste Daroussin rewind(f1); 8673bbe3f67SBaptiste Daroussin rewind(f2); 8683bbe3f67SBaptiste Daroussin m = len[0]; 8693bbe3f67SBaptiste Daroussin J[0] = 0; 8703bbe3f67SBaptiste Daroussin J[m + 1] = len[1] + 1; 8713bbe3f67SBaptiste Daroussin if (diff_format != D_EDIT) { 8723bbe3f67SBaptiste Daroussin for (i0 = 1; i0 <= m; i0 = i1 + 1) { 8733bbe3f67SBaptiste Daroussin while (i0 <= m && J[i0] == J[i0 - 1] + 1) 8743bbe3f67SBaptiste Daroussin i0++; 8753bbe3f67SBaptiste Daroussin j0 = J[i0 - 1] + 1; 8763bbe3f67SBaptiste Daroussin i1 = i0 - 1; 8773bbe3f67SBaptiste Daroussin while (i1 < m && J[i1 + 1] == 0) 8783bbe3f67SBaptiste Daroussin i1++; 8793bbe3f67SBaptiste Daroussin j1 = J[i1 + 1] - 1; 8803bbe3f67SBaptiste Daroussin J[i1] = j1; 8813bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i0, i1, j0, j1, &flags); 8823bbe3f67SBaptiste Daroussin } 8833bbe3f67SBaptiste Daroussin } else { 8843bbe3f67SBaptiste Daroussin for (i0 = m; i0 >= 1; i0 = i1 - 1) { 8853bbe3f67SBaptiste Daroussin while (i0 >= 1 && J[i0] == J[i0 + 1] - 1 && J[i0] != 0) 8863bbe3f67SBaptiste Daroussin i0--; 8873bbe3f67SBaptiste Daroussin j0 = J[i0 + 1] - 1; 8883bbe3f67SBaptiste Daroussin i1 = i0 + 1; 8893bbe3f67SBaptiste Daroussin while (i1 > 1 && J[i1 - 1] == 0) 8903bbe3f67SBaptiste Daroussin i1--; 8913bbe3f67SBaptiste Daroussin j1 = J[i1 - 1] + 1; 8923bbe3f67SBaptiste Daroussin J[i1] = j1; 8933bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i1, i0, j1, j0, &flags); 8943bbe3f67SBaptiste Daroussin } 8953bbe3f67SBaptiste Daroussin } 8963bbe3f67SBaptiste Daroussin if (m == 0) 8973bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, 1, 0, 1, len[1], &flags); 898fddcb7b8SBaptiste Daroussin if (diff_format == D_IFDEF || diff_format == D_GFORMAT) { 8993bbe3f67SBaptiste Daroussin for (;;) { 9003bbe3f67SBaptiste Daroussin #define c i0 9013bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == EOF) 9023bbe3f67SBaptiste Daroussin return; 9033bbe3f67SBaptiste Daroussin diff_output("%c", c); 9043bbe3f67SBaptiste Daroussin } 9053bbe3f67SBaptiste Daroussin #undef c 9063bbe3f67SBaptiste Daroussin } 9073bbe3f67SBaptiste Daroussin if (anychange != 0) { 9083bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 9093bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, flags); 9103bbe3f67SBaptiste Daroussin else if (diff_format == D_UNIFIED) 9113bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, flags); 9123bbe3f67SBaptiste Daroussin } 9133bbe3f67SBaptiste Daroussin } 9143bbe3f67SBaptiste Daroussin 9153bbe3f67SBaptiste Daroussin static void 9163bbe3f67SBaptiste Daroussin range(int a, int b, const char *separator) 9173bbe3f67SBaptiste Daroussin { 9183bbe3f67SBaptiste Daroussin diff_output("%d", a > b ? b : a); 9193bbe3f67SBaptiste Daroussin if (a < b) 9203bbe3f67SBaptiste Daroussin diff_output("%s%d", separator, b); 9213bbe3f67SBaptiste Daroussin } 9223bbe3f67SBaptiste Daroussin 9233bbe3f67SBaptiste Daroussin static void 9243bbe3f67SBaptiste Daroussin uni_range(int a, int b) 9253bbe3f67SBaptiste Daroussin { 9263bbe3f67SBaptiste Daroussin if (a < b) 9273bbe3f67SBaptiste Daroussin diff_output("%d,%d", a, b - a + 1); 9283bbe3f67SBaptiste Daroussin else if (a == b) 9293bbe3f67SBaptiste Daroussin diff_output("%d", b); 9303bbe3f67SBaptiste Daroussin else 9313bbe3f67SBaptiste Daroussin diff_output("%d,0", b); 9323bbe3f67SBaptiste Daroussin } 9333bbe3f67SBaptiste Daroussin 9343bbe3f67SBaptiste Daroussin static char * 9353bbe3f67SBaptiste Daroussin preadline(int fd, size_t rlen, off_t off) 9363bbe3f67SBaptiste Daroussin { 9373bbe3f67SBaptiste Daroussin char *line; 9383bbe3f67SBaptiste Daroussin ssize_t nr; 9393bbe3f67SBaptiste Daroussin 9403bbe3f67SBaptiste Daroussin line = xmalloc(rlen + 1); 9413bbe3f67SBaptiste Daroussin if ((nr = pread(fd, line, rlen, off)) < 0) 9423bbe3f67SBaptiste Daroussin err(2, "preadline"); 9433bbe3f67SBaptiste Daroussin if (nr > 0 && line[nr-1] == '\n') 9443bbe3f67SBaptiste Daroussin nr--; 9453bbe3f67SBaptiste Daroussin line[nr] = '\0'; 9463bbe3f67SBaptiste Daroussin return (line); 9473bbe3f67SBaptiste Daroussin } 9483bbe3f67SBaptiste Daroussin 9493bbe3f67SBaptiste Daroussin static int 9503bbe3f67SBaptiste Daroussin ignoreline(char *line) 9513bbe3f67SBaptiste Daroussin { 9523bbe3f67SBaptiste Daroussin int ret; 9533bbe3f67SBaptiste Daroussin 9543bbe3f67SBaptiste Daroussin ret = regexec(&ignore_re, line, 0, NULL, 0); 9553bbe3f67SBaptiste Daroussin free(line); 9563bbe3f67SBaptiste Daroussin return (ret == 0); /* if it matched, it should be ignored. */ 9573bbe3f67SBaptiste Daroussin } 9583bbe3f67SBaptiste Daroussin 9593bbe3f67SBaptiste Daroussin /* 9603bbe3f67SBaptiste Daroussin * Indicate that there is a difference between lines a and b of the from file 9613bbe3f67SBaptiste Daroussin * to get to lines c to d of the to file. If a is greater then b then there 9623bbe3f67SBaptiste Daroussin * are no lines in the from file involved and this means that there were 9633bbe3f67SBaptiste Daroussin * lines appended (beginning at b). If c is greater than d then there are 9643bbe3f67SBaptiste Daroussin * lines missing from the to file. 9653bbe3f67SBaptiste Daroussin */ 9663bbe3f67SBaptiste Daroussin static void 9673bbe3f67SBaptiste Daroussin change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, 9683bbe3f67SBaptiste Daroussin int *pflags) 9693bbe3f67SBaptiste Daroussin { 9703bbe3f67SBaptiste Daroussin static size_t max_context = 64; 971fddcb7b8SBaptiste Daroussin long curpos; 9727ef35d05SDimitry Andric int i, nc, f; 973fddcb7b8SBaptiste Daroussin const char *walk; 9743bbe3f67SBaptiste Daroussin 9753bbe3f67SBaptiste Daroussin restart: 976fddcb7b8SBaptiste Daroussin if ((diff_format != D_IFDEF || diff_format == D_GFORMAT) && 977fddcb7b8SBaptiste Daroussin a > b && c > d) 9783bbe3f67SBaptiste Daroussin return; 9793bbe3f67SBaptiste Daroussin if (ignore_pats != NULL) { 9803bbe3f67SBaptiste Daroussin char *line; 9813bbe3f67SBaptiste Daroussin /* 9823bbe3f67SBaptiste Daroussin * All lines in the change, insert, or delete must 9833bbe3f67SBaptiste Daroussin * match an ignore pattern for the change to be 9843bbe3f67SBaptiste Daroussin * ignored. 9853bbe3f67SBaptiste Daroussin */ 9863bbe3f67SBaptiste Daroussin if (a <= b) { /* Changes and deletes. */ 9873bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 9883bbe3f67SBaptiste Daroussin line = preadline(fileno(f1), 9893bbe3f67SBaptiste Daroussin ixold[i] - ixold[i - 1], ixold[i - 1]); 9903bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 9913bbe3f67SBaptiste Daroussin goto proceed; 9923bbe3f67SBaptiste Daroussin } 9933bbe3f67SBaptiste Daroussin } 9943bbe3f67SBaptiste Daroussin if (a > b || c <= d) { /* Changes and inserts. */ 9953bbe3f67SBaptiste Daroussin for (i = c; i <= d; i++) { 9963bbe3f67SBaptiste Daroussin line = preadline(fileno(f2), 9973bbe3f67SBaptiste Daroussin ixnew[i] - ixnew[i - 1], ixnew[i - 1]); 9983bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 9993bbe3f67SBaptiste Daroussin goto proceed; 10003bbe3f67SBaptiste Daroussin } 10013bbe3f67SBaptiste Daroussin } 10023bbe3f67SBaptiste Daroussin return; 10033bbe3f67SBaptiste Daroussin } 1004*e68edb8cSKyle Evans if (*pflags & D_SKIPBLANKLINES) { 1005*e68edb8cSKyle Evans char *line; 1006*e68edb8cSKyle Evans /* 1007*e68edb8cSKyle Evans * All lines in the change, insert, or delete must not be 1008*e68edb8cSKyle Evans * empty for the change to be ignored. 1009*e68edb8cSKyle Evans */ 1010*e68edb8cSKyle Evans if (a <= b) { /* Changes and deletes. */ 1011*e68edb8cSKyle Evans for (i = a; i <= b; i++) { 1012*e68edb8cSKyle Evans line = preadline(fileno(f1), 1013*e68edb8cSKyle Evans ixold[i] - ixold[i - 1], ixold[i - 1]); 1014*e68edb8cSKyle Evans if (*line != '\0') 1015*e68edb8cSKyle Evans goto proceed; 1016*e68edb8cSKyle Evans } 1017*e68edb8cSKyle Evans } 1018*e68edb8cSKyle Evans if (a > b || c <= d) { /* Changes and inserts. */ 1019*e68edb8cSKyle Evans for (i = c; i <= d; i++) { 1020*e68edb8cSKyle Evans line = preadline(fileno(f2), 1021*e68edb8cSKyle Evans ixnew[i] - ixnew[i - 1], ixnew[i - 1]); 1022*e68edb8cSKyle Evans if (*line != '\0') 1023*e68edb8cSKyle Evans goto proceed; 1024*e68edb8cSKyle Evans } 1025*e68edb8cSKyle Evans } 1026*e68edb8cSKyle Evans return; 1027*e68edb8cSKyle Evans 1028*e68edb8cSKyle Evans } 10293bbe3f67SBaptiste Daroussin proceed: 10304d8c5790SEnji Cooper if (*pflags & D_HEADER && diff_format != D_BRIEF) { 10313bbe3f67SBaptiste Daroussin diff_output("%s %s %s\n", diffargs, file1, file2); 10323bbe3f67SBaptiste Daroussin *pflags &= ~D_HEADER; 10333bbe3f67SBaptiste Daroussin } 10343bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) { 10353bbe3f67SBaptiste Daroussin /* 10363bbe3f67SBaptiste Daroussin * Allocate change records as needed. 10373bbe3f67SBaptiste Daroussin */ 10383bbe3f67SBaptiste Daroussin if (context_vec_ptr == context_vec_end - 1) { 10393bbe3f67SBaptiste Daroussin ptrdiff_t offset = context_vec_ptr - context_vec_start; 10403bbe3f67SBaptiste Daroussin max_context <<= 1; 10413bbe3f67SBaptiste Daroussin context_vec_start = xreallocarray(context_vec_start, 10423bbe3f67SBaptiste Daroussin max_context, sizeof(*context_vec_start)); 10433bbe3f67SBaptiste Daroussin context_vec_end = context_vec_start + max_context; 10443bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start + offset; 10453bbe3f67SBaptiste Daroussin } 10463bbe3f67SBaptiste Daroussin if (anychange == 0) { 10473bbe3f67SBaptiste Daroussin /* 10483bbe3f67SBaptiste Daroussin * Print the context/unidiff header first time through. 10493bbe3f67SBaptiste Daroussin */ 10503bbe3f67SBaptiste Daroussin print_header(file1, file2); 10513bbe3f67SBaptiste Daroussin anychange = 1; 10523bbe3f67SBaptiste Daroussin } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && 10533bbe3f67SBaptiste Daroussin c > context_vec_ptr->d + (2 * diff_context) + 1) { 10543bbe3f67SBaptiste Daroussin /* 10553bbe3f67SBaptiste Daroussin * If this change is more than 'diff_context' lines from the 10563bbe3f67SBaptiste Daroussin * previous change, dump the record and reset it. 10573bbe3f67SBaptiste Daroussin */ 10583bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 10593bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, *pflags); 10603bbe3f67SBaptiste Daroussin else 10613bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, *pflags); 10623bbe3f67SBaptiste Daroussin } 10633bbe3f67SBaptiste Daroussin context_vec_ptr++; 10643bbe3f67SBaptiste Daroussin context_vec_ptr->a = a; 10653bbe3f67SBaptiste Daroussin context_vec_ptr->b = b; 10663bbe3f67SBaptiste Daroussin context_vec_ptr->c = c; 10673bbe3f67SBaptiste Daroussin context_vec_ptr->d = d; 10683bbe3f67SBaptiste Daroussin return; 10693bbe3f67SBaptiste Daroussin } 10703bbe3f67SBaptiste Daroussin if (anychange == 0) 10713bbe3f67SBaptiste Daroussin anychange = 1; 10723bbe3f67SBaptiste Daroussin switch (diff_format) { 10733bbe3f67SBaptiste Daroussin case D_BRIEF: 10743bbe3f67SBaptiste Daroussin return; 10753bbe3f67SBaptiste Daroussin case D_NORMAL: 10763bbe3f67SBaptiste Daroussin case D_EDIT: 10773bbe3f67SBaptiste Daroussin range(a, b, ","); 10783bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 10793bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL) 10803bbe3f67SBaptiste Daroussin range(c, d, ","); 10813bbe3f67SBaptiste Daroussin diff_output("\n"); 10823bbe3f67SBaptiste Daroussin break; 10833bbe3f67SBaptiste Daroussin case D_REVERSE: 10843bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 10853bbe3f67SBaptiste Daroussin range(a, b, " "); 10863bbe3f67SBaptiste Daroussin diff_output("\n"); 10873bbe3f67SBaptiste Daroussin break; 10883bbe3f67SBaptiste Daroussin case D_NREVERSE: 10893bbe3f67SBaptiste Daroussin if (a > b) 10903bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 10913bbe3f67SBaptiste Daroussin else { 10923bbe3f67SBaptiste Daroussin diff_output("d%d %d\n", a, b - a + 1); 10933bbe3f67SBaptiste Daroussin if (!(c > d)) 10943bbe3f67SBaptiste Daroussin /* add changed lines */ 10953bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 10963bbe3f67SBaptiste Daroussin } 10973bbe3f67SBaptiste Daroussin break; 10983bbe3f67SBaptiste Daroussin } 1099fddcb7b8SBaptiste Daroussin if (diff_format == D_GFORMAT) { 1100fddcb7b8SBaptiste Daroussin curpos = ftell(f1); 1101fddcb7b8SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 1102fddcb7b8SBaptiste Daroussin nc = ixold[a > b ? b : a - 1] - curpos; 1103fddcb7b8SBaptiste Daroussin for (i = 0; i < nc; i++) 1104fddcb7b8SBaptiste Daroussin diff_output("%c", getc(f1)); 1105fddcb7b8SBaptiste Daroussin for (walk = group_format; *walk != '\0'; walk++) { 1106fddcb7b8SBaptiste Daroussin if (*walk == '%') { 1107fddcb7b8SBaptiste Daroussin walk++; 1108fddcb7b8SBaptiste Daroussin switch (*walk) { 1109fddcb7b8SBaptiste Daroussin case '<': 1110fddcb7b8SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 1111fddcb7b8SBaptiste Daroussin break; 1112fddcb7b8SBaptiste Daroussin case '>': 1113fddcb7b8SBaptiste Daroussin fetch(ixnew, c, d, f2, '>', 0, *pflags); 1114fddcb7b8SBaptiste Daroussin break; 1115fddcb7b8SBaptiste Daroussin default: 1116fddcb7b8SBaptiste Daroussin diff_output("%%%c", *walk); 1117fddcb7b8SBaptiste Daroussin break; 1118fddcb7b8SBaptiste Daroussin } 1119fddcb7b8SBaptiste Daroussin continue; 1120fddcb7b8SBaptiste Daroussin } 1121fddcb7b8SBaptiste Daroussin diff_output("%c", *walk); 1122fddcb7b8SBaptiste Daroussin } 1123fddcb7b8SBaptiste Daroussin } 11243bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL || diff_format == D_IFDEF) { 11253bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 11263bbe3f67SBaptiste Daroussin if (a <= b && c <= d && diff_format == D_NORMAL) 11273bbe3f67SBaptiste Daroussin diff_output("---\n"); 11283bbe3f67SBaptiste Daroussin } 11297ef35d05SDimitry Andric f = 0; 1130fddcb7b8SBaptiste Daroussin if (diff_format != D_GFORMAT) 11317ef35d05SDimitry Andric f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags); 11327ef35d05SDimitry Andric if (f != 0 && diff_format == D_EDIT) { 11333bbe3f67SBaptiste Daroussin /* 11343bbe3f67SBaptiste Daroussin * A non-zero return value for D_EDIT indicates that the 11353bbe3f67SBaptiste Daroussin * last line printed was a bare dot (".") that has been 11363bbe3f67SBaptiste Daroussin * escaped as ".." to prevent ed(1) from misinterpreting 11373bbe3f67SBaptiste Daroussin * it. We have to add a substitute command to change this 11383bbe3f67SBaptiste Daroussin * back and restart where we left off. 11393bbe3f67SBaptiste Daroussin */ 11403bbe3f67SBaptiste Daroussin diff_output(".\n"); 11417ef35d05SDimitry Andric diff_output("%ds/.//\n", a + f - 1); 11427ef35d05SDimitry Andric b = a + f - 1; 11433bbe3f67SBaptiste Daroussin a = b + 1; 11447ef35d05SDimitry Andric c += f; 11453bbe3f67SBaptiste Daroussin goto restart; 11463bbe3f67SBaptiste Daroussin } 11473bbe3f67SBaptiste Daroussin if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d) 11483bbe3f67SBaptiste Daroussin diff_output(".\n"); 11493bbe3f67SBaptiste Daroussin if (inifdef) { 11503bbe3f67SBaptiste Daroussin diff_output("#endif /* %s */\n", ifdefname); 11513bbe3f67SBaptiste Daroussin inifdef = 0; 11523bbe3f67SBaptiste Daroussin } 11533bbe3f67SBaptiste Daroussin } 11543bbe3f67SBaptiste Daroussin 11553bbe3f67SBaptiste Daroussin static int 11563bbe3f67SBaptiste Daroussin fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) 11573bbe3f67SBaptiste Daroussin { 11583bbe3f67SBaptiste Daroussin int i, j, c, lastc, col, nc; 11593bbe3f67SBaptiste Daroussin int newcol; 11603bbe3f67SBaptiste Daroussin 11613bbe3f67SBaptiste Daroussin /* 11623bbe3f67SBaptiste Daroussin * When doing #ifdef's, copy down to current line 11633bbe3f67SBaptiste Daroussin * if this is the first file, so that stuff makes it to output. 11643bbe3f67SBaptiste Daroussin */ 1165fddcb7b8SBaptiste Daroussin if ((diff_format == D_IFDEF) && oldfile) { 11663bbe3f67SBaptiste Daroussin long curpos = ftell(lb); 11673bbe3f67SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 11683bbe3f67SBaptiste Daroussin nc = f[a > b ? b : a - 1] - curpos; 11693bbe3f67SBaptiste Daroussin for (i = 0; i < nc; i++) 11703bbe3f67SBaptiste Daroussin diff_output("%c", getc(lb)); 11713bbe3f67SBaptiste Daroussin } 11723bbe3f67SBaptiste Daroussin if (a > b) 11733bbe3f67SBaptiste Daroussin return (0); 11743bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF) { 11753bbe3f67SBaptiste Daroussin if (inifdef) { 11763bbe3f67SBaptiste Daroussin diff_output("#else /* %s%s */\n", 11773bbe3f67SBaptiste Daroussin oldfile == 1 ? "!" : "", ifdefname); 11783bbe3f67SBaptiste Daroussin } else { 11793bbe3f67SBaptiste Daroussin if (oldfile) 11803bbe3f67SBaptiste Daroussin diff_output("#ifndef %s\n", ifdefname); 11813bbe3f67SBaptiste Daroussin else 11823bbe3f67SBaptiste Daroussin diff_output("#ifdef %s\n", ifdefname); 11833bbe3f67SBaptiste Daroussin } 11843bbe3f67SBaptiste Daroussin inifdef = 1 + oldfile; 11853bbe3f67SBaptiste Daroussin } 11863bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 11873bbe3f67SBaptiste Daroussin fseek(lb, f[i - 1], SEEK_SET); 11883bbe3f67SBaptiste Daroussin nc = f[i] - f[i - 1]; 1189fddcb7b8SBaptiste Daroussin if ((diff_format != D_IFDEF && diff_format != D_GFORMAT) && 1190fddcb7b8SBaptiste Daroussin ch != '\0') { 11913bbe3f67SBaptiste Daroussin diff_output("%c", ch); 11923bbe3f67SBaptiste Daroussin if (Tflag && (diff_format == D_NORMAL || diff_format == D_CONTEXT 11933bbe3f67SBaptiste Daroussin || diff_format == D_UNIFIED)) 11943bbe3f67SBaptiste Daroussin diff_output("\t"); 11953bbe3f67SBaptiste Daroussin else if (diff_format != D_UNIFIED) 11963bbe3f67SBaptiste Daroussin diff_output(" "); 11973bbe3f67SBaptiste Daroussin } 11983bbe3f67SBaptiste Daroussin col = 0; 11993bbe3f67SBaptiste Daroussin for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) { 12003bbe3f67SBaptiste Daroussin if ((c = getc(lb)) == EOF) { 12013bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT || diff_format == D_REVERSE || 12023bbe3f67SBaptiste Daroussin diff_format == D_NREVERSE) 12033bbe3f67SBaptiste Daroussin warnx("No newline at end of file"); 12043bbe3f67SBaptiste Daroussin else 12053bbe3f67SBaptiste Daroussin diff_output("\n\\ No newline at end of " 12063bbe3f67SBaptiste Daroussin "file\n"); 12073bbe3f67SBaptiste Daroussin return (0); 12083bbe3f67SBaptiste Daroussin } 12093bbe3f67SBaptiste Daroussin if (c == '\t' && (flags & D_EXPANDTABS)) { 12103bbe3f67SBaptiste Daroussin newcol = ((col/tabsize)+1)*tabsize; 12113bbe3f67SBaptiste Daroussin do { 12123bbe3f67SBaptiste Daroussin diff_output(" "); 12133bbe3f67SBaptiste Daroussin } while (++col < newcol); 12143bbe3f67SBaptiste Daroussin } else { 12153bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT && j == 1 && c == '\n' 12163bbe3f67SBaptiste Daroussin && lastc == '.') { 12173bbe3f67SBaptiste Daroussin /* 12183bbe3f67SBaptiste Daroussin * Don't print a bare "." line 12193bbe3f67SBaptiste Daroussin * since that will confuse ed(1). 12203bbe3f67SBaptiste Daroussin * Print ".." instead and return, 12213bbe3f67SBaptiste Daroussin * giving the caller an offset 12223bbe3f67SBaptiste Daroussin * from which to restart. 12233bbe3f67SBaptiste Daroussin */ 12243bbe3f67SBaptiste Daroussin diff_output(".\n"); 12253bbe3f67SBaptiste Daroussin return (i - a + 1); 12263bbe3f67SBaptiste Daroussin } 12273bbe3f67SBaptiste Daroussin diff_output("%c", c); 12283bbe3f67SBaptiste Daroussin col++; 12293bbe3f67SBaptiste Daroussin } 12303bbe3f67SBaptiste Daroussin } 12313bbe3f67SBaptiste Daroussin } 12323bbe3f67SBaptiste Daroussin return (0); 12333bbe3f67SBaptiste Daroussin } 12343bbe3f67SBaptiste Daroussin 12353bbe3f67SBaptiste Daroussin /* 12363bbe3f67SBaptiste Daroussin * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578. 12373bbe3f67SBaptiste Daroussin */ 12383bbe3f67SBaptiste Daroussin static int 12393bbe3f67SBaptiste Daroussin readhash(FILE *f, int flags) 12403bbe3f67SBaptiste Daroussin { 12413bbe3f67SBaptiste Daroussin int i, t, space; 12423bbe3f67SBaptiste Daroussin int sum; 12433bbe3f67SBaptiste Daroussin 12443bbe3f67SBaptiste Daroussin sum = 1; 12453bbe3f67SBaptiste Daroussin space = 0; 12463bbe3f67SBaptiste Daroussin if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) { 12473bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 12483bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 12493bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 12503bbe3f67SBaptiste Daroussin t = getc(f); 12513bbe3f67SBaptiste Daroussin if (t == '\n') 12523bbe3f67SBaptiste Daroussin break; 12533bbe3f67SBaptiste Daroussin ungetc(t, f); 12543bbe3f67SBaptiste Daroussin } 12553bbe3f67SBaptiste Daroussin if (t == EOF) { 12563bbe3f67SBaptiste Daroussin if (i == 0) 12573bbe3f67SBaptiste Daroussin return (0); 12583bbe3f67SBaptiste Daroussin break; 12593bbe3f67SBaptiste Daroussin } 12600118df5eSBaptiste Daroussin sum = sum * 127 + chrtran(t); 12613bbe3f67SBaptiste Daroussin } 12623bbe3f67SBaptiste Daroussin else 12633bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 12643bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 12653bbe3f67SBaptiste Daroussin t = getc(f); 12663bbe3f67SBaptiste Daroussin if (t == '\n') 12673bbe3f67SBaptiste Daroussin break; 12683bbe3f67SBaptiste Daroussin ungetc(t, f); 12693bbe3f67SBaptiste Daroussin } 12703bbe3f67SBaptiste Daroussin if (t == EOF) { 12713bbe3f67SBaptiste Daroussin if (i == 0) 12723bbe3f67SBaptiste Daroussin return (0); 12733bbe3f67SBaptiste Daroussin break; 12743bbe3f67SBaptiste Daroussin } 12753bbe3f67SBaptiste Daroussin sum = sum * 127 + t; 12763bbe3f67SBaptiste Daroussin } 12773bbe3f67SBaptiste Daroussin } else { 12783bbe3f67SBaptiste Daroussin for (i = 0;;) { 12793bbe3f67SBaptiste Daroussin switch (t = getc(f)) { 12803bbe3f67SBaptiste Daroussin case '\r': 12813bbe3f67SBaptiste Daroussin case '\t': 12823bbe3f67SBaptiste Daroussin case '\v': 12833bbe3f67SBaptiste Daroussin case '\f': 12843bbe3f67SBaptiste Daroussin case ' ': 12853bbe3f67SBaptiste Daroussin space++; 12863bbe3f67SBaptiste Daroussin continue; 12873bbe3f67SBaptiste Daroussin default: 12883bbe3f67SBaptiste Daroussin if (space && (flags & D_IGNOREBLANKS) == 0) { 12893bbe3f67SBaptiste Daroussin i++; 12903bbe3f67SBaptiste Daroussin space = 0; 12913bbe3f67SBaptiste Daroussin } 12920118df5eSBaptiste Daroussin sum = sum * 127 + chrtran(t); 12933bbe3f67SBaptiste Daroussin i++; 12943bbe3f67SBaptiste Daroussin continue; 12953bbe3f67SBaptiste Daroussin case EOF: 12963bbe3f67SBaptiste Daroussin if (i == 0) 12973bbe3f67SBaptiste Daroussin return (0); 12983bbe3f67SBaptiste Daroussin /* FALLTHROUGH */ 12993bbe3f67SBaptiste Daroussin case '\n': 13003bbe3f67SBaptiste Daroussin break; 13013bbe3f67SBaptiste Daroussin } 13023bbe3f67SBaptiste Daroussin break; 13033bbe3f67SBaptiste Daroussin } 13043bbe3f67SBaptiste Daroussin } 13053bbe3f67SBaptiste Daroussin /* 13063bbe3f67SBaptiste Daroussin * There is a remote possibility that we end up with a zero sum. 13073bbe3f67SBaptiste Daroussin * Zero is used as an EOF marker, so return 1 instead. 13083bbe3f67SBaptiste Daroussin */ 13093bbe3f67SBaptiste Daroussin return (sum == 0 ? 1 : sum); 13103bbe3f67SBaptiste Daroussin } 13113bbe3f67SBaptiste Daroussin 13123bbe3f67SBaptiste Daroussin static int 13133bbe3f67SBaptiste Daroussin asciifile(FILE *f) 13143bbe3f67SBaptiste Daroussin { 13153bbe3f67SBaptiste Daroussin unsigned char buf[BUFSIZ]; 13163bbe3f67SBaptiste Daroussin size_t cnt; 13173bbe3f67SBaptiste Daroussin 13183bbe3f67SBaptiste Daroussin if (f == NULL) 13193bbe3f67SBaptiste Daroussin return (1); 13203bbe3f67SBaptiste Daroussin 13213bbe3f67SBaptiste Daroussin rewind(f); 13223bbe3f67SBaptiste Daroussin cnt = fread(buf, 1, sizeof(buf), f); 13233bbe3f67SBaptiste Daroussin return (memchr(buf, '\0', cnt) == NULL); 13243bbe3f67SBaptiste Daroussin } 13253bbe3f67SBaptiste Daroussin 13263bbe3f67SBaptiste Daroussin #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0) 13273bbe3f67SBaptiste Daroussin 13283bbe3f67SBaptiste Daroussin static char * 13293bbe3f67SBaptiste Daroussin match_function(const long *f, int pos, FILE *fp) 13303bbe3f67SBaptiste Daroussin { 13313bbe3f67SBaptiste Daroussin unsigned char buf[FUNCTION_CONTEXT_SIZE]; 13323bbe3f67SBaptiste Daroussin size_t nc; 13333bbe3f67SBaptiste Daroussin int last = lastline; 13343bbe3f67SBaptiste Daroussin const char *state = NULL; 13353bbe3f67SBaptiste Daroussin 13363bbe3f67SBaptiste Daroussin lastline = pos; 13373bbe3f67SBaptiste Daroussin while (pos > last) { 13383bbe3f67SBaptiste Daroussin fseek(fp, f[pos - 1], SEEK_SET); 13393bbe3f67SBaptiste Daroussin nc = f[pos] - f[pos - 1]; 13403bbe3f67SBaptiste Daroussin if (nc >= sizeof(buf)) 13413bbe3f67SBaptiste Daroussin nc = sizeof(buf) - 1; 13423bbe3f67SBaptiste Daroussin nc = fread(buf, 1, nc, fp); 13433bbe3f67SBaptiste Daroussin if (nc > 0) { 13443bbe3f67SBaptiste Daroussin buf[nc] = '\0'; 13453bbe3f67SBaptiste Daroussin buf[strcspn(buf, "\n")] = '\0'; 13463bbe3f67SBaptiste Daroussin if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') { 13473bbe3f67SBaptiste Daroussin if (begins_with(buf, "private:")) { 13483bbe3f67SBaptiste Daroussin if (!state) 13493bbe3f67SBaptiste Daroussin state = " (private)"; 13503bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "protected:")) { 13513bbe3f67SBaptiste Daroussin if (!state) 13523bbe3f67SBaptiste Daroussin state = " (protected)"; 13533bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "public:")) { 13543bbe3f67SBaptiste Daroussin if (!state) 13553bbe3f67SBaptiste Daroussin state = " (public)"; 13563bbe3f67SBaptiste Daroussin } else { 13573bbe3f67SBaptiste Daroussin strlcpy(lastbuf, buf, sizeof lastbuf); 13583bbe3f67SBaptiste Daroussin if (state) 13593bbe3f67SBaptiste Daroussin strlcat(lastbuf, state, 13603bbe3f67SBaptiste Daroussin sizeof lastbuf); 13613bbe3f67SBaptiste Daroussin lastmatchline = pos; 13623bbe3f67SBaptiste Daroussin return lastbuf; 13633bbe3f67SBaptiste Daroussin } 13643bbe3f67SBaptiste Daroussin } 13653bbe3f67SBaptiste Daroussin } 13663bbe3f67SBaptiste Daroussin pos--; 13673bbe3f67SBaptiste Daroussin } 13683bbe3f67SBaptiste Daroussin return lastmatchline > 0 ? lastbuf : NULL; 13693bbe3f67SBaptiste Daroussin } 13703bbe3f67SBaptiste Daroussin 13713bbe3f67SBaptiste Daroussin /* dump accumulated "context" diff changes */ 13723bbe3f67SBaptiste Daroussin static void 13733bbe3f67SBaptiste Daroussin dump_context_vec(FILE *f1, FILE *f2, int flags) 13743bbe3f67SBaptiste Daroussin { 13753bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 13763bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd, do_output; 13773bbe3f67SBaptiste Daroussin int a, b, c, d; 13783bbe3f67SBaptiste Daroussin char ch, *f; 13793bbe3f67SBaptiste Daroussin 13803bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 13813bbe3f67SBaptiste Daroussin return; 13823bbe3f67SBaptiste Daroussin 13833bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 138442c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 138542c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 138642c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 138742c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 13883bbe3f67SBaptiste Daroussin 13893bbe3f67SBaptiste Daroussin diff_output("***************"); 13903bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 13913bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 13923bbe3f67SBaptiste Daroussin if (f != NULL) 13933bbe3f67SBaptiste Daroussin diff_output(" %s", f); 13943bbe3f67SBaptiste Daroussin } 13953bbe3f67SBaptiste Daroussin diff_output("\n*** "); 13963bbe3f67SBaptiste Daroussin range(lowa, upb, ","); 13973bbe3f67SBaptiste Daroussin diff_output(" ****\n"); 13983bbe3f67SBaptiste Daroussin 13993bbe3f67SBaptiste Daroussin /* 14003bbe3f67SBaptiste Daroussin * Output changes to the "old" file. The first loop suppresses 14013bbe3f67SBaptiste Daroussin * output if there were no changes to the "old" file (we'll see 14023bbe3f67SBaptiste Daroussin * the "old" lines as context in the "new" list). 14033bbe3f67SBaptiste Daroussin */ 14043bbe3f67SBaptiste Daroussin do_output = 0; 14053bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) 14063bbe3f67SBaptiste Daroussin if (cvp->a <= cvp->b) { 14073bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14083bbe3f67SBaptiste Daroussin do_output++; 14093bbe3f67SBaptiste Daroussin break; 14103bbe3f67SBaptiste Daroussin } 14113bbe3f67SBaptiste Daroussin if (do_output) { 14123bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14133bbe3f67SBaptiste Daroussin a = cvp->a; 14143bbe3f67SBaptiste Daroussin b = cvp->b; 14153bbe3f67SBaptiste Daroussin c = cvp->c; 14163bbe3f67SBaptiste Daroussin d = cvp->d; 14173bbe3f67SBaptiste Daroussin 14183bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 14193bbe3f67SBaptiste Daroussin ch = 'c'; 14203bbe3f67SBaptiste Daroussin else 14213bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 14223bbe3f67SBaptiste Daroussin 14233bbe3f67SBaptiste Daroussin if (ch == 'a') 14243bbe3f67SBaptiste Daroussin fetch(ixold, lowa, b, f1, ' ', 0, flags); 14253bbe3f67SBaptiste Daroussin else { 14263bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 14273bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, 14283bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '-', 0, flags); 14293bbe3f67SBaptiste Daroussin } 14303bbe3f67SBaptiste Daroussin lowa = b + 1; 14313bbe3f67SBaptiste Daroussin cvp++; 14323bbe3f67SBaptiste Daroussin } 14333bbe3f67SBaptiste Daroussin fetch(ixold, b + 1, upb, f1, ' ', 0, flags); 14343bbe3f67SBaptiste Daroussin } 14353bbe3f67SBaptiste Daroussin /* output changes to the "new" file */ 14363bbe3f67SBaptiste Daroussin diff_output("--- "); 14373bbe3f67SBaptiste Daroussin range(lowc, upd, ","); 14383bbe3f67SBaptiste Daroussin diff_output(" ----\n"); 14393bbe3f67SBaptiste Daroussin 14403bbe3f67SBaptiste Daroussin do_output = 0; 14413bbe3f67SBaptiste Daroussin for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++) 14423bbe3f67SBaptiste Daroussin if (cvp->c <= cvp->d) { 14433bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14443bbe3f67SBaptiste Daroussin do_output++; 14453bbe3f67SBaptiste Daroussin break; 14463bbe3f67SBaptiste Daroussin } 14473bbe3f67SBaptiste Daroussin if (do_output) { 14483bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14493bbe3f67SBaptiste Daroussin a = cvp->a; 14503bbe3f67SBaptiste Daroussin b = cvp->b; 14513bbe3f67SBaptiste Daroussin c = cvp->c; 14523bbe3f67SBaptiste Daroussin d = cvp->d; 14533bbe3f67SBaptiste Daroussin 14543bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 14553bbe3f67SBaptiste Daroussin ch = 'c'; 14563bbe3f67SBaptiste Daroussin else 14573bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 14583bbe3f67SBaptiste Daroussin 14593bbe3f67SBaptiste Daroussin if (ch == 'd') 14603bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, d, f2, ' ', 0, flags); 14613bbe3f67SBaptiste Daroussin else { 14623bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 14633bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, 14643bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '+', 0, flags); 14653bbe3f67SBaptiste Daroussin } 14663bbe3f67SBaptiste Daroussin lowc = d + 1; 14673bbe3f67SBaptiste Daroussin cvp++; 14683bbe3f67SBaptiste Daroussin } 14693bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 14703bbe3f67SBaptiste Daroussin } 14713bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 14723bbe3f67SBaptiste Daroussin } 14733bbe3f67SBaptiste Daroussin 14743bbe3f67SBaptiste Daroussin /* dump accumulated "unified" diff changes */ 14753bbe3f67SBaptiste Daroussin static void 14763bbe3f67SBaptiste Daroussin dump_unified_vec(FILE *f1, FILE *f2, int flags) 14773bbe3f67SBaptiste Daroussin { 14783bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 14793bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd; 14803bbe3f67SBaptiste Daroussin int a, b, c, d; 14813bbe3f67SBaptiste Daroussin char ch, *f; 14823bbe3f67SBaptiste Daroussin 14833bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 14843bbe3f67SBaptiste Daroussin return; 14853bbe3f67SBaptiste Daroussin 14863bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 148742c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 148842c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 148942c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 149042c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 14913bbe3f67SBaptiste Daroussin 14923bbe3f67SBaptiste Daroussin diff_output("@@ -"); 14933bbe3f67SBaptiste Daroussin uni_range(lowa, upb); 14943bbe3f67SBaptiste Daroussin diff_output(" +"); 14953bbe3f67SBaptiste Daroussin uni_range(lowc, upd); 14963bbe3f67SBaptiste Daroussin diff_output(" @@"); 14973bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 14983bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 14993bbe3f67SBaptiste Daroussin if (f != NULL) 15003bbe3f67SBaptiste Daroussin diff_output(" %s", f); 15013bbe3f67SBaptiste Daroussin } 15023bbe3f67SBaptiste Daroussin diff_output("\n"); 15033bbe3f67SBaptiste Daroussin 15043bbe3f67SBaptiste Daroussin /* 15053bbe3f67SBaptiste Daroussin * Output changes in "unified" diff format--the old and new lines 15063bbe3f67SBaptiste Daroussin * are printed together. 15073bbe3f67SBaptiste Daroussin */ 15083bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) { 15093bbe3f67SBaptiste Daroussin a = cvp->a; 15103bbe3f67SBaptiste Daroussin b = cvp->b; 15113bbe3f67SBaptiste Daroussin c = cvp->c; 15123bbe3f67SBaptiste Daroussin d = cvp->d; 15133bbe3f67SBaptiste Daroussin 15143bbe3f67SBaptiste Daroussin /* 15153bbe3f67SBaptiste Daroussin * c: both new and old changes 15163bbe3f67SBaptiste Daroussin * d: only changes in the old file 15173bbe3f67SBaptiste Daroussin * a: only changes in the new file 15183bbe3f67SBaptiste Daroussin */ 15193bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15203bbe3f67SBaptiste Daroussin ch = 'c'; 15213bbe3f67SBaptiste Daroussin else 15223bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15233bbe3f67SBaptiste Daroussin 15243bbe3f67SBaptiste Daroussin switch (ch) { 15253bbe3f67SBaptiste Daroussin case 'c': 15263bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15273bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15283bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15293bbe3f67SBaptiste Daroussin break; 15303bbe3f67SBaptiste Daroussin case 'd': 15313bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15323bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15333bbe3f67SBaptiste Daroussin break; 15343bbe3f67SBaptiste Daroussin case 'a': 15353bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 15363bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15373bbe3f67SBaptiste Daroussin break; 15383bbe3f67SBaptiste Daroussin } 15393bbe3f67SBaptiste Daroussin lowa = b + 1; 15403bbe3f67SBaptiste Daroussin lowc = d + 1; 15413bbe3f67SBaptiste Daroussin } 15423bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 15433bbe3f67SBaptiste Daroussin 15443bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 15453bbe3f67SBaptiste Daroussin } 15463bbe3f67SBaptiste Daroussin 15473bbe3f67SBaptiste Daroussin static void 15483bbe3f67SBaptiste Daroussin print_header(const char *file1, const char *file2) 15493bbe3f67SBaptiste Daroussin { 15503bbe3f67SBaptiste Daroussin const char *time_format; 15513bbe3f67SBaptiste Daroussin char buf1[256]; 15523bbe3f67SBaptiste Daroussin char buf2[256]; 15533bbe3f67SBaptiste Daroussin char end1[10]; 15543bbe3f67SBaptiste Daroussin char end2[10]; 155558cf4d86SJilles Tjoelker struct tm tm1, tm2, *tm_ptr1, *tm_ptr2; 1556385a67dcSJilles Tjoelker int nsec1 = stb1.st_mtim.tv_nsec; 1557385a67dcSJilles Tjoelker int nsec2 = stb2.st_mtim.tv_nsec; 15583bbe3f67SBaptiste Daroussin 15593bbe3f67SBaptiste Daroussin time_format = "%Y-%m-%d %H:%M:%S"; 15603bbe3f67SBaptiste Daroussin 15613bbe3f67SBaptiste Daroussin if (cflag) 15623bbe3f67SBaptiste Daroussin time_format = "%c"; 156358cf4d86SJilles Tjoelker tm_ptr1 = localtime_r(&stb1.st_mtime, &tm1); 156458cf4d86SJilles Tjoelker tm_ptr2 = localtime_r(&stb2.st_mtime, &tm2); 15653bbe3f67SBaptiste Daroussin strftime(buf1, 256, time_format, tm_ptr1); 15663bbe3f67SBaptiste Daroussin strftime(buf2, 256, time_format, tm_ptr2); 15673bbe3f67SBaptiste Daroussin if (!cflag) { 15683bbe3f67SBaptiste Daroussin strftime(end1, 10, "%z", tm_ptr1); 15693bbe3f67SBaptiste Daroussin strftime(end2, 10, "%z", tm_ptr2); 15703bbe3f67SBaptiste Daroussin sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1); 15713bbe3f67SBaptiste Daroussin sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2); 15723bbe3f67SBaptiste Daroussin } 15733bbe3f67SBaptiste Daroussin if (label[0] != NULL) 15743bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "***" : "---", 15753bbe3f67SBaptiste Daroussin label[0]); 15763bbe3f67SBaptiste Daroussin else 15773bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "***" : "---", 15783bbe3f67SBaptiste Daroussin file1, buf1); 15793bbe3f67SBaptiste Daroussin if (label[1] != NULL) 15803bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "---" : "+++", 15813bbe3f67SBaptiste Daroussin label[1]); 15823bbe3f67SBaptiste Daroussin else 15833bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "---" : "+++", 15843bbe3f67SBaptiste Daroussin file2, buf2); 15853bbe3f67SBaptiste Daroussin } 1586