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/procdesc.h> 743bbe3f67SBaptiste Daroussin #include <sys/stat.h> 753bbe3f67SBaptiste Daroussin #include <sys/types.h> 763bbe3f67SBaptiste Daroussin #include <sys/event.h> 773bbe3f67SBaptiste Daroussin #include <sys/wait.h> 783bbe3f67SBaptiste Daroussin 793bbe3f67SBaptiste Daroussin #include <capsicum_helpers.h> 803bbe3f67SBaptiste Daroussin #include <ctype.h> 813bbe3f67SBaptiste Daroussin #include <err.h> 823bbe3f67SBaptiste Daroussin #include <errno.h> 833bbe3f67SBaptiste Daroussin #include <fcntl.h> 843bbe3f67SBaptiste Daroussin #include <paths.h> 857752043cSBaptiste Daroussin #include <regex.h> 863bbe3f67SBaptiste Daroussin #include <stddef.h> 873bbe3f67SBaptiste Daroussin #include <stdint.h> 883bbe3f67SBaptiste Daroussin #include <stdio.h> 893bbe3f67SBaptiste Daroussin #include <stdlib.h> 903bbe3f67SBaptiste Daroussin #include <string.h> 913bbe3f67SBaptiste Daroussin #include <unistd.h> 923bbe3f67SBaptiste Daroussin #include <limits.h> 933bbe3f67SBaptiste Daroussin #include <signal.h> 943bbe3f67SBaptiste Daroussin 953bbe3f67SBaptiste Daroussin #include "diff.h" 963bbe3f67SBaptiste Daroussin #include "xmalloc.h" 973bbe3f67SBaptiste Daroussin 983bbe3f67SBaptiste Daroussin #define _PATH_PR "/usr/bin/pr" 993bbe3f67SBaptiste Daroussin 1003bbe3f67SBaptiste Daroussin /* 1013bbe3f67SBaptiste Daroussin * diff - compare two files. 1023bbe3f67SBaptiste Daroussin */ 1033bbe3f67SBaptiste Daroussin 1043bbe3f67SBaptiste Daroussin /* 1053bbe3f67SBaptiste Daroussin * Uses an algorithm due to Harold Stone, which finds 1063bbe3f67SBaptiste Daroussin * a pair of longest identical subsequences in the two 1073bbe3f67SBaptiste Daroussin * files. 1083bbe3f67SBaptiste Daroussin * 1093bbe3f67SBaptiste Daroussin * The major goal is to generate the match vector J. 1103bbe3f67SBaptiste Daroussin * J[i] is the index of the line in file1 corresponding 1113bbe3f67SBaptiste Daroussin * to line i file0. J[i] = 0 if there is no 1123bbe3f67SBaptiste Daroussin * such line in file1. 1133bbe3f67SBaptiste Daroussin * 1143bbe3f67SBaptiste Daroussin * Lines are hashed so as to work in core. All potential 1153bbe3f67SBaptiste Daroussin * matches are located by sorting the lines of each file 1163bbe3f67SBaptiste Daroussin * on the hash (called ``value''). In particular, this 1173bbe3f67SBaptiste Daroussin * collects the equivalence classes in file1 together. 1183bbe3f67SBaptiste Daroussin * Subroutine equiv replaces the value of each line in 1193bbe3f67SBaptiste Daroussin * file0 by the index of the first element of its 1203bbe3f67SBaptiste Daroussin * matching equivalence in (the reordered) file1. 1213bbe3f67SBaptiste Daroussin * To save space equiv squeezes file1 into a single 1223bbe3f67SBaptiste Daroussin * array member in which the equivalence classes 1233bbe3f67SBaptiste Daroussin * are simply concatenated, except that their first 1243bbe3f67SBaptiste Daroussin * members are flagged by changing sign. 1253bbe3f67SBaptiste Daroussin * 1263bbe3f67SBaptiste Daroussin * Next the indices that point into member are unsorted into 1273bbe3f67SBaptiste Daroussin * array class according to the original order of file0. 1283bbe3f67SBaptiste Daroussin * 1293bbe3f67SBaptiste Daroussin * The cleverness lies in routine stone. This marches 1303bbe3f67SBaptiste Daroussin * through the lines of file0, developing a vector klist 1313bbe3f67SBaptiste Daroussin * of "k-candidates". At step i a k-candidate is a matched 1323bbe3f67SBaptiste Daroussin * pair of lines x,y (x in file0 y in file1) such that 1333bbe3f67SBaptiste Daroussin * there is a common subsequence of length k 1343bbe3f67SBaptiste Daroussin * between the first i lines of file0 and the first y 1353bbe3f67SBaptiste Daroussin * lines of file1, but there is no such subsequence for 1363bbe3f67SBaptiste Daroussin * any smaller y. x is the earliest possible mate to y 1373bbe3f67SBaptiste Daroussin * that occurs in such a subsequence. 1383bbe3f67SBaptiste Daroussin * 1393bbe3f67SBaptiste Daroussin * Whenever any of the members of the equivalence class of 1403bbe3f67SBaptiste Daroussin * lines in file1 matable to a line in file0 has serial number 1413bbe3f67SBaptiste Daroussin * less than the y of some k-candidate, that k-candidate 1423bbe3f67SBaptiste Daroussin * with the smallest such y is replaced. The new 1433bbe3f67SBaptiste Daroussin * k-candidate is chained (via pred) to the current 1443bbe3f67SBaptiste Daroussin * k-1 candidate so that the actual subsequence can 1453bbe3f67SBaptiste Daroussin * be recovered. When a member has serial number greater 1463bbe3f67SBaptiste Daroussin * that the y of all k-candidates, the klist is extended. 1473bbe3f67SBaptiste Daroussin * At the end, the longest subsequence is pulled out 1483bbe3f67SBaptiste Daroussin * and placed in the array J by unravel 1493bbe3f67SBaptiste Daroussin * 1503bbe3f67SBaptiste Daroussin * With J in hand, the matches there recorded are 1513bbe3f67SBaptiste Daroussin * check'ed against reality to assure that no spurious 1523bbe3f67SBaptiste Daroussin * matches have crept in due to hashing. If they have, 1533bbe3f67SBaptiste Daroussin * they are broken, and "jackpot" is recorded--a harmless 1543bbe3f67SBaptiste Daroussin * matter except that a true match for a spuriously 1553bbe3f67SBaptiste Daroussin * mated line may now be unnecessarily reported as a change. 1563bbe3f67SBaptiste Daroussin * 1573bbe3f67SBaptiste Daroussin * Much of the complexity of the program comes simply 1583bbe3f67SBaptiste Daroussin * from trying to minimize core utilization and 1593bbe3f67SBaptiste Daroussin * maximize the range of doable problems by dynamically 1603bbe3f67SBaptiste Daroussin * allocating what is needed and reusing what is not. 1613bbe3f67SBaptiste Daroussin * The core requirements for problems larger than somewhat 1623bbe3f67SBaptiste Daroussin * are (in words) 2*length(file0) + length(file1) + 1633bbe3f67SBaptiste Daroussin * 3*(number of k-candidates installed), typically about 1643bbe3f67SBaptiste Daroussin * 6n words for files of length n. 1653bbe3f67SBaptiste Daroussin */ 1663bbe3f67SBaptiste Daroussin 1673bbe3f67SBaptiste Daroussin struct cand { 1683bbe3f67SBaptiste Daroussin int x; 1693bbe3f67SBaptiste Daroussin int y; 1703bbe3f67SBaptiste Daroussin int pred; 1713bbe3f67SBaptiste Daroussin }; 1723bbe3f67SBaptiste Daroussin 1733bbe3f67SBaptiste Daroussin static struct line { 1743bbe3f67SBaptiste Daroussin int serial; 1753bbe3f67SBaptiste Daroussin int value; 1763bbe3f67SBaptiste Daroussin } *file[2]; 1773bbe3f67SBaptiste Daroussin 1783bbe3f67SBaptiste Daroussin /* 1793bbe3f67SBaptiste Daroussin * The following struct is used to record change information when 1803bbe3f67SBaptiste Daroussin * doing a "context" or "unified" diff. (see routine "change" to 1813bbe3f67SBaptiste Daroussin * understand the highly mnemonic field names) 1823bbe3f67SBaptiste Daroussin */ 1833bbe3f67SBaptiste Daroussin struct context_vec { 1843bbe3f67SBaptiste Daroussin int a; /* start line in old file */ 1853bbe3f67SBaptiste Daroussin int b; /* end line in old file */ 1863bbe3f67SBaptiste Daroussin int c; /* start line in new file */ 1873bbe3f67SBaptiste Daroussin int d; /* end line in new file */ 1883bbe3f67SBaptiste Daroussin }; 1893bbe3f67SBaptiste Daroussin 1903bbe3f67SBaptiste Daroussin #define diff_output printf 191ff807815SBaptiste Daroussin static FILE *opentemp(const char *); 1923bbe3f67SBaptiste Daroussin static void output(char *, FILE *, char *, FILE *, int); 1933bbe3f67SBaptiste Daroussin static void check(FILE *, FILE *, int); 1943bbe3f67SBaptiste Daroussin static void range(int, int, const char *); 1953bbe3f67SBaptiste Daroussin static void uni_range(int, int); 1963bbe3f67SBaptiste Daroussin static void dump_context_vec(FILE *, FILE *, int); 1973bbe3f67SBaptiste Daroussin static void dump_unified_vec(FILE *, FILE *, int); 198d5b187aeSBaptiste Daroussin static void prepare(int, FILE *, size_t, int); 1993bbe3f67SBaptiste Daroussin static void prune(void); 2003bbe3f67SBaptiste Daroussin static void equiv(struct line *, int, struct line *, int, int *); 2013bbe3f67SBaptiste Daroussin static void unravel(int); 2023bbe3f67SBaptiste Daroussin static void unsort(struct line *, int, int *); 2033bbe3f67SBaptiste Daroussin static void change(char *, FILE *, char *, FILE *, int, int, int, int, int *); 2043bbe3f67SBaptiste Daroussin static void sort(struct line *, int); 2053bbe3f67SBaptiste Daroussin static void print_header(const char *, const char *); 2063bbe3f67SBaptiste Daroussin static int ignoreline(char *); 2073bbe3f67SBaptiste Daroussin static int asciifile(FILE *); 2083bbe3f67SBaptiste Daroussin static int fetch(long *, int, int, FILE *, int, int, int); 2093bbe3f67SBaptiste Daroussin static int newcand(int, int, int); 2103bbe3f67SBaptiste Daroussin static int search(int *, int, int); 2113bbe3f67SBaptiste Daroussin static int skipline(FILE *); 2123bbe3f67SBaptiste Daroussin static int isqrt(int); 2133bbe3f67SBaptiste Daroussin static int stone(int *, int, int *, int *, int); 2143bbe3f67SBaptiste Daroussin static int readhash(FILE *, int); 2153bbe3f67SBaptiste Daroussin static int files_differ(FILE *, FILE *, int); 2163bbe3f67SBaptiste Daroussin static char *match_function(const long *, int, FILE *); 2173bbe3f67SBaptiste Daroussin static char *preadline(int, size_t, off_t); 2183bbe3f67SBaptiste Daroussin 2193bbe3f67SBaptiste Daroussin static int *J; /* will be overlaid on class */ 2203bbe3f67SBaptiste Daroussin static int *class; /* will be overlaid on file[0] */ 2213bbe3f67SBaptiste Daroussin static int *klist; /* will be overlaid on file[0] after class */ 2223bbe3f67SBaptiste Daroussin static int *member; /* will be overlaid on file[1] */ 2233bbe3f67SBaptiste Daroussin static int clen; 2243bbe3f67SBaptiste Daroussin static int inifdef; /* whether or not we are in a #ifdef block */ 2253bbe3f67SBaptiste Daroussin static int len[2]; 2263bbe3f67SBaptiste Daroussin static int pref, suff; /* length of prefix and suffix */ 2273bbe3f67SBaptiste Daroussin static int slen[2]; 2283bbe3f67SBaptiste Daroussin static int anychange; 2293bbe3f67SBaptiste Daroussin static long *ixnew; /* will be overlaid on file[1] */ 2303bbe3f67SBaptiste Daroussin static long *ixold; /* will be overlaid on klist */ 2313bbe3f67SBaptiste Daroussin static struct cand *clist; /* merely a free storage pot for candidates */ 2323bbe3f67SBaptiste Daroussin static int clistlen; /* the length of clist */ 2333bbe3f67SBaptiste Daroussin static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */ 234*0118df5eSBaptiste Daroussin static int (*chrtran)(int); /* translation table for case-folding */ 2353bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_start; 2363bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_end; 2373bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_ptr; 2383bbe3f67SBaptiste Daroussin 2393bbe3f67SBaptiste Daroussin #define FUNCTION_CONTEXT_SIZE 55 2403bbe3f67SBaptiste Daroussin static char lastbuf[FUNCTION_CONTEXT_SIZE]; 2413bbe3f67SBaptiste Daroussin static int lastline; 2423bbe3f67SBaptiste Daroussin static int lastmatchline; 2433bbe3f67SBaptiste Daroussin 244*0118df5eSBaptiste Daroussin static int 245*0118df5eSBaptiste Daroussin clow2low(int c) 246*0118df5eSBaptiste Daroussin { 2473bbe3f67SBaptiste Daroussin 248*0118df5eSBaptiste Daroussin return (c); 249*0118df5eSBaptiste Daroussin } 2503bbe3f67SBaptiste Daroussin 251*0118df5eSBaptiste Daroussin static int 252*0118df5eSBaptiste Daroussin cup2low(int c) 253*0118df5eSBaptiste Daroussin { 254*0118df5eSBaptiste Daroussin 255*0118df5eSBaptiste Daroussin return tolower(c); 256*0118df5eSBaptiste Daroussin } 2573bbe3f67SBaptiste Daroussin 2583bbe3f67SBaptiste Daroussin int 2593bbe3f67SBaptiste Daroussin diffreg(char *file1, char *file2, int flags, int capsicum) 2603bbe3f67SBaptiste Daroussin { 2613bbe3f67SBaptiste Daroussin FILE *f1, *f2; 2623bbe3f67SBaptiste Daroussin int i, rval; 2633bbe3f67SBaptiste Daroussin int ostdout = -1; 2643bbe3f67SBaptiste Daroussin int pr_pd, kq; 2653bbe3f67SBaptiste Daroussin struct kevent *e; 2663bbe3f67SBaptiste Daroussin cap_rights_t rights_ro; 2673bbe3f67SBaptiste Daroussin 268d5b187aeSBaptiste Daroussin e = NULL; 269d5b187aeSBaptiste Daroussin kq = -1; 2703bbe3f67SBaptiste Daroussin f1 = f2 = NULL; 2713bbe3f67SBaptiste Daroussin rval = D_SAME; 2723bbe3f67SBaptiste Daroussin anychange = 0; 2733bbe3f67SBaptiste Daroussin lastline = 0; 2743bbe3f67SBaptiste Daroussin lastmatchline = 0; 2753bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 2763bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 2773bbe3f67SBaptiste Daroussin chrtran = cup2low; 2783bbe3f67SBaptiste Daroussin else 2793bbe3f67SBaptiste Daroussin chrtran = clow2low; 2803bbe3f67SBaptiste Daroussin if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode)) 2813bbe3f67SBaptiste Daroussin return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2); 2823bbe3f67SBaptiste Daroussin if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0) 2833bbe3f67SBaptiste Daroussin goto closem; 2843bbe3f67SBaptiste Daroussin 2853bbe3f67SBaptiste Daroussin if (flags & D_EMPTY1) 2863bbe3f67SBaptiste Daroussin f1 = fopen(_PATH_DEVNULL, "r"); 2873bbe3f67SBaptiste Daroussin else { 288ff807815SBaptiste Daroussin if (!S_ISREG(stb1.st_mode)) { 289ff807815SBaptiste Daroussin if ((f1 = opentemp(file1)) == NULL || 290ff807815SBaptiste Daroussin fstat(fileno(f1), &stb1) < 0) { 291ff807815SBaptiste Daroussin warn("%s", file1); 292ff807815SBaptiste Daroussin status |= 2; 293ff807815SBaptiste Daroussin goto closem; 294ff807815SBaptiste Daroussin } 295ff807815SBaptiste Daroussin } else if (strcmp(file1, "-") == 0) 2963bbe3f67SBaptiste Daroussin f1 = stdin; 2973bbe3f67SBaptiste Daroussin else 2983bbe3f67SBaptiste Daroussin f1 = fopen(file1, "r"); 2993bbe3f67SBaptiste Daroussin } 3003bbe3f67SBaptiste Daroussin if (f1 == NULL) { 3013bbe3f67SBaptiste Daroussin warn("%s", file1); 3023bbe3f67SBaptiste Daroussin status |= 2; 3033bbe3f67SBaptiste Daroussin goto closem; 3043bbe3f67SBaptiste Daroussin } 3053bbe3f67SBaptiste Daroussin 3063bbe3f67SBaptiste Daroussin if (flags & D_EMPTY2) 3073bbe3f67SBaptiste Daroussin f2 = fopen(_PATH_DEVNULL, "r"); 3083bbe3f67SBaptiste Daroussin else { 309ff807815SBaptiste Daroussin if (!S_ISREG(stb2.st_mode)) { 310ff807815SBaptiste Daroussin if ((f2 = opentemp(file2)) == NULL || 311ff807815SBaptiste Daroussin fstat(fileno(f2), &stb2) < 0) { 312ff807815SBaptiste Daroussin warn("%s", file2); 313ff807815SBaptiste Daroussin status |= 2; 314ff807815SBaptiste Daroussin goto closem; 315ff807815SBaptiste Daroussin } 316ff807815SBaptiste Daroussin } else if (strcmp(file2, "-") == 0) 3173bbe3f67SBaptiste Daroussin f2 = stdin; 3183bbe3f67SBaptiste Daroussin else 3193bbe3f67SBaptiste Daroussin f2 = fopen(file2, "r"); 3203bbe3f67SBaptiste Daroussin } 3213bbe3f67SBaptiste Daroussin if (f2 == NULL) { 3223bbe3f67SBaptiste Daroussin warn("%s", file2); 3233bbe3f67SBaptiste Daroussin status |= 2; 3243bbe3f67SBaptiste Daroussin goto closem; 3253bbe3f67SBaptiste Daroussin } 3263bbe3f67SBaptiste Daroussin 3273bbe3f67SBaptiste Daroussin if (lflag) { 3283bbe3f67SBaptiste Daroussin /* redirect stdout to pr */ 3293bbe3f67SBaptiste Daroussin int pfd[2]; 3303bbe3f67SBaptiste Daroussin pid_t pid; 3313bbe3f67SBaptiste Daroussin char *header; 3323bbe3f67SBaptiste Daroussin 3333bbe3f67SBaptiste Daroussin xasprintf(&header, "%s %s %s", diffargs, file1, file2); 3343bbe3f67SBaptiste Daroussin signal(SIGPIPE, SIG_IGN); 3353bbe3f67SBaptiste Daroussin fflush(stdout); 3363bbe3f67SBaptiste Daroussin rewind(stdout); 3373bbe3f67SBaptiste Daroussin pipe(pfd); 3383bbe3f67SBaptiste Daroussin switch ((pid = pdfork(&pr_pd, PD_CLOEXEC))) { 3393bbe3f67SBaptiste Daroussin case -1: 3403bbe3f67SBaptiste Daroussin status |= 2; 3413bbe3f67SBaptiste Daroussin free(header); 3423bbe3f67SBaptiste Daroussin err(2, "No more processes"); 3433bbe3f67SBaptiste Daroussin case 0: 3443bbe3f67SBaptiste Daroussin /* child */ 3453bbe3f67SBaptiste Daroussin if (pfd[0] != STDIN_FILENO) { 3463bbe3f67SBaptiste Daroussin dup2(pfd[0], STDIN_FILENO); 3473bbe3f67SBaptiste Daroussin close(pfd[0]); 3483bbe3f67SBaptiste Daroussin } 3493bbe3f67SBaptiste Daroussin close(pfd[1]); 3503bbe3f67SBaptiste Daroussin execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); 3513bbe3f67SBaptiste Daroussin _exit(127); 3523bbe3f67SBaptiste Daroussin default: 3533bbe3f67SBaptiste Daroussin 3543bbe3f67SBaptiste Daroussin /* parent */ 3553bbe3f67SBaptiste Daroussin if (pfd[1] != STDOUT_FILENO) { 3563bbe3f67SBaptiste Daroussin ostdout = dup(STDOUT_FILENO); 3573bbe3f67SBaptiste Daroussin dup2(pfd[1], STDOUT_FILENO); 3583bbe3f67SBaptiste Daroussin close(pfd[1]); 3593bbe3f67SBaptiste Daroussin } 3603bbe3f67SBaptiste Daroussin close(pfd[0]); 3613bbe3f67SBaptiste Daroussin rewind(stdout); 3623bbe3f67SBaptiste Daroussin free(header); 3633bbe3f67SBaptiste Daroussin kq = kqueue(); 3643bbe3f67SBaptiste Daroussin if (kq == -1) 3653bbe3f67SBaptiste Daroussin err(2, "kqueue"); 3663bbe3f67SBaptiste Daroussin e = xmalloc(sizeof(struct kevent)); 3673bbe3f67SBaptiste Daroussin EV_SET(e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, 3683bbe3f67SBaptiste Daroussin NULL); 3693bbe3f67SBaptiste Daroussin if (kevent(kq, e, 1, NULL, 0, NULL) == -1) 3703bbe3f67SBaptiste Daroussin err(2, "kevent"); 3713bbe3f67SBaptiste Daroussin } 3723bbe3f67SBaptiste Daroussin } 3733bbe3f67SBaptiste Daroussin 3743bbe3f67SBaptiste Daroussin if (capsicum) { 3753bbe3f67SBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 37678f6a0c1SBaptiste Daroussin if (cap_rights_limit(fileno(f1), &rights_ro) < 0 37778f6a0c1SBaptiste Daroussin && errno != ENOSYS) 3783bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 37978f6a0c1SBaptiste Daroussin if (cap_rights_limit(fileno(f2), &rights_ro) < 0 && 38078f6a0c1SBaptiste Daroussin errno != ENOSYS) 3813bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 3823bbe3f67SBaptiste Daroussin if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { 3833bbe3f67SBaptiste Daroussin /* stding has already been limited */ 3843bbe3f67SBaptiste Daroussin if (caph_limit_stderr() == -1) 3853bbe3f67SBaptiste Daroussin err(2, "unable to limit stderr"); 3863bbe3f67SBaptiste Daroussin if (caph_limit_stdout() == -1) 3873bbe3f67SBaptiste Daroussin err(2, "unable to limit stdout"); 3883bbe3f67SBaptiste Daroussin } else if (caph_limit_stdio() == -1) 3893bbe3f67SBaptiste Daroussin err(2, "unable to limit stdio"); 3903bbe3f67SBaptiste Daroussin 3913bbe3f67SBaptiste Daroussin caph_cache_catpages(); 3925bbffb00SBaptiste Daroussin caph_cache_tzdata(); 3933bbe3f67SBaptiste Daroussin if (cap_enter() < 0 && errno != ENOSYS) 3943bbe3f67SBaptiste Daroussin err(2, "unable to enter capability mode"); 3953bbe3f67SBaptiste Daroussin } 3963bbe3f67SBaptiste Daroussin 3973bbe3f67SBaptiste Daroussin switch (files_differ(f1, f2, flags)) { 3983bbe3f67SBaptiste Daroussin case 0: 3993bbe3f67SBaptiste Daroussin goto closem; 4003bbe3f67SBaptiste Daroussin case 1: 4013bbe3f67SBaptiste Daroussin break; 4023bbe3f67SBaptiste Daroussin default: 4033bbe3f67SBaptiste Daroussin /* error */ 4043bbe3f67SBaptiste Daroussin status |= 2; 4053bbe3f67SBaptiste Daroussin goto closem; 4063bbe3f67SBaptiste Daroussin } 4073bbe3f67SBaptiste Daroussin 4083bbe3f67SBaptiste Daroussin if ((flags & D_FORCEASCII) == 0 && 4093bbe3f67SBaptiste Daroussin (!asciifile(f1) || !asciifile(f2))) { 4103bbe3f67SBaptiste Daroussin rval = D_BINARY; 4113bbe3f67SBaptiste Daroussin status |= 1; 4123bbe3f67SBaptiste Daroussin goto closem; 4133bbe3f67SBaptiste Daroussin } 4143bbe3f67SBaptiste Daroussin prepare(0, f1, stb1.st_size, flags); 4153bbe3f67SBaptiste Daroussin prepare(1, f2, stb2.st_size, flags); 4163bbe3f67SBaptiste Daroussin 4173bbe3f67SBaptiste Daroussin prune(); 4183bbe3f67SBaptiste Daroussin sort(sfile[0], slen[0]); 4193bbe3f67SBaptiste Daroussin sort(sfile[1], slen[1]); 4203bbe3f67SBaptiste Daroussin 4213bbe3f67SBaptiste Daroussin member = (int *)file[1]; 4223bbe3f67SBaptiste Daroussin equiv(sfile[0], slen[0], sfile[1], slen[1], member); 4233bbe3f67SBaptiste Daroussin member = xreallocarray(member, slen[1] + 2, sizeof(*member)); 4243bbe3f67SBaptiste Daroussin 4253bbe3f67SBaptiste Daroussin class = (int *)file[0]; 4263bbe3f67SBaptiste Daroussin unsort(sfile[0], slen[0], class); 4273bbe3f67SBaptiste Daroussin class = xreallocarray(class, slen[0] + 2, sizeof(*class)); 4283bbe3f67SBaptiste Daroussin 4293bbe3f67SBaptiste Daroussin klist = xcalloc(slen[0] + 2, sizeof(*klist)); 4303bbe3f67SBaptiste Daroussin clen = 0; 4313bbe3f67SBaptiste Daroussin clistlen = 100; 4323bbe3f67SBaptiste Daroussin clist = xcalloc(clistlen, sizeof(*clist)); 4333bbe3f67SBaptiste Daroussin i = stone(class, slen[0], member, klist, flags); 4343bbe3f67SBaptiste Daroussin free(member); 4353bbe3f67SBaptiste Daroussin free(class); 4363bbe3f67SBaptiste Daroussin 4373bbe3f67SBaptiste Daroussin J = xreallocarray(J, len[0] + 2, sizeof(*J)); 4383bbe3f67SBaptiste Daroussin unravel(klist[i]); 4393bbe3f67SBaptiste Daroussin free(clist); 4403bbe3f67SBaptiste Daroussin free(klist); 4413bbe3f67SBaptiste Daroussin 4423bbe3f67SBaptiste Daroussin ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); 4433bbe3f67SBaptiste Daroussin ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); 4443bbe3f67SBaptiste Daroussin check(f1, f2, flags); 4453bbe3f67SBaptiste Daroussin output(file1, f1, file2, f2, flags); 446d5b187aeSBaptiste Daroussin if (ostdout != -1 && e != NULL) { 4473bbe3f67SBaptiste Daroussin /* close the pipe to pr and restore stdout */ 4483bbe3f67SBaptiste Daroussin int wstatus; 4493bbe3f67SBaptiste Daroussin 4503bbe3f67SBaptiste Daroussin fflush(stdout); 4513bbe3f67SBaptiste Daroussin if (ostdout != STDOUT_FILENO) { 4523bbe3f67SBaptiste Daroussin close(STDOUT_FILENO); 4533bbe3f67SBaptiste Daroussin dup2(ostdout, STDOUT_FILENO); 4543bbe3f67SBaptiste Daroussin close(ostdout); 4553bbe3f67SBaptiste Daroussin } 4563bbe3f67SBaptiste Daroussin if (kevent(kq, NULL, 0, e, 1, NULL) == -1) 4573bbe3f67SBaptiste Daroussin err(2, "kevent"); 4583bbe3f67SBaptiste Daroussin wstatus = e[0].data; 4593bbe3f67SBaptiste Daroussin close(kq); 4603bbe3f67SBaptiste Daroussin if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) 4613bbe3f67SBaptiste Daroussin errx(2, "pr exited abnormally"); 4623bbe3f67SBaptiste Daroussin else if (WIFSIGNALED(wstatus)) 4633bbe3f67SBaptiste Daroussin errx(2, "pr killed by signal %d", 4643bbe3f67SBaptiste Daroussin WTERMSIG(wstatus)); 4653bbe3f67SBaptiste Daroussin } 4663bbe3f67SBaptiste Daroussin 4673bbe3f67SBaptiste Daroussin closem: 4683bbe3f67SBaptiste Daroussin if (anychange) { 4693bbe3f67SBaptiste Daroussin status |= 1; 4703bbe3f67SBaptiste Daroussin if (rval == D_SAME) 4713bbe3f67SBaptiste Daroussin rval = D_DIFFER; 4723bbe3f67SBaptiste Daroussin } 4733bbe3f67SBaptiste Daroussin if (f1 != NULL) 4743bbe3f67SBaptiste Daroussin fclose(f1); 4753bbe3f67SBaptiste Daroussin if (f2 != NULL) 4763bbe3f67SBaptiste Daroussin fclose(f2); 4773bbe3f67SBaptiste Daroussin 4783bbe3f67SBaptiste Daroussin return (rval); 4793bbe3f67SBaptiste Daroussin } 4803bbe3f67SBaptiste Daroussin 4813bbe3f67SBaptiste Daroussin /* 4823bbe3f67SBaptiste Daroussin * Check to see if the given files differ. 4833bbe3f67SBaptiste Daroussin * Returns 0 if they are the same, 1 if different, and -1 on error. 4843bbe3f67SBaptiste Daroussin * XXX - could use code from cmp(1) [faster] 4853bbe3f67SBaptiste Daroussin */ 4863bbe3f67SBaptiste Daroussin static int 4873bbe3f67SBaptiste Daroussin files_differ(FILE *f1, FILE *f2, int flags) 4883bbe3f67SBaptiste Daroussin { 4893bbe3f67SBaptiste Daroussin char buf1[BUFSIZ], buf2[BUFSIZ]; 4903bbe3f67SBaptiste Daroussin size_t i, j; 4913bbe3f67SBaptiste Daroussin 4923bbe3f67SBaptiste Daroussin if ((flags & (D_EMPTY1|D_EMPTY2)) || stb1.st_size != stb2.st_size || 4933bbe3f67SBaptiste Daroussin (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT)) 4943bbe3f67SBaptiste Daroussin return (1); 4953bbe3f67SBaptiste Daroussin for (;;) { 4963bbe3f67SBaptiste Daroussin i = fread(buf1, 1, sizeof(buf1), f1); 4973bbe3f67SBaptiste Daroussin j = fread(buf2, 1, sizeof(buf2), f2); 4983bbe3f67SBaptiste Daroussin if ((!i && ferror(f1)) || (!j && ferror(f2))) 4993bbe3f67SBaptiste Daroussin return (-1); 5003bbe3f67SBaptiste Daroussin if (i != j) 5013bbe3f67SBaptiste Daroussin return (1); 5023bbe3f67SBaptiste Daroussin if (i == 0) 5033bbe3f67SBaptiste Daroussin return (0); 5043bbe3f67SBaptiste Daroussin if (memcmp(buf1, buf2, i) != 0) 5053bbe3f67SBaptiste Daroussin return (1); 5063bbe3f67SBaptiste Daroussin } 5073bbe3f67SBaptiste Daroussin } 5083bbe3f67SBaptiste Daroussin 509ff807815SBaptiste Daroussin static FILE * 510ff807815SBaptiste Daroussin opentemp(const char *f) 511ff807815SBaptiste Daroussin { 512ff807815SBaptiste Daroussin char buf[BUFSIZ], tempfile[PATH_MAX]; 513ff807815SBaptiste Daroussin ssize_t nread; 514ff807815SBaptiste Daroussin int ifd, ofd; 515ff807815SBaptiste Daroussin 516ff807815SBaptiste Daroussin if (strcmp(f, "-") == 0) 517ff807815SBaptiste Daroussin ifd = STDIN_FILENO; 518ff807815SBaptiste Daroussin else if ((ifd = open(f, O_RDONLY, 0644)) < 0) 519ff807815SBaptiste Daroussin return (NULL); 520ff807815SBaptiste Daroussin 521ff807815SBaptiste Daroussin (void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile)); 522ff807815SBaptiste Daroussin 523ff807815SBaptiste Daroussin if ((ofd = mkstemp(tempfile)) < 0) { 524ff807815SBaptiste Daroussin close(ifd); 525ff807815SBaptiste Daroussin return (NULL); 526ff807815SBaptiste Daroussin } 527ff807815SBaptiste Daroussin unlink(tempfile); 528ff807815SBaptiste Daroussin while ((nread = read(ifd, buf, BUFSIZ)) > 0) { 529ff807815SBaptiste Daroussin if (write(ofd, buf, nread) != nread) { 530ff807815SBaptiste Daroussin close(ifd); 531ff807815SBaptiste Daroussin close(ofd); 532ff807815SBaptiste Daroussin return (NULL); 533ff807815SBaptiste Daroussin } 534ff807815SBaptiste Daroussin } 535ff807815SBaptiste Daroussin close(ifd); 536ff807815SBaptiste Daroussin lseek(ofd, (off_t)0, SEEK_SET); 537ff807815SBaptiste Daroussin return (fdopen(ofd, "r")); 538ff807815SBaptiste Daroussin } 539ff807815SBaptiste Daroussin 5403bbe3f67SBaptiste Daroussin char * 5413bbe3f67SBaptiste Daroussin splice(char *dir, char *path) 5423bbe3f67SBaptiste Daroussin { 5433bbe3f67SBaptiste Daroussin char *tail, *buf; 5443bbe3f67SBaptiste Daroussin size_t dirlen; 5453bbe3f67SBaptiste Daroussin 5463bbe3f67SBaptiste Daroussin dirlen = strlen(dir); 5473bbe3f67SBaptiste Daroussin while (dirlen != 0 && dir[dirlen - 1] == '/') 5483bbe3f67SBaptiste Daroussin dirlen--; 5493bbe3f67SBaptiste Daroussin if ((tail = strrchr(path, '/')) == NULL) 5503bbe3f67SBaptiste Daroussin tail = path; 5513bbe3f67SBaptiste Daroussin else 5523bbe3f67SBaptiste Daroussin tail++; 5533bbe3f67SBaptiste Daroussin xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail); 5543bbe3f67SBaptiste Daroussin return (buf); 5553bbe3f67SBaptiste Daroussin } 5563bbe3f67SBaptiste Daroussin 5573bbe3f67SBaptiste Daroussin static void 558d5b187aeSBaptiste Daroussin prepare(int i, FILE *fd, size_t filesize, int flags) 5593bbe3f67SBaptiste Daroussin { 5603bbe3f67SBaptiste Daroussin struct line *p; 5613bbe3f67SBaptiste Daroussin int h; 5623bbe3f67SBaptiste Daroussin size_t sz, j; 5633bbe3f67SBaptiste Daroussin 5643bbe3f67SBaptiste Daroussin rewind(fd); 5653bbe3f67SBaptiste Daroussin 5666b8059c4SBaptiste Daroussin sz = MIN(filesize, SIZE_MAX) / 25; 5673bbe3f67SBaptiste Daroussin if (sz < 100) 5683bbe3f67SBaptiste Daroussin sz = 100; 5693bbe3f67SBaptiste Daroussin 5703bbe3f67SBaptiste Daroussin p = xcalloc(sz + 3, sizeof(*p)); 5713bbe3f67SBaptiste Daroussin for (j = 0; (h = readhash(fd, flags));) { 5723bbe3f67SBaptiste Daroussin if (j == sz) { 5733bbe3f67SBaptiste Daroussin sz = sz * 3 / 2; 5743bbe3f67SBaptiste Daroussin p = xreallocarray(p, sz + 3, sizeof(*p)); 5753bbe3f67SBaptiste Daroussin } 5763bbe3f67SBaptiste Daroussin p[++j].value = h; 5773bbe3f67SBaptiste Daroussin } 5783bbe3f67SBaptiste Daroussin len[i] = j; 5793bbe3f67SBaptiste Daroussin file[i] = p; 5803bbe3f67SBaptiste Daroussin } 5813bbe3f67SBaptiste Daroussin 5823bbe3f67SBaptiste Daroussin static void 5833bbe3f67SBaptiste Daroussin prune(void) 5843bbe3f67SBaptiste Daroussin { 5853bbe3f67SBaptiste Daroussin int i, j; 5863bbe3f67SBaptiste Daroussin 5873bbe3f67SBaptiste Daroussin for (pref = 0; pref < len[0] && pref < len[1] && 5883bbe3f67SBaptiste Daroussin file[0][pref + 1].value == file[1][pref + 1].value; 5893bbe3f67SBaptiste Daroussin pref++) 5903bbe3f67SBaptiste Daroussin ; 5913bbe3f67SBaptiste Daroussin for (suff = 0; suff < len[0] - pref && suff < len[1] - pref && 5923bbe3f67SBaptiste Daroussin file[0][len[0] - suff].value == file[1][len[1] - suff].value; 5933bbe3f67SBaptiste Daroussin suff++) 5943bbe3f67SBaptiste Daroussin ; 5953bbe3f67SBaptiste Daroussin for (j = 0; j < 2; j++) { 5963bbe3f67SBaptiste Daroussin sfile[j] = file[j] + pref; 5973bbe3f67SBaptiste Daroussin slen[j] = len[j] - pref - suff; 5983bbe3f67SBaptiste Daroussin for (i = 0; i <= slen[j]; i++) 5993bbe3f67SBaptiste Daroussin sfile[j][i].serial = i; 6003bbe3f67SBaptiste Daroussin } 6013bbe3f67SBaptiste Daroussin } 6023bbe3f67SBaptiste Daroussin 6033bbe3f67SBaptiste Daroussin static void 6043bbe3f67SBaptiste Daroussin equiv(struct line *a, int n, struct line *b, int m, int *c) 6053bbe3f67SBaptiste Daroussin { 6063bbe3f67SBaptiste Daroussin int i, j; 6073bbe3f67SBaptiste Daroussin 6083bbe3f67SBaptiste Daroussin i = j = 1; 6093bbe3f67SBaptiste Daroussin while (i <= n && j <= m) { 6103bbe3f67SBaptiste Daroussin if (a[i].value < b[j].value) 6113bbe3f67SBaptiste Daroussin a[i++].value = 0; 6123bbe3f67SBaptiste Daroussin else if (a[i].value == b[j].value) 6133bbe3f67SBaptiste Daroussin a[i++].value = j; 6143bbe3f67SBaptiste Daroussin else 6153bbe3f67SBaptiste Daroussin j++; 6163bbe3f67SBaptiste Daroussin } 6173bbe3f67SBaptiste Daroussin while (i <= n) 6183bbe3f67SBaptiste Daroussin a[i++].value = 0; 6193bbe3f67SBaptiste Daroussin b[m + 1].value = 0; 6203bbe3f67SBaptiste Daroussin j = 0; 6213bbe3f67SBaptiste Daroussin while (++j <= m) { 6223bbe3f67SBaptiste Daroussin c[j] = -b[j].serial; 6233bbe3f67SBaptiste Daroussin while (b[j + 1].value == b[j].value) { 6243bbe3f67SBaptiste Daroussin j++; 6253bbe3f67SBaptiste Daroussin c[j] = b[j].serial; 6263bbe3f67SBaptiste Daroussin } 6273bbe3f67SBaptiste Daroussin } 6283bbe3f67SBaptiste Daroussin c[j] = -1; 6293bbe3f67SBaptiste Daroussin } 6303bbe3f67SBaptiste Daroussin 6313bbe3f67SBaptiste Daroussin /* Code taken from ping.c */ 6323bbe3f67SBaptiste Daroussin static int 6333bbe3f67SBaptiste Daroussin isqrt(int n) 6343bbe3f67SBaptiste Daroussin { 6353bbe3f67SBaptiste Daroussin int y, x = 1; 6363bbe3f67SBaptiste Daroussin 6373bbe3f67SBaptiste Daroussin if (n == 0) 6383bbe3f67SBaptiste Daroussin return (0); 6393bbe3f67SBaptiste Daroussin 6403bbe3f67SBaptiste Daroussin do { /* newton was a stinker */ 6413bbe3f67SBaptiste Daroussin y = x; 6423bbe3f67SBaptiste Daroussin x = n / x; 6433bbe3f67SBaptiste Daroussin x += y; 6443bbe3f67SBaptiste Daroussin x /= 2; 6453bbe3f67SBaptiste Daroussin } while ((x - y) > 1 || (x - y) < -1); 6463bbe3f67SBaptiste Daroussin 6473bbe3f67SBaptiste Daroussin return (x); 6483bbe3f67SBaptiste Daroussin } 6493bbe3f67SBaptiste Daroussin 6503bbe3f67SBaptiste Daroussin static int 6513bbe3f67SBaptiste Daroussin stone(int *a, int n, int *b, int *c, int flags) 6523bbe3f67SBaptiste Daroussin { 6533bbe3f67SBaptiste Daroussin int i, k, y, j, l; 6543bbe3f67SBaptiste Daroussin int oldc, tc, oldl, sq; 6553bbe3f67SBaptiste Daroussin u_int numtries, bound; 6563bbe3f67SBaptiste Daroussin 6573bbe3f67SBaptiste Daroussin if (flags & D_MINIMAL) 6583bbe3f67SBaptiste Daroussin bound = UINT_MAX; 6593bbe3f67SBaptiste Daroussin else { 6603bbe3f67SBaptiste Daroussin sq = isqrt(n); 66142c88c41SBaptiste Daroussin bound = MAX(256, sq); 6623bbe3f67SBaptiste Daroussin } 6633bbe3f67SBaptiste Daroussin 6643bbe3f67SBaptiste Daroussin k = 0; 6653bbe3f67SBaptiste Daroussin c[0] = newcand(0, 0, 0); 6663bbe3f67SBaptiste Daroussin for (i = 1; i <= n; i++) { 6673bbe3f67SBaptiste Daroussin j = a[i]; 6683bbe3f67SBaptiste Daroussin if (j == 0) 6693bbe3f67SBaptiste Daroussin continue; 6703bbe3f67SBaptiste Daroussin y = -b[j]; 6713bbe3f67SBaptiste Daroussin oldl = 0; 6723bbe3f67SBaptiste Daroussin oldc = c[0]; 6733bbe3f67SBaptiste Daroussin numtries = 0; 6743bbe3f67SBaptiste Daroussin do { 6753bbe3f67SBaptiste Daroussin if (y <= clist[oldc].y) 6763bbe3f67SBaptiste Daroussin continue; 6773bbe3f67SBaptiste Daroussin l = search(c, k, y); 6783bbe3f67SBaptiste Daroussin if (l != oldl + 1) 6793bbe3f67SBaptiste Daroussin oldc = c[l - 1]; 6803bbe3f67SBaptiste Daroussin if (l <= k) { 6813bbe3f67SBaptiste Daroussin if (clist[c[l]].y <= y) 6823bbe3f67SBaptiste Daroussin continue; 6833bbe3f67SBaptiste Daroussin tc = c[l]; 6843bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6853bbe3f67SBaptiste Daroussin oldc = tc; 6863bbe3f67SBaptiste Daroussin oldl = l; 6873bbe3f67SBaptiste Daroussin numtries++; 6883bbe3f67SBaptiste Daroussin } else { 6893bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6903bbe3f67SBaptiste Daroussin k++; 6913bbe3f67SBaptiste Daroussin break; 6923bbe3f67SBaptiste Daroussin } 6933bbe3f67SBaptiste Daroussin } while ((y = b[++j]) > 0 && numtries < bound); 6943bbe3f67SBaptiste Daroussin } 6953bbe3f67SBaptiste Daroussin return (k); 6963bbe3f67SBaptiste Daroussin } 6973bbe3f67SBaptiste Daroussin 6983bbe3f67SBaptiste Daroussin static int 6993bbe3f67SBaptiste Daroussin newcand(int x, int y, int pred) 7003bbe3f67SBaptiste Daroussin { 7013bbe3f67SBaptiste Daroussin struct cand *q; 7023bbe3f67SBaptiste Daroussin 7033bbe3f67SBaptiste Daroussin if (clen == clistlen) { 7043bbe3f67SBaptiste Daroussin clistlen = clistlen * 11 / 10; 7053bbe3f67SBaptiste Daroussin clist = xreallocarray(clist, clistlen, sizeof(*clist)); 7063bbe3f67SBaptiste Daroussin } 7073bbe3f67SBaptiste Daroussin q = clist + clen; 7083bbe3f67SBaptiste Daroussin q->x = x; 7093bbe3f67SBaptiste Daroussin q->y = y; 7103bbe3f67SBaptiste Daroussin q->pred = pred; 7113bbe3f67SBaptiste Daroussin return (clen++); 7123bbe3f67SBaptiste Daroussin } 7133bbe3f67SBaptiste Daroussin 7143bbe3f67SBaptiste Daroussin static int 7153bbe3f67SBaptiste Daroussin search(int *c, int k, int y) 7163bbe3f67SBaptiste Daroussin { 7173bbe3f67SBaptiste Daroussin int i, j, l, t; 7183bbe3f67SBaptiste Daroussin 7193bbe3f67SBaptiste Daroussin if (clist[c[k]].y < y) /* quick look for typical case */ 7203bbe3f67SBaptiste Daroussin return (k + 1); 7213bbe3f67SBaptiste Daroussin i = 0; 7223bbe3f67SBaptiste Daroussin j = k + 1; 7233bbe3f67SBaptiste Daroussin for (;;) { 7243bbe3f67SBaptiste Daroussin l = (i + j) / 2; 7253bbe3f67SBaptiste Daroussin if (l <= i) 7263bbe3f67SBaptiste Daroussin break; 7273bbe3f67SBaptiste Daroussin t = clist[c[l]].y; 7283bbe3f67SBaptiste Daroussin if (t > y) 7293bbe3f67SBaptiste Daroussin j = l; 7303bbe3f67SBaptiste Daroussin else if (t < y) 7313bbe3f67SBaptiste Daroussin i = l; 7323bbe3f67SBaptiste Daroussin else 7333bbe3f67SBaptiste Daroussin return (l); 7343bbe3f67SBaptiste Daroussin } 7353bbe3f67SBaptiste Daroussin return (l + 1); 7363bbe3f67SBaptiste Daroussin } 7373bbe3f67SBaptiste Daroussin 7383bbe3f67SBaptiste Daroussin static void 7393bbe3f67SBaptiste Daroussin unravel(int p) 7403bbe3f67SBaptiste Daroussin { 7413bbe3f67SBaptiste Daroussin struct cand *q; 7423bbe3f67SBaptiste Daroussin int i; 7433bbe3f67SBaptiste Daroussin 7443bbe3f67SBaptiste Daroussin for (i = 0; i <= len[0]; i++) 7453bbe3f67SBaptiste Daroussin J[i] = i <= pref ? i : 7463bbe3f67SBaptiste Daroussin i > len[0] - suff ? i + len[1] - len[0] : 0; 7473bbe3f67SBaptiste Daroussin for (q = clist + p; q->y != 0; q = clist + q->pred) 7483bbe3f67SBaptiste Daroussin J[q->x + pref] = q->y + pref; 7493bbe3f67SBaptiste Daroussin } 7503bbe3f67SBaptiste Daroussin 7513bbe3f67SBaptiste Daroussin /* 7523bbe3f67SBaptiste Daroussin * Check does double duty: 7533bbe3f67SBaptiste Daroussin * 1. ferret out any fortuitous correspondences due 7543bbe3f67SBaptiste Daroussin * to confounding by hashing (which result in "jackpot") 7553bbe3f67SBaptiste Daroussin * 2. collect random access indexes to the two files 7563bbe3f67SBaptiste Daroussin */ 7573bbe3f67SBaptiste Daroussin static void 7583bbe3f67SBaptiste Daroussin check(FILE *f1, FILE *f2, int flags) 7593bbe3f67SBaptiste Daroussin { 7603bbe3f67SBaptiste Daroussin int i, j, jackpot, c, d; 7613bbe3f67SBaptiste Daroussin long ctold, ctnew; 7623bbe3f67SBaptiste Daroussin 7633bbe3f67SBaptiste Daroussin rewind(f1); 7643bbe3f67SBaptiste Daroussin rewind(f2); 7653bbe3f67SBaptiste Daroussin j = 1; 7663bbe3f67SBaptiste Daroussin ixold[0] = ixnew[0] = 0; 7673bbe3f67SBaptiste Daroussin jackpot = 0; 7683bbe3f67SBaptiste Daroussin ctold = ctnew = 0; 7693bbe3f67SBaptiste Daroussin for (i = 1; i <= len[0]; i++) { 7703bbe3f67SBaptiste Daroussin if (J[i] == 0) { 7713bbe3f67SBaptiste Daroussin ixold[i] = ctold += skipline(f1); 7723bbe3f67SBaptiste Daroussin continue; 7733bbe3f67SBaptiste Daroussin } 7743bbe3f67SBaptiste Daroussin while (j < J[i]) { 7753bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 7763bbe3f67SBaptiste Daroussin j++; 7773bbe3f67SBaptiste Daroussin } 7783bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE|D_STRIPCR)) { 7793bbe3f67SBaptiste Daroussin for (;;) { 7803bbe3f67SBaptiste Daroussin c = getc(f1); 7813bbe3f67SBaptiste Daroussin d = getc(f2); 7823bbe3f67SBaptiste Daroussin /* 7833bbe3f67SBaptiste Daroussin * GNU diff ignores a missing newline 7843bbe3f67SBaptiste Daroussin * in one file for -b or -w. 7853bbe3f67SBaptiste Daroussin */ 7863bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) { 7873bbe3f67SBaptiste Daroussin if (c == EOF && d == '\n') { 7883bbe3f67SBaptiste Daroussin ctnew++; 7893bbe3f67SBaptiste Daroussin break; 7903bbe3f67SBaptiste Daroussin } else if (c == '\n' && d == EOF) { 7913bbe3f67SBaptiste Daroussin ctold++; 7923bbe3f67SBaptiste Daroussin break; 7933bbe3f67SBaptiste Daroussin } 7943bbe3f67SBaptiste Daroussin } 7953bbe3f67SBaptiste Daroussin ctold++; 7963bbe3f67SBaptiste Daroussin ctnew++; 7973bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR) { 7983bbe3f67SBaptiste Daroussin if (c == '\r') { 7993bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == '\n') { 8003bbe3f67SBaptiste Daroussin ctnew++; 8013bbe3f67SBaptiste Daroussin break; 8023bbe3f67SBaptiste Daroussin } 8033bbe3f67SBaptiste Daroussin } 8043bbe3f67SBaptiste Daroussin if (d == '\r') { 8053bbe3f67SBaptiste Daroussin if ((d = getc(f2)) == '\n') { 8063bbe3f67SBaptiste Daroussin ctold++; 8073bbe3f67SBaptiste Daroussin break; 8083bbe3f67SBaptiste Daroussin } 8093bbe3f67SBaptiste Daroussin } 8103bbe3f67SBaptiste Daroussin } 8113bbe3f67SBaptiste Daroussin if ((flags & D_FOLDBLANKS) && isspace(c) && 8123bbe3f67SBaptiste Daroussin isspace(d)) { 8133bbe3f67SBaptiste Daroussin do { 8143bbe3f67SBaptiste Daroussin if (c == '\n') 8153bbe3f67SBaptiste Daroussin break; 8163bbe3f67SBaptiste Daroussin ctold++; 8173bbe3f67SBaptiste Daroussin } while (isspace(c = getc(f1))); 8183bbe3f67SBaptiste Daroussin do { 8193bbe3f67SBaptiste Daroussin if (d == '\n') 8203bbe3f67SBaptiste Daroussin break; 8213bbe3f67SBaptiste Daroussin ctnew++; 8223bbe3f67SBaptiste Daroussin } while (isspace(d = getc(f2))); 8233bbe3f67SBaptiste Daroussin } else if ((flags & D_IGNOREBLANKS)) { 8243bbe3f67SBaptiste Daroussin while (isspace(c) && c != '\n') { 8253bbe3f67SBaptiste Daroussin c = getc(f1); 8263bbe3f67SBaptiste Daroussin ctold++; 8273bbe3f67SBaptiste Daroussin } 8283bbe3f67SBaptiste Daroussin while (isspace(d) && d != '\n') { 8293bbe3f67SBaptiste Daroussin d = getc(f2); 8303bbe3f67SBaptiste Daroussin ctnew++; 8313bbe3f67SBaptiste Daroussin } 8323bbe3f67SBaptiste Daroussin } 833*0118df5eSBaptiste Daroussin if (chrtran(c) != chrtran(d)) { 8343bbe3f67SBaptiste Daroussin jackpot++; 8353bbe3f67SBaptiste Daroussin J[i] = 0; 8363bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 8373bbe3f67SBaptiste Daroussin ctold += skipline(f1); 8383bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 8393bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 8403bbe3f67SBaptiste Daroussin break; 8413bbe3f67SBaptiste Daroussin } 8423bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 8433bbe3f67SBaptiste Daroussin break; 8443bbe3f67SBaptiste Daroussin } 8453bbe3f67SBaptiste Daroussin } else { 8463bbe3f67SBaptiste Daroussin for (;;) { 8473bbe3f67SBaptiste Daroussin ctold++; 8483bbe3f67SBaptiste Daroussin ctnew++; 8493bbe3f67SBaptiste Daroussin if ((c = getc(f1)) != (d = getc(f2))) { 8503bbe3f67SBaptiste Daroussin /* jackpot++; */ 8513bbe3f67SBaptiste Daroussin J[i] = 0; 8523bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 8533bbe3f67SBaptiste Daroussin ctold += skipline(f1); 8543bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 8553bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 8563bbe3f67SBaptiste Daroussin break; 8573bbe3f67SBaptiste Daroussin } 8583bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 8593bbe3f67SBaptiste Daroussin break; 8603bbe3f67SBaptiste Daroussin } 8613bbe3f67SBaptiste Daroussin } 8623bbe3f67SBaptiste Daroussin ixold[i] = ctold; 8633bbe3f67SBaptiste Daroussin ixnew[j] = ctnew; 8643bbe3f67SBaptiste Daroussin j++; 8653bbe3f67SBaptiste Daroussin } 8663bbe3f67SBaptiste Daroussin for (; j <= len[1]; j++) { 8673bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 8683bbe3f67SBaptiste Daroussin } 8693bbe3f67SBaptiste Daroussin /* 8703bbe3f67SBaptiste Daroussin * if (jackpot) 8713bbe3f67SBaptiste Daroussin * fprintf(stderr, "jackpot\n"); 8723bbe3f67SBaptiste Daroussin */ 8733bbe3f67SBaptiste Daroussin } 8743bbe3f67SBaptiste Daroussin 8753bbe3f67SBaptiste Daroussin /* shellsort CACM #201 */ 8763bbe3f67SBaptiste Daroussin static void 8773bbe3f67SBaptiste Daroussin sort(struct line *a, int n) 8783bbe3f67SBaptiste Daroussin { 8793bbe3f67SBaptiste Daroussin struct line *ai, *aim, w; 8803bbe3f67SBaptiste Daroussin int j, m = 0, k; 8813bbe3f67SBaptiste Daroussin 8823bbe3f67SBaptiste Daroussin if (n == 0) 8833bbe3f67SBaptiste Daroussin return; 8843bbe3f67SBaptiste Daroussin for (j = 1; j <= n; j *= 2) 8853bbe3f67SBaptiste Daroussin m = 2 * j - 1; 8863bbe3f67SBaptiste Daroussin for (m /= 2; m != 0; m /= 2) { 8873bbe3f67SBaptiste Daroussin k = n - m; 8883bbe3f67SBaptiste Daroussin for (j = 1; j <= k; j++) { 8893bbe3f67SBaptiste Daroussin for (ai = &a[j]; ai > a; ai -= m) { 8903bbe3f67SBaptiste Daroussin aim = &ai[m]; 8913bbe3f67SBaptiste Daroussin if (aim < ai) 8923bbe3f67SBaptiste Daroussin break; /* wraparound */ 8933bbe3f67SBaptiste Daroussin if (aim->value > ai[0].value || 8943bbe3f67SBaptiste Daroussin (aim->value == ai[0].value && 8953bbe3f67SBaptiste Daroussin aim->serial > ai[0].serial)) 8963bbe3f67SBaptiste Daroussin break; 8973bbe3f67SBaptiste Daroussin w.value = ai[0].value; 8983bbe3f67SBaptiste Daroussin ai[0].value = aim->value; 8993bbe3f67SBaptiste Daroussin aim->value = w.value; 9003bbe3f67SBaptiste Daroussin w.serial = ai[0].serial; 9013bbe3f67SBaptiste Daroussin ai[0].serial = aim->serial; 9023bbe3f67SBaptiste Daroussin aim->serial = w.serial; 9033bbe3f67SBaptiste Daroussin } 9043bbe3f67SBaptiste Daroussin } 9053bbe3f67SBaptiste Daroussin } 9063bbe3f67SBaptiste Daroussin } 9073bbe3f67SBaptiste Daroussin 9083bbe3f67SBaptiste Daroussin static void 9093bbe3f67SBaptiste Daroussin unsort(struct line *f, int l, int *b) 9103bbe3f67SBaptiste Daroussin { 9113bbe3f67SBaptiste Daroussin int *a, i; 9123bbe3f67SBaptiste Daroussin 9133bbe3f67SBaptiste Daroussin a = xcalloc(l + 1, sizeof(*a)); 9143bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 9153bbe3f67SBaptiste Daroussin a[f[i].serial] = f[i].value; 9163bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 9173bbe3f67SBaptiste Daroussin b[i] = a[i]; 9183bbe3f67SBaptiste Daroussin free(a); 9193bbe3f67SBaptiste Daroussin } 9203bbe3f67SBaptiste Daroussin 9213bbe3f67SBaptiste Daroussin static int 9223bbe3f67SBaptiste Daroussin skipline(FILE *f) 9233bbe3f67SBaptiste Daroussin { 9243bbe3f67SBaptiste Daroussin int i, c; 9253bbe3f67SBaptiste Daroussin 9263bbe3f67SBaptiste Daroussin for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++) 9273bbe3f67SBaptiste Daroussin continue; 9283bbe3f67SBaptiste Daroussin return (i); 9293bbe3f67SBaptiste Daroussin } 9303bbe3f67SBaptiste Daroussin 9313bbe3f67SBaptiste Daroussin static void 9323bbe3f67SBaptiste Daroussin output(char *file1, FILE *f1, char *file2, FILE *f2, int flags) 9333bbe3f67SBaptiste Daroussin { 9343bbe3f67SBaptiste Daroussin int m, i0, i1, j0, j1; 9353bbe3f67SBaptiste Daroussin 9363bbe3f67SBaptiste Daroussin rewind(f1); 9373bbe3f67SBaptiste Daroussin rewind(f2); 9383bbe3f67SBaptiste Daroussin m = len[0]; 9393bbe3f67SBaptiste Daroussin J[0] = 0; 9403bbe3f67SBaptiste Daroussin J[m + 1] = len[1] + 1; 9413bbe3f67SBaptiste Daroussin if (diff_format != D_EDIT) { 9423bbe3f67SBaptiste Daroussin for (i0 = 1; i0 <= m; i0 = i1 + 1) { 9433bbe3f67SBaptiste Daroussin while (i0 <= m && J[i0] == J[i0 - 1] + 1) 9443bbe3f67SBaptiste Daroussin i0++; 9453bbe3f67SBaptiste Daroussin j0 = J[i0 - 1] + 1; 9463bbe3f67SBaptiste Daroussin i1 = i0 - 1; 9473bbe3f67SBaptiste Daroussin while (i1 < m && J[i1 + 1] == 0) 9483bbe3f67SBaptiste Daroussin i1++; 9493bbe3f67SBaptiste Daroussin j1 = J[i1 + 1] - 1; 9503bbe3f67SBaptiste Daroussin J[i1] = j1; 9513bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i0, i1, j0, j1, &flags); 9523bbe3f67SBaptiste Daroussin } 9533bbe3f67SBaptiste Daroussin } else { 9543bbe3f67SBaptiste Daroussin for (i0 = m; i0 >= 1; i0 = i1 - 1) { 9553bbe3f67SBaptiste Daroussin while (i0 >= 1 && J[i0] == J[i0 + 1] - 1 && J[i0] != 0) 9563bbe3f67SBaptiste Daroussin i0--; 9573bbe3f67SBaptiste Daroussin j0 = J[i0 + 1] - 1; 9583bbe3f67SBaptiste Daroussin i1 = i0 + 1; 9593bbe3f67SBaptiste Daroussin while (i1 > 1 && J[i1 - 1] == 0) 9603bbe3f67SBaptiste Daroussin i1--; 9613bbe3f67SBaptiste Daroussin j1 = J[i1 - 1] + 1; 9623bbe3f67SBaptiste Daroussin J[i1] = j1; 9633bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i1, i0, j1, j0, &flags); 9643bbe3f67SBaptiste Daroussin } 9653bbe3f67SBaptiste Daroussin } 9663bbe3f67SBaptiste Daroussin if (m == 0) 9673bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, 1, 0, 1, len[1], &flags); 968fddcb7b8SBaptiste Daroussin if (diff_format == D_IFDEF || diff_format == D_GFORMAT) { 9693bbe3f67SBaptiste Daroussin for (;;) { 9703bbe3f67SBaptiste Daroussin #define c i0 9713bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == EOF) 9723bbe3f67SBaptiste Daroussin return; 9733bbe3f67SBaptiste Daroussin diff_output("%c", c); 9743bbe3f67SBaptiste Daroussin } 9753bbe3f67SBaptiste Daroussin #undef c 9763bbe3f67SBaptiste Daroussin } 9773bbe3f67SBaptiste Daroussin if (anychange != 0) { 9783bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 9793bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, flags); 9803bbe3f67SBaptiste Daroussin else if (diff_format == D_UNIFIED) 9813bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, flags); 9823bbe3f67SBaptiste Daroussin } 9833bbe3f67SBaptiste Daroussin } 9843bbe3f67SBaptiste Daroussin 9853bbe3f67SBaptiste Daroussin static void 9863bbe3f67SBaptiste Daroussin range(int a, int b, const char *separator) 9873bbe3f67SBaptiste Daroussin { 9883bbe3f67SBaptiste Daroussin diff_output("%d", a > b ? b : a); 9893bbe3f67SBaptiste Daroussin if (a < b) 9903bbe3f67SBaptiste Daroussin diff_output("%s%d", separator, b); 9913bbe3f67SBaptiste Daroussin } 9923bbe3f67SBaptiste Daroussin 9933bbe3f67SBaptiste Daroussin static void 9943bbe3f67SBaptiste Daroussin uni_range(int a, int b) 9953bbe3f67SBaptiste Daroussin { 9963bbe3f67SBaptiste Daroussin if (a < b) 9973bbe3f67SBaptiste Daroussin diff_output("%d,%d", a, b - a + 1); 9983bbe3f67SBaptiste Daroussin else if (a == b) 9993bbe3f67SBaptiste Daroussin diff_output("%d", b); 10003bbe3f67SBaptiste Daroussin else 10013bbe3f67SBaptiste Daroussin diff_output("%d,0", b); 10023bbe3f67SBaptiste Daroussin } 10033bbe3f67SBaptiste Daroussin 10043bbe3f67SBaptiste Daroussin static char * 10053bbe3f67SBaptiste Daroussin preadline(int fd, size_t rlen, off_t off) 10063bbe3f67SBaptiste Daroussin { 10073bbe3f67SBaptiste Daroussin char *line; 10083bbe3f67SBaptiste Daroussin ssize_t nr; 10093bbe3f67SBaptiste Daroussin 10103bbe3f67SBaptiste Daroussin line = xmalloc(rlen + 1); 10113bbe3f67SBaptiste Daroussin if ((nr = pread(fd, line, rlen, off)) < 0) 10123bbe3f67SBaptiste Daroussin err(2, "preadline"); 10133bbe3f67SBaptiste Daroussin if (nr > 0 && line[nr-1] == '\n') 10143bbe3f67SBaptiste Daroussin nr--; 10153bbe3f67SBaptiste Daroussin line[nr] = '\0'; 10163bbe3f67SBaptiste Daroussin return (line); 10173bbe3f67SBaptiste Daroussin } 10183bbe3f67SBaptiste Daroussin 10193bbe3f67SBaptiste Daroussin static int 10203bbe3f67SBaptiste Daroussin ignoreline(char *line) 10213bbe3f67SBaptiste Daroussin { 10223bbe3f67SBaptiste Daroussin int ret; 10233bbe3f67SBaptiste Daroussin 10243bbe3f67SBaptiste Daroussin ret = regexec(&ignore_re, line, 0, NULL, 0); 10253bbe3f67SBaptiste Daroussin free(line); 10263bbe3f67SBaptiste Daroussin return (ret == 0); /* if it matched, it should be ignored. */ 10273bbe3f67SBaptiste Daroussin } 10283bbe3f67SBaptiste Daroussin 10293bbe3f67SBaptiste Daroussin /* 10303bbe3f67SBaptiste Daroussin * Indicate that there is a difference between lines a and b of the from file 10313bbe3f67SBaptiste Daroussin * to get to lines c to d of the to file. If a is greater then b then there 10323bbe3f67SBaptiste Daroussin * are no lines in the from file involved and this means that there were 10333bbe3f67SBaptiste Daroussin * lines appended (beginning at b). If c is greater than d then there are 10343bbe3f67SBaptiste Daroussin * lines missing from the to file. 10353bbe3f67SBaptiste Daroussin */ 10363bbe3f67SBaptiste Daroussin static void 10373bbe3f67SBaptiste Daroussin change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, 10383bbe3f67SBaptiste Daroussin int *pflags) 10393bbe3f67SBaptiste Daroussin { 10403bbe3f67SBaptiste Daroussin static size_t max_context = 64; 1041fddcb7b8SBaptiste Daroussin long curpos; 10427ef35d05SDimitry Andric int i, nc, f; 1043fddcb7b8SBaptiste Daroussin const char *walk; 10443bbe3f67SBaptiste Daroussin 10453bbe3f67SBaptiste Daroussin restart: 1046fddcb7b8SBaptiste Daroussin if ((diff_format != D_IFDEF || diff_format == D_GFORMAT) && 1047fddcb7b8SBaptiste Daroussin a > b && c > d) 10483bbe3f67SBaptiste Daroussin return; 10493bbe3f67SBaptiste Daroussin if (ignore_pats != NULL) { 10503bbe3f67SBaptiste Daroussin char *line; 10513bbe3f67SBaptiste Daroussin /* 10523bbe3f67SBaptiste Daroussin * All lines in the change, insert, or delete must 10533bbe3f67SBaptiste Daroussin * match an ignore pattern for the change to be 10543bbe3f67SBaptiste Daroussin * ignored. 10553bbe3f67SBaptiste Daroussin */ 10563bbe3f67SBaptiste Daroussin if (a <= b) { /* Changes and deletes. */ 10573bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 10583bbe3f67SBaptiste Daroussin line = preadline(fileno(f1), 10593bbe3f67SBaptiste Daroussin ixold[i] - ixold[i - 1], ixold[i - 1]); 10603bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 10613bbe3f67SBaptiste Daroussin goto proceed; 10623bbe3f67SBaptiste Daroussin } 10633bbe3f67SBaptiste Daroussin } 10643bbe3f67SBaptiste Daroussin if (a > b || c <= d) { /* Changes and inserts. */ 10653bbe3f67SBaptiste Daroussin for (i = c; i <= d; i++) { 10663bbe3f67SBaptiste Daroussin line = preadline(fileno(f2), 10673bbe3f67SBaptiste Daroussin ixnew[i] - ixnew[i - 1], ixnew[i - 1]); 10683bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 10693bbe3f67SBaptiste Daroussin goto proceed; 10703bbe3f67SBaptiste Daroussin } 10713bbe3f67SBaptiste Daroussin } 10723bbe3f67SBaptiste Daroussin return; 10733bbe3f67SBaptiste Daroussin } 10743bbe3f67SBaptiste Daroussin proceed: 10754d8c5790SEnji Cooper if (*pflags & D_HEADER && diff_format != D_BRIEF) { 10763bbe3f67SBaptiste Daroussin diff_output("%s %s %s\n", diffargs, file1, file2); 10773bbe3f67SBaptiste Daroussin *pflags &= ~D_HEADER; 10783bbe3f67SBaptiste Daroussin } 10793bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) { 10803bbe3f67SBaptiste Daroussin /* 10813bbe3f67SBaptiste Daroussin * Allocate change records as needed. 10823bbe3f67SBaptiste Daroussin */ 10833bbe3f67SBaptiste Daroussin if (context_vec_ptr == context_vec_end - 1) { 10843bbe3f67SBaptiste Daroussin ptrdiff_t offset = context_vec_ptr - context_vec_start; 10853bbe3f67SBaptiste Daroussin max_context <<= 1; 10863bbe3f67SBaptiste Daroussin context_vec_start = xreallocarray(context_vec_start, 10873bbe3f67SBaptiste Daroussin max_context, sizeof(*context_vec_start)); 10883bbe3f67SBaptiste Daroussin context_vec_end = context_vec_start + max_context; 10893bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start + offset; 10903bbe3f67SBaptiste Daroussin } 10913bbe3f67SBaptiste Daroussin if (anychange == 0) { 10923bbe3f67SBaptiste Daroussin /* 10933bbe3f67SBaptiste Daroussin * Print the context/unidiff header first time through. 10943bbe3f67SBaptiste Daroussin */ 10953bbe3f67SBaptiste Daroussin print_header(file1, file2); 10963bbe3f67SBaptiste Daroussin anychange = 1; 10973bbe3f67SBaptiste Daroussin } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && 10983bbe3f67SBaptiste Daroussin c > context_vec_ptr->d + (2 * diff_context) + 1) { 10993bbe3f67SBaptiste Daroussin /* 11003bbe3f67SBaptiste Daroussin * If this change is more than 'diff_context' lines from the 11013bbe3f67SBaptiste Daroussin * previous change, dump the record and reset it. 11023bbe3f67SBaptiste Daroussin */ 11033bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 11043bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, *pflags); 11053bbe3f67SBaptiste Daroussin else 11063bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, *pflags); 11073bbe3f67SBaptiste Daroussin } 11083bbe3f67SBaptiste Daroussin context_vec_ptr++; 11093bbe3f67SBaptiste Daroussin context_vec_ptr->a = a; 11103bbe3f67SBaptiste Daroussin context_vec_ptr->b = b; 11113bbe3f67SBaptiste Daroussin context_vec_ptr->c = c; 11123bbe3f67SBaptiste Daroussin context_vec_ptr->d = d; 11133bbe3f67SBaptiste Daroussin return; 11143bbe3f67SBaptiste Daroussin } 11153bbe3f67SBaptiste Daroussin if (anychange == 0) 11163bbe3f67SBaptiste Daroussin anychange = 1; 11173bbe3f67SBaptiste Daroussin switch (diff_format) { 11183bbe3f67SBaptiste Daroussin case D_BRIEF: 11193bbe3f67SBaptiste Daroussin return; 11203bbe3f67SBaptiste Daroussin case D_NORMAL: 11213bbe3f67SBaptiste Daroussin case D_EDIT: 11223bbe3f67SBaptiste Daroussin range(a, b, ","); 11233bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11243bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL) 11253bbe3f67SBaptiste Daroussin range(c, d, ","); 11263bbe3f67SBaptiste Daroussin diff_output("\n"); 11273bbe3f67SBaptiste Daroussin break; 11283bbe3f67SBaptiste Daroussin case D_REVERSE: 11293bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11303bbe3f67SBaptiste Daroussin range(a, b, " "); 11313bbe3f67SBaptiste Daroussin diff_output("\n"); 11323bbe3f67SBaptiste Daroussin break; 11333bbe3f67SBaptiste Daroussin case D_NREVERSE: 11343bbe3f67SBaptiste Daroussin if (a > b) 11353bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 11363bbe3f67SBaptiste Daroussin else { 11373bbe3f67SBaptiste Daroussin diff_output("d%d %d\n", a, b - a + 1); 11383bbe3f67SBaptiste Daroussin if (!(c > d)) 11393bbe3f67SBaptiste Daroussin /* add changed lines */ 11403bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 11413bbe3f67SBaptiste Daroussin } 11423bbe3f67SBaptiste Daroussin break; 11433bbe3f67SBaptiste Daroussin } 1144fddcb7b8SBaptiste Daroussin if (diff_format == D_GFORMAT) { 1145fddcb7b8SBaptiste Daroussin curpos = ftell(f1); 1146fddcb7b8SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 1147fddcb7b8SBaptiste Daroussin nc = ixold[a > b ? b : a - 1] - curpos; 1148fddcb7b8SBaptiste Daroussin for (i = 0; i < nc; i++) 1149fddcb7b8SBaptiste Daroussin diff_output("%c", getc(f1)); 1150fddcb7b8SBaptiste Daroussin for (walk = group_format; *walk != '\0'; walk++) { 1151fddcb7b8SBaptiste Daroussin if (*walk == '%') { 1152fddcb7b8SBaptiste Daroussin walk++; 1153fddcb7b8SBaptiste Daroussin switch (*walk) { 1154fddcb7b8SBaptiste Daroussin case '<': 1155fddcb7b8SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 1156fddcb7b8SBaptiste Daroussin break; 1157fddcb7b8SBaptiste Daroussin case '>': 1158fddcb7b8SBaptiste Daroussin fetch(ixnew, c, d, f2, '>', 0, *pflags); 1159fddcb7b8SBaptiste Daroussin break; 1160fddcb7b8SBaptiste Daroussin default: 1161fddcb7b8SBaptiste Daroussin diff_output("%%%c", *walk); 1162fddcb7b8SBaptiste Daroussin break; 1163fddcb7b8SBaptiste Daroussin } 1164fddcb7b8SBaptiste Daroussin continue; 1165fddcb7b8SBaptiste Daroussin } 1166fddcb7b8SBaptiste Daroussin diff_output("%c", *walk); 1167fddcb7b8SBaptiste Daroussin } 1168fddcb7b8SBaptiste Daroussin } 11693bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL || diff_format == D_IFDEF) { 11703bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 11713bbe3f67SBaptiste Daroussin if (a <= b && c <= d && diff_format == D_NORMAL) 11723bbe3f67SBaptiste Daroussin diff_output("---\n"); 11733bbe3f67SBaptiste Daroussin } 11747ef35d05SDimitry Andric f = 0; 1175fddcb7b8SBaptiste Daroussin if (diff_format != D_GFORMAT) 11767ef35d05SDimitry Andric f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags); 11777ef35d05SDimitry Andric if (f != 0 && diff_format == D_EDIT) { 11783bbe3f67SBaptiste Daroussin /* 11793bbe3f67SBaptiste Daroussin * A non-zero return value for D_EDIT indicates that the 11803bbe3f67SBaptiste Daroussin * last line printed was a bare dot (".") that has been 11813bbe3f67SBaptiste Daroussin * escaped as ".." to prevent ed(1) from misinterpreting 11823bbe3f67SBaptiste Daroussin * it. We have to add a substitute command to change this 11833bbe3f67SBaptiste Daroussin * back and restart where we left off. 11843bbe3f67SBaptiste Daroussin */ 11853bbe3f67SBaptiste Daroussin diff_output(".\n"); 11867ef35d05SDimitry Andric diff_output("%ds/.//\n", a + f - 1); 11877ef35d05SDimitry Andric b = a + f - 1; 11883bbe3f67SBaptiste Daroussin a = b + 1; 11897ef35d05SDimitry Andric c += f; 11903bbe3f67SBaptiste Daroussin goto restart; 11913bbe3f67SBaptiste Daroussin } 11923bbe3f67SBaptiste Daroussin if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d) 11933bbe3f67SBaptiste Daroussin diff_output(".\n"); 11943bbe3f67SBaptiste Daroussin if (inifdef) { 11953bbe3f67SBaptiste Daroussin diff_output("#endif /* %s */\n", ifdefname); 11963bbe3f67SBaptiste Daroussin inifdef = 0; 11973bbe3f67SBaptiste Daroussin } 11983bbe3f67SBaptiste Daroussin } 11993bbe3f67SBaptiste Daroussin 12003bbe3f67SBaptiste Daroussin static int 12013bbe3f67SBaptiste Daroussin fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) 12023bbe3f67SBaptiste Daroussin { 12033bbe3f67SBaptiste Daroussin int i, j, c, lastc, col, nc; 12043bbe3f67SBaptiste Daroussin int newcol; 12053bbe3f67SBaptiste Daroussin 12063bbe3f67SBaptiste Daroussin /* 12073bbe3f67SBaptiste Daroussin * When doing #ifdef's, copy down to current line 12083bbe3f67SBaptiste Daroussin * if this is the first file, so that stuff makes it to output. 12093bbe3f67SBaptiste Daroussin */ 1210fddcb7b8SBaptiste Daroussin if ((diff_format == D_IFDEF) && oldfile) { 12113bbe3f67SBaptiste Daroussin long curpos = ftell(lb); 12123bbe3f67SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 12133bbe3f67SBaptiste Daroussin nc = f[a > b ? b : a - 1] - curpos; 12143bbe3f67SBaptiste Daroussin for (i = 0; i < nc; i++) 12153bbe3f67SBaptiste Daroussin diff_output("%c", getc(lb)); 12163bbe3f67SBaptiste Daroussin } 12173bbe3f67SBaptiste Daroussin if (a > b) 12183bbe3f67SBaptiste Daroussin return (0); 12193bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF) { 12203bbe3f67SBaptiste Daroussin if (inifdef) { 12213bbe3f67SBaptiste Daroussin diff_output("#else /* %s%s */\n", 12223bbe3f67SBaptiste Daroussin oldfile == 1 ? "!" : "", ifdefname); 12233bbe3f67SBaptiste Daroussin } else { 12243bbe3f67SBaptiste Daroussin if (oldfile) 12253bbe3f67SBaptiste Daroussin diff_output("#ifndef %s\n", ifdefname); 12263bbe3f67SBaptiste Daroussin else 12273bbe3f67SBaptiste Daroussin diff_output("#ifdef %s\n", ifdefname); 12283bbe3f67SBaptiste Daroussin } 12293bbe3f67SBaptiste Daroussin inifdef = 1 + oldfile; 12303bbe3f67SBaptiste Daroussin } 12313bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 12323bbe3f67SBaptiste Daroussin fseek(lb, f[i - 1], SEEK_SET); 12333bbe3f67SBaptiste Daroussin nc = f[i] - f[i - 1]; 1234fddcb7b8SBaptiste Daroussin if ((diff_format != D_IFDEF && diff_format != D_GFORMAT) && 1235fddcb7b8SBaptiste Daroussin ch != '\0') { 12363bbe3f67SBaptiste Daroussin diff_output("%c", ch); 12373bbe3f67SBaptiste Daroussin if (Tflag && (diff_format == D_NORMAL || diff_format == D_CONTEXT 12383bbe3f67SBaptiste Daroussin || diff_format == D_UNIFIED)) 12393bbe3f67SBaptiste Daroussin diff_output("\t"); 12403bbe3f67SBaptiste Daroussin else if (diff_format != D_UNIFIED) 12413bbe3f67SBaptiste Daroussin diff_output(" "); 12423bbe3f67SBaptiste Daroussin } 12433bbe3f67SBaptiste Daroussin col = 0; 12443bbe3f67SBaptiste Daroussin for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) { 12453bbe3f67SBaptiste Daroussin if ((c = getc(lb)) == EOF) { 12463bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT || diff_format == D_REVERSE || 12473bbe3f67SBaptiste Daroussin diff_format == D_NREVERSE) 12483bbe3f67SBaptiste Daroussin warnx("No newline at end of file"); 12493bbe3f67SBaptiste Daroussin else 12503bbe3f67SBaptiste Daroussin diff_output("\n\\ No newline at end of " 12513bbe3f67SBaptiste Daroussin "file\n"); 12523bbe3f67SBaptiste Daroussin return (0); 12533bbe3f67SBaptiste Daroussin } 12543bbe3f67SBaptiste Daroussin if (c == '\t' && (flags & D_EXPANDTABS)) { 12553bbe3f67SBaptiste Daroussin newcol = ((col/tabsize)+1)*tabsize; 12563bbe3f67SBaptiste Daroussin do { 12573bbe3f67SBaptiste Daroussin diff_output(" "); 12583bbe3f67SBaptiste Daroussin } while (++col < newcol); 12593bbe3f67SBaptiste Daroussin } else { 12603bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT && j == 1 && c == '\n' 12613bbe3f67SBaptiste Daroussin && lastc == '.') { 12623bbe3f67SBaptiste Daroussin /* 12633bbe3f67SBaptiste Daroussin * Don't print a bare "." line 12643bbe3f67SBaptiste Daroussin * since that will confuse ed(1). 12653bbe3f67SBaptiste Daroussin * Print ".." instead and return, 12663bbe3f67SBaptiste Daroussin * giving the caller an offset 12673bbe3f67SBaptiste Daroussin * from which to restart. 12683bbe3f67SBaptiste Daroussin */ 12693bbe3f67SBaptiste Daroussin diff_output(".\n"); 12703bbe3f67SBaptiste Daroussin return (i - a + 1); 12713bbe3f67SBaptiste Daroussin } 12723bbe3f67SBaptiste Daroussin diff_output("%c", c); 12733bbe3f67SBaptiste Daroussin col++; 12743bbe3f67SBaptiste Daroussin } 12753bbe3f67SBaptiste Daroussin } 12763bbe3f67SBaptiste Daroussin } 12773bbe3f67SBaptiste Daroussin return (0); 12783bbe3f67SBaptiste Daroussin } 12793bbe3f67SBaptiste Daroussin 12803bbe3f67SBaptiste Daroussin /* 12813bbe3f67SBaptiste Daroussin * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578. 12823bbe3f67SBaptiste Daroussin */ 12833bbe3f67SBaptiste Daroussin static int 12843bbe3f67SBaptiste Daroussin readhash(FILE *f, int flags) 12853bbe3f67SBaptiste Daroussin { 12863bbe3f67SBaptiste Daroussin int i, t, space; 12873bbe3f67SBaptiste Daroussin int sum; 12883bbe3f67SBaptiste Daroussin 12893bbe3f67SBaptiste Daroussin sum = 1; 12903bbe3f67SBaptiste Daroussin space = 0; 12913bbe3f67SBaptiste Daroussin if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) { 12923bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 12933bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 12943bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 12953bbe3f67SBaptiste Daroussin t = getc(f); 12963bbe3f67SBaptiste Daroussin if (t == '\n') 12973bbe3f67SBaptiste Daroussin break; 12983bbe3f67SBaptiste Daroussin ungetc(t, f); 12993bbe3f67SBaptiste Daroussin } 13003bbe3f67SBaptiste Daroussin if (t == EOF) { 13013bbe3f67SBaptiste Daroussin if (i == 0) 13023bbe3f67SBaptiste Daroussin return (0); 13033bbe3f67SBaptiste Daroussin break; 13043bbe3f67SBaptiste Daroussin } 1305*0118df5eSBaptiste Daroussin sum = sum * 127 + chrtran(t); 13063bbe3f67SBaptiste Daroussin } 13073bbe3f67SBaptiste Daroussin else 13083bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 13093bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 13103bbe3f67SBaptiste Daroussin t = getc(f); 13113bbe3f67SBaptiste Daroussin if (t == '\n') 13123bbe3f67SBaptiste Daroussin break; 13133bbe3f67SBaptiste Daroussin ungetc(t, f); 13143bbe3f67SBaptiste Daroussin } 13153bbe3f67SBaptiste Daroussin if (t == EOF) { 13163bbe3f67SBaptiste Daroussin if (i == 0) 13173bbe3f67SBaptiste Daroussin return (0); 13183bbe3f67SBaptiste Daroussin break; 13193bbe3f67SBaptiste Daroussin } 13203bbe3f67SBaptiste Daroussin sum = sum * 127 + t; 13213bbe3f67SBaptiste Daroussin } 13223bbe3f67SBaptiste Daroussin } else { 13233bbe3f67SBaptiste Daroussin for (i = 0;;) { 13243bbe3f67SBaptiste Daroussin switch (t = getc(f)) { 13253bbe3f67SBaptiste Daroussin case '\r': 13263bbe3f67SBaptiste Daroussin case '\t': 13273bbe3f67SBaptiste Daroussin case '\v': 13283bbe3f67SBaptiste Daroussin case '\f': 13293bbe3f67SBaptiste Daroussin case ' ': 13303bbe3f67SBaptiste Daroussin space++; 13313bbe3f67SBaptiste Daroussin continue; 13323bbe3f67SBaptiste Daroussin default: 13333bbe3f67SBaptiste Daroussin if (space && (flags & D_IGNOREBLANKS) == 0) { 13343bbe3f67SBaptiste Daroussin i++; 13353bbe3f67SBaptiste Daroussin space = 0; 13363bbe3f67SBaptiste Daroussin } 1337*0118df5eSBaptiste Daroussin sum = sum * 127 + chrtran(t); 13383bbe3f67SBaptiste Daroussin i++; 13393bbe3f67SBaptiste Daroussin continue; 13403bbe3f67SBaptiste Daroussin case EOF: 13413bbe3f67SBaptiste Daroussin if (i == 0) 13423bbe3f67SBaptiste Daroussin return (0); 13433bbe3f67SBaptiste Daroussin /* FALLTHROUGH */ 13443bbe3f67SBaptiste Daroussin case '\n': 13453bbe3f67SBaptiste Daroussin break; 13463bbe3f67SBaptiste Daroussin } 13473bbe3f67SBaptiste Daroussin break; 13483bbe3f67SBaptiste Daroussin } 13493bbe3f67SBaptiste Daroussin } 13503bbe3f67SBaptiste Daroussin /* 13513bbe3f67SBaptiste Daroussin * There is a remote possibility that we end up with a zero sum. 13523bbe3f67SBaptiste Daroussin * Zero is used as an EOF marker, so return 1 instead. 13533bbe3f67SBaptiste Daroussin */ 13543bbe3f67SBaptiste Daroussin return (sum == 0 ? 1 : sum); 13553bbe3f67SBaptiste Daroussin } 13563bbe3f67SBaptiste Daroussin 13573bbe3f67SBaptiste Daroussin static int 13583bbe3f67SBaptiste Daroussin asciifile(FILE *f) 13593bbe3f67SBaptiste Daroussin { 13603bbe3f67SBaptiste Daroussin unsigned char buf[BUFSIZ]; 13613bbe3f67SBaptiste Daroussin size_t cnt; 13623bbe3f67SBaptiste Daroussin 13633bbe3f67SBaptiste Daroussin if (f == NULL) 13643bbe3f67SBaptiste Daroussin return (1); 13653bbe3f67SBaptiste Daroussin 13663bbe3f67SBaptiste Daroussin rewind(f); 13673bbe3f67SBaptiste Daroussin cnt = fread(buf, 1, sizeof(buf), f); 13683bbe3f67SBaptiste Daroussin return (memchr(buf, '\0', cnt) == NULL); 13693bbe3f67SBaptiste Daroussin } 13703bbe3f67SBaptiste Daroussin 13713bbe3f67SBaptiste Daroussin #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0) 13723bbe3f67SBaptiste Daroussin 13733bbe3f67SBaptiste Daroussin static char * 13743bbe3f67SBaptiste Daroussin match_function(const long *f, int pos, FILE *fp) 13753bbe3f67SBaptiste Daroussin { 13763bbe3f67SBaptiste Daroussin unsigned char buf[FUNCTION_CONTEXT_SIZE]; 13773bbe3f67SBaptiste Daroussin size_t nc; 13783bbe3f67SBaptiste Daroussin int last = lastline; 13793bbe3f67SBaptiste Daroussin const char *state = NULL; 13803bbe3f67SBaptiste Daroussin 13813bbe3f67SBaptiste Daroussin lastline = pos; 13823bbe3f67SBaptiste Daroussin while (pos > last) { 13833bbe3f67SBaptiste Daroussin fseek(fp, f[pos - 1], SEEK_SET); 13843bbe3f67SBaptiste Daroussin nc = f[pos] - f[pos - 1]; 13853bbe3f67SBaptiste Daroussin if (nc >= sizeof(buf)) 13863bbe3f67SBaptiste Daroussin nc = sizeof(buf) - 1; 13873bbe3f67SBaptiste Daroussin nc = fread(buf, 1, nc, fp); 13883bbe3f67SBaptiste Daroussin if (nc > 0) { 13893bbe3f67SBaptiste Daroussin buf[nc] = '\0'; 13903bbe3f67SBaptiste Daroussin buf[strcspn(buf, "\n")] = '\0'; 13913bbe3f67SBaptiste Daroussin if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') { 13923bbe3f67SBaptiste Daroussin if (begins_with(buf, "private:")) { 13933bbe3f67SBaptiste Daroussin if (!state) 13943bbe3f67SBaptiste Daroussin state = " (private)"; 13953bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "protected:")) { 13963bbe3f67SBaptiste Daroussin if (!state) 13973bbe3f67SBaptiste Daroussin state = " (protected)"; 13983bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "public:")) { 13993bbe3f67SBaptiste Daroussin if (!state) 14003bbe3f67SBaptiste Daroussin state = " (public)"; 14013bbe3f67SBaptiste Daroussin } else { 14023bbe3f67SBaptiste Daroussin strlcpy(lastbuf, buf, sizeof lastbuf); 14033bbe3f67SBaptiste Daroussin if (state) 14043bbe3f67SBaptiste Daroussin strlcat(lastbuf, state, 14053bbe3f67SBaptiste Daroussin sizeof lastbuf); 14063bbe3f67SBaptiste Daroussin lastmatchline = pos; 14073bbe3f67SBaptiste Daroussin return lastbuf; 14083bbe3f67SBaptiste Daroussin } 14093bbe3f67SBaptiste Daroussin } 14103bbe3f67SBaptiste Daroussin } 14113bbe3f67SBaptiste Daroussin pos--; 14123bbe3f67SBaptiste Daroussin } 14133bbe3f67SBaptiste Daroussin return lastmatchline > 0 ? lastbuf : NULL; 14143bbe3f67SBaptiste Daroussin } 14153bbe3f67SBaptiste Daroussin 14163bbe3f67SBaptiste Daroussin /* dump accumulated "context" diff changes */ 14173bbe3f67SBaptiste Daroussin static void 14183bbe3f67SBaptiste Daroussin dump_context_vec(FILE *f1, FILE *f2, int flags) 14193bbe3f67SBaptiste Daroussin { 14203bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 14213bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd, do_output; 14223bbe3f67SBaptiste Daroussin int a, b, c, d; 14233bbe3f67SBaptiste Daroussin char ch, *f; 14243bbe3f67SBaptiste Daroussin 14253bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 14263bbe3f67SBaptiste Daroussin return; 14273bbe3f67SBaptiste Daroussin 14283bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 142942c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 143042c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 143142c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 143242c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 14333bbe3f67SBaptiste Daroussin 14343bbe3f67SBaptiste Daroussin diff_output("***************"); 14353bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 14363bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 14373bbe3f67SBaptiste Daroussin if (f != NULL) 14383bbe3f67SBaptiste Daroussin diff_output(" %s", f); 14393bbe3f67SBaptiste Daroussin } 14403bbe3f67SBaptiste Daroussin diff_output("\n*** "); 14413bbe3f67SBaptiste Daroussin range(lowa, upb, ","); 14423bbe3f67SBaptiste Daroussin diff_output(" ****\n"); 14433bbe3f67SBaptiste Daroussin 14443bbe3f67SBaptiste Daroussin /* 14453bbe3f67SBaptiste Daroussin * Output changes to the "old" file. The first loop suppresses 14463bbe3f67SBaptiste Daroussin * output if there were no changes to the "old" file (we'll see 14473bbe3f67SBaptiste Daroussin * the "old" lines as context in the "new" list). 14483bbe3f67SBaptiste Daroussin */ 14493bbe3f67SBaptiste Daroussin do_output = 0; 14503bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) 14513bbe3f67SBaptiste Daroussin if (cvp->a <= cvp->b) { 14523bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14533bbe3f67SBaptiste Daroussin do_output++; 14543bbe3f67SBaptiste Daroussin break; 14553bbe3f67SBaptiste Daroussin } 14563bbe3f67SBaptiste Daroussin if (do_output) { 14573bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14583bbe3f67SBaptiste Daroussin a = cvp->a; 14593bbe3f67SBaptiste Daroussin b = cvp->b; 14603bbe3f67SBaptiste Daroussin c = cvp->c; 14613bbe3f67SBaptiste Daroussin d = cvp->d; 14623bbe3f67SBaptiste Daroussin 14633bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 14643bbe3f67SBaptiste Daroussin ch = 'c'; 14653bbe3f67SBaptiste Daroussin else 14663bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 14673bbe3f67SBaptiste Daroussin 14683bbe3f67SBaptiste Daroussin if (ch == 'a') 14693bbe3f67SBaptiste Daroussin fetch(ixold, lowa, b, f1, ' ', 0, flags); 14703bbe3f67SBaptiste Daroussin else { 14713bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 14723bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, 14733bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '-', 0, flags); 14743bbe3f67SBaptiste Daroussin } 14753bbe3f67SBaptiste Daroussin lowa = b + 1; 14763bbe3f67SBaptiste Daroussin cvp++; 14773bbe3f67SBaptiste Daroussin } 14783bbe3f67SBaptiste Daroussin fetch(ixold, b + 1, upb, f1, ' ', 0, flags); 14793bbe3f67SBaptiste Daroussin } 14803bbe3f67SBaptiste Daroussin /* output changes to the "new" file */ 14813bbe3f67SBaptiste Daroussin diff_output("--- "); 14823bbe3f67SBaptiste Daroussin range(lowc, upd, ","); 14833bbe3f67SBaptiste Daroussin diff_output(" ----\n"); 14843bbe3f67SBaptiste Daroussin 14853bbe3f67SBaptiste Daroussin do_output = 0; 14863bbe3f67SBaptiste Daroussin for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++) 14873bbe3f67SBaptiste Daroussin if (cvp->c <= cvp->d) { 14883bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14893bbe3f67SBaptiste Daroussin do_output++; 14903bbe3f67SBaptiste Daroussin break; 14913bbe3f67SBaptiste Daroussin } 14923bbe3f67SBaptiste Daroussin if (do_output) { 14933bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14943bbe3f67SBaptiste Daroussin a = cvp->a; 14953bbe3f67SBaptiste Daroussin b = cvp->b; 14963bbe3f67SBaptiste Daroussin c = cvp->c; 14973bbe3f67SBaptiste Daroussin d = cvp->d; 14983bbe3f67SBaptiste Daroussin 14993bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15003bbe3f67SBaptiste Daroussin ch = 'c'; 15013bbe3f67SBaptiste Daroussin else 15023bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15033bbe3f67SBaptiste Daroussin 15043bbe3f67SBaptiste Daroussin if (ch == 'd') 15053bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, d, f2, ' ', 0, flags); 15063bbe3f67SBaptiste Daroussin else { 15073bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 15083bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, 15093bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '+', 0, flags); 15103bbe3f67SBaptiste Daroussin } 15113bbe3f67SBaptiste Daroussin lowc = d + 1; 15123bbe3f67SBaptiste Daroussin cvp++; 15133bbe3f67SBaptiste Daroussin } 15143bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 15153bbe3f67SBaptiste Daroussin } 15163bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 15173bbe3f67SBaptiste Daroussin } 15183bbe3f67SBaptiste Daroussin 15193bbe3f67SBaptiste Daroussin /* dump accumulated "unified" diff changes */ 15203bbe3f67SBaptiste Daroussin static void 15213bbe3f67SBaptiste Daroussin dump_unified_vec(FILE *f1, FILE *f2, int flags) 15223bbe3f67SBaptiste Daroussin { 15233bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 15243bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd; 15253bbe3f67SBaptiste Daroussin int a, b, c, d; 15263bbe3f67SBaptiste Daroussin char ch, *f; 15273bbe3f67SBaptiste Daroussin 15283bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 15293bbe3f67SBaptiste Daroussin return; 15303bbe3f67SBaptiste Daroussin 15313bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 153242c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 153342c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 153442c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 153542c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 15363bbe3f67SBaptiste Daroussin 15373bbe3f67SBaptiste Daroussin diff_output("@@ -"); 15383bbe3f67SBaptiste Daroussin uni_range(lowa, upb); 15393bbe3f67SBaptiste Daroussin diff_output(" +"); 15403bbe3f67SBaptiste Daroussin uni_range(lowc, upd); 15413bbe3f67SBaptiste Daroussin diff_output(" @@"); 15423bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 15433bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 15443bbe3f67SBaptiste Daroussin if (f != NULL) 15453bbe3f67SBaptiste Daroussin diff_output(" %s", f); 15463bbe3f67SBaptiste Daroussin } 15473bbe3f67SBaptiste Daroussin diff_output("\n"); 15483bbe3f67SBaptiste Daroussin 15493bbe3f67SBaptiste Daroussin /* 15503bbe3f67SBaptiste Daroussin * Output changes in "unified" diff format--the old and new lines 15513bbe3f67SBaptiste Daroussin * are printed together. 15523bbe3f67SBaptiste Daroussin */ 15533bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) { 15543bbe3f67SBaptiste Daroussin a = cvp->a; 15553bbe3f67SBaptiste Daroussin b = cvp->b; 15563bbe3f67SBaptiste Daroussin c = cvp->c; 15573bbe3f67SBaptiste Daroussin d = cvp->d; 15583bbe3f67SBaptiste Daroussin 15593bbe3f67SBaptiste Daroussin /* 15603bbe3f67SBaptiste Daroussin * c: both new and old changes 15613bbe3f67SBaptiste Daroussin * d: only changes in the old file 15623bbe3f67SBaptiste Daroussin * a: only changes in the new file 15633bbe3f67SBaptiste Daroussin */ 15643bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15653bbe3f67SBaptiste Daroussin ch = 'c'; 15663bbe3f67SBaptiste Daroussin else 15673bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15683bbe3f67SBaptiste Daroussin 15693bbe3f67SBaptiste Daroussin switch (ch) { 15703bbe3f67SBaptiste Daroussin case 'c': 15713bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15723bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15733bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15743bbe3f67SBaptiste Daroussin break; 15753bbe3f67SBaptiste Daroussin case 'd': 15763bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15773bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15783bbe3f67SBaptiste Daroussin break; 15793bbe3f67SBaptiste Daroussin case 'a': 15803bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 15813bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15823bbe3f67SBaptiste Daroussin break; 15833bbe3f67SBaptiste Daroussin } 15843bbe3f67SBaptiste Daroussin lowa = b + 1; 15853bbe3f67SBaptiste Daroussin lowc = d + 1; 15863bbe3f67SBaptiste Daroussin } 15873bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 15883bbe3f67SBaptiste Daroussin 15893bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 15903bbe3f67SBaptiste Daroussin } 15913bbe3f67SBaptiste Daroussin 15923bbe3f67SBaptiste Daroussin static void 15933bbe3f67SBaptiste Daroussin print_header(const char *file1, const char *file2) 15943bbe3f67SBaptiste Daroussin { 15953bbe3f67SBaptiste Daroussin const char *time_format; 15963bbe3f67SBaptiste Daroussin char buf1[256]; 15973bbe3f67SBaptiste Daroussin char buf2[256]; 15983bbe3f67SBaptiste Daroussin char end1[10]; 15993bbe3f67SBaptiste Daroussin char end2[10]; 160058cf4d86SJilles Tjoelker struct tm tm1, tm2, *tm_ptr1, *tm_ptr2; 1601385a67dcSJilles Tjoelker int nsec1 = stb1.st_mtim.tv_nsec; 1602385a67dcSJilles Tjoelker int nsec2 = stb2.st_mtim.tv_nsec; 16033bbe3f67SBaptiste Daroussin 16043bbe3f67SBaptiste Daroussin time_format = "%Y-%m-%d %H:%M:%S"; 16053bbe3f67SBaptiste Daroussin 16063bbe3f67SBaptiste Daroussin if (cflag) 16073bbe3f67SBaptiste Daroussin time_format = "%c"; 160858cf4d86SJilles Tjoelker tm_ptr1 = localtime_r(&stb1.st_mtime, &tm1); 160958cf4d86SJilles Tjoelker tm_ptr2 = localtime_r(&stb2.st_mtime, &tm2); 16103bbe3f67SBaptiste Daroussin strftime(buf1, 256, time_format, tm_ptr1); 16113bbe3f67SBaptiste Daroussin strftime(buf2, 256, time_format, tm_ptr2); 16123bbe3f67SBaptiste Daroussin if (!cflag) { 16133bbe3f67SBaptiste Daroussin strftime(end1, 10, "%z", tm_ptr1); 16143bbe3f67SBaptiste Daroussin strftime(end2, 10, "%z", tm_ptr2); 16153bbe3f67SBaptiste Daroussin sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1); 16163bbe3f67SBaptiste Daroussin sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2); 16173bbe3f67SBaptiste Daroussin } 16183bbe3f67SBaptiste Daroussin if (label[0] != NULL) 16193bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "***" : "---", 16203bbe3f67SBaptiste Daroussin label[0]); 16213bbe3f67SBaptiste Daroussin else 16223bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "***" : "---", 16233bbe3f67SBaptiste Daroussin file1, buf1); 16243bbe3f67SBaptiste Daroussin if (label[1] != NULL) 16253bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "---" : "+++", 16263bbe3f67SBaptiste Daroussin label[1]); 16273bbe3f67SBaptiste Daroussin else 16283bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "---" : "+++", 16293bbe3f67SBaptiste Daroussin file2, buf2); 16303bbe3f67SBaptiste Daroussin } 1631