13bbe3f67SBaptiste Daroussin /* $OpenBSD: diffreg.c,v 1.91 2016/03/01 20:57:35 natano Exp $ */ 23bbe3f67SBaptiste Daroussin 33bbe3f67SBaptiste Daroussin /* 43bbe3f67SBaptiste Daroussin * Copyright (C) Caldera International Inc. 2001-2002. 53bbe3f67SBaptiste Daroussin * All rights reserved. 63bbe3f67SBaptiste Daroussin * 73bbe3f67SBaptiste Daroussin * Redistribution and use in source and binary forms, with or without 83bbe3f67SBaptiste Daroussin * modification, are permitted provided that the following conditions 93bbe3f67SBaptiste Daroussin * are met: 103bbe3f67SBaptiste Daroussin * 1. Redistributions of source code and documentation must retain the above 113bbe3f67SBaptiste Daroussin * copyright notice, this list of conditions and the following disclaimer. 123bbe3f67SBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright 133bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the 143bbe3f67SBaptiste Daroussin * documentation and/or other materials provided with the distribution. 153bbe3f67SBaptiste Daroussin * 3. All advertising materials mentioning features or use of this software 163bbe3f67SBaptiste Daroussin * must display the following acknowledgement: 173bbe3f67SBaptiste Daroussin * This product includes software developed or owned by Caldera 183bbe3f67SBaptiste Daroussin * International, Inc. 193bbe3f67SBaptiste Daroussin * 4. Neither the name of Caldera International, Inc. nor the names of other 203bbe3f67SBaptiste Daroussin * contributors may be used to endorse or promote products derived from 213bbe3f67SBaptiste Daroussin * this software without specific prior written permission. 223bbe3f67SBaptiste Daroussin * 233bbe3f67SBaptiste Daroussin * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA 243bbe3f67SBaptiste Daroussin * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR 253bbe3f67SBaptiste Daroussin * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 263bbe3f67SBaptiste Daroussin * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 273bbe3f67SBaptiste Daroussin * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT, 283bbe3f67SBaptiste Daroussin * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 293bbe3f67SBaptiste Daroussin * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 303bbe3f67SBaptiste Daroussin * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 313bbe3f67SBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 323bbe3f67SBaptiste Daroussin * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 333bbe3f67SBaptiste Daroussin * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 343bbe3f67SBaptiste Daroussin * POSSIBILITY OF SUCH DAMAGE. 353bbe3f67SBaptiste Daroussin */ 363bbe3f67SBaptiste Daroussin /*- 373bbe3f67SBaptiste Daroussin * Copyright (c) 1991, 1993 383bbe3f67SBaptiste Daroussin * The Regents of the University of California. All rights reserved. 393bbe3f67SBaptiste Daroussin * 403bbe3f67SBaptiste Daroussin * Redistribution and use in source and binary forms, with or without 413bbe3f67SBaptiste Daroussin * modification, are permitted provided that the following conditions 423bbe3f67SBaptiste Daroussin * are met: 433bbe3f67SBaptiste Daroussin * 1. Redistributions of source code must retain the above copyright 443bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer. 453bbe3f67SBaptiste Daroussin * 2. Redistributions in binary form must reproduce the above copyright 463bbe3f67SBaptiste Daroussin * notice, this list of conditions and the following disclaimer in the 473bbe3f67SBaptiste Daroussin * documentation and/or other materials provided with the distribution. 483bbe3f67SBaptiste Daroussin * 3. Neither the name of the University nor the names of its contributors 493bbe3f67SBaptiste Daroussin * may be used to endorse or promote products derived from this software 503bbe3f67SBaptiste Daroussin * without specific prior written permission. 513bbe3f67SBaptiste Daroussin * 523bbe3f67SBaptiste Daroussin * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND 533bbe3f67SBaptiste Daroussin * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 543bbe3f67SBaptiste Daroussin * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 553bbe3f67SBaptiste Daroussin * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 563bbe3f67SBaptiste Daroussin * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 573bbe3f67SBaptiste Daroussin * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 583bbe3f67SBaptiste Daroussin * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 593bbe3f67SBaptiste Daroussin * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 603bbe3f67SBaptiste Daroussin * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 613bbe3f67SBaptiste Daroussin * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 623bbe3f67SBaptiste Daroussin * SUCH DAMAGE. 633bbe3f67SBaptiste Daroussin * 643bbe3f67SBaptiste Daroussin * @(#)diffreg.c 8.1 (Berkeley) 6/6/93 653bbe3f67SBaptiste Daroussin */ 663bbe3f67SBaptiste Daroussin 673bbe3f67SBaptiste Daroussin #include <sys/cdefs.h> 683bbe3f67SBaptiste Daroussin __FBSDID("$FreeBSD$"); 693bbe3f67SBaptiste Daroussin 703bbe3f67SBaptiste Daroussin #include <sys/capsicum.h> 713bbe3f67SBaptiste Daroussin #include <sys/procdesc.h> 723bbe3f67SBaptiste Daroussin #include <sys/stat.h> 733bbe3f67SBaptiste Daroussin #include <sys/types.h> 743bbe3f67SBaptiste Daroussin #include <sys/event.h> 753bbe3f67SBaptiste Daroussin #include <sys/wait.h> 763bbe3f67SBaptiste Daroussin 773bbe3f67SBaptiste Daroussin #include <capsicum_helpers.h> 783bbe3f67SBaptiste Daroussin #include <ctype.h> 793bbe3f67SBaptiste Daroussin #include <err.h> 803bbe3f67SBaptiste Daroussin #include <errno.h> 813bbe3f67SBaptiste Daroussin #include <fcntl.h> 823bbe3f67SBaptiste Daroussin #include <paths.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 #include <unistd.h> 893bbe3f67SBaptiste Daroussin #include <limits.h> 903bbe3f67SBaptiste Daroussin #include <signal.h> 913bbe3f67SBaptiste Daroussin 923bbe3f67SBaptiste Daroussin #include "diff.h" 933bbe3f67SBaptiste Daroussin #include "xmalloc.h" 943bbe3f67SBaptiste Daroussin 953bbe3f67SBaptiste Daroussin #define _PATH_PR "/usr/bin/pr" 963bbe3f67SBaptiste Daroussin 973bbe3f67SBaptiste Daroussin #ifdef ST_MTIM_NSEC 983bbe3f67SBaptiste Daroussin # define TIMESPEC_NS(timespec) ((timespec).ST_MTIM_NSEC) 993bbe3f67SBaptiste Daroussin #else 1003bbe3f67SBaptiste Daroussin # define TIMESPEC_NS(timespec) 0 1013bbe3f67SBaptiste Daroussin #endif 1023bbe3f67SBaptiste Daroussin 1033bbe3f67SBaptiste Daroussin #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b)) 1043bbe3f67SBaptiste Daroussin #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b)) 1053bbe3f67SBaptiste Daroussin 1063bbe3f67SBaptiste Daroussin /* 1073bbe3f67SBaptiste Daroussin * diff - compare two files. 1083bbe3f67SBaptiste Daroussin */ 1093bbe3f67SBaptiste Daroussin 1103bbe3f67SBaptiste Daroussin /* 1113bbe3f67SBaptiste Daroussin * Uses an algorithm due to Harold Stone, which finds 1123bbe3f67SBaptiste Daroussin * a pair of longest identical subsequences in the two 1133bbe3f67SBaptiste Daroussin * files. 1143bbe3f67SBaptiste Daroussin * 1153bbe3f67SBaptiste Daroussin * The major goal is to generate the match vector J. 1163bbe3f67SBaptiste Daroussin * J[i] is the index of the line in file1 corresponding 1173bbe3f67SBaptiste Daroussin * to line i file0. J[i] = 0 if there is no 1183bbe3f67SBaptiste Daroussin * such line in file1. 1193bbe3f67SBaptiste Daroussin * 1203bbe3f67SBaptiste Daroussin * Lines are hashed so as to work in core. All potential 1213bbe3f67SBaptiste Daroussin * matches are located by sorting the lines of each file 1223bbe3f67SBaptiste Daroussin * on the hash (called ``value''). In particular, this 1233bbe3f67SBaptiste Daroussin * collects the equivalence classes in file1 together. 1243bbe3f67SBaptiste Daroussin * Subroutine equiv replaces the value of each line in 1253bbe3f67SBaptiste Daroussin * file0 by the index of the first element of its 1263bbe3f67SBaptiste Daroussin * matching equivalence in (the reordered) file1. 1273bbe3f67SBaptiste Daroussin * To save space equiv squeezes file1 into a single 1283bbe3f67SBaptiste Daroussin * array member in which the equivalence classes 1293bbe3f67SBaptiste Daroussin * are simply concatenated, except that their first 1303bbe3f67SBaptiste Daroussin * members are flagged by changing sign. 1313bbe3f67SBaptiste Daroussin * 1323bbe3f67SBaptiste Daroussin * Next the indices that point into member are unsorted into 1333bbe3f67SBaptiste Daroussin * array class according to the original order of file0. 1343bbe3f67SBaptiste Daroussin * 1353bbe3f67SBaptiste Daroussin * The cleverness lies in routine stone. This marches 1363bbe3f67SBaptiste Daroussin * through the lines of file0, developing a vector klist 1373bbe3f67SBaptiste Daroussin * of "k-candidates". At step i a k-candidate is a matched 1383bbe3f67SBaptiste Daroussin * pair of lines x,y (x in file0 y in file1) such that 1393bbe3f67SBaptiste Daroussin * there is a common subsequence of length k 1403bbe3f67SBaptiste Daroussin * between the first i lines of file0 and the first y 1413bbe3f67SBaptiste Daroussin * lines of file1, but there is no such subsequence for 1423bbe3f67SBaptiste Daroussin * any smaller y. x is the earliest possible mate to y 1433bbe3f67SBaptiste Daroussin * that occurs in such a subsequence. 1443bbe3f67SBaptiste Daroussin * 1453bbe3f67SBaptiste Daroussin * Whenever any of the members of the equivalence class of 1463bbe3f67SBaptiste Daroussin * lines in file1 matable to a line in file0 has serial number 1473bbe3f67SBaptiste Daroussin * less than the y of some k-candidate, that k-candidate 1483bbe3f67SBaptiste Daroussin * with the smallest such y is replaced. The new 1493bbe3f67SBaptiste Daroussin * k-candidate is chained (via pred) to the current 1503bbe3f67SBaptiste Daroussin * k-1 candidate so that the actual subsequence can 1513bbe3f67SBaptiste Daroussin * be recovered. When a member has serial number greater 1523bbe3f67SBaptiste Daroussin * that the y of all k-candidates, the klist is extended. 1533bbe3f67SBaptiste Daroussin * At the end, the longest subsequence is pulled out 1543bbe3f67SBaptiste Daroussin * and placed in the array J by unravel 1553bbe3f67SBaptiste Daroussin * 1563bbe3f67SBaptiste Daroussin * With J in hand, the matches there recorded are 1573bbe3f67SBaptiste Daroussin * check'ed against reality to assure that no spurious 1583bbe3f67SBaptiste Daroussin * matches have crept in due to hashing. If they have, 1593bbe3f67SBaptiste Daroussin * they are broken, and "jackpot" is recorded--a harmless 1603bbe3f67SBaptiste Daroussin * matter except that a true match for a spuriously 1613bbe3f67SBaptiste Daroussin * mated line may now be unnecessarily reported as a change. 1623bbe3f67SBaptiste Daroussin * 1633bbe3f67SBaptiste Daroussin * Much of the complexity of the program comes simply 1643bbe3f67SBaptiste Daroussin * from trying to minimize core utilization and 1653bbe3f67SBaptiste Daroussin * maximize the range of doable problems by dynamically 1663bbe3f67SBaptiste Daroussin * allocating what is needed and reusing what is not. 1673bbe3f67SBaptiste Daroussin * The core requirements for problems larger than somewhat 1683bbe3f67SBaptiste Daroussin * are (in words) 2*length(file0) + length(file1) + 1693bbe3f67SBaptiste Daroussin * 3*(number of k-candidates installed), typically about 1703bbe3f67SBaptiste Daroussin * 6n words for files of length n. 1713bbe3f67SBaptiste Daroussin */ 1723bbe3f67SBaptiste Daroussin 1733bbe3f67SBaptiste Daroussin struct cand { 1743bbe3f67SBaptiste Daroussin int x; 1753bbe3f67SBaptiste Daroussin int y; 1763bbe3f67SBaptiste Daroussin int pred; 1773bbe3f67SBaptiste Daroussin }; 1783bbe3f67SBaptiste Daroussin 1793bbe3f67SBaptiste Daroussin static struct line { 1803bbe3f67SBaptiste Daroussin int serial; 1813bbe3f67SBaptiste Daroussin int value; 1823bbe3f67SBaptiste Daroussin } *file[2]; 1833bbe3f67SBaptiste Daroussin 1843bbe3f67SBaptiste Daroussin /* 1853bbe3f67SBaptiste Daroussin * The following struct is used to record change information when 1863bbe3f67SBaptiste Daroussin * doing a "context" or "unified" diff. (see routine "change" to 1873bbe3f67SBaptiste Daroussin * understand the highly mnemonic field names) 1883bbe3f67SBaptiste Daroussin */ 1893bbe3f67SBaptiste Daroussin struct context_vec { 1903bbe3f67SBaptiste Daroussin int a; /* start line in old file */ 1913bbe3f67SBaptiste Daroussin int b; /* end line in old file */ 1923bbe3f67SBaptiste Daroussin int c; /* start line in new file */ 1933bbe3f67SBaptiste Daroussin int d; /* end line in new file */ 1943bbe3f67SBaptiste Daroussin }; 1953bbe3f67SBaptiste Daroussin 1963bbe3f67SBaptiste Daroussin #define diff_output printf 1973bbe3f67SBaptiste Daroussin static void output(char *, FILE *, char *, FILE *, int); 1983bbe3f67SBaptiste Daroussin static void check(FILE *, FILE *, int); 1993bbe3f67SBaptiste Daroussin static void range(int, int, const char *); 2003bbe3f67SBaptiste Daroussin static void uni_range(int, int); 2013bbe3f67SBaptiste Daroussin static void dump_context_vec(FILE *, FILE *, int); 2023bbe3f67SBaptiste Daroussin static void dump_unified_vec(FILE *, FILE *, int); 203*d5b187aeSBaptiste Daroussin static void prepare(int, FILE *, size_t, int); 2043bbe3f67SBaptiste Daroussin static void prune(void); 2053bbe3f67SBaptiste Daroussin static void equiv(struct line *, int, struct line *, int, int *); 2063bbe3f67SBaptiste Daroussin static void unravel(int); 2073bbe3f67SBaptiste Daroussin static void unsort(struct line *, int, int *); 2083bbe3f67SBaptiste Daroussin static void change(char *, FILE *, char *, FILE *, int, int, int, int, int *); 2093bbe3f67SBaptiste Daroussin static void sort(struct line *, int); 2103bbe3f67SBaptiste Daroussin static void print_header(const char *, const char *); 2113bbe3f67SBaptiste Daroussin static int ignoreline(char *); 2123bbe3f67SBaptiste Daroussin static int asciifile(FILE *); 2133bbe3f67SBaptiste Daroussin static int fetch(long *, int, int, FILE *, int, int, int); 2143bbe3f67SBaptiste Daroussin static int newcand(int, int, int); 2153bbe3f67SBaptiste Daroussin static int search(int *, int, int); 2163bbe3f67SBaptiste Daroussin static int skipline(FILE *); 2173bbe3f67SBaptiste Daroussin static int isqrt(int); 2183bbe3f67SBaptiste Daroussin static int stone(int *, int, int *, int *, int); 2193bbe3f67SBaptiste Daroussin static int readhash(FILE *, int); 2203bbe3f67SBaptiste Daroussin static int files_differ(FILE *, FILE *, int); 2213bbe3f67SBaptiste Daroussin static char *match_function(const long *, int, FILE *); 2223bbe3f67SBaptiste Daroussin static char *preadline(int, size_t, off_t); 2233bbe3f67SBaptiste Daroussin 2243bbe3f67SBaptiste Daroussin static int *J; /* will be overlaid on class */ 2253bbe3f67SBaptiste Daroussin static int *class; /* will be overlaid on file[0] */ 2263bbe3f67SBaptiste Daroussin static int *klist; /* will be overlaid on file[0] after class */ 2273bbe3f67SBaptiste Daroussin static int *member; /* will be overlaid on file[1] */ 2283bbe3f67SBaptiste Daroussin static int clen; 2293bbe3f67SBaptiste Daroussin static int inifdef; /* whether or not we are in a #ifdef block */ 2303bbe3f67SBaptiste Daroussin static int len[2]; 2313bbe3f67SBaptiste Daroussin static int pref, suff; /* length of prefix and suffix */ 2323bbe3f67SBaptiste Daroussin static int slen[2]; 2333bbe3f67SBaptiste Daroussin static int anychange; 2343bbe3f67SBaptiste Daroussin static long *ixnew; /* will be overlaid on file[1] */ 2353bbe3f67SBaptiste Daroussin static long *ixold; /* will be overlaid on klist */ 2363bbe3f67SBaptiste Daroussin static struct cand *clist; /* merely a free storage pot for candidates */ 2373bbe3f67SBaptiste Daroussin static int clistlen; /* the length of clist */ 2383bbe3f67SBaptiste Daroussin static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */ 2393bbe3f67SBaptiste Daroussin static u_char *chrtran; /* translation table for case-folding */ 2403bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_start; 2413bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_end; 2423bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_ptr; 2433bbe3f67SBaptiste Daroussin 2443bbe3f67SBaptiste Daroussin #define FUNCTION_CONTEXT_SIZE 55 2453bbe3f67SBaptiste Daroussin static char lastbuf[FUNCTION_CONTEXT_SIZE]; 2463bbe3f67SBaptiste Daroussin static int lastline; 2473bbe3f67SBaptiste Daroussin static int lastmatchline; 2483bbe3f67SBaptiste Daroussin 2493bbe3f67SBaptiste Daroussin 2503bbe3f67SBaptiste Daroussin /* 2513bbe3f67SBaptiste Daroussin * chrtran points to one of 2 translation tables: cup2low if folding upper to 2523bbe3f67SBaptiste Daroussin * lower case clow2low if not folding case 2533bbe3f67SBaptiste Daroussin */ 2543bbe3f67SBaptiste Daroussin static u_char clow2low[256] = { 2553bbe3f67SBaptiste Daroussin 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 2563bbe3f67SBaptiste Daroussin 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 2573bbe3f67SBaptiste Daroussin 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 2583bbe3f67SBaptiste Daroussin 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 2593bbe3f67SBaptiste Daroussin 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 2603bbe3f67SBaptiste Daroussin 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41, 2613bbe3f67SBaptiste Daroussin 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c, 2623bbe3f67SBaptiste Daroussin 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 2633bbe3f67SBaptiste Daroussin 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62, 2643bbe3f67SBaptiste Daroussin 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 2653bbe3f67SBaptiste Daroussin 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 2663bbe3f67SBaptiste Daroussin 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 2673bbe3f67SBaptiste Daroussin 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 2683bbe3f67SBaptiste Daroussin 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 2693bbe3f67SBaptiste Daroussin 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 2703bbe3f67SBaptiste Daroussin 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 2713bbe3f67SBaptiste Daroussin 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 2723bbe3f67SBaptiste Daroussin 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 2733bbe3f67SBaptiste Daroussin 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 2743bbe3f67SBaptiste Daroussin 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 2753bbe3f67SBaptiste Daroussin 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 2763bbe3f67SBaptiste Daroussin 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 2773bbe3f67SBaptiste Daroussin 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 2783bbe3f67SBaptiste Daroussin 0xfd, 0xfe, 0xff 2793bbe3f67SBaptiste Daroussin }; 2803bbe3f67SBaptiste Daroussin 2813bbe3f67SBaptiste Daroussin static u_char cup2low[256] = { 2823bbe3f67SBaptiste Daroussin 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 2833bbe3f67SBaptiste Daroussin 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 2843bbe3f67SBaptiste Daroussin 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 2853bbe3f67SBaptiste Daroussin 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 2863bbe3f67SBaptiste Daroussin 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 2873bbe3f67SBaptiste Daroussin 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61, 2883bbe3f67SBaptiste Daroussin 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 2893bbe3f67SBaptiste Daroussin 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 2903bbe3f67SBaptiste Daroussin 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62, 2913bbe3f67SBaptiste Daroussin 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 2923bbe3f67SBaptiste Daroussin 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 2933bbe3f67SBaptiste Daroussin 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 2943bbe3f67SBaptiste Daroussin 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 2953bbe3f67SBaptiste Daroussin 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 2963bbe3f67SBaptiste Daroussin 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 2973bbe3f67SBaptiste Daroussin 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 2983bbe3f67SBaptiste Daroussin 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 2993bbe3f67SBaptiste Daroussin 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 3003bbe3f67SBaptiste Daroussin 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 3013bbe3f67SBaptiste Daroussin 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 3023bbe3f67SBaptiste Daroussin 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 3033bbe3f67SBaptiste Daroussin 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 3043bbe3f67SBaptiste Daroussin 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 3053bbe3f67SBaptiste Daroussin 0xfd, 0xfe, 0xff 3063bbe3f67SBaptiste Daroussin }; 3073bbe3f67SBaptiste Daroussin 3083bbe3f67SBaptiste Daroussin int 3093bbe3f67SBaptiste Daroussin diffreg(char *file1, char *file2, int flags, int capsicum) 3103bbe3f67SBaptiste Daroussin { 3113bbe3f67SBaptiste Daroussin FILE *f1, *f2; 3123bbe3f67SBaptiste Daroussin int i, rval; 3133bbe3f67SBaptiste Daroussin int ostdout = -1; 3143bbe3f67SBaptiste Daroussin int pr_pd, kq; 3153bbe3f67SBaptiste Daroussin struct kevent *e; 3163bbe3f67SBaptiste Daroussin cap_rights_t rights_ro; 3173bbe3f67SBaptiste Daroussin 318*d5b187aeSBaptiste Daroussin e = NULL; 319*d5b187aeSBaptiste Daroussin kq = -1; 3203bbe3f67SBaptiste Daroussin f1 = f2 = NULL; 3213bbe3f67SBaptiste Daroussin rval = D_SAME; 3223bbe3f67SBaptiste Daroussin anychange = 0; 3233bbe3f67SBaptiste Daroussin lastline = 0; 3243bbe3f67SBaptiste Daroussin lastmatchline = 0; 3253bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 3263bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 3273bbe3f67SBaptiste Daroussin chrtran = cup2low; 3283bbe3f67SBaptiste Daroussin else 3293bbe3f67SBaptiste Daroussin chrtran = clow2low; 3303bbe3f67SBaptiste Daroussin if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode)) 3313bbe3f67SBaptiste Daroussin return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2); 3323bbe3f67SBaptiste Daroussin if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0) 3333bbe3f67SBaptiste Daroussin goto closem; 3343bbe3f67SBaptiste Daroussin 3353bbe3f67SBaptiste Daroussin if (flags & D_EMPTY1) 3363bbe3f67SBaptiste Daroussin f1 = fopen(_PATH_DEVNULL, "r"); 3373bbe3f67SBaptiste Daroussin else { 3383bbe3f67SBaptiste Daroussin if (strcmp(file1, "-") == 0) 3393bbe3f67SBaptiste Daroussin f1 = stdin; 3403bbe3f67SBaptiste Daroussin else 3413bbe3f67SBaptiste Daroussin f1 = fopen(file1, "r"); 3423bbe3f67SBaptiste Daroussin } 3433bbe3f67SBaptiste Daroussin if (f1 == NULL) { 3443bbe3f67SBaptiste Daroussin warn("%s", file1); 3453bbe3f67SBaptiste Daroussin status |= 2; 3463bbe3f67SBaptiste Daroussin goto closem; 3473bbe3f67SBaptiste Daroussin } 3483bbe3f67SBaptiste Daroussin 3493bbe3f67SBaptiste Daroussin if (flags & D_EMPTY2) 3503bbe3f67SBaptiste Daroussin f2 = fopen(_PATH_DEVNULL, "r"); 3513bbe3f67SBaptiste Daroussin else { 3523bbe3f67SBaptiste Daroussin if (strcmp(file2, "-") == 0) 3533bbe3f67SBaptiste Daroussin f2 = stdin; 3543bbe3f67SBaptiste Daroussin else 3553bbe3f67SBaptiste Daroussin f2 = fopen(file2, "r"); 3563bbe3f67SBaptiste Daroussin } 3573bbe3f67SBaptiste Daroussin if (f2 == NULL) { 3583bbe3f67SBaptiste Daroussin warn("%s", file2); 3593bbe3f67SBaptiste Daroussin status |= 2; 3603bbe3f67SBaptiste Daroussin goto closem; 3613bbe3f67SBaptiste Daroussin } 3623bbe3f67SBaptiste Daroussin 3633bbe3f67SBaptiste Daroussin if (lflag) { 3643bbe3f67SBaptiste Daroussin /* redirect stdout to pr */ 3653bbe3f67SBaptiste Daroussin int pfd[2]; 3663bbe3f67SBaptiste Daroussin pid_t pid; 3673bbe3f67SBaptiste Daroussin char *header; 3683bbe3f67SBaptiste Daroussin 3693bbe3f67SBaptiste Daroussin xasprintf(&header, "%s %s %s", diffargs, file1, file2); 3703bbe3f67SBaptiste Daroussin signal(SIGPIPE, SIG_IGN); 3713bbe3f67SBaptiste Daroussin fflush(stdout); 3723bbe3f67SBaptiste Daroussin rewind(stdout); 3733bbe3f67SBaptiste Daroussin pipe(pfd); 3743bbe3f67SBaptiste Daroussin switch ((pid = pdfork(&pr_pd, PD_CLOEXEC))) { 3753bbe3f67SBaptiste Daroussin case -1: 3763bbe3f67SBaptiste Daroussin status |= 2; 3773bbe3f67SBaptiste Daroussin free(header); 3783bbe3f67SBaptiste Daroussin err(2, "No more processes"); 3793bbe3f67SBaptiste Daroussin case 0: 3803bbe3f67SBaptiste Daroussin /* child */ 3813bbe3f67SBaptiste Daroussin if (pfd[0] != STDIN_FILENO) { 3823bbe3f67SBaptiste Daroussin dup2(pfd[0], STDIN_FILENO); 3833bbe3f67SBaptiste Daroussin close(pfd[0]); 3843bbe3f67SBaptiste Daroussin } 3853bbe3f67SBaptiste Daroussin close(pfd[1]); 3863bbe3f67SBaptiste Daroussin execl(_PATH_PR, _PATH_PR, "-h", header, (char *)0); 3873bbe3f67SBaptiste Daroussin _exit(127); 3883bbe3f67SBaptiste Daroussin default: 3893bbe3f67SBaptiste Daroussin 3903bbe3f67SBaptiste Daroussin /* parent */ 3913bbe3f67SBaptiste Daroussin if (pfd[1] != STDOUT_FILENO) { 3923bbe3f67SBaptiste Daroussin ostdout = dup(STDOUT_FILENO); 3933bbe3f67SBaptiste Daroussin dup2(pfd[1], STDOUT_FILENO); 3943bbe3f67SBaptiste Daroussin close(pfd[1]); 3953bbe3f67SBaptiste Daroussin } 3963bbe3f67SBaptiste Daroussin close(pfd[0]); 3973bbe3f67SBaptiste Daroussin rewind(stdout); 3983bbe3f67SBaptiste Daroussin free(header); 3993bbe3f67SBaptiste Daroussin kq = kqueue(); 4003bbe3f67SBaptiste Daroussin if (kq == -1) 4013bbe3f67SBaptiste Daroussin err(2, "kqueue"); 4023bbe3f67SBaptiste Daroussin e = xmalloc(sizeof(struct kevent)); 4033bbe3f67SBaptiste Daroussin EV_SET(e, pr_pd, EVFILT_PROCDESC, EV_ADD, NOTE_EXIT, 0, 4043bbe3f67SBaptiste Daroussin NULL); 4053bbe3f67SBaptiste Daroussin if (kevent(kq, e, 1, NULL, 0, NULL) == -1) 4063bbe3f67SBaptiste Daroussin err(2, "kevent"); 4073bbe3f67SBaptiste Daroussin } 4083bbe3f67SBaptiste Daroussin } 4093bbe3f67SBaptiste Daroussin 4103bbe3f67SBaptiste Daroussin if (capsicum) { 4113bbe3f67SBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 4123bbe3f67SBaptiste Daroussin if (cap_rights_limit(fileno(f1), &rights_ro) < 0) 4133bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 4143bbe3f67SBaptiste Daroussin if (cap_rights_limit(fileno(f2), &rights_ro) < 0) 4153bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 4163bbe3f67SBaptiste Daroussin if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { 4173bbe3f67SBaptiste Daroussin /* stding has already been limited */ 4183bbe3f67SBaptiste Daroussin if (caph_limit_stderr() == -1) 4193bbe3f67SBaptiste Daroussin err(2, "unable to limit stderr"); 4203bbe3f67SBaptiste Daroussin if (caph_limit_stdout() == -1) 4213bbe3f67SBaptiste Daroussin err(2, "unable to limit stdout"); 4223bbe3f67SBaptiste Daroussin } else if (caph_limit_stdio() == -1) 4233bbe3f67SBaptiste Daroussin err(2, "unable to limit stdio"); 4243bbe3f67SBaptiste Daroussin 4253bbe3f67SBaptiste Daroussin caph_cache_catpages(); 4263bbe3f67SBaptiste Daroussin if (cap_enter() < 0 && errno != ENOSYS) 4273bbe3f67SBaptiste Daroussin err(2, "unable to enter capability mode"); 4283bbe3f67SBaptiste Daroussin } 4293bbe3f67SBaptiste Daroussin 4303bbe3f67SBaptiste Daroussin switch (files_differ(f1, f2, flags)) { 4313bbe3f67SBaptiste Daroussin case 0: 4323bbe3f67SBaptiste Daroussin goto closem; 4333bbe3f67SBaptiste Daroussin case 1: 4343bbe3f67SBaptiste Daroussin break; 4353bbe3f67SBaptiste Daroussin default: 4363bbe3f67SBaptiste Daroussin /* error */ 4373bbe3f67SBaptiste Daroussin status |= 2; 4383bbe3f67SBaptiste Daroussin goto closem; 4393bbe3f67SBaptiste Daroussin } 4403bbe3f67SBaptiste Daroussin 4413bbe3f67SBaptiste Daroussin if ((flags & D_FORCEASCII) == 0 && 4423bbe3f67SBaptiste Daroussin (!asciifile(f1) || !asciifile(f2))) { 4433bbe3f67SBaptiste Daroussin rval = D_BINARY; 4443bbe3f67SBaptiste Daroussin status |= 1; 4453bbe3f67SBaptiste Daroussin goto closem; 4463bbe3f67SBaptiste Daroussin } 4473bbe3f67SBaptiste Daroussin prepare(0, f1, stb1.st_size, flags); 4483bbe3f67SBaptiste Daroussin prepare(1, f2, stb2.st_size, flags); 4493bbe3f67SBaptiste Daroussin 4503bbe3f67SBaptiste Daroussin prune(); 4513bbe3f67SBaptiste Daroussin sort(sfile[0], slen[0]); 4523bbe3f67SBaptiste Daroussin sort(sfile[1], slen[1]); 4533bbe3f67SBaptiste Daroussin 4543bbe3f67SBaptiste Daroussin member = (int *)file[1]; 4553bbe3f67SBaptiste Daroussin equiv(sfile[0], slen[0], sfile[1], slen[1], member); 4563bbe3f67SBaptiste Daroussin member = xreallocarray(member, slen[1] + 2, sizeof(*member)); 4573bbe3f67SBaptiste Daroussin 4583bbe3f67SBaptiste Daroussin class = (int *)file[0]; 4593bbe3f67SBaptiste Daroussin unsort(sfile[0], slen[0], class); 4603bbe3f67SBaptiste Daroussin class = xreallocarray(class, slen[0] + 2, sizeof(*class)); 4613bbe3f67SBaptiste Daroussin 4623bbe3f67SBaptiste Daroussin klist = xcalloc(slen[0] + 2, sizeof(*klist)); 4633bbe3f67SBaptiste Daroussin clen = 0; 4643bbe3f67SBaptiste Daroussin clistlen = 100; 4653bbe3f67SBaptiste Daroussin clist = xcalloc(clistlen, sizeof(*clist)); 4663bbe3f67SBaptiste Daroussin i = stone(class, slen[0], member, klist, flags); 4673bbe3f67SBaptiste Daroussin free(member); 4683bbe3f67SBaptiste Daroussin free(class); 4693bbe3f67SBaptiste Daroussin 4703bbe3f67SBaptiste Daroussin J = xreallocarray(J, len[0] + 2, sizeof(*J)); 4713bbe3f67SBaptiste Daroussin unravel(klist[i]); 4723bbe3f67SBaptiste Daroussin free(clist); 4733bbe3f67SBaptiste Daroussin free(klist); 4743bbe3f67SBaptiste Daroussin 4753bbe3f67SBaptiste Daroussin ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); 4763bbe3f67SBaptiste Daroussin ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); 4773bbe3f67SBaptiste Daroussin check(f1, f2, flags); 4783bbe3f67SBaptiste Daroussin output(file1, f1, file2, f2, flags); 479*d5b187aeSBaptiste Daroussin if (ostdout != -1 && e != NULL) { 4803bbe3f67SBaptiste Daroussin /* close the pipe to pr and restore stdout */ 4813bbe3f67SBaptiste Daroussin int wstatus; 4823bbe3f67SBaptiste Daroussin 4833bbe3f67SBaptiste Daroussin fflush(stdout); 4843bbe3f67SBaptiste Daroussin if (ostdout != STDOUT_FILENO) { 4853bbe3f67SBaptiste Daroussin close(STDOUT_FILENO); 4863bbe3f67SBaptiste Daroussin dup2(ostdout, STDOUT_FILENO); 4873bbe3f67SBaptiste Daroussin close(ostdout); 4883bbe3f67SBaptiste Daroussin } 4893bbe3f67SBaptiste Daroussin if (kevent(kq, NULL, 0, e, 1, NULL) == -1) 4903bbe3f67SBaptiste Daroussin err(2, "kevent"); 4913bbe3f67SBaptiste Daroussin wstatus = e[0].data; 4923bbe3f67SBaptiste Daroussin close(kq); 4933bbe3f67SBaptiste Daroussin if (WIFEXITED(wstatus) && WEXITSTATUS(wstatus) != 0) 4943bbe3f67SBaptiste Daroussin errx(2, "pr exited abnormally"); 4953bbe3f67SBaptiste Daroussin else if (WIFSIGNALED(wstatus)) 4963bbe3f67SBaptiste Daroussin errx(2, "pr killed by signal %d", 4973bbe3f67SBaptiste Daroussin WTERMSIG(wstatus)); 4983bbe3f67SBaptiste Daroussin } 4993bbe3f67SBaptiste Daroussin 5003bbe3f67SBaptiste Daroussin closem: 5013bbe3f67SBaptiste Daroussin if (anychange) { 5023bbe3f67SBaptiste Daroussin status |= 1; 5033bbe3f67SBaptiste Daroussin if (rval == D_SAME) 5043bbe3f67SBaptiste Daroussin rval = D_DIFFER; 5053bbe3f67SBaptiste Daroussin } 5063bbe3f67SBaptiste Daroussin if (f1 != NULL) 5073bbe3f67SBaptiste Daroussin fclose(f1); 5083bbe3f67SBaptiste Daroussin if (f2 != NULL) 5093bbe3f67SBaptiste Daroussin fclose(f2); 5103bbe3f67SBaptiste Daroussin 5113bbe3f67SBaptiste Daroussin return (rval); 5123bbe3f67SBaptiste Daroussin } 5133bbe3f67SBaptiste Daroussin 5143bbe3f67SBaptiste Daroussin /* 5153bbe3f67SBaptiste Daroussin * Check to see if the given files differ. 5163bbe3f67SBaptiste Daroussin * Returns 0 if they are the same, 1 if different, and -1 on error. 5173bbe3f67SBaptiste Daroussin * XXX - could use code from cmp(1) [faster] 5183bbe3f67SBaptiste Daroussin */ 5193bbe3f67SBaptiste Daroussin static int 5203bbe3f67SBaptiste Daroussin files_differ(FILE *f1, FILE *f2, int flags) 5213bbe3f67SBaptiste Daroussin { 5223bbe3f67SBaptiste Daroussin char buf1[BUFSIZ], buf2[BUFSIZ]; 5233bbe3f67SBaptiste Daroussin size_t i, j; 5243bbe3f67SBaptiste Daroussin 5253bbe3f67SBaptiste Daroussin if ((flags & (D_EMPTY1|D_EMPTY2)) || stb1.st_size != stb2.st_size || 5263bbe3f67SBaptiste Daroussin (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT)) 5273bbe3f67SBaptiste Daroussin return (1); 5283bbe3f67SBaptiste Daroussin for (;;) { 5293bbe3f67SBaptiste Daroussin i = fread(buf1, 1, sizeof(buf1), f1); 5303bbe3f67SBaptiste Daroussin j = fread(buf2, 1, sizeof(buf2), f2); 5313bbe3f67SBaptiste Daroussin if ((!i && ferror(f1)) || (!j && ferror(f2))) 5323bbe3f67SBaptiste Daroussin return (-1); 5333bbe3f67SBaptiste Daroussin if (i != j) 5343bbe3f67SBaptiste Daroussin return (1); 5353bbe3f67SBaptiste Daroussin if (i == 0) 5363bbe3f67SBaptiste Daroussin return (0); 5373bbe3f67SBaptiste Daroussin if (memcmp(buf1, buf2, i) != 0) 5383bbe3f67SBaptiste Daroussin return (1); 5393bbe3f67SBaptiste Daroussin } 5403bbe3f67SBaptiste Daroussin } 5413bbe3f67SBaptiste Daroussin 5423bbe3f67SBaptiste Daroussin char * 5433bbe3f67SBaptiste Daroussin splice(char *dir, char *path) 5443bbe3f67SBaptiste Daroussin { 5453bbe3f67SBaptiste Daroussin char *tail, *buf; 5463bbe3f67SBaptiste Daroussin size_t dirlen; 5473bbe3f67SBaptiste Daroussin 5483bbe3f67SBaptiste Daroussin dirlen = strlen(dir); 5493bbe3f67SBaptiste Daroussin while (dirlen != 0 && dir[dirlen - 1] == '/') 5503bbe3f67SBaptiste Daroussin dirlen--; 5513bbe3f67SBaptiste Daroussin if ((tail = strrchr(path, '/')) == NULL) 5523bbe3f67SBaptiste Daroussin tail = path; 5533bbe3f67SBaptiste Daroussin else 5543bbe3f67SBaptiste Daroussin tail++; 5553bbe3f67SBaptiste Daroussin xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail); 5563bbe3f67SBaptiste Daroussin return (buf); 5573bbe3f67SBaptiste Daroussin } 5583bbe3f67SBaptiste Daroussin 5593bbe3f67SBaptiste Daroussin static void 560*d5b187aeSBaptiste Daroussin prepare(int i, FILE *fd, size_t filesize, int flags) 5613bbe3f67SBaptiste Daroussin { 5623bbe3f67SBaptiste Daroussin struct line *p; 5633bbe3f67SBaptiste Daroussin int h; 5643bbe3f67SBaptiste Daroussin size_t sz, j; 5653bbe3f67SBaptiste Daroussin 5663bbe3f67SBaptiste Daroussin rewind(fd); 5673bbe3f67SBaptiste Daroussin 5683bbe3f67SBaptiste Daroussin sz = ((unsigned long)filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25; 5693bbe3f67SBaptiste Daroussin if (sz < 100) 5703bbe3f67SBaptiste Daroussin sz = 100; 5713bbe3f67SBaptiste Daroussin 5723bbe3f67SBaptiste Daroussin p = xcalloc(sz + 3, sizeof(*p)); 5733bbe3f67SBaptiste Daroussin for (j = 0; (h = readhash(fd, flags));) { 5743bbe3f67SBaptiste Daroussin if (j == sz) { 5753bbe3f67SBaptiste Daroussin sz = sz * 3 / 2; 5763bbe3f67SBaptiste Daroussin p = xreallocarray(p, sz + 3, sizeof(*p)); 5773bbe3f67SBaptiste Daroussin } 5783bbe3f67SBaptiste Daroussin p[++j].value = h; 5793bbe3f67SBaptiste Daroussin } 5803bbe3f67SBaptiste Daroussin len[i] = j; 5813bbe3f67SBaptiste Daroussin file[i] = p; 5823bbe3f67SBaptiste Daroussin } 5833bbe3f67SBaptiste Daroussin 5843bbe3f67SBaptiste Daroussin static void 5853bbe3f67SBaptiste Daroussin prune(void) 5863bbe3f67SBaptiste Daroussin { 5873bbe3f67SBaptiste Daroussin int i, j; 5883bbe3f67SBaptiste Daroussin 5893bbe3f67SBaptiste Daroussin for (pref = 0; pref < len[0] && pref < len[1] && 5903bbe3f67SBaptiste Daroussin file[0][pref + 1].value == file[1][pref + 1].value; 5913bbe3f67SBaptiste Daroussin pref++) 5923bbe3f67SBaptiste Daroussin ; 5933bbe3f67SBaptiste Daroussin for (suff = 0; suff < len[0] - pref && suff < len[1] - pref && 5943bbe3f67SBaptiste Daroussin file[0][len[0] - suff].value == file[1][len[1] - suff].value; 5953bbe3f67SBaptiste Daroussin suff++) 5963bbe3f67SBaptiste Daroussin ; 5973bbe3f67SBaptiste Daroussin for (j = 0; j < 2; j++) { 5983bbe3f67SBaptiste Daroussin sfile[j] = file[j] + pref; 5993bbe3f67SBaptiste Daroussin slen[j] = len[j] - pref - suff; 6003bbe3f67SBaptiste Daroussin for (i = 0; i <= slen[j]; i++) 6013bbe3f67SBaptiste Daroussin sfile[j][i].serial = i; 6023bbe3f67SBaptiste Daroussin } 6033bbe3f67SBaptiste Daroussin } 6043bbe3f67SBaptiste Daroussin 6053bbe3f67SBaptiste Daroussin static void 6063bbe3f67SBaptiste Daroussin equiv(struct line *a, int n, struct line *b, int m, int *c) 6073bbe3f67SBaptiste Daroussin { 6083bbe3f67SBaptiste Daroussin int i, j; 6093bbe3f67SBaptiste Daroussin 6103bbe3f67SBaptiste Daroussin i = j = 1; 6113bbe3f67SBaptiste Daroussin while (i <= n && j <= m) { 6123bbe3f67SBaptiste Daroussin if (a[i].value < b[j].value) 6133bbe3f67SBaptiste Daroussin a[i++].value = 0; 6143bbe3f67SBaptiste Daroussin else if (a[i].value == b[j].value) 6153bbe3f67SBaptiste Daroussin a[i++].value = j; 6163bbe3f67SBaptiste Daroussin else 6173bbe3f67SBaptiste Daroussin j++; 6183bbe3f67SBaptiste Daroussin } 6193bbe3f67SBaptiste Daroussin while (i <= n) 6203bbe3f67SBaptiste Daroussin a[i++].value = 0; 6213bbe3f67SBaptiste Daroussin b[m + 1].value = 0; 6223bbe3f67SBaptiste Daroussin j = 0; 6233bbe3f67SBaptiste Daroussin while (++j <= m) { 6243bbe3f67SBaptiste Daroussin c[j] = -b[j].serial; 6253bbe3f67SBaptiste Daroussin while (b[j + 1].value == b[j].value) { 6263bbe3f67SBaptiste Daroussin j++; 6273bbe3f67SBaptiste Daroussin c[j] = b[j].serial; 6283bbe3f67SBaptiste Daroussin } 6293bbe3f67SBaptiste Daroussin } 6303bbe3f67SBaptiste Daroussin c[j] = -1; 6313bbe3f67SBaptiste Daroussin } 6323bbe3f67SBaptiste Daroussin 6333bbe3f67SBaptiste Daroussin /* Code taken from ping.c */ 6343bbe3f67SBaptiste Daroussin static int 6353bbe3f67SBaptiste Daroussin isqrt(int n) 6363bbe3f67SBaptiste Daroussin { 6373bbe3f67SBaptiste Daroussin int y, x = 1; 6383bbe3f67SBaptiste Daroussin 6393bbe3f67SBaptiste Daroussin if (n == 0) 6403bbe3f67SBaptiste Daroussin return (0); 6413bbe3f67SBaptiste Daroussin 6423bbe3f67SBaptiste Daroussin do { /* newton was a stinker */ 6433bbe3f67SBaptiste Daroussin y = x; 6443bbe3f67SBaptiste Daroussin x = n / x; 6453bbe3f67SBaptiste Daroussin x += y; 6463bbe3f67SBaptiste Daroussin x /= 2; 6473bbe3f67SBaptiste Daroussin } while ((x - y) > 1 || (x - y) < -1); 6483bbe3f67SBaptiste Daroussin 6493bbe3f67SBaptiste Daroussin return (x); 6503bbe3f67SBaptiste Daroussin } 6513bbe3f67SBaptiste Daroussin 6523bbe3f67SBaptiste Daroussin static int 6533bbe3f67SBaptiste Daroussin stone(int *a, int n, int *b, int *c, int flags) 6543bbe3f67SBaptiste Daroussin { 6553bbe3f67SBaptiste Daroussin int i, k, y, j, l; 6563bbe3f67SBaptiste Daroussin int oldc, tc, oldl, sq; 6573bbe3f67SBaptiste Daroussin u_int numtries, bound; 6583bbe3f67SBaptiste Daroussin 6593bbe3f67SBaptiste Daroussin if (flags & D_MINIMAL) 6603bbe3f67SBaptiste Daroussin bound = UINT_MAX; 6613bbe3f67SBaptiste Daroussin else { 6623bbe3f67SBaptiste Daroussin sq = isqrt(n); 6633bbe3f67SBaptiste Daroussin bound = MAXIMUM(256, sq); 6643bbe3f67SBaptiste Daroussin } 6653bbe3f67SBaptiste Daroussin 6663bbe3f67SBaptiste Daroussin k = 0; 6673bbe3f67SBaptiste Daroussin c[0] = newcand(0, 0, 0); 6683bbe3f67SBaptiste Daroussin for (i = 1; i <= n; i++) { 6693bbe3f67SBaptiste Daroussin j = a[i]; 6703bbe3f67SBaptiste Daroussin if (j == 0) 6713bbe3f67SBaptiste Daroussin continue; 6723bbe3f67SBaptiste Daroussin y = -b[j]; 6733bbe3f67SBaptiste Daroussin oldl = 0; 6743bbe3f67SBaptiste Daroussin oldc = c[0]; 6753bbe3f67SBaptiste Daroussin numtries = 0; 6763bbe3f67SBaptiste Daroussin do { 6773bbe3f67SBaptiste Daroussin if (y <= clist[oldc].y) 6783bbe3f67SBaptiste Daroussin continue; 6793bbe3f67SBaptiste Daroussin l = search(c, k, y); 6803bbe3f67SBaptiste Daroussin if (l != oldl + 1) 6813bbe3f67SBaptiste Daroussin oldc = c[l - 1]; 6823bbe3f67SBaptiste Daroussin if (l <= k) { 6833bbe3f67SBaptiste Daroussin if (clist[c[l]].y <= y) 6843bbe3f67SBaptiste Daroussin continue; 6853bbe3f67SBaptiste Daroussin tc = c[l]; 6863bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6873bbe3f67SBaptiste Daroussin oldc = tc; 6883bbe3f67SBaptiste Daroussin oldl = l; 6893bbe3f67SBaptiste Daroussin numtries++; 6903bbe3f67SBaptiste Daroussin } else { 6913bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6923bbe3f67SBaptiste Daroussin k++; 6933bbe3f67SBaptiste Daroussin break; 6943bbe3f67SBaptiste Daroussin } 6953bbe3f67SBaptiste Daroussin } while ((y = b[++j]) > 0 && numtries < bound); 6963bbe3f67SBaptiste Daroussin } 6973bbe3f67SBaptiste Daroussin return (k); 6983bbe3f67SBaptiste Daroussin } 6993bbe3f67SBaptiste Daroussin 7003bbe3f67SBaptiste Daroussin static int 7013bbe3f67SBaptiste Daroussin newcand(int x, int y, int pred) 7023bbe3f67SBaptiste Daroussin { 7033bbe3f67SBaptiste Daroussin struct cand *q; 7043bbe3f67SBaptiste Daroussin 7053bbe3f67SBaptiste Daroussin if (clen == clistlen) { 7063bbe3f67SBaptiste Daroussin clistlen = clistlen * 11 / 10; 7073bbe3f67SBaptiste Daroussin clist = xreallocarray(clist, clistlen, sizeof(*clist)); 7083bbe3f67SBaptiste Daroussin } 7093bbe3f67SBaptiste Daroussin q = clist + clen; 7103bbe3f67SBaptiste Daroussin q->x = x; 7113bbe3f67SBaptiste Daroussin q->y = y; 7123bbe3f67SBaptiste Daroussin q->pred = pred; 7133bbe3f67SBaptiste Daroussin return (clen++); 7143bbe3f67SBaptiste Daroussin } 7153bbe3f67SBaptiste Daroussin 7163bbe3f67SBaptiste Daroussin static int 7173bbe3f67SBaptiste Daroussin search(int *c, int k, int y) 7183bbe3f67SBaptiste Daroussin { 7193bbe3f67SBaptiste Daroussin int i, j, l, t; 7203bbe3f67SBaptiste Daroussin 7213bbe3f67SBaptiste Daroussin if (clist[c[k]].y < y) /* quick look for typical case */ 7223bbe3f67SBaptiste Daroussin return (k + 1); 7233bbe3f67SBaptiste Daroussin i = 0; 7243bbe3f67SBaptiste Daroussin j = k + 1; 7253bbe3f67SBaptiste Daroussin for (;;) { 7263bbe3f67SBaptiste Daroussin l = (i + j) / 2; 7273bbe3f67SBaptiste Daroussin if (l <= i) 7283bbe3f67SBaptiste Daroussin break; 7293bbe3f67SBaptiste Daroussin t = clist[c[l]].y; 7303bbe3f67SBaptiste Daroussin if (t > y) 7313bbe3f67SBaptiste Daroussin j = l; 7323bbe3f67SBaptiste Daroussin else if (t < y) 7333bbe3f67SBaptiste Daroussin i = l; 7343bbe3f67SBaptiste Daroussin else 7353bbe3f67SBaptiste Daroussin return (l); 7363bbe3f67SBaptiste Daroussin } 7373bbe3f67SBaptiste Daroussin return (l + 1); 7383bbe3f67SBaptiste Daroussin } 7393bbe3f67SBaptiste Daroussin 7403bbe3f67SBaptiste Daroussin static void 7413bbe3f67SBaptiste Daroussin unravel(int p) 7423bbe3f67SBaptiste Daroussin { 7433bbe3f67SBaptiste Daroussin struct cand *q; 7443bbe3f67SBaptiste Daroussin int i; 7453bbe3f67SBaptiste Daroussin 7463bbe3f67SBaptiste Daroussin for (i = 0; i <= len[0]; i++) 7473bbe3f67SBaptiste Daroussin J[i] = i <= pref ? i : 7483bbe3f67SBaptiste Daroussin i > len[0] - suff ? i + len[1] - len[0] : 0; 7493bbe3f67SBaptiste Daroussin for (q = clist + p; q->y != 0; q = clist + q->pred) 7503bbe3f67SBaptiste Daroussin J[q->x + pref] = q->y + pref; 7513bbe3f67SBaptiste Daroussin } 7523bbe3f67SBaptiste Daroussin 7533bbe3f67SBaptiste Daroussin /* 7543bbe3f67SBaptiste Daroussin * Check does double duty: 7553bbe3f67SBaptiste Daroussin * 1. ferret out any fortuitous correspondences due 7563bbe3f67SBaptiste Daroussin * to confounding by hashing (which result in "jackpot") 7573bbe3f67SBaptiste Daroussin * 2. collect random access indexes to the two files 7583bbe3f67SBaptiste Daroussin */ 7593bbe3f67SBaptiste Daroussin static void 7603bbe3f67SBaptiste Daroussin check(FILE *f1, FILE *f2, int flags) 7613bbe3f67SBaptiste Daroussin { 7623bbe3f67SBaptiste Daroussin int i, j, jackpot, c, d; 7633bbe3f67SBaptiste Daroussin long ctold, ctnew; 7643bbe3f67SBaptiste Daroussin 7653bbe3f67SBaptiste Daroussin rewind(f1); 7663bbe3f67SBaptiste Daroussin rewind(f2); 7673bbe3f67SBaptiste Daroussin j = 1; 7683bbe3f67SBaptiste Daroussin ixold[0] = ixnew[0] = 0; 7693bbe3f67SBaptiste Daroussin jackpot = 0; 7703bbe3f67SBaptiste Daroussin ctold = ctnew = 0; 7713bbe3f67SBaptiste Daroussin for (i = 1; i <= len[0]; i++) { 7723bbe3f67SBaptiste Daroussin if (J[i] == 0) { 7733bbe3f67SBaptiste Daroussin ixold[i] = ctold += skipline(f1); 7743bbe3f67SBaptiste Daroussin continue; 7753bbe3f67SBaptiste Daroussin } 7763bbe3f67SBaptiste Daroussin while (j < J[i]) { 7773bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 7783bbe3f67SBaptiste Daroussin j++; 7793bbe3f67SBaptiste Daroussin } 7803bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE|D_STRIPCR)) { 7813bbe3f67SBaptiste Daroussin for (;;) { 7823bbe3f67SBaptiste Daroussin c = getc(f1); 7833bbe3f67SBaptiste Daroussin d = getc(f2); 7843bbe3f67SBaptiste Daroussin /* 7853bbe3f67SBaptiste Daroussin * GNU diff ignores a missing newline 7863bbe3f67SBaptiste Daroussin * in one file for -b or -w. 7873bbe3f67SBaptiste Daroussin */ 7883bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) { 7893bbe3f67SBaptiste Daroussin if (c == EOF && d == '\n') { 7903bbe3f67SBaptiste Daroussin ctnew++; 7913bbe3f67SBaptiste Daroussin break; 7923bbe3f67SBaptiste Daroussin } else if (c == '\n' && d == EOF) { 7933bbe3f67SBaptiste Daroussin ctold++; 7943bbe3f67SBaptiste Daroussin break; 7953bbe3f67SBaptiste Daroussin } 7963bbe3f67SBaptiste Daroussin } 7973bbe3f67SBaptiste Daroussin ctold++; 7983bbe3f67SBaptiste Daroussin ctnew++; 7993bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR) { 8003bbe3f67SBaptiste Daroussin if (c == '\r') { 8013bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == '\n') { 8023bbe3f67SBaptiste Daroussin ctnew++; 8033bbe3f67SBaptiste Daroussin break; 8043bbe3f67SBaptiste Daroussin } 8053bbe3f67SBaptiste Daroussin } 8063bbe3f67SBaptiste Daroussin if (d == '\r') { 8073bbe3f67SBaptiste Daroussin if ((d = getc(f2)) == '\n') { 8083bbe3f67SBaptiste Daroussin ctold++; 8093bbe3f67SBaptiste Daroussin break; 8103bbe3f67SBaptiste Daroussin } 8113bbe3f67SBaptiste Daroussin } 8123bbe3f67SBaptiste Daroussin } 8133bbe3f67SBaptiste Daroussin if ((flags & D_FOLDBLANKS) && isspace(c) && 8143bbe3f67SBaptiste Daroussin isspace(d)) { 8153bbe3f67SBaptiste Daroussin do { 8163bbe3f67SBaptiste Daroussin if (c == '\n') 8173bbe3f67SBaptiste Daroussin break; 8183bbe3f67SBaptiste Daroussin ctold++; 8193bbe3f67SBaptiste Daroussin } while (isspace(c = getc(f1))); 8203bbe3f67SBaptiste Daroussin do { 8213bbe3f67SBaptiste Daroussin if (d == '\n') 8223bbe3f67SBaptiste Daroussin break; 8233bbe3f67SBaptiste Daroussin ctnew++; 8243bbe3f67SBaptiste Daroussin } while (isspace(d = getc(f2))); 8253bbe3f67SBaptiste Daroussin } else if ((flags & D_IGNOREBLANKS)) { 8263bbe3f67SBaptiste Daroussin while (isspace(c) && c != '\n') { 8273bbe3f67SBaptiste Daroussin c = getc(f1); 8283bbe3f67SBaptiste Daroussin ctold++; 8293bbe3f67SBaptiste Daroussin } 8303bbe3f67SBaptiste Daroussin while (isspace(d) && d != '\n') { 8313bbe3f67SBaptiste Daroussin d = getc(f2); 8323bbe3f67SBaptiste Daroussin ctnew++; 8333bbe3f67SBaptiste Daroussin } 8343bbe3f67SBaptiste Daroussin } 8353bbe3f67SBaptiste Daroussin if (chrtran[c] != chrtran[d]) { 8363bbe3f67SBaptiste Daroussin jackpot++; 8373bbe3f67SBaptiste Daroussin J[i] = 0; 8383bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 8393bbe3f67SBaptiste Daroussin ctold += skipline(f1); 8403bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 8413bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 8423bbe3f67SBaptiste Daroussin break; 8433bbe3f67SBaptiste Daroussin } 8443bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 8453bbe3f67SBaptiste Daroussin break; 8463bbe3f67SBaptiste Daroussin } 8473bbe3f67SBaptiste Daroussin } else { 8483bbe3f67SBaptiste Daroussin for (;;) { 8493bbe3f67SBaptiste Daroussin ctold++; 8503bbe3f67SBaptiste Daroussin ctnew++; 8513bbe3f67SBaptiste Daroussin if ((c = getc(f1)) != (d = getc(f2))) { 8523bbe3f67SBaptiste Daroussin /* jackpot++; */ 8533bbe3f67SBaptiste Daroussin J[i] = 0; 8543bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 8553bbe3f67SBaptiste Daroussin ctold += skipline(f1); 8563bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 8573bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 8583bbe3f67SBaptiste Daroussin break; 8593bbe3f67SBaptiste Daroussin } 8603bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 8613bbe3f67SBaptiste Daroussin break; 8623bbe3f67SBaptiste Daroussin } 8633bbe3f67SBaptiste Daroussin } 8643bbe3f67SBaptiste Daroussin ixold[i] = ctold; 8653bbe3f67SBaptiste Daroussin ixnew[j] = ctnew; 8663bbe3f67SBaptiste Daroussin j++; 8673bbe3f67SBaptiste Daroussin } 8683bbe3f67SBaptiste Daroussin for (; j <= len[1]; j++) { 8693bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 8703bbe3f67SBaptiste Daroussin } 8713bbe3f67SBaptiste Daroussin /* 8723bbe3f67SBaptiste Daroussin * if (jackpot) 8733bbe3f67SBaptiste Daroussin * fprintf(stderr, "jackpot\n"); 8743bbe3f67SBaptiste Daroussin */ 8753bbe3f67SBaptiste Daroussin } 8763bbe3f67SBaptiste Daroussin 8773bbe3f67SBaptiste Daroussin /* shellsort CACM #201 */ 8783bbe3f67SBaptiste Daroussin static void 8793bbe3f67SBaptiste Daroussin sort(struct line *a, int n) 8803bbe3f67SBaptiste Daroussin { 8813bbe3f67SBaptiste Daroussin struct line *ai, *aim, w; 8823bbe3f67SBaptiste Daroussin int j, m = 0, k; 8833bbe3f67SBaptiste Daroussin 8843bbe3f67SBaptiste Daroussin if (n == 0) 8853bbe3f67SBaptiste Daroussin return; 8863bbe3f67SBaptiste Daroussin for (j = 1; j <= n; j *= 2) 8873bbe3f67SBaptiste Daroussin m = 2 * j - 1; 8883bbe3f67SBaptiste Daroussin for (m /= 2; m != 0; m /= 2) { 8893bbe3f67SBaptiste Daroussin k = n - m; 8903bbe3f67SBaptiste Daroussin for (j = 1; j <= k; j++) { 8913bbe3f67SBaptiste Daroussin for (ai = &a[j]; ai > a; ai -= m) { 8923bbe3f67SBaptiste Daroussin aim = &ai[m]; 8933bbe3f67SBaptiste Daroussin if (aim < ai) 8943bbe3f67SBaptiste Daroussin break; /* wraparound */ 8953bbe3f67SBaptiste Daroussin if (aim->value > ai[0].value || 8963bbe3f67SBaptiste Daroussin (aim->value == ai[0].value && 8973bbe3f67SBaptiste Daroussin aim->serial > ai[0].serial)) 8983bbe3f67SBaptiste Daroussin break; 8993bbe3f67SBaptiste Daroussin w.value = ai[0].value; 9003bbe3f67SBaptiste Daroussin ai[0].value = aim->value; 9013bbe3f67SBaptiste Daroussin aim->value = w.value; 9023bbe3f67SBaptiste Daroussin w.serial = ai[0].serial; 9033bbe3f67SBaptiste Daroussin ai[0].serial = aim->serial; 9043bbe3f67SBaptiste Daroussin aim->serial = w.serial; 9053bbe3f67SBaptiste Daroussin } 9063bbe3f67SBaptiste Daroussin } 9073bbe3f67SBaptiste Daroussin } 9083bbe3f67SBaptiste Daroussin } 9093bbe3f67SBaptiste Daroussin 9103bbe3f67SBaptiste Daroussin static void 9113bbe3f67SBaptiste Daroussin unsort(struct line *f, int l, int *b) 9123bbe3f67SBaptiste Daroussin { 9133bbe3f67SBaptiste Daroussin int *a, i; 9143bbe3f67SBaptiste Daroussin 9153bbe3f67SBaptiste Daroussin a = xcalloc(l + 1, sizeof(*a)); 9163bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 9173bbe3f67SBaptiste Daroussin a[f[i].serial] = f[i].value; 9183bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 9193bbe3f67SBaptiste Daroussin b[i] = a[i]; 9203bbe3f67SBaptiste Daroussin free(a); 9213bbe3f67SBaptiste Daroussin } 9223bbe3f67SBaptiste Daroussin 9233bbe3f67SBaptiste Daroussin static int 9243bbe3f67SBaptiste Daroussin skipline(FILE *f) 9253bbe3f67SBaptiste Daroussin { 9263bbe3f67SBaptiste Daroussin int i, c; 9273bbe3f67SBaptiste Daroussin 9283bbe3f67SBaptiste Daroussin for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++) 9293bbe3f67SBaptiste Daroussin continue; 9303bbe3f67SBaptiste Daroussin return (i); 9313bbe3f67SBaptiste Daroussin } 9323bbe3f67SBaptiste Daroussin 9333bbe3f67SBaptiste Daroussin static void 9343bbe3f67SBaptiste Daroussin output(char *file1, FILE *f1, char *file2, FILE *f2, int flags) 9353bbe3f67SBaptiste Daroussin { 9363bbe3f67SBaptiste Daroussin int m, i0, i1, j0, j1; 9373bbe3f67SBaptiste Daroussin 9383bbe3f67SBaptiste Daroussin rewind(f1); 9393bbe3f67SBaptiste Daroussin rewind(f2); 9403bbe3f67SBaptiste Daroussin m = len[0]; 9413bbe3f67SBaptiste Daroussin J[0] = 0; 9423bbe3f67SBaptiste Daroussin J[m + 1] = len[1] + 1; 9433bbe3f67SBaptiste Daroussin if (diff_format != D_EDIT) { 9443bbe3f67SBaptiste Daroussin for (i0 = 1; i0 <= m; i0 = i1 + 1) { 9453bbe3f67SBaptiste Daroussin while (i0 <= m && J[i0] == J[i0 - 1] + 1) 9463bbe3f67SBaptiste Daroussin i0++; 9473bbe3f67SBaptiste Daroussin j0 = J[i0 - 1] + 1; 9483bbe3f67SBaptiste Daroussin i1 = i0 - 1; 9493bbe3f67SBaptiste Daroussin while (i1 < m && J[i1 + 1] == 0) 9503bbe3f67SBaptiste Daroussin i1++; 9513bbe3f67SBaptiste Daroussin j1 = J[i1 + 1] - 1; 9523bbe3f67SBaptiste Daroussin J[i1] = j1; 9533bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i0, i1, j0, j1, &flags); 9543bbe3f67SBaptiste Daroussin } 9553bbe3f67SBaptiste Daroussin } else { 9563bbe3f67SBaptiste Daroussin for (i0 = m; i0 >= 1; i0 = i1 - 1) { 9573bbe3f67SBaptiste Daroussin while (i0 >= 1 && J[i0] == J[i0 + 1] - 1 && J[i0] != 0) 9583bbe3f67SBaptiste Daroussin i0--; 9593bbe3f67SBaptiste Daroussin j0 = J[i0 + 1] - 1; 9603bbe3f67SBaptiste Daroussin i1 = i0 + 1; 9613bbe3f67SBaptiste Daroussin while (i1 > 1 && J[i1 - 1] == 0) 9623bbe3f67SBaptiste Daroussin i1--; 9633bbe3f67SBaptiste Daroussin j1 = J[i1 - 1] + 1; 9643bbe3f67SBaptiste Daroussin J[i1] = j1; 9653bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i1, i0, j1, j0, &flags); 9663bbe3f67SBaptiste Daroussin } 9673bbe3f67SBaptiste Daroussin } 9683bbe3f67SBaptiste Daroussin if (m == 0) 9693bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, 1, 0, 1, len[1], &flags); 9703bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF) { 9713bbe3f67SBaptiste Daroussin for (;;) { 9723bbe3f67SBaptiste Daroussin #define c i0 9733bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == EOF) 9743bbe3f67SBaptiste Daroussin return; 9753bbe3f67SBaptiste Daroussin diff_output("%c", c); 9763bbe3f67SBaptiste Daroussin } 9773bbe3f67SBaptiste Daroussin #undef c 9783bbe3f67SBaptiste Daroussin } 9793bbe3f67SBaptiste Daroussin if (anychange != 0) { 9803bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 9813bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, flags); 9823bbe3f67SBaptiste Daroussin else if (diff_format == D_UNIFIED) 9833bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, flags); 9843bbe3f67SBaptiste Daroussin } 9853bbe3f67SBaptiste Daroussin } 9863bbe3f67SBaptiste Daroussin 9873bbe3f67SBaptiste Daroussin static void 9883bbe3f67SBaptiste Daroussin range(int a, int b, const char *separator) 9893bbe3f67SBaptiste Daroussin { 9903bbe3f67SBaptiste Daroussin diff_output("%d", a > b ? b : a); 9913bbe3f67SBaptiste Daroussin if (a < b) 9923bbe3f67SBaptiste Daroussin diff_output("%s%d", separator, b); 9933bbe3f67SBaptiste Daroussin } 9943bbe3f67SBaptiste Daroussin 9953bbe3f67SBaptiste Daroussin static void 9963bbe3f67SBaptiste Daroussin uni_range(int a, int b) 9973bbe3f67SBaptiste Daroussin { 9983bbe3f67SBaptiste Daroussin if (a < b) 9993bbe3f67SBaptiste Daroussin diff_output("%d,%d", a, b - a + 1); 10003bbe3f67SBaptiste Daroussin else if (a == b) 10013bbe3f67SBaptiste Daroussin diff_output("%d", b); 10023bbe3f67SBaptiste Daroussin else 10033bbe3f67SBaptiste Daroussin diff_output("%d,0", b); 10043bbe3f67SBaptiste Daroussin } 10053bbe3f67SBaptiste Daroussin 10063bbe3f67SBaptiste Daroussin static char * 10073bbe3f67SBaptiste Daroussin preadline(int fd, size_t rlen, off_t off) 10083bbe3f67SBaptiste Daroussin { 10093bbe3f67SBaptiste Daroussin char *line; 10103bbe3f67SBaptiste Daroussin ssize_t nr; 10113bbe3f67SBaptiste Daroussin 10123bbe3f67SBaptiste Daroussin line = xmalloc(rlen + 1); 10133bbe3f67SBaptiste Daroussin if ((nr = pread(fd, line, rlen, off)) < 0) 10143bbe3f67SBaptiste Daroussin err(2, "preadline"); 10153bbe3f67SBaptiste Daroussin if (nr > 0 && line[nr-1] == '\n') 10163bbe3f67SBaptiste Daroussin nr--; 10173bbe3f67SBaptiste Daroussin line[nr] = '\0'; 10183bbe3f67SBaptiste Daroussin return (line); 10193bbe3f67SBaptiste Daroussin } 10203bbe3f67SBaptiste Daroussin 10213bbe3f67SBaptiste Daroussin static int 10223bbe3f67SBaptiste Daroussin ignoreline(char *line) 10233bbe3f67SBaptiste Daroussin { 10243bbe3f67SBaptiste Daroussin int ret; 10253bbe3f67SBaptiste Daroussin 10263bbe3f67SBaptiste Daroussin ret = regexec(&ignore_re, line, 0, NULL, 0); 10273bbe3f67SBaptiste Daroussin free(line); 10283bbe3f67SBaptiste Daroussin return (ret == 0); /* if it matched, it should be ignored. */ 10293bbe3f67SBaptiste Daroussin } 10303bbe3f67SBaptiste Daroussin 10313bbe3f67SBaptiste Daroussin /* 10323bbe3f67SBaptiste Daroussin * Indicate that there is a difference between lines a and b of the from file 10333bbe3f67SBaptiste Daroussin * to get to lines c to d of the to file. If a is greater then b then there 10343bbe3f67SBaptiste Daroussin * are no lines in the from file involved and this means that there were 10353bbe3f67SBaptiste Daroussin * lines appended (beginning at b). If c is greater than d then there are 10363bbe3f67SBaptiste Daroussin * lines missing from the to file. 10373bbe3f67SBaptiste Daroussin */ 10383bbe3f67SBaptiste Daroussin static void 10393bbe3f67SBaptiste Daroussin change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, 10403bbe3f67SBaptiste Daroussin int *pflags) 10413bbe3f67SBaptiste Daroussin { 10423bbe3f67SBaptiste Daroussin static size_t max_context = 64; 10433bbe3f67SBaptiste Daroussin int i; 10443bbe3f67SBaptiste Daroussin 10453bbe3f67SBaptiste Daroussin restart: 10463bbe3f67SBaptiste Daroussin if (diff_format != D_IFDEF && a > b && c > d) 10473bbe3f67SBaptiste Daroussin return; 10483bbe3f67SBaptiste Daroussin if (ignore_pats != NULL) { 10493bbe3f67SBaptiste Daroussin char *line; 10503bbe3f67SBaptiste Daroussin /* 10513bbe3f67SBaptiste Daroussin * All lines in the change, insert, or delete must 10523bbe3f67SBaptiste Daroussin * match an ignore pattern for the change to be 10533bbe3f67SBaptiste Daroussin * ignored. 10543bbe3f67SBaptiste Daroussin */ 10553bbe3f67SBaptiste Daroussin if (a <= b) { /* Changes and deletes. */ 10563bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 10573bbe3f67SBaptiste Daroussin line = preadline(fileno(f1), 10583bbe3f67SBaptiste Daroussin ixold[i] - ixold[i - 1], ixold[i - 1]); 10593bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 10603bbe3f67SBaptiste Daroussin goto proceed; 10613bbe3f67SBaptiste Daroussin } 10623bbe3f67SBaptiste Daroussin } 10633bbe3f67SBaptiste Daroussin if (a > b || c <= d) { /* Changes and inserts. */ 10643bbe3f67SBaptiste Daroussin for (i = c; i <= d; i++) { 10653bbe3f67SBaptiste Daroussin line = preadline(fileno(f2), 10663bbe3f67SBaptiste Daroussin ixnew[i] - ixnew[i - 1], ixnew[i - 1]); 10673bbe3f67SBaptiste Daroussin if (!ignoreline(line)) 10683bbe3f67SBaptiste Daroussin goto proceed; 10693bbe3f67SBaptiste Daroussin } 10703bbe3f67SBaptiste Daroussin } 10713bbe3f67SBaptiste Daroussin return; 10723bbe3f67SBaptiste Daroussin } 10733bbe3f67SBaptiste Daroussin proceed: 10743bbe3f67SBaptiste Daroussin if (*pflags & D_HEADER) { 10753bbe3f67SBaptiste Daroussin diff_output("%s %s %s\n", diffargs, file1, file2); 10763bbe3f67SBaptiste Daroussin *pflags &= ~D_HEADER; 10773bbe3f67SBaptiste Daroussin } 10783bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) { 10793bbe3f67SBaptiste Daroussin /* 10803bbe3f67SBaptiste Daroussin * Allocate change records as needed. 10813bbe3f67SBaptiste Daroussin */ 10823bbe3f67SBaptiste Daroussin if (context_vec_ptr == context_vec_end - 1) { 10833bbe3f67SBaptiste Daroussin ptrdiff_t offset = context_vec_ptr - context_vec_start; 10843bbe3f67SBaptiste Daroussin max_context <<= 1; 10853bbe3f67SBaptiste Daroussin context_vec_start = xreallocarray(context_vec_start, 10863bbe3f67SBaptiste Daroussin max_context, sizeof(*context_vec_start)); 10873bbe3f67SBaptiste Daroussin context_vec_end = context_vec_start + max_context; 10883bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start + offset; 10893bbe3f67SBaptiste Daroussin } 10903bbe3f67SBaptiste Daroussin if (anychange == 0) { 10913bbe3f67SBaptiste Daroussin /* 10923bbe3f67SBaptiste Daroussin * Print the context/unidiff header first time through. 10933bbe3f67SBaptiste Daroussin */ 10943bbe3f67SBaptiste Daroussin print_header(file1, file2); 10953bbe3f67SBaptiste Daroussin anychange = 1; 10963bbe3f67SBaptiste Daroussin } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && 10973bbe3f67SBaptiste Daroussin c > context_vec_ptr->d + (2 * diff_context) + 1) { 10983bbe3f67SBaptiste Daroussin /* 10993bbe3f67SBaptiste Daroussin * If this change is more than 'diff_context' lines from the 11003bbe3f67SBaptiste Daroussin * previous change, dump the record and reset it. 11013bbe3f67SBaptiste Daroussin */ 11023bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 11033bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, *pflags); 11043bbe3f67SBaptiste Daroussin else 11053bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, *pflags); 11063bbe3f67SBaptiste Daroussin } 11073bbe3f67SBaptiste Daroussin context_vec_ptr++; 11083bbe3f67SBaptiste Daroussin context_vec_ptr->a = a; 11093bbe3f67SBaptiste Daroussin context_vec_ptr->b = b; 11103bbe3f67SBaptiste Daroussin context_vec_ptr->c = c; 11113bbe3f67SBaptiste Daroussin context_vec_ptr->d = d; 11123bbe3f67SBaptiste Daroussin return; 11133bbe3f67SBaptiste Daroussin } 11143bbe3f67SBaptiste Daroussin if (anychange == 0) 11153bbe3f67SBaptiste Daroussin anychange = 1; 11163bbe3f67SBaptiste Daroussin switch (diff_format) { 11173bbe3f67SBaptiste Daroussin case D_BRIEF: 11183bbe3f67SBaptiste Daroussin return; 11193bbe3f67SBaptiste Daroussin case D_NORMAL: 11203bbe3f67SBaptiste Daroussin case D_EDIT: 11213bbe3f67SBaptiste Daroussin range(a, b, ","); 11223bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11233bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL) 11243bbe3f67SBaptiste Daroussin range(c, d, ","); 11253bbe3f67SBaptiste Daroussin diff_output("\n"); 11263bbe3f67SBaptiste Daroussin break; 11273bbe3f67SBaptiste Daroussin case D_REVERSE: 11283bbe3f67SBaptiste Daroussin diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11293bbe3f67SBaptiste Daroussin range(a, b, " "); 11303bbe3f67SBaptiste Daroussin diff_output("\n"); 11313bbe3f67SBaptiste Daroussin break; 11323bbe3f67SBaptiste Daroussin case D_NREVERSE: 11333bbe3f67SBaptiste Daroussin if (a > b) 11343bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 11353bbe3f67SBaptiste Daroussin else { 11363bbe3f67SBaptiste Daroussin diff_output("d%d %d\n", a, b - a + 1); 11373bbe3f67SBaptiste Daroussin if (!(c > d)) 11383bbe3f67SBaptiste Daroussin /* add changed lines */ 11393bbe3f67SBaptiste Daroussin diff_output("a%d %d\n", b, d - c + 1); 11403bbe3f67SBaptiste Daroussin } 11413bbe3f67SBaptiste Daroussin break; 11423bbe3f67SBaptiste Daroussin } 11433bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL || diff_format == D_IFDEF) { 11443bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 11453bbe3f67SBaptiste Daroussin if (a <= b && c <= d && diff_format == D_NORMAL) 11463bbe3f67SBaptiste Daroussin diff_output("---\n"); 11473bbe3f67SBaptiste Daroussin } 11483bbe3f67SBaptiste Daroussin i = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags); 11493bbe3f67SBaptiste Daroussin if (i != 0 && diff_format == D_EDIT) { 11503bbe3f67SBaptiste Daroussin /* 11513bbe3f67SBaptiste Daroussin * A non-zero return value for D_EDIT indicates that the 11523bbe3f67SBaptiste Daroussin * last line printed was a bare dot (".") that has been 11533bbe3f67SBaptiste Daroussin * escaped as ".." to prevent ed(1) from misinterpreting 11543bbe3f67SBaptiste Daroussin * it. We have to add a substitute command to change this 11553bbe3f67SBaptiste Daroussin * back and restart where we left off. 11563bbe3f67SBaptiste Daroussin */ 11573bbe3f67SBaptiste Daroussin diff_output(".\n"); 11583bbe3f67SBaptiste Daroussin diff_output("%ds/.//\n", a + i - 1); 11593bbe3f67SBaptiste Daroussin b = a + i - 1; 11603bbe3f67SBaptiste Daroussin a = b + 1; 11613bbe3f67SBaptiste Daroussin c += i; 11623bbe3f67SBaptiste Daroussin goto restart; 11633bbe3f67SBaptiste Daroussin } 11643bbe3f67SBaptiste Daroussin if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d) 11653bbe3f67SBaptiste Daroussin diff_output(".\n"); 11663bbe3f67SBaptiste Daroussin if (inifdef) { 11673bbe3f67SBaptiste Daroussin diff_output("#endif /* %s */\n", ifdefname); 11683bbe3f67SBaptiste Daroussin inifdef = 0; 11693bbe3f67SBaptiste Daroussin } 11703bbe3f67SBaptiste Daroussin } 11713bbe3f67SBaptiste Daroussin 11723bbe3f67SBaptiste Daroussin static int 11733bbe3f67SBaptiste Daroussin fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) 11743bbe3f67SBaptiste Daroussin { 11753bbe3f67SBaptiste Daroussin int i, j, c, lastc, col, nc; 11763bbe3f67SBaptiste Daroussin int newcol; 11773bbe3f67SBaptiste Daroussin 11783bbe3f67SBaptiste Daroussin /* 11793bbe3f67SBaptiste Daroussin * When doing #ifdef's, copy down to current line 11803bbe3f67SBaptiste Daroussin * if this is the first file, so that stuff makes it to output. 11813bbe3f67SBaptiste Daroussin */ 11823bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF && oldfile) { 11833bbe3f67SBaptiste Daroussin long curpos = ftell(lb); 11843bbe3f67SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 11853bbe3f67SBaptiste Daroussin nc = f[a > b ? b : a - 1] - curpos; 11863bbe3f67SBaptiste Daroussin for (i = 0; i < nc; i++) 11873bbe3f67SBaptiste Daroussin diff_output("%c", getc(lb)); 11883bbe3f67SBaptiste Daroussin } 11893bbe3f67SBaptiste Daroussin if (a > b) 11903bbe3f67SBaptiste Daroussin return (0); 11913bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF) { 11923bbe3f67SBaptiste Daroussin if (inifdef) { 11933bbe3f67SBaptiste Daroussin diff_output("#else /* %s%s */\n", 11943bbe3f67SBaptiste Daroussin oldfile == 1 ? "!" : "", ifdefname); 11953bbe3f67SBaptiste Daroussin } else { 11963bbe3f67SBaptiste Daroussin if (oldfile) 11973bbe3f67SBaptiste Daroussin diff_output("#ifndef %s\n", ifdefname); 11983bbe3f67SBaptiste Daroussin else 11993bbe3f67SBaptiste Daroussin diff_output("#ifdef %s\n", ifdefname); 12003bbe3f67SBaptiste Daroussin } 12013bbe3f67SBaptiste Daroussin inifdef = 1 + oldfile; 12023bbe3f67SBaptiste Daroussin } 12033bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 12043bbe3f67SBaptiste Daroussin fseek(lb, f[i - 1], SEEK_SET); 12053bbe3f67SBaptiste Daroussin nc = f[i] - f[i - 1]; 12063bbe3f67SBaptiste Daroussin if (diff_format != D_IFDEF && ch != '\0') { 12073bbe3f67SBaptiste Daroussin diff_output("%c", ch); 12083bbe3f67SBaptiste Daroussin if (Tflag && (diff_format == D_NORMAL || diff_format == D_CONTEXT 12093bbe3f67SBaptiste Daroussin || diff_format == D_UNIFIED)) 12103bbe3f67SBaptiste Daroussin diff_output("\t"); 12113bbe3f67SBaptiste Daroussin else if (diff_format != D_UNIFIED) 12123bbe3f67SBaptiste Daroussin diff_output(" "); 12133bbe3f67SBaptiste Daroussin } 12143bbe3f67SBaptiste Daroussin col = 0; 12153bbe3f67SBaptiste Daroussin for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) { 12163bbe3f67SBaptiste Daroussin if ((c = getc(lb)) == EOF) { 12173bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT || diff_format == D_REVERSE || 12183bbe3f67SBaptiste Daroussin diff_format == D_NREVERSE) 12193bbe3f67SBaptiste Daroussin warnx("No newline at end of file"); 12203bbe3f67SBaptiste Daroussin else 12213bbe3f67SBaptiste Daroussin diff_output("\n\\ No newline at end of " 12223bbe3f67SBaptiste Daroussin "file\n"); 12233bbe3f67SBaptiste Daroussin return (0); 12243bbe3f67SBaptiste Daroussin } 12253bbe3f67SBaptiste Daroussin if (c == '\t' && (flags & D_EXPANDTABS)) { 12263bbe3f67SBaptiste Daroussin newcol = ((col/tabsize)+1)*tabsize; 12273bbe3f67SBaptiste Daroussin do { 12283bbe3f67SBaptiste Daroussin diff_output(" "); 12293bbe3f67SBaptiste Daroussin } while (++col < newcol); 12303bbe3f67SBaptiste Daroussin } else { 12313bbe3f67SBaptiste Daroussin if (diff_format == D_EDIT && j == 1 && c == '\n' 12323bbe3f67SBaptiste Daroussin && lastc == '.') { 12333bbe3f67SBaptiste Daroussin /* 12343bbe3f67SBaptiste Daroussin * Don't print a bare "." line 12353bbe3f67SBaptiste Daroussin * since that will confuse ed(1). 12363bbe3f67SBaptiste Daroussin * Print ".." instead and return, 12373bbe3f67SBaptiste Daroussin * giving the caller an offset 12383bbe3f67SBaptiste Daroussin * from which to restart. 12393bbe3f67SBaptiste Daroussin */ 12403bbe3f67SBaptiste Daroussin diff_output(".\n"); 12413bbe3f67SBaptiste Daroussin return (i - a + 1); 12423bbe3f67SBaptiste Daroussin } 12433bbe3f67SBaptiste Daroussin diff_output("%c", c); 12443bbe3f67SBaptiste Daroussin col++; 12453bbe3f67SBaptiste Daroussin } 12463bbe3f67SBaptiste Daroussin } 12473bbe3f67SBaptiste Daroussin } 12483bbe3f67SBaptiste Daroussin return (0); 12493bbe3f67SBaptiste Daroussin } 12503bbe3f67SBaptiste Daroussin 12513bbe3f67SBaptiste Daroussin /* 12523bbe3f67SBaptiste Daroussin * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578. 12533bbe3f67SBaptiste Daroussin */ 12543bbe3f67SBaptiste Daroussin static int 12553bbe3f67SBaptiste Daroussin readhash(FILE *f, int flags) 12563bbe3f67SBaptiste Daroussin { 12573bbe3f67SBaptiste Daroussin int i, t, space; 12583bbe3f67SBaptiste Daroussin int sum; 12593bbe3f67SBaptiste Daroussin 12603bbe3f67SBaptiste Daroussin sum = 1; 12613bbe3f67SBaptiste Daroussin space = 0; 12623bbe3f67SBaptiste Daroussin if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) { 12633bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 12643bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 12653bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 12663bbe3f67SBaptiste Daroussin t = getc(f); 12673bbe3f67SBaptiste Daroussin if (t == '\n') 12683bbe3f67SBaptiste Daroussin break; 12693bbe3f67SBaptiste Daroussin ungetc(t, f); 12703bbe3f67SBaptiste Daroussin } 12713bbe3f67SBaptiste Daroussin if (t == EOF) { 12723bbe3f67SBaptiste Daroussin if (i == 0) 12733bbe3f67SBaptiste Daroussin return (0); 12743bbe3f67SBaptiste Daroussin break; 12753bbe3f67SBaptiste Daroussin } 12763bbe3f67SBaptiste Daroussin sum = sum * 127 + chrtran[t]; 12773bbe3f67SBaptiste Daroussin } 12783bbe3f67SBaptiste Daroussin else 12793bbe3f67SBaptiste Daroussin for (i = 0; (t = getc(f)) != '\n'; i++) { 12803bbe3f67SBaptiste Daroussin if (flags & D_STRIPCR && t == '\r') { 12813bbe3f67SBaptiste Daroussin t = getc(f); 12823bbe3f67SBaptiste Daroussin if (t == '\n') 12833bbe3f67SBaptiste Daroussin break; 12843bbe3f67SBaptiste Daroussin ungetc(t, f); 12853bbe3f67SBaptiste Daroussin } 12863bbe3f67SBaptiste Daroussin if (t == EOF) { 12873bbe3f67SBaptiste Daroussin if (i == 0) 12883bbe3f67SBaptiste Daroussin return (0); 12893bbe3f67SBaptiste Daroussin break; 12903bbe3f67SBaptiste Daroussin } 12913bbe3f67SBaptiste Daroussin sum = sum * 127 + t; 12923bbe3f67SBaptiste Daroussin } 12933bbe3f67SBaptiste Daroussin } else { 12943bbe3f67SBaptiste Daroussin for (i = 0;;) { 12953bbe3f67SBaptiste Daroussin switch (t = getc(f)) { 12963bbe3f67SBaptiste Daroussin case '\r': 12973bbe3f67SBaptiste Daroussin case '\t': 12983bbe3f67SBaptiste Daroussin case '\v': 12993bbe3f67SBaptiste Daroussin case '\f': 13003bbe3f67SBaptiste Daroussin case ' ': 13013bbe3f67SBaptiste Daroussin space++; 13023bbe3f67SBaptiste Daroussin continue; 13033bbe3f67SBaptiste Daroussin default: 13043bbe3f67SBaptiste Daroussin if (space && (flags & D_IGNOREBLANKS) == 0) { 13053bbe3f67SBaptiste Daroussin i++; 13063bbe3f67SBaptiste Daroussin space = 0; 13073bbe3f67SBaptiste Daroussin } 13083bbe3f67SBaptiste Daroussin sum = sum * 127 + chrtran[t]; 13093bbe3f67SBaptiste Daroussin i++; 13103bbe3f67SBaptiste Daroussin continue; 13113bbe3f67SBaptiste Daroussin case EOF: 13123bbe3f67SBaptiste Daroussin if (i == 0) 13133bbe3f67SBaptiste Daroussin return (0); 13143bbe3f67SBaptiste Daroussin /* FALLTHROUGH */ 13153bbe3f67SBaptiste Daroussin case '\n': 13163bbe3f67SBaptiste Daroussin break; 13173bbe3f67SBaptiste Daroussin } 13183bbe3f67SBaptiste Daroussin break; 13193bbe3f67SBaptiste Daroussin } 13203bbe3f67SBaptiste Daroussin } 13213bbe3f67SBaptiste Daroussin /* 13223bbe3f67SBaptiste Daroussin * There is a remote possibility that we end up with a zero sum. 13233bbe3f67SBaptiste Daroussin * Zero is used as an EOF marker, so return 1 instead. 13243bbe3f67SBaptiste Daroussin */ 13253bbe3f67SBaptiste Daroussin return (sum == 0 ? 1 : sum); 13263bbe3f67SBaptiste Daroussin } 13273bbe3f67SBaptiste Daroussin 13283bbe3f67SBaptiste Daroussin static int 13293bbe3f67SBaptiste Daroussin asciifile(FILE *f) 13303bbe3f67SBaptiste Daroussin { 13313bbe3f67SBaptiste Daroussin unsigned char buf[BUFSIZ]; 13323bbe3f67SBaptiste Daroussin size_t cnt; 13333bbe3f67SBaptiste Daroussin 13343bbe3f67SBaptiste Daroussin if (f == NULL) 13353bbe3f67SBaptiste Daroussin return (1); 13363bbe3f67SBaptiste Daroussin 13373bbe3f67SBaptiste Daroussin rewind(f); 13383bbe3f67SBaptiste Daroussin cnt = fread(buf, 1, sizeof(buf), f); 13393bbe3f67SBaptiste Daroussin return (memchr(buf, '\0', cnt) == NULL); 13403bbe3f67SBaptiste Daroussin } 13413bbe3f67SBaptiste Daroussin 13423bbe3f67SBaptiste Daroussin #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0) 13433bbe3f67SBaptiste Daroussin 13443bbe3f67SBaptiste Daroussin static char * 13453bbe3f67SBaptiste Daroussin match_function(const long *f, int pos, FILE *fp) 13463bbe3f67SBaptiste Daroussin { 13473bbe3f67SBaptiste Daroussin unsigned char buf[FUNCTION_CONTEXT_SIZE]; 13483bbe3f67SBaptiste Daroussin size_t nc; 13493bbe3f67SBaptiste Daroussin int last = lastline; 13503bbe3f67SBaptiste Daroussin const char *state = NULL; 13513bbe3f67SBaptiste Daroussin 13523bbe3f67SBaptiste Daroussin lastline = pos; 13533bbe3f67SBaptiste Daroussin while (pos > last) { 13543bbe3f67SBaptiste Daroussin fseek(fp, f[pos - 1], SEEK_SET); 13553bbe3f67SBaptiste Daroussin nc = f[pos] - f[pos - 1]; 13563bbe3f67SBaptiste Daroussin if (nc >= sizeof(buf)) 13573bbe3f67SBaptiste Daroussin nc = sizeof(buf) - 1; 13583bbe3f67SBaptiste Daroussin nc = fread(buf, 1, nc, fp); 13593bbe3f67SBaptiste Daroussin if (nc > 0) { 13603bbe3f67SBaptiste Daroussin buf[nc] = '\0'; 13613bbe3f67SBaptiste Daroussin buf[strcspn(buf, "\n")] = '\0'; 13623bbe3f67SBaptiste Daroussin if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') { 13633bbe3f67SBaptiste Daroussin if (begins_with(buf, "private:")) { 13643bbe3f67SBaptiste Daroussin if (!state) 13653bbe3f67SBaptiste Daroussin state = " (private)"; 13663bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "protected:")) { 13673bbe3f67SBaptiste Daroussin if (!state) 13683bbe3f67SBaptiste Daroussin state = " (protected)"; 13693bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "public:")) { 13703bbe3f67SBaptiste Daroussin if (!state) 13713bbe3f67SBaptiste Daroussin state = " (public)"; 13723bbe3f67SBaptiste Daroussin } else { 13733bbe3f67SBaptiste Daroussin strlcpy(lastbuf, buf, sizeof lastbuf); 13743bbe3f67SBaptiste Daroussin if (state) 13753bbe3f67SBaptiste Daroussin strlcat(lastbuf, state, 13763bbe3f67SBaptiste Daroussin sizeof lastbuf); 13773bbe3f67SBaptiste Daroussin lastmatchline = pos; 13783bbe3f67SBaptiste Daroussin return lastbuf; 13793bbe3f67SBaptiste Daroussin } 13803bbe3f67SBaptiste Daroussin } 13813bbe3f67SBaptiste Daroussin } 13823bbe3f67SBaptiste Daroussin pos--; 13833bbe3f67SBaptiste Daroussin } 13843bbe3f67SBaptiste Daroussin return lastmatchline > 0 ? lastbuf : NULL; 13853bbe3f67SBaptiste Daroussin } 13863bbe3f67SBaptiste Daroussin 13873bbe3f67SBaptiste Daroussin /* dump accumulated "context" diff changes */ 13883bbe3f67SBaptiste Daroussin static void 13893bbe3f67SBaptiste Daroussin dump_context_vec(FILE *f1, FILE *f2, int flags) 13903bbe3f67SBaptiste Daroussin { 13913bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 13923bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd, do_output; 13933bbe3f67SBaptiste Daroussin int a, b, c, d; 13943bbe3f67SBaptiste Daroussin char ch, *f; 13953bbe3f67SBaptiste Daroussin 13963bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 13973bbe3f67SBaptiste Daroussin return; 13983bbe3f67SBaptiste Daroussin 13993bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 14003bbe3f67SBaptiste Daroussin lowa = MAXIMUM(1, cvp->a - diff_context); 14013bbe3f67SBaptiste Daroussin upb = MINIMUM(len[0], context_vec_ptr->b + diff_context); 14023bbe3f67SBaptiste Daroussin lowc = MAXIMUM(1, cvp->c - diff_context); 14033bbe3f67SBaptiste Daroussin upd = MINIMUM(len[1], context_vec_ptr->d + diff_context); 14043bbe3f67SBaptiste Daroussin 14053bbe3f67SBaptiste Daroussin diff_output("***************"); 14063bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 14073bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 14083bbe3f67SBaptiste Daroussin if (f != NULL) 14093bbe3f67SBaptiste Daroussin diff_output(" %s", f); 14103bbe3f67SBaptiste Daroussin } 14113bbe3f67SBaptiste Daroussin diff_output("\n*** "); 14123bbe3f67SBaptiste Daroussin range(lowa, upb, ","); 14133bbe3f67SBaptiste Daroussin diff_output(" ****\n"); 14143bbe3f67SBaptiste Daroussin 14153bbe3f67SBaptiste Daroussin /* 14163bbe3f67SBaptiste Daroussin * Output changes to the "old" file. The first loop suppresses 14173bbe3f67SBaptiste Daroussin * output if there were no changes to the "old" file (we'll see 14183bbe3f67SBaptiste Daroussin * the "old" lines as context in the "new" list). 14193bbe3f67SBaptiste Daroussin */ 14203bbe3f67SBaptiste Daroussin do_output = 0; 14213bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) 14223bbe3f67SBaptiste Daroussin if (cvp->a <= cvp->b) { 14233bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14243bbe3f67SBaptiste Daroussin do_output++; 14253bbe3f67SBaptiste Daroussin break; 14263bbe3f67SBaptiste Daroussin } 14273bbe3f67SBaptiste Daroussin if (do_output) { 14283bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14293bbe3f67SBaptiste Daroussin a = cvp->a; 14303bbe3f67SBaptiste Daroussin b = cvp->b; 14313bbe3f67SBaptiste Daroussin c = cvp->c; 14323bbe3f67SBaptiste Daroussin d = cvp->d; 14333bbe3f67SBaptiste Daroussin 14343bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 14353bbe3f67SBaptiste Daroussin ch = 'c'; 14363bbe3f67SBaptiste Daroussin else 14373bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 14383bbe3f67SBaptiste Daroussin 14393bbe3f67SBaptiste Daroussin if (ch == 'a') 14403bbe3f67SBaptiste Daroussin fetch(ixold, lowa, b, f1, ' ', 0, flags); 14413bbe3f67SBaptiste Daroussin else { 14423bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 14433bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, 14443bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '-', 0, flags); 14453bbe3f67SBaptiste Daroussin } 14463bbe3f67SBaptiste Daroussin lowa = b + 1; 14473bbe3f67SBaptiste Daroussin cvp++; 14483bbe3f67SBaptiste Daroussin } 14493bbe3f67SBaptiste Daroussin fetch(ixold, b + 1, upb, f1, ' ', 0, flags); 14503bbe3f67SBaptiste Daroussin } 14513bbe3f67SBaptiste Daroussin /* output changes to the "new" file */ 14523bbe3f67SBaptiste Daroussin diff_output("--- "); 14533bbe3f67SBaptiste Daroussin range(lowc, upd, ","); 14543bbe3f67SBaptiste Daroussin diff_output(" ----\n"); 14553bbe3f67SBaptiste Daroussin 14563bbe3f67SBaptiste Daroussin do_output = 0; 14573bbe3f67SBaptiste Daroussin for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++) 14583bbe3f67SBaptiste Daroussin if (cvp->c <= cvp->d) { 14593bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14603bbe3f67SBaptiste Daroussin do_output++; 14613bbe3f67SBaptiste Daroussin break; 14623bbe3f67SBaptiste Daroussin } 14633bbe3f67SBaptiste Daroussin if (do_output) { 14643bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 14653bbe3f67SBaptiste Daroussin a = cvp->a; 14663bbe3f67SBaptiste Daroussin b = cvp->b; 14673bbe3f67SBaptiste Daroussin c = cvp->c; 14683bbe3f67SBaptiste Daroussin d = cvp->d; 14693bbe3f67SBaptiste Daroussin 14703bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 14713bbe3f67SBaptiste Daroussin ch = 'c'; 14723bbe3f67SBaptiste Daroussin else 14733bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 14743bbe3f67SBaptiste Daroussin 14753bbe3f67SBaptiste Daroussin if (ch == 'd') 14763bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, d, f2, ' ', 0, flags); 14773bbe3f67SBaptiste Daroussin else { 14783bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 14793bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, 14803bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '+', 0, flags); 14813bbe3f67SBaptiste Daroussin } 14823bbe3f67SBaptiste Daroussin lowc = d + 1; 14833bbe3f67SBaptiste Daroussin cvp++; 14843bbe3f67SBaptiste Daroussin } 14853bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 14863bbe3f67SBaptiste Daroussin } 14873bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 14883bbe3f67SBaptiste Daroussin } 14893bbe3f67SBaptiste Daroussin 14903bbe3f67SBaptiste Daroussin /* dump accumulated "unified" diff changes */ 14913bbe3f67SBaptiste Daroussin static void 14923bbe3f67SBaptiste Daroussin dump_unified_vec(FILE *f1, FILE *f2, int flags) 14933bbe3f67SBaptiste Daroussin { 14943bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 14953bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd; 14963bbe3f67SBaptiste Daroussin int a, b, c, d; 14973bbe3f67SBaptiste Daroussin char ch, *f; 14983bbe3f67SBaptiste Daroussin 14993bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 15003bbe3f67SBaptiste Daroussin return; 15013bbe3f67SBaptiste Daroussin 15023bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 15033bbe3f67SBaptiste Daroussin lowa = MAXIMUM(1, cvp->a - diff_context); 15043bbe3f67SBaptiste Daroussin upb = MINIMUM(len[0], context_vec_ptr->b + diff_context); 15053bbe3f67SBaptiste Daroussin lowc = MAXIMUM(1, cvp->c - diff_context); 15063bbe3f67SBaptiste Daroussin upd = MINIMUM(len[1], context_vec_ptr->d + diff_context); 15073bbe3f67SBaptiste Daroussin 15083bbe3f67SBaptiste Daroussin diff_output("@@ -"); 15093bbe3f67SBaptiste Daroussin uni_range(lowa, upb); 15103bbe3f67SBaptiste Daroussin diff_output(" +"); 15113bbe3f67SBaptiste Daroussin uni_range(lowc, upd); 15123bbe3f67SBaptiste Daroussin diff_output(" @@"); 15133bbe3f67SBaptiste Daroussin if ((flags & D_PROTOTYPE)) { 15143bbe3f67SBaptiste Daroussin f = match_function(ixold, lowa-1, f1); 15153bbe3f67SBaptiste Daroussin if (f != NULL) 15163bbe3f67SBaptiste Daroussin diff_output(" %s", f); 15173bbe3f67SBaptiste Daroussin } 15183bbe3f67SBaptiste Daroussin diff_output("\n"); 15193bbe3f67SBaptiste Daroussin 15203bbe3f67SBaptiste Daroussin /* 15213bbe3f67SBaptiste Daroussin * Output changes in "unified" diff format--the old and new lines 15223bbe3f67SBaptiste Daroussin * are printed together. 15233bbe3f67SBaptiste Daroussin */ 15243bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) { 15253bbe3f67SBaptiste Daroussin a = cvp->a; 15263bbe3f67SBaptiste Daroussin b = cvp->b; 15273bbe3f67SBaptiste Daroussin c = cvp->c; 15283bbe3f67SBaptiste Daroussin d = cvp->d; 15293bbe3f67SBaptiste Daroussin 15303bbe3f67SBaptiste Daroussin /* 15313bbe3f67SBaptiste Daroussin * c: both new and old changes 15323bbe3f67SBaptiste Daroussin * d: only changes in the old file 15333bbe3f67SBaptiste Daroussin * a: only changes in the new file 15343bbe3f67SBaptiste Daroussin */ 15353bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15363bbe3f67SBaptiste Daroussin ch = 'c'; 15373bbe3f67SBaptiste Daroussin else 15383bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15393bbe3f67SBaptiste Daroussin 15403bbe3f67SBaptiste Daroussin switch (ch) { 15413bbe3f67SBaptiste Daroussin case 'c': 15423bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15433bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15443bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15453bbe3f67SBaptiste Daroussin break; 15463bbe3f67SBaptiste Daroussin case 'd': 15473bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15483bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 15493bbe3f67SBaptiste Daroussin break; 15503bbe3f67SBaptiste Daroussin case 'a': 15513bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 15523bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 15533bbe3f67SBaptiste Daroussin break; 15543bbe3f67SBaptiste Daroussin } 15553bbe3f67SBaptiste Daroussin lowa = b + 1; 15563bbe3f67SBaptiste Daroussin lowc = d + 1; 15573bbe3f67SBaptiste Daroussin } 15583bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 15593bbe3f67SBaptiste Daroussin 15603bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 15613bbe3f67SBaptiste Daroussin } 15623bbe3f67SBaptiste Daroussin 15633bbe3f67SBaptiste Daroussin static void 15643bbe3f67SBaptiste Daroussin print_header(const char *file1, const char *file2) 15653bbe3f67SBaptiste Daroussin { 15663bbe3f67SBaptiste Daroussin const char *time_format; 15673bbe3f67SBaptiste Daroussin char buf1[256]; 15683bbe3f67SBaptiste Daroussin char buf2[256]; 15693bbe3f67SBaptiste Daroussin char end1[10]; 15703bbe3f67SBaptiste Daroussin char end2[10]; 15713bbe3f67SBaptiste Daroussin struct tm *tm_ptr1, *tm_ptr2; 15723bbe3f67SBaptiste Daroussin int nsec1 = TIMESPEC_NS (stb1.st_mtime); 15733bbe3f67SBaptiste Daroussin int nsec2 = TIMESPEC_NS (stb2.st_mtime); 15743bbe3f67SBaptiste Daroussin 15753bbe3f67SBaptiste Daroussin #ifdef ST_MTIM_NSEC 15763bbe3f67SBaptiste Daroussin time_format = "%Y-%m-%d %H:%M:%S.%N"; 15773bbe3f67SBaptiste Daroussin #else 15783bbe3f67SBaptiste Daroussin time_format = "%Y-%m-%d %H:%M:%S"; 15793bbe3f67SBaptiste Daroussin #endif 15803bbe3f67SBaptiste Daroussin 15813bbe3f67SBaptiste Daroussin if (cflag) 15823bbe3f67SBaptiste Daroussin time_format = "%c"; 15833bbe3f67SBaptiste Daroussin tm_ptr1 = localtime(&stb1.st_mtime); 15843bbe3f67SBaptiste Daroussin tm_ptr2 = localtime(&stb2.st_mtime); 15853bbe3f67SBaptiste Daroussin strftime(buf1, 256, time_format, tm_ptr1); 15863bbe3f67SBaptiste Daroussin strftime(buf2, 256, time_format, tm_ptr2); 15873bbe3f67SBaptiste Daroussin if (!cflag) { 15883bbe3f67SBaptiste Daroussin strftime(end1, 10, "%z", tm_ptr1); 15893bbe3f67SBaptiste Daroussin strftime(end2, 10, "%z", tm_ptr2); 15903bbe3f67SBaptiste Daroussin sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1); 15913bbe3f67SBaptiste Daroussin sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2); 15923bbe3f67SBaptiste Daroussin } 15933bbe3f67SBaptiste Daroussin if (label[0] != NULL) 15943bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "***" : "---", 15953bbe3f67SBaptiste Daroussin label[0]); 15963bbe3f67SBaptiste Daroussin else 15973bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "***" : "---", 15983bbe3f67SBaptiste Daroussin file1, buf1); 15993bbe3f67SBaptiste Daroussin if (label[1] != NULL) 16003bbe3f67SBaptiste Daroussin diff_output("%s %s\n", diff_format == D_CONTEXT ? "---" : "+++", 16013bbe3f67SBaptiste Daroussin label[1]); 16023bbe3f67SBaptiste Daroussin else 16033bbe3f67SBaptiste Daroussin diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "---" : "+++", 16043bbe3f67SBaptiste Daroussin file2, buf2); 16053bbe3f67SBaptiste Daroussin } 1606