112d9c0dcSBaptiste Daroussin /* $OpenBSD: diffreg.c,v 1.93 2019/06/28 13:35:00 deraadt 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 673bbe3f67SBaptiste Daroussin #include <sys/capsicum.h> 683bbe3f67SBaptiste Daroussin #include <sys/stat.h> 693bbe3f67SBaptiste Daroussin 703bbe3f67SBaptiste Daroussin #include <capsicum_helpers.h> 713bbe3f67SBaptiste Daroussin #include <ctype.h> 723bbe3f67SBaptiste Daroussin #include <err.h> 733bbe3f67SBaptiste Daroussin #include <errno.h> 743bbe3f67SBaptiste Daroussin #include <fcntl.h> 75bcf2e78dSPiotr Pawel Stefaniak #include <math.h> 763bbe3f67SBaptiste Daroussin #include <paths.h> 777752043cSBaptiste Daroussin #include <regex.h> 78e68edb8cSKyle Evans #include <stdbool.h> 793bbe3f67SBaptiste Daroussin #include <stddef.h> 803bbe3f67SBaptiste Daroussin #include <stdint.h> 813bbe3f67SBaptiste Daroussin #include <stdio.h> 823bbe3f67SBaptiste Daroussin #include <stdlib.h> 833bbe3f67SBaptiste Daroussin #include <string.h> 843bbe3f67SBaptiste Daroussin 856fa5bf08SBaptiste Daroussin #include "pr.h" 863bbe3f67SBaptiste Daroussin #include "diff.h" 873bbe3f67SBaptiste Daroussin #include "xmalloc.h" 883bbe3f67SBaptiste Daroussin 893bbe3f67SBaptiste Daroussin /* 903bbe3f67SBaptiste Daroussin * diff - compare two files. 913bbe3f67SBaptiste Daroussin */ 923bbe3f67SBaptiste Daroussin 933bbe3f67SBaptiste Daroussin /* 9403582021SPiotr Pawel Stefaniak * Uses an algorithm due to Harold Stone, which finds a pair of longest 9503582021SPiotr Pawel Stefaniak * identical subsequences in the two files. 963bbe3f67SBaptiste Daroussin * 9703582021SPiotr Pawel Stefaniak * The major goal is to generate the match vector J. J[i] is the index of 9803582021SPiotr Pawel Stefaniak * the line in file1 corresponding to line i file0. J[i] = 0 if there is no 993bbe3f67SBaptiste Daroussin * such line in file1. 1003bbe3f67SBaptiste Daroussin * 10103582021SPiotr Pawel Stefaniak * Lines are hashed so as to work in core. All potential matches are 10203582021SPiotr Pawel Stefaniak * located by sorting the lines of each file on the hash (called 10303582021SPiotr Pawel Stefaniak * ``value''). In particular, this collects the equivalence classes in 10403582021SPiotr Pawel Stefaniak * file1 together. Subroutine equiv replaces the value of each line in 10503582021SPiotr Pawel Stefaniak * file0 by the index of the first element of its matching equivalence in 10603582021SPiotr Pawel Stefaniak * (the reordered) file1. To save space equiv squeezes file1 into a single 10703582021SPiotr Pawel Stefaniak * array member in which the equivalence classes are simply concatenated, 10803582021SPiotr Pawel Stefaniak * except that their first members are flagged by changing sign. 1093bbe3f67SBaptiste Daroussin * 11003582021SPiotr Pawel Stefaniak * Next the indices that point into member are unsorted into array class 11103582021SPiotr Pawel Stefaniak * according to the original order of file0. 1123bbe3f67SBaptiste Daroussin * 11303582021SPiotr Pawel Stefaniak * The cleverness lies in routine stone. This marches through the lines of 11403582021SPiotr Pawel Stefaniak * file0, developing a vector klist of "k-candidates". At step i 11503582021SPiotr Pawel Stefaniak * a k-candidate is a matched pair of lines x,y (x in file0 y in file1) 11603582021SPiotr Pawel Stefaniak * such that there is a common subsequence of length k between the first 11703582021SPiotr Pawel Stefaniak * i lines of file0 and the first y lines of file1, but there is no such 11803582021SPiotr Pawel Stefaniak * subsequence for any smaller y. x is the earliest possible mate to y that 11903582021SPiotr Pawel Stefaniak * occurs in such a subsequence. 1203bbe3f67SBaptiste Daroussin * 12103582021SPiotr Pawel Stefaniak * Whenever any of the members of the equivalence class of lines in file1 12203582021SPiotr Pawel Stefaniak * matable to a line in file0 has serial number less than the y of some 12303582021SPiotr Pawel Stefaniak * k-candidate, that k-candidate with the smallest such y is replaced. The 12403582021SPiotr Pawel Stefaniak * new k-candidate is chained (via pred) to the current k-1 candidate so 12503582021SPiotr Pawel Stefaniak * that the actual subsequence can be recovered. When a member has serial 12603582021SPiotr Pawel Stefaniak * number greater that the y of all k-candidates, the klist is extended. At 12703582021SPiotr Pawel Stefaniak * the end, the longest subsequence is pulled out and placed in the array J 12803582021SPiotr Pawel Stefaniak * by unravel. 1293bbe3f67SBaptiste Daroussin * 13003582021SPiotr Pawel Stefaniak * With J in hand, the matches there recorded are check'ed against reality 13103582021SPiotr Pawel Stefaniak * to assure that no spurious matches have crept in due to hashing. If they 13203582021SPiotr Pawel Stefaniak * have, they are broken, and "jackpot" is recorded -- a harmless matter 13303582021SPiotr Pawel Stefaniak * except that a true match for a spuriously mated line may now be 13403582021SPiotr Pawel Stefaniak * unnecessarily reported as a change. 1353bbe3f67SBaptiste Daroussin * 13603582021SPiotr Pawel Stefaniak * Much of the complexity of the program comes simply from trying to 13703582021SPiotr Pawel Stefaniak * minimize core utilization and maximize the range of doable problems by 13803582021SPiotr Pawel Stefaniak * dynamically allocating what is needed and reusing what is not. The core 13903582021SPiotr Pawel Stefaniak * requirements for problems larger than somewhat are (in words) 14003582021SPiotr Pawel Stefaniak * 2*length(file0) + length(file1) + 3*(number of k-candidates installed), 14103582021SPiotr Pawel Stefaniak * typically about 6n words for files of length n. 1423bbe3f67SBaptiste Daroussin */ 1433bbe3f67SBaptiste Daroussin 1443bbe3f67SBaptiste Daroussin struct cand { 1453bbe3f67SBaptiste Daroussin int x; 1463bbe3f67SBaptiste Daroussin int y; 1473bbe3f67SBaptiste Daroussin int pred; 1483bbe3f67SBaptiste Daroussin }; 1493bbe3f67SBaptiste Daroussin 1503bbe3f67SBaptiste Daroussin static struct line { 1513bbe3f67SBaptiste Daroussin int serial; 1523bbe3f67SBaptiste Daroussin int value; 1533bbe3f67SBaptiste Daroussin } *file[2]; 1543bbe3f67SBaptiste Daroussin 1553bbe3f67SBaptiste Daroussin /* 1563bbe3f67SBaptiste Daroussin * The following struct is used to record change information when 1573bbe3f67SBaptiste Daroussin * doing a "context" or "unified" diff. (see routine "change" to 1583bbe3f67SBaptiste Daroussin * understand the highly mnemonic field names) 1593bbe3f67SBaptiste Daroussin */ 1603bbe3f67SBaptiste Daroussin struct context_vec { 1613bbe3f67SBaptiste Daroussin int a; /* start line in old file */ 1623bbe3f67SBaptiste Daroussin int b; /* end line in old file */ 1633bbe3f67SBaptiste Daroussin int c; /* start line in new file */ 1643bbe3f67SBaptiste Daroussin int d; /* end line in new file */ 1653bbe3f67SBaptiste Daroussin }; 1663bbe3f67SBaptiste Daroussin 1673cbf98e2SPiotr Pawel Stefaniak enum readhash { RH_BINARY, RH_OK, RH_EOF }; 1683cbf98e2SPiotr Pawel Stefaniak 169ff807815SBaptiste Daroussin static FILE *opentemp(const char *); 1703bbe3f67SBaptiste Daroussin static void output(char *, FILE *, char *, FILE *, int); 1713bbe3f67SBaptiste Daroussin static void check(FILE *, FILE *, int); 1723bbe3f67SBaptiste Daroussin static void range(int, int, const char *); 1733bbe3f67SBaptiste Daroussin static void uni_range(int, int); 1743bbe3f67SBaptiste Daroussin static void dump_context_vec(FILE *, FILE *, int); 1753bbe3f67SBaptiste Daroussin static void dump_unified_vec(FILE *, FILE *, int); 1763cbf98e2SPiotr Pawel Stefaniak static bool prepare(int, FILE *, size_t, int); 1773bbe3f67SBaptiste Daroussin static void prune(void); 1783bbe3f67SBaptiste Daroussin static void equiv(struct line *, int, struct line *, int, int *); 1793bbe3f67SBaptiste Daroussin static void unravel(int); 1803bbe3f67SBaptiste Daroussin static void unsort(struct line *, int, int *); 1813bbe3f67SBaptiste Daroussin static void change(char *, FILE *, char *, FILE *, int, int, int, int, int *); 1823bbe3f67SBaptiste Daroussin static void sort(struct line *, int); 1833bbe3f67SBaptiste Daroussin static void print_header(const char *, const char *); 18464793e74SBaptiste Daroussin static void print_space(int, int, int); 1859488de00SKyle Evans static bool ignoreline_pattern(char *); 1869488de00SKyle Evans static bool ignoreline(char *, bool); 1873bbe3f67SBaptiste Daroussin static int asciifile(FILE *); 1883bbe3f67SBaptiste Daroussin static int fetch(long *, int, int, FILE *, int, int, int); 1893bbe3f67SBaptiste Daroussin static int newcand(int, int, int); 1903bbe3f67SBaptiste Daroussin static int search(int *, int, int); 1913bbe3f67SBaptiste Daroussin static int skipline(FILE *); 1923bbe3f67SBaptiste Daroussin static int stone(int *, int, int *, int *, int); 1933cbf98e2SPiotr Pawel Stefaniak static enum readhash readhash(FILE *, int, unsigned *); 1943bbe3f67SBaptiste Daroussin static int files_differ(FILE *, FILE *, int); 1953bbe3f67SBaptiste Daroussin static char *match_function(const long *, int, FILE *); 1963bbe3f67SBaptiste Daroussin static char *preadline(int, size_t, off_t); 1973bbe3f67SBaptiste Daroussin 1983bbe3f67SBaptiste Daroussin static int *J; /* will be overlaid on class */ 1993bbe3f67SBaptiste Daroussin static int *class; /* will be overlaid on file[0] */ 2003bbe3f67SBaptiste Daroussin static int *klist; /* will be overlaid on file[0] after class */ 2013bbe3f67SBaptiste Daroussin static int *member; /* will be overlaid on file[1] */ 2023bbe3f67SBaptiste Daroussin static int clen; 2033bbe3f67SBaptiste Daroussin static int inifdef; /* whether or not we are in a #ifdef block */ 2043bbe3f67SBaptiste Daroussin static int len[2]; 2053bbe3f67SBaptiste Daroussin static int pref, suff; /* length of prefix and suffix */ 2063bbe3f67SBaptiste Daroussin static int slen[2]; 2073bbe3f67SBaptiste Daroussin static int anychange; 208*53de23f4SDag-Erling Smørgrav static int hw, lpad, rpad; /* half width and padding */ 20964793e74SBaptiste Daroussin static int edoffset; 2103bbe3f67SBaptiste Daroussin static long *ixnew; /* will be overlaid on file[1] */ 2113bbe3f67SBaptiste Daroussin static long *ixold; /* will be overlaid on klist */ 2123bbe3f67SBaptiste Daroussin static struct cand *clist; /* merely a free storage pot for candidates */ 2133bbe3f67SBaptiste Daroussin static int clistlen; /* the length of clist */ 2143bbe3f67SBaptiste Daroussin static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */ 2150118df5eSBaptiste Daroussin static int (*chrtran)(int); /* translation table for case-folding */ 2163bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_start; 2173bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_end; 2183bbe3f67SBaptiste Daroussin static struct context_vec *context_vec_ptr; 2193bbe3f67SBaptiste Daroussin 2203bbe3f67SBaptiste Daroussin #define FUNCTION_CONTEXT_SIZE 55 2213bbe3f67SBaptiste Daroussin static char lastbuf[FUNCTION_CONTEXT_SIZE]; 2223bbe3f67SBaptiste Daroussin static int lastline; 2233bbe3f67SBaptiste Daroussin static int lastmatchline; 2243bbe3f67SBaptiste Daroussin 2250118df5eSBaptiste Daroussin static int 2260118df5eSBaptiste Daroussin clow2low(int c) 2270118df5eSBaptiste Daroussin { 2283bbe3f67SBaptiste Daroussin 2290118df5eSBaptiste Daroussin return (c); 2300118df5eSBaptiste Daroussin } 2313bbe3f67SBaptiste Daroussin 2320118df5eSBaptiste Daroussin static int 2330118df5eSBaptiste Daroussin cup2low(int c) 2340118df5eSBaptiste Daroussin { 2350118df5eSBaptiste Daroussin 23603582021SPiotr Pawel Stefaniak return (tolower(c)); 2370118df5eSBaptiste Daroussin } 2383bbe3f67SBaptiste Daroussin 2393bbe3f67SBaptiste Daroussin int 2403bbe3f67SBaptiste Daroussin diffreg(char *file1, char *file2, int flags, int capsicum) 2413bbe3f67SBaptiste Daroussin { 2423bbe3f67SBaptiste Daroussin FILE *f1, *f2; 2433bbe3f67SBaptiste Daroussin int i, rval; 2446fa5bf08SBaptiste Daroussin struct pr *pr = NULL; 2453bbe3f67SBaptiste Daroussin cap_rights_t rights_ro; 2463bbe3f67SBaptiste Daroussin 2473bbe3f67SBaptiste Daroussin f1 = f2 = NULL; 2483bbe3f67SBaptiste Daroussin rval = D_SAME; 2493bbe3f67SBaptiste Daroussin anychange = 0; 2503bbe3f67SBaptiste Daroussin lastline = 0; 2513bbe3f67SBaptiste Daroussin lastmatchline = 0; 25264793e74SBaptiste Daroussin 25364793e74SBaptiste Daroussin /* 254*53de23f4SDag-Erling Smørgrav * In side-by-side mode, we need to print the left column, a 255*53de23f4SDag-Erling Smørgrav * change marker surrounded by padding, and the right column. 256*53de23f4SDag-Erling Smørgrav * 257*53de23f4SDag-Erling Smørgrav * If expanding tabs, we don't care about alignment, so we simply 258*53de23f4SDag-Erling Smørgrav * subtract 3 from the width and divide by two. 259*53de23f4SDag-Erling Smørgrav * 260*53de23f4SDag-Erling Smørgrav * If not expanding tabs, we need to ensure that the right column 261*53de23f4SDag-Erling Smørgrav * is aligned to a tab stop. We start with the same formula, then 262*53de23f4SDag-Erling Smørgrav * decrement until we reach a size that lets us tab-align the 263*53de23f4SDag-Erling Smørgrav * right column. We then adjust the width down if necessary for 264*53de23f4SDag-Erling Smørgrav * the padding calculation to work. 265*53de23f4SDag-Erling Smørgrav * 266*53de23f4SDag-Erling Smørgrav * Left padding is half the space left over, rounded down; right 267*53de23f4SDag-Erling Smørgrav * padding is whatever is needed to match the width. 26864793e74SBaptiste Daroussin */ 26964793e74SBaptiste Daroussin if (diff_format == D_SIDEBYSIDE) { 270*53de23f4SDag-Erling Smørgrav if (flags & D_EXPANDTABS) { 271*53de23f4SDag-Erling Smørgrav if (width > 3) { 272*53de23f4SDag-Erling Smørgrav hw = (width - 3) / 2; 273*53de23f4SDag-Erling Smørgrav } else { 274*53de23f4SDag-Erling Smørgrav /* not enough space */ 275*53de23f4SDag-Erling Smørgrav hw = 0; 27664793e74SBaptiste Daroussin } 277*53de23f4SDag-Erling Smørgrav } else if (width <= 3 || width <= tabsize) { 278*53de23f4SDag-Erling Smørgrav /* not enough space */ 279*53de23f4SDag-Erling Smørgrav hw = 0; 280*53de23f4SDag-Erling Smørgrav } else { 281*53de23f4SDag-Erling Smørgrav hw = (width - 3) / 2; 282*53de23f4SDag-Erling Smørgrav while (hw > 0 && roundup(hw + 3, tabsize) + hw > width) 283*53de23f4SDag-Erling Smørgrav hw--; 284*53de23f4SDag-Erling Smørgrav if (width - (roundup(hw + 3, tabsize) + hw) < tabsize) 285*53de23f4SDag-Erling Smørgrav width = roundup(hw + 3, tabsize) + hw; 286*53de23f4SDag-Erling Smørgrav } 287*53de23f4SDag-Erling Smørgrav lpad = (width - hw * 2 - 1) / 2; 288*53de23f4SDag-Erling Smørgrav rpad = (width - hw * 2 - 1) - lpad; 289*53de23f4SDag-Erling Smørgrav } 29064793e74SBaptiste Daroussin 2913bbe3f67SBaptiste Daroussin if (flags & D_IGNORECASE) 2923bbe3f67SBaptiste Daroussin chrtran = cup2low; 2933bbe3f67SBaptiste Daroussin else 2943bbe3f67SBaptiste Daroussin chrtran = clow2low; 2953bbe3f67SBaptiste Daroussin if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode)) 2963bbe3f67SBaptiste Daroussin return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2); 2973bbe3f67SBaptiste Daroussin if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0) 2983bbe3f67SBaptiste Daroussin goto closem; 2993bbe3f67SBaptiste Daroussin 3003bbe3f67SBaptiste Daroussin if (flags & D_EMPTY1) 3013bbe3f67SBaptiste Daroussin f1 = fopen(_PATH_DEVNULL, "r"); 3023bbe3f67SBaptiste Daroussin else { 303ff807815SBaptiste Daroussin if (!S_ISREG(stb1.st_mode)) { 304ff807815SBaptiste Daroussin if ((f1 = opentemp(file1)) == NULL || 30512d9c0dcSBaptiste Daroussin fstat(fileno(f1), &stb1) == -1) { 306ff807815SBaptiste Daroussin warn("%s", file1); 307fefb3c46SJamie Landeg-Jones rval = D_ERROR; 308ff807815SBaptiste Daroussin status |= 2; 309ff807815SBaptiste Daroussin goto closem; 310ff807815SBaptiste Daroussin } 311ff807815SBaptiste Daroussin } else if (strcmp(file1, "-") == 0) 3123bbe3f67SBaptiste Daroussin f1 = stdin; 3133bbe3f67SBaptiste Daroussin else 3143bbe3f67SBaptiste Daroussin f1 = fopen(file1, "r"); 3153bbe3f67SBaptiste Daroussin } 3163bbe3f67SBaptiste Daroussin if (f1 == NULL) { 3173bbe3f67SBaptiste Daroussin warn("%s", file1); 318fefb3c46SJamie Landeg-Jones rval = D_ERROR; 3193bbe3f67SBaptiste Daroussin status |= 2; 3203bbe3f67SBaptiste Daroussin goto closem; 3213bbe3f67SBaptiste Daroussin } 3223bbe3f67SBaptiste Daroussin 3233bbe3f67SBaptiste Daroussin if (flags & D_EMPTY2) 3243bbe3f67SBaptiste Daroussin f2 = fopen(_PATH_DEVNULL, "r"); 3253bbe3f67SBaptiste Daroussin else { 326ff807815SBaptiste Daroussin if (!S_ISREG(stb2.st_mode)) { 327ff807815SBaptiste Daroussin if ((f2 = opentemp(file2)) == NULL || 32812d9c0dcSBaptiste Daroussin fstat(fileno(f2), &stb2) == -1) { 329ff807815SBaptiste Daroussin warn("%s", file2); 330fefb3c46SJamie Landeg-Jones rval = D_ERROR; 331ff807815SBaptiste Daroussin status |= 2; 332ff807815SBaptiste Daroussin goto closem; 333ff807815SBaptiste Daroussin } 334ff807815SBaptiste Daroussin } else if (strcmp(file2, "-") == 0) 3353bbe3f67SBaptiste Daroussin f2 = stdin; 3363bbe3f67SBaptiste Daroussin else 3373bbe3f67SBaptiste Daroussin f2 = fopen(file2, "r"); 3383bbe3f67SBaptiste Daroussin } 3393bbe3f67SBaptiste Daroussin if (f2 == NULL) { 3403bbe3f67SBaptiste Daroussin warn("%s", file2); 341fefb3c46SJamie Landeg-Jones rval = D_ERROR; 3423bbe3f67SBaptiste Daroussin status |= 2; 3433bbe3f67SBaptiste Daroussin goto closem; 3443bbe3f67SBaptiste Daroussin } 3453bbe3f67SBaptiste Daroussin 3466fa5bf08SBaptiste Daroussin if (lflag) 3476fa5bf08SBaptiste Daroussin pr = start_pr(file1, file2); 3483bbe3f67SBaptiste Daroussin 3493bbe3f67SBaptiste Daroussin if (capsicum) { 3503bbe3f67SBaptiste Daroussin cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK); 351377421dfSMariusz Zaborski if (caph_rights_limit(fileno(f1), &rights_ro) < 0) 3523bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file1); 353377421dfSMariusz Zaborski if (caph_rights_limit(fileno(f2), &rights_ro) < 0) 3543bbe3f67SBaptiste Daroussin err(2, "unable to limit rights on: %s", file2); 3553bbe3f67SBaptiste Daroussin if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) { 356e52546a3SBaptiste Daroussin /* stdin has already been limited */ 3573bbe3f67SBaptiste Daroussin if (caph_limit_stderr() == -1) 3583bbe3f67SBaptiste Daroussin err(2, "unable to limit stderr"); 3593bbe3f67SBaptiste Daroussin if (caph_limit_stdout() == -1) 3603bbe3f67SBaptiste Daroussin err(2, "unable to limit stdout"); 3613bbe3f67SBaptiste Daroussin } else if (caph_limit_stdio() == -1) 3623bbe3f67SBaptiste Daroussin err(2, "unable to limit stdio"); 3633bbe3f67SBaptiste Daroussin 3643bbe3f67SBaptiste Daroussin caph_cache_catpages(); 3655bbffb00SBaptiste Daroussin caph_cache_tzdata(); 3667672a014SMariusz Zaborski if (caph_enter() < 0) 3673bbe3f67SBaptiste Daroussin err(2, "unable to enter capability mode"); 3683bbe3f67SBaptiste Daroussin } 3693bbe3f67SBaptiste Daroussin 3703bbe3f67SBaptiste Daroussin switch (files_differ(f1, f2, flags)) { 3713bbe3f67SBaptiste Daroussin case 0: 3723bbe3f67SBaptiste Daroussin goto closem; 3733bbe3f67SBaptiste Daroussin case 1: 3743bbe3f67SBaptiste Daroussin break; 3753bbe3f67SBaptiste Daroussin default: 3763bbe3f67SBaptiste Daroussin /* error */ 377fefb3c46SJamie Landeg-Jones rval = D_ERROR; 3783bbe3f67SBaptiste Daroussin status |= 2; 3793bbe3f67SBaptiste Daroussin goto closem; 3803bbe3f67SBaptiste Daroussin } 3813bbe3f67SBaptiste Daroussin 38212a8d302SEd Maste if (diff_format == D_BRIEF && ignore_pats == NULL && 38312a8d302SEd Maste (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE|D_STRIPCR)) == 0) 38412a8d302SEd Maste { 3855248d3b1SMark Johnston rval = D_DIFFER; 3865248d3b1SMark Johnston status |= 1; 3875248d3b1SMark Johnston goto closem; 3885248d3b1SMark Johnston } 3893cbf98e2SPiotr Pawel Stefaniak if ((flags & D_FORCEASCII) != 0) { 3903cbf98e2SPiotr Pawel Stefaniak (void)prepare(0, f1, stb1.st_size, flags); 3913cbf98e2SPiotr Pawel Stefaniak (void)prepare(1, f2, stb2.st_size, flags); 3923cbf98e2SPiotr Pawel Stefaniak } else if (!asciifile(f1) || !asciifile(f2) || 3933cbf98e2SPiotr Pawel Stefaniak !prepare(0, f1, stb1.st_size, flags) || 3943cbf98e2SPiotr Pawel Stefaniak !prepare(1, f2, stb2.st_size, flags)) { 3953bbe3f67SBaptiste Daroussin rval = D_BINARY; 3963bbe3f67SBaptiste Daroussin status |= 1; 3973bbe3f67SBaptiste Daroussin goto closem; 3983bbe3f67SBaptiste Daroussin } 3993bbe3f67SBaptiste Daroussin 4003bbe3f67SBaptiste Daroussin prune(); 4013bbe3f67SBaptiste Daroussin sort(sfile[0], slen[0]); 4023bbe3f67SBaptiste Daroussin sort(sfile[1], slen[1]); 4033bbe3f67SBaptiste Daroussin 4043bbe3f67SBaptiste Daroussin member = (int *)file[1]; 4053bbe3f67SBaptiste Daroussin equiv(sfile[0], slen[0], sfile[1], slen[1], member); 4063bbe3f67SBaptiste Daroussin member = xreallocarray(member, slen[1] + 2, sizeof(*member)); 4073bbe3f67SBaptiste Daroussin 4083bbe3f67SBaptiste Daroussin class = (int *)file[0]; 4093bbe3f67SBaptiste Daroussin unsort(sfile[0], slen[0], class); 4103bbe3f67SBaptiste Daroussin class = xreallocarray(class, slen[0] + 2, sizeof(*class)); 4113bbe3f67SBaptiste Daroussin 4123bbe3f67SBaptiste Daroussin klist = xcalloc(slen[0] + 2, sizeof(*klist)); 4133bbe3f67SBaptiste Daroussin clen = 0; 4143bbe3f67SBaptiste Daroussin clistlen = 100; 4153bbe3f67SBaptiste Daroussin clist = xcalloc(clistlen, sizeof(*clist)); 4163bbe3f67SBaptiste Daroussin i = stone(class, slen[0], member, klist, flags); 4173bbe3f67SBaptiste Daroussin free(member); 4183bbe3f67SBaptiste Daroussin free(class); 4193bbe3f67SBaptiste Daroussin 4203bbe3f67SBaptiste Daroussin J = xreallocarray(J, len[0] + 2, sizeof(*J)); 4213bbe3f67SBaptiste Daroussin unravel(klist[i]); 4223bbe3f67SBaptiste Daroussin free(clist); 4233bbe3f67SBaptiste Daroussin free(klist); 4243bbe3f67SBaptiste Daroussin 4253bbe3f67SBaptiste Daroussin ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold)); 4263bbe3f67SBaptiste Daroussin ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew)); 4273bbe3f67SBaptiste Daroussin check(f1, f2, flags); 4283bbe3f67SBaptiste Daroussin output(file1, f1, file2, f2, flags); 4293bbe3f67SBaptiste Daroussin 4303bbe3f67SBaptiste Daroussin closem: 431fb0d1c69SBaptiste Daroussin if (pr != NULL) 432fb0d1c69SBaptiste Daroussin stop_pr(pr); 4333bbe3f67SBaptiste Daroussin if (anychange) { 4343bbe3f67SBaptiste Daroussin status |= 1; 4353bbe3f67SBaptiste Daroussin if (rval == D_SAME) 4363bbe3f67SBaptiste Daroussin rval = D_DIFFER; 4373bbe3f67SBaptiste Daroussin } 4383bbe3f67SBaptiste Daroussin if (f1 != NULL) 4393bbe3f67SBaptiste Daroussin fclose(f1); 4403bbe3f67SBaptiste Daroussin if (f2 != NULL) 4413bbe3f67SBaptiste Daroussin fclose(f2); 4423bbe3f67SBaptiste Daroussin 4433bbe3f67SBaptiste Daroussin return (rval); 4443bbe3f67SBaptiste Daroussin } 4453bbe3f67SBaptiste Daroussin 4463bbe3f67SBaptiste Daroussin /* 4473bbe3f67SBaptiste Daroussin * Check to see if the given files differ. 4483bbe3f67SBaptiste Daroussin * Returns 0 if they are the same, 1 if different, and -1 on error. 4493bbe3f67SBaptiste Daroussin * XXX - could use code from cmp(1) [faster] 4503bbe3f67SBaptiste Daroussin */ 4513bbe3f67SBaptiste Daroussin static int 4523bbe3f67SBaptiste Daroussin files_differ(FILE *f1, FILE *f2, int flags) 4533bbe3f67SBaptiste Daroussin { 4543bbe3f67SBaptiste Daroussin char buf1[BUFSIZ], buf2[BUFSIZ]; 4553bbe3f67SBaptiste Daroussin size_t i, j; 4563bbe3f67SBaptiste Daroussin 4573bbe3f67SBaptiste Daroussin if ((flags & (D_EMPTY1|D_EMPTY2)) || stb1.st_size != stb2.st_size || 4583bbe3f67SBaptiste Daroussin (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT)) 4593bbe3f67SBaptiste Daroussin return (1); 460824bbb9aSMariusz Zaborski 461824bbb9aSMariusz Zaborski if (stb1.st_dev == stb2.st_dev && stb1.st_ino == stb2.st_ino) 462824bbb9aSMariusz Zaborski return (0); 463824bbb9aSMariusz Zaborski 4643bbe3f67SBaptiste Daroussin for (;;) { 4653bbe3f67SBaptiste Daroussin i = fread(buf1, 1, sizeof(buf1), f1); 4663bbe3f67SBaptiste Daroussin j = fread(buf2, 1, sizeof(buf2), f2); 4673bbe3f67SBaptiste Daroussin if ((!i && ferror(f1)) || (!j && ferror(f2))) 4683bbe3f67SBaptiste Daroussin return (-1); 4693bbe3f67SBaptiste Daroussin if (i != j) 4703bbe3f67SBaptiste Daroussin return (1); 4713bbe3f67SBaptiste Daroussin if (i == 0) 4723bbe3f67SBaptiste Daroussin return (0); 4733bbe3f67SBaptiste Daroussin if (memcmp(buf1, buf2, i) != 0) 4743bbe3f67SBaptiste Daroussin return (1); 4753bbe3f67SBaptiste Daroussin } 4763bbe3f67SBaptiste Daroussin } 4773bbe3f67SBaptiste Daroussin 478ff807815SBaptiste Daroussin static FILE * 479ff807815SBaptiste Daroussin opentemp(const char *f) 480ff807815SBaptiste Daroussin { 481ff807815SBaptiste Daroussin char buf[BUFSIZ], tempfile[PATH_MAX]; 482ff807815SBaptiste Daroussin ssize_t nread; 483ff807815SBaptiste Daroussin int ifd, ofd; 484ff807815SBaptiste Daroussin 485ff807815SBaptiste Daroussin if (strcmp(f, "-") == 0) 486ff807815SBaptiste Daroussin ifd = STDIN_FILENO; 48712d9c0dcSBaptiste Daroussin else if ((ifd = open(f, O_RDONLY, 0644)) == -1) 488ff807815SBaptiste Daroussin return (NULL); 489ff807815SBaptiste Daroussin 490ff807815SBaptiste Daroussin (void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile)); 491ff807815SBaptiste Daroussin 492a3337141SBaptiste Daroussin if ((ofd = mkstemp(tempfile)) == -1) { 493ff807815SBaptiste Daroussin close(ifd); 494ff807815SBaptiste Daroussin return (NULL); 495ff807815SBaptiste Daroussin } 496ff807815SBaptiste Daroussin unlink(tempfile); 497ff807815SBaptiste Daroussin while ((nread = read(ifd, buf, BUFSIZ)) > 0) { 498ff807815SBaptiste Daroussin if (write(ofd, buf, nread) != nread) { 499ff807815SBaptiste Daroussin close(ifd); 500ff807815SBaptiste Daroussin close(ofd); 501ff807815SBaptiste Daroussin return (NULL); 502ff807815SBaptiste Daroussin } 503ff807815SBaptiste Daroussin } 504ff807815SBaptiste Daroussin close(ifd); 505c69047caSBaptiste Daroussin lseek(ofd, (off_t)0, SEEK_SET); 506ff807815SBaptiste Daroussin return (fdopen(ofd, "r")); 507ff807815SBaptiste Daroussin } 508ff807815SBaptiste Daroussin 5093cbf98e2SPiotr Pawel Stefaniak static bool 510d5b187aeSBaptiste Daroussin prepare(int i, FILE *fd, size_t filesize, int flags) 5113bbe3f67SBaptiste Daroussin { 5123bbe3f67SBaptiste Daroussin struct line *p; 5133cbf98e2SPiotr Pawel Stefaniak unsigned h; 5143cbf98e2SPiotr Pawel Stefaniak size_t sz, j = 0; 5153cbf98e2SPiotr Pawel Stefaniak enum readhash r; 5163bbe3f67SBaptiste Daroussin 5173bbe3f67SBaptiste Daroussin rewind(fd); 5183bbe3f67SBaptiste Daroussin 5196b8059c4SBaptiste Daroussin sz = MIN(filesize, SIZE_MAX) / 25; 5203bbe3f67SBaptiste Daroussin if (sz < 100) 5213bbe3f67SBaptiste Daroussin sz = 100; 5223bbe3f67SBaptiste Daroussin 5233bbe3f67SBaptiste Daroussin p = xcalloc(sz + 3, sizeof(*p)); 5243cbf98e2SPiotr Pawel Stefaniak while ((r = readhash(fd, flags, &h)) != RH_EOF) 5253cbf98e2SPiotr Pawel Stefaniak switch (r) { 5263cbf98e2SPiotr Pawel Stefaniak case RH_EOF: /* otherwise clang complains */ 5273cbf98e2SPiotr Pawel Stefaniak case RH_BINARY: 5283cbf98e2SPiotr Pawel Stefaniak return (false); 5293cbf98e2SPiotr Pawel Stefaniak case RH_OK: 5303bbe3f67SBaptiste Daroussin if (j == sz) { 5313bbe3f67SBaptiste Daroussin sz = sz * 3 / 2; 5323bbe3f67SBaptiste Daroussin p = xreallocarray(p, sz + 3, sizeof(*p)); 5333bbe3f67SBaptiste Daroussin } 5343bbe3f67SBaptiste Daroussin p[++j].value = h; 5353bbe3f67SBaptiste Daroussin } 5363cbf98e2SPiotr Pawel Stefaniak 5373bbe3f67SBaptiste Daroussin len[i] = j; 5383bbe3f67SBaptiste Daroussin file[i] = p; 5393cbf98e2SPiotr Pawel Stefaniak 5403cbf98e2SPiotr Pawel Stefaniak return (true); 5413bbe3f67SBaptiste Daroussin } 5423bbe3f67SBaptiste Daroussin 5433bbe3f67SBaptiste Daroussin static void 5443bbe3f67SBaptiste Daroussin prune(void) 5453bbe3f67SBaptiste Daroussin { 5463bbe3f67SBaptiste Daroussin int i, j; 5473bbe3f67SBaptiste Daroussin 5483bbe3f67SBaptiste Daroussin for (pref = 0; pref < len[0] && pref < len[1] && 5493bbe3f67SBaptiste Daroussin file[0][pref + 1].value == file[1][pref + 1].value; 5503bbe3f67SBaptiste Daroussin pref++) 5513bbe3f67SBaptiste Daroussin ; 5523bbe3f67SBaptiste Daroussin for (suff = 0; suff < len[0] - pref && suff < len[1] - pref && 5533bbe3f67SBaptiste Daroussin file[0][len[0] - suff].value == file[1][len[1] - suff].value; 5543bbe3f67SBaptiste Daroussin suff++) 5553bbe3f67SBaptiste Daroussin ; 5563bbe3f67SBaptiste Daroussin for (j = 0; j < 2; j++) { 5573bbe3f67SBaptiste Daroussin sfile[j] = file[j] + pref; 5583bbe3f67SBaptiste Daroussin slen[j] = len[j] - pref - suff; 5593bbe3f67SBaptiste Daroussin for (i = 0; i <= slen[j]; i++) 5603bbe3f67SBaptiste Daroussin sfile[j][i].serial = i; 5613bbe3f67SBaptiste Daroussin } 5623bbe3f67SBaptiste Daroussin } 5633bbe3f67SBaptiste Daroussin 5643bbe3f67SBaptiste Daroussin static void 5653bbe3f67SBaptiste Daroussin equiv(struct line *a, int n, struct line *b, int m, int *c) 5663bbe3f67SBaptiste Daroussin { 5673bbe3f67SBaptiste Daroussin int i, j; 5683bbe3f67SBaptiste Daroussin 5693bbe3f67SBaptiste Daroussin i = j = 1; 5703bbe3f67SBaptiste Daroussin while (i <= n && j <= m) { 5713bbe3f67SBaptiste Daroussin if (a[i].value < b[j].value) 5723bbe3f67SBaptiste Daroussin a[i++].value = 0; 5733bbe3f67SBaptiste Daroussin else if (a[i].value == b[j].value) 5743bbe3f67SBaptiste Daroussin a[i++].value = j; 5753bbe3f67SBaptiste Daroussin else 5763bbe3f67SBaptiste Daroussin j++; 5773bbe3f67SBaptiste Daroussin } 5783bbe3f67SBaptiste Daroussin while (i <= n) 5793bbe3f67SBaptiste Daroussin a[i++].value = 0; 5803bbe3f67SBaptiste Daroussin b[m + 1].value = 0; 5813bbe3f67SBaptiste Daroussin j = 0; 5823bbe3f67SBaptiste Daroussin while (++j <= m) { 5833bbe3f67SBaptiste Daroussin c[j] = -b[j].serial; 5843bbe3f67SBaptiste Daroussin while (b[j + 1].value == b[j].value) { 5853bbe3f67SBaptiste Daroussin j++; 5863bbe3f67SBaptiste Daroussin c[j] = b[j].serial; 5873bbe3f67SBaptiste Daroussin } 5883bbe3f67SBaptiste Daroussin } 5893bbe3f67SBaptiste Daroussin c[j] = -1; 5903bbe3f67SBaptiste Daroussin } 5913bbe3f67SBaptiste Daroussin 5923bbe3f67SBaptiste Daroussin static int 5933bbe3f67SBaptiste Daroussin stone(int *a, int n, int *b, int *c, int flags) 5943bbe3f67SBaptiste Daroussin { 5953bbe3f67SBaptiste Daroussin int i, k, y, j, l; 5963bbe3f67SBaptiste Daroussin int oldc, tc, oldl, sq; 59703582021SPiotr Pawel Stefaniak unsigned numtries, bound; 5983bbe3f67SBaptiste Daroussin 5993bbe3f67SBaptiste Daroussin if (flags & D_MINIMAL) 6003bbe3f67SBaptiste Daroussin bound = UINT_MAX; 6013bbe3f67SBaptiste Daroussin else { 602bcf2e78dSPiotr Pawel Stefaniak sq = sqrt(n); 60342c88c41SBaptiste Daroussin bound = MAX(256, sq); 6043bbe3f67SBaptiste Daroussin } 6053bbe3f67SBaptiste Daroussin 6063bbe3f67SBaptiste Daroussin k = 0; 6073bbe3f67SBaptiste Daroussin c[0] = newcand(0, 0, 0); 6083bbe3f67SBaptiste Daroussin for (i = 1; i <= n; i++) { 6093bbe3f67SBaptiste Daroussin j = a[i]; 6103bbe3f67SBaptiste Daroussin if (j == 0) 6113bbe3f67SBaptiste Daroussin continue; 6123bbe3f67SBaptiste Daroussin y = -b[j]; 6133bbe3f67SBaptiste Daroussin oldl = 0; 6143bbe3f67SBaptiste Daroussin oldc = c[0]; 6153bbe3f67SBaptiste Daroussin numtries = 0; 6163bbe3f67SBaptiste Daroussin do { 6173bbe3f67SBaptiste Daroussin if (y <= clist[oldc].y) 6183bbe3f67SBaptiste Daroussin continue; 6193bbe3f67SBaptiste Daroussin l = search(c, k, y); 6203bbe3f67SBaptiste Daroussin if (l != oldl + 1) 6213bbe3f67SBaptiste Daroussin oldc = c[l - 1]; 6223bbe3f67SBaptiste Daroussin if (l <= k) { 6233bbe3f67SBaptiste Daroussin if (clist[c[l]].y <= y) 6243bbe3f67SBaptiste Daroussin continue; 6253bbe3f67SBaptiste Daroussin tc = c[l]; 6263bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6273bbe3f67SBaptiste Daroussin oldc = tc; 6283bbe3f67SBaptiste Daroussin oldl = l; 6293bbe3f67SBaptiste Daroussin numtries++; 6303bbe3f67SBaptiste Daroussin } else { 6313bbe3f67SBaptiste Daroussin c[l] = newcand(i, y, oldc); 6323bbe3f67SBaptiste Daroussin k++; 6333bbe3f67SBaptiste Daroussin break; 6343bbe3f67SBaptiste Daroussin } 6353bbe3f67SBaptiste Daroussin } while ((y = b[++j]) > 0 && numtries < bound); 6363bbe3f67SBaptiste Daroussin } 6373bbe3f67SBaptiste Daroussin return (k); 6383bbe3f67SBaptiste Daroussin } 6393bbe3f67SBaptiste Daroussin 6403bbe3f67SBaptiste Daroussin static int 6413bbe3f67SBaptiste Daroussin newcand(int x, int y, int pred) 6423bbe3f67SBaptiste Daroussin { 6433bbe3f67SBaptiste Daroussin struct cand *q; 6443bbe3f67SBaptiste Daroussin 6453bbe3f67SBaptiste Daroussin if (clen == clistlen) { 6463bbe3f67SBaptiste Daroussin clistlen = clistlen * 11 / 10; 6473bbe3f67SBaptiste Daroussin clist = xreallocarray(clist, clistlen, sizeof(*clist)); 6483bbe3f67SBaptiste Daroussin } 6493bbe3f67SBaptiste Daroussin q = clist + clen; 6503bbe3f67SBaptiste Daroussin q->x = x; 6513bbe3f67SBaptiste Daroussin q->y = y; 6523bbe3f67SBaptiste Daroussin q->pred = pred; 6533bbe3f67SBaptiste Daroussin return (clen++); 6543bbe3f67SBaptiste Daroussin } 6553bbe3f67SBaptiste Daroussin 6563bbe3f67SBaptiste Daroussin static int 6573bbe3f67SBaptiste Daroussin search(int *c, int k, int y) 6583bbe3f67SBaptiste Daroussin { 6593bbe3f67SBaptiste Daroussin int i, j, l, t; 6603bbe3f67SBaptiste Daroussin 6613bbe3f67SBaptiste Daroussin if (clist[c[k]].y < y) /* quick look for typical case */ 6623bbe3f67SBaptiste Daroussin return (k + 1); 6633bbe3f67SBaptiste Daroussin i = 0; 6643bbe3f67SBaptiste Daroussin j = k + 1; 6653bbe3f67SBaptiste Daroussin for (;;) { 6663bbe3f67SBaptiste Daroussin l = (i + j) / 2; 6673bbe3f67SBaptiste Daroussin if (l <= i) 6683bbe3f67SBaptiste Daroussin break; 6693bbe3f67SBaptiste Daroussin t = clist[c[l]].y; 6703bbe3f67SBaptiste Daroussin if (t > y) 6713bbe3f67SBaptiste Daroussin j = l; 6723bbe3f67SBaptiste Daroussin else if (t < y) 6733bbe3f67SBaptiste Daroussin i = l; 6743bbe3f67SBaptiste Daroussin else 6753bbe3f67SBaptiste Daroussin return (l); 6763bbe3f67SBaptiste Daroussin } 6773bbe3f67SBaptiste Daroussin return (l + 1); 6783bbe3f67SBaptiste Daroussin } 6793bbe3f67SBaptiste Daroussin 6803bbe3f67SBaptiste Daroussin static void 6813bbe3f67SBaptiste Daroussin unravel(int p) 6823bbe3f67SBaptiste Daroussin { 6833bbe3f67SBaptiste Daroussin struct cand *q; 6843bbe3f67SBaptiste Daroussin int i; 6853bbe3f67SBaptiste Daroussin 6863bbe3f67SBaptiste Daroussin for (i = 0; i <= len[0]; i++) 6873bbe3f67SBaptiste Daroussin J[i] = i <= pref ? i : 6883bbe3f67SBaptiste Daroussin i > len[0] - suff ? i + len[1] - len[0] : 0; 6893bbe3f67SBaptiste Daroussin for (q = clist + p; q->y != 0; q = clist + q->pred) 6903bbe3f67SBaptiste Daroussin J[q->x + pref] = q->y + pref; 6913bbe3f67SBaptiste Daroussin } 6923bbe3f67SBaptiste Daroussin 6933bbe3f67SBaptiste Daroussin /* 6943bbe3f67SBaptiste Daroussin * Check does double duty: 69503582021SPiotr Pawel Stefaniak * 1. ferret out any fortuitous correspondences due to confounding by 69603582021SPiotr Pawel Stefaniak * hashing (which result in "jackpot") 6973bbe3f67SBaptiste Daroussin * 2. collect random access indexes to the two files 6983bbe3f67SBaptiste Daroussin */ 6993bbe3f67SBaptiste Daroussin static void 7003bbe3f67SBaptiste Daroussin check(FILE *f1, FILE *f2, int flags) 7013bbe3f67SBaptiste Daroussin { 702e8f740fbSJohn Baldwin int i, j, /* jackpot, */ c, d; 7033bbe3f67SBaptiste Daroussin long ctold, ctnew; 7043bbe3f67SBaptiste Daroussin 7053bbe3f67SBaptiste Daroussin rewind(f1); 7063bbe3f67SBaptiste Daroussin rewind(f2); 7073bbe3f67SBaptiste Daroussin j = 1; 7083bbe3f67SBaptiste Daroussin ixold[0] = ixnew[0] = 0; 709e8f740fbSJohn Baldwin /* jackpot = 0; */ 7103bbe3f67SBaptiste Daroussin ctold = ctnew = 0; 7113bbe3f67SBaptiste Daroussin for (i = 1; i <= len[0]; i++) { 7123bbe3f67SBaptiste Daroussin if (J[i] == 0) { 7133bbe3f67SBaptiste Daroussin ixold[i] = ctold += skipline(f1); 7143bbe3f67SBaptiste Daroussin continue; 7153bbe3f67SBaptiste Daroussin } 7163bbe3f67SBaptiste Daroussin while (j < J[i]) { 7173bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 7183bbe3f67SBaptiste Daroussin j++; 7193bbe3f67SBaptiste Daroussin } 7203bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS | D_IGNOREBLANKS | D_IGNORECASE | D_STRIPCR)) { 7213bbe3f67SBaptiste Daroussin for (;;) { 7223bbe3f67SBaptiste Daroussin c = getc(f1); 7233bbe3f67SBaptiste Daroussin d = getc(f2); 7243bbe3f67SBaptiste Daroussin /* 7253bbe3f67SBaptiste Daroussin * GNU diff ignores a missing newline 7263bbe3f67SBaptiste Daroussin * in one file for -b or -w. 7273bbe3f67SBaptiste Daroussin */ 7283bbe3f67SBaptiste Daroussin if (flags & (D_FOLDBLANKS | D_IGNOREBLANKS)) { 7293bbe3f67SBaptiste Daroussin if (c == EOF && d == '\n') { 7303bbe3f67SBaptiste Daroussin ctnew++; 7313bbe3f67SBaptiste Daroussin break; 7323bbe3f67SBaptiste Daroussin } else if (c == '\n' && d == EOF) { 7333bbe3f67SBaptiste Daroussin ctold++; 7343bbe3f67SBaptiste Daroussin break; 7353bbe3f67SBaptiste Daroussin } 7363bbe3f67SBaptiste Daroussin } 7373bbe3f67SBaptiste Daroussin ctold++; 7383bbe3f67SBaptiste Daroussin ctnew++; 7399977c7b5SXin LI if (flags & D_STRIPCR && (c == '\r' || d == '\r')) { 7403bbe3f67SBaptiste Daroussin if (c == '\r') { 7413bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == '\n') { 7429977c7b5SXin LI ctold++; 7439977c7b5SXin LI } else { 7449977c7b5SXin LI ungetc(c, f1); 7453bbe3f67SBaptiste Daroussin } 7463bbe3f67SBaptiste Daroussin } 7473bbe3f67SBaptiste Daroussin if (d == '\r') { 7483bbe3f67SBaptiste Daroussin if ((d = getc(f2)) == '\n') { 7499977c7b5SXin LI ctnew++; 7509977c7b5SXin LI } else { 7519977c7b5SXin LI ungetc(d, f2); 7529977c7b5SXin LI } 7539977c7b5SXin LI } 7543bbe3f67SBaptiste Daroussin break; 7553bbe3f67SBaptiste Daroussin } 7563bbe3f67SBaptiste Daroussin if ((flags & D_FOLDBLANKS) && isspace(c) && 7573bbe3f67SBaptiste Daroussin isspace(d)) { 7583bbe3f67SBaptiste Daroussin do { 7593bbe3f67SBaptiste Daroussin if (c == '\n') 7603bbe3f67SBaptiste Daroussin break; 7613bbe3f67SBaptiste Daroussin ctold++; 7623bbe3f67SBaptiste Daroussin } while (isspace(c = getc(f1))); 7633bbe3f67SBaptiste Daroussin do { 7643bbe3f67SBaptiste Daroussin if (d == '\n') 7653bbe3f67SBaptiste Daroussin break; 7663bbe3f67SBaptiste Daroussin ctnew++; 7673bbe3f67SBaptiste Daroussin } while (isspace(d = getc(f2))); 76803582021SPiotr Pawel Stefaniak } else if (flags & D_IGNOREBLANKS) { 7693bbe3f67SBaptiste Daroussin while (isspace(c) && c != '\n') { 7703bbe3f67SBaptiste Daroussin c = getc(f1); 7713bbe3f67SBaptiste Daroussin ctold++; 7723bbe3f67SBaptiste Daroussin } 7733bbe3f67SBaptiste Daroussin while (isspace(d) && d != '\n') { 7743bbe3f67SBaptiste Daroussin d = getc(f2); 7753bbe3f67SBaptiste Daroussin ctnew++; 7763bbe3f67SBaptiste Daroussin } 7773bbe3f67SBaptiste Daroussin } 7780118df5eSBaptiste Daroussin if (chrtran(c) != chrtran(d)) { 779e8f740fbSJohn Baldwin /* jackpot++; */ 7803bbe3f67SBaptiste Daroussin J[i] = 0; 7813bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 7823bbe3f67SBaptiste Daroussin ctold += skipline(f1); 7833bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 7843bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 7853bbe3f67SBaptiste Daroussin break; 7863bbe3f67SBaptiste Daroussin } 7873bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 7883bbe3f67SBaptiste Daroussin break; 7893bbe3f67SBaptiste Daroussin } 7903bbe3f67SBaptiste Daroussin } else { 7913bbe3f67SBaptiste Daroussin for (;;) { 7923bbe3f67SBaptiste Daroussin ctold++; 7933bbe3f67SBaptiste Daroussin ctnew++; 7943bbe3f67SBaptiste Daroussin if ((c = getc(f1)) != (d = getc(f2))) { 7953bbe3f67SBaptiste Daroussin /* jackpot++; */ 7963bbe3f67SBaptiste Daroussin J[i] = 0; 7973bbe3f67SBaptiste Daroussin if (c != '\n' && c != EOF) 7983bbe3f67SBaptiste Daroussin ctold += skipline(f1); 7993bbe3f67SBaptiste Daroussin if (d != '\n' && c != EOF) 8003bbe3f67SBaptiste Daroussin ctnew += skipline(f2); 8013bbe3f67SBaptiste Daroussin break; 8023bbe3f67SBaptiste Daroussin } 8033bbe3f67SBaptiste Daroussin if (c == '\n' || c == EOF) 8043bbe3f67SBaptiste Daroussin break; 8053bbe3f67SBaptiste Daroussin } 8063bbe3f67SBaptiste Daroussin } 8073bbe3f67SBaptiste Daroussin ixold[i] = ctold; 8083bbe3f67SBaptiste Daroussin ixnew[j] = ctnew; 8093bbe3f67SBaptiste Daroussin j++; 8103bbe3f67SBaptiste Daroussin } 8113bbe3f67SBaptiste Daroussin for (; j <= len[1]; j++) { 8123bbe3f67SBaptiste Daroussin ixnew[j] = ctnew += skipline(f2); 8133bbe3f67SBaptiste Daroussin } 8143bbe3f67SBaptiste Daroussin /* 8153bbe3f67SBaptiste Daroussin * if (jackpot) 8163bbe3f67SBaptiste Daroussin * fprintf(stderr, "jackpot\n"); 8173bbe3f67SBaptiste Daroussin */ 8183bbe3f67SBaptiste Daroussin } 8193bbe3f67SBaptiste Daroussin 8203bbe3f67SBaptiste Daroussin /* shellsort CACM #201 */ 8213bbe3f67SBaptiste Daroussin static void 8223bbe3f67SBaptiste Daroussin sort(struct line *a, int n) 8233bbe3f67SBaptiste Daroussin { 8243bbe3f67SBaptiste Daroussin struct line *ai, *aim, w; 8253bbe3f67SBaptiste Daroussin int j, m = 0, k; 8263bbe3f67SBaptiste Daroussin 8273bbe3f67SBaptiste Daroussin if (n == 0) 8283bbe3f67SBaptiste Daroussin return; 8293bbe3f67SBaptiste Daroussin for (j = 1; j <= n; j *= 2) 8303bbe3f67SBaptiste Daroussin m = 2 * j - 1; 8313bbe3f67SBaptiste Daroussin for (m /= 2; m != 0; m /= 2) { 8323bbe3f67SBaptiste Daroussin k = n - m; 8333bbe3f67SBaptiste Daroussin for (j = 1; j <= k; j++) { 8343bbe3f67SBaptiste Daroussin for (ai = &a[j]; ai > a; ai -= m) { 8353bbe3f67SBaptiste Daroussin aim = &ai[m]; 8363bbe3f67SBaptiste Daroussin if (aim < ai) 8373bbe3f67SBaptiste Daroussin break; /* wraparound */ 8383bbe3f67SBaptiste Daroussin if (aim->value > ai[0].value || 8393bbe3f67SBaptiste Daroussin (aim->value == ai[0].value && 8403bbe3f67SBaptiste Daroussin aim->serial > ai[0].serial)) 8413bbe3f67SBaptiste Daroussin break; 8423bbe3f67SBaptiste Daroussin w.value = ai[0].value; 8433bbe3f67SBaptiste Daroussin ai[0].value = aim->value; 8443bbe3f67SBaptiste Daroussin aim->value = w.value; 8453bbe3f67SBaptiste Daroussin w.serial = ai[0].serial; 8463bbe3f67SBaptiste Daroussin ai[0].serial = aim->serial; 8473bbe3f67SBaptiste Daroussin aim->serial = w.serial; 8483bbe3f67SBaptiste Daroussin } 8493bbe3f67SBaptiste Daroussin } 8503bbe3f67SBaptiste Daroussin } 8513bbe3f67SBaptiste Daroussin } 8523bbe3f67SBaptiste Daroussin 8533bbe3f67SBaptiste Daroussin static void 8543bbe3f67SBaptiste Daroussin unsort(struct line *f, int l, int *b) 8553bbe3f67SBaptiste Daroussin { 8563bbe3f67SBaptiste Daroussin int *a, i; 8573bbe3f67SBaptiste Daroussin 8583bbe3f67SBaptiste Daroussin a = xcalloc(l + 1, sizeof(*a)); 8593bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 8603bbe3f67SBaptiste Daroussin a[f[i].serial] = f[i].value; 8613bbe3f67SBaptiste Daroussin for (i = 1; i <= l; i++) 8623bbe3f67SBaptiste Daroussin b[i] = a[i]; 8633bbe3f67SBaptiste Daroussin free(a); 8643bbe3f67SBaptiste Daroussin } 8653bbe3f67SBaptiste Daroussin 8663bbe3f67SBaptiste Daroussin static int 8673bbe3f67SBaptiste Daroussin skipline(FILE *f) 8683bbe3f67SBaptiste Daroussin { 8693bbe3f67SBaptiste Daroussin int i, c; 8703bbe3f67SBaptiste Daroussin 8713bbe3f67SBaptiste Daroussin for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++) 8723bbe3f67SBaptiste Daroussin continue; 8733bbe3f67SBaptiste Daroussin return (i); 8743bbe3f67SBaptiste Daroussin } 8753bbe3f67SBaptiste Daroussin 8763bbe3f67SBaptiste Daroussin static void 8773bbe3f67SBaptiste Daroussin output(char *file1, FILE *f1, char *file2, FILE *f2, int flags) 8783bbe3f67SBaptiste Daroussin { 87964793e74SBaptiste Daroussin int i, j, m, i0, i1, j0, j1, nc; 8803bbe3f67SBaptiste Daroussin 8813bbe3f67SBaptiste Daroussin rewind(f1); 8823bbe3f67SBaptiste Daroussin rewind(f2); 8833bbe3f67SBaptiste Daroussin m = len[0]; 8843bbe3f67SBaptiste Daroussin J[0] = 0; 8853bbe3f67SBaptiste Daroussin J[m + 1] = len[1] + 1; 8863bbe3f67SBaptiste Daroussin if (diff_format != D_EDIT) { 8873bbe3f67SBaptiste Daroussin for (i0 = 1; i0 <= m; i0 = i1 + 1) { 88864793e74SBaptiste Daroussin while (i0 <= m && J[i0] == J[i0 - 1] + 1) { 88903582021SPiotr Pawel Stefaniak if (diff_format == D_SIDEBYSIDE && suppress_common != 1) { 89003582021SPiotr Pawel Stefaniak nc = fetch(ixold, i0, i0, f1, '\0', 1, flags); 891*53de23f4SDag-Erling Smørgrav print_space(nc, hw - nc + lpad + 1 + rpad, flags); 89203582021SPiotr Pawel Stefaniak fetch(ixnew, J[i0], J[i0], f2, '\0', 0, flags); 8937a57c9cbSBaptiste Daroussin printf("\n"); 89464793e74SBaptiste Daroussin } 8953bbe3f67SBaptiste Daroussin i0++; 89664793e74SBaptiste Daroussin } 8973bbe3f67SBaptiste Daroussin j0 = J[i0 - 1] + 1; 8983bbe3f67SBaptiste Daroussin i1 = i0 - 1; 8993bbe3f67SBaptiste Daroussin while (i1 < m && J[i1 + 1] == 0) 9003bbe3f67SBaptiste Daroussin i1++; 9013bbe3f67SBaptiste Daroussin j1 = J[i1 + 1] - 1; 9023bbe3f67SBaptiste Daroussin J[i1] = j1; 90364793e74SBaptiste Daroussin 90464793e74SBaptiste Daroussin /* 90503582021SPiotr Pawel Stefaniak * When using side-by-side, lines from both of the files are 90603582021SPiotr Pawel Stefaniak * printed. The algorithm used by diff(1) identifies the ranges 90703582021SPiotr Pawel Stefaniak * in which two files differ. 90864793e74SBaptiste Daroussin * See the change() function below. 90903582021SPiotr Pawel Stefaniak * The for loop below consumes the shorter range, whereas one of 91003582021SPiotr Pawel Stefaniak * the while loops deals with the longer one. 91164793e74SBaptiste Daroussin */ 91264793e74SBaptiste Daroussin if (diff_format == D_SIDEBYSIDE) { 91364793e74SBaptiste Daroussin for (i = i0, j = j0; i <= i1 && j <= j1; i++, j++) 91403582021SPiotr Pawel Stefaniak change(file1, f1, file2, f2, i, i, j, j, &flags); 91564793e74SBaptiste Daroussin 91664793e74SBaptiste Daroussin while (i <= i1) { 91703582021SPiotr Pawel Stefaniak change(file1, f1, file2, f2, i, i, j + 1, j, &flags); 91864793e74SBaptiste Daroussin i++; 91964793e74SBaptiste Daroussin } 92064793e74SBaptiste Daroussin 92164793e74SBaptiste Daroussin while (j <= j1) { 92203582021SPiotr Pawel Stefaniak change(file1, f1, file2, f2, i + 1, i, j, j, &flags); 92364793e74SBaptiste Daroussin j++; 92464793e74SBaptiste Daroussin } 92564793e74SBaptiste Daroussin } else 92603582021SPiotr Pawel Stefaniak change(file1, f1, file2, f2, i0, i1, j0, j1, &flags); 9273bbe3f67SBaptiste Daroussin } 9283bbe3f67SBaptiste Daroussin } else { 9293bbe3f67SBaptiste Daroussin for (i0 = m; i0 >= 1; i0 = i1 - 1) { 9303bbe3f67SBaptiste Daroussin while (i0 >= 1 && J[i0] == J[i0 + 1] - 1 && J[i0] != 0) 9313bbe3f67SBaptiste Daroussin i0--; 9323bbe3f67SBaptiste Daroussin j0 = J[i0 + 1] - 1; 9333bbe3f67SBaptiste Daroussin i1 = i0 + 1; 9343bbe3f67SBaptiste Daroussin while (i1 > 1 && J[i1 - 1] == 0) 9353bbe3f67SBaptiste Daroussin i1--; 9363bbe3f67SBaptiste Daroussin j1 = J[i1 - 1] + 1; 9373bbe3f67SBaptiste Daroussin J[i1] = j1; 9383bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, i1, i0, j1, j0, &flags); 9393bbe3f67SBaptiste Daroussin } 9403bbe3f67SBaptiste Daroussin } 9413bbe3f67SBaptiste Daroussin if (m == 0) 9423bbe3f67SBaptiste Daroussin change(file1, f1, file2, f2, 1, 0, 1, len[1], &flags); 943fddcb7b8SBaptiste Daroussin if (diff_format == D_IFDEF || diff_format == D_GFORMAT) { 9443bbe3f67SBaptiste Daroussin for (;;) { 9453bbe3f67SBaptiste Daroussin #define c i0 9463bbe3f67SBaptiste Daroussin if ((c = getc(f1)) == EOF) 9473bbe3f67SBaptiste Daroussin return; 9487a57c9cbSBaptiste Daroussin printf("%c", c); 9493bbe3f67SBaptiste Daroussin } 9503bbe3f67SBaptiste Daroussin #undef c 9513bbe3f67SBaptiste Daroussin } 9523bbe3f67SBaptiste Daroussin if (anychange != 0) { 9533bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 9543bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, flags); 9553bbe3f67SBaptiste Daroussin else if (diff_format == D_UNIFIED) 9563bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, flags); 9573bbe3f67SBaptiste Daroussin } 9583bbe3f67SBaptiste Daroussin } 9593bbe3f67SBaptiste Daroussin 9603bbe3f67SBaptiste Daroussin static void 9613bbe3f67SBaptiste Daroussin range(int a, int b, const char *separator) 9623bbe3f67SBaptiste Daroussin { 9637a57c9cbSBaptiste Daroussin printf("%d", a > b ? b : a); 9643bbe3f67SBaptiste Daroussin if (a < b) 9657a57c9cbSBaptiste Daroussin printf("%s%d", separator, b); 9663bbe3f67SBaptiste Daroussin } 9673bbe3f67SBaptiste Daroussin 9683bbe3f67SBaptiste Daroussin static void 9693bbe3f67SBaptiste Daroussin uni_range(int a, int b) 9703bbe3f67SBaptiste Daroussin { 9713bbe3f67SBaptiste Daroussin if (a < b) 9727a57c9cbSBaptiste Daroussin printf("%d,%d", a, b - a + 1); 9733bbe3f67SBaptiste Daroussin else if (a == b) 9747a57c9cbSBaptiste Daroussin printf("%d", b); 9753bbe3f67SBaptiste Daroussin else 9767a57c9cbSBaptiste Daroussin printf("%d,0", b); 9773bbe3f67SBaptiste Daroussin } 9783bbe3f67SBaptiste Daroussin 9793bbe3f67SBaptiste Daroussin static char * 9803bbe3f67SBaptiste Daroussin preadline(int fd, size_t rlen, off_t off) 9813bbe3f67SBaptiste Daroussin { 9823bbe3f67SBaptiste Daroussin char *line; 9833bbe3f67SBaptiste Daroussin ssize_t nr; 9843bbe3f67SBaptiste Daroussin 9853bbe3f67SBaptiste Daroussin line = xmalloc(rlen + 1); 98612d9c0dcSBaptiste Daroussin if ((nr = pread(fd, line, rlen, off)) == -1) 9873bbe3f67SBaptiste Daroussin err(2, "preadline"); 9883bbe3f67SBaptiste Daroussin if (nr > 0 && line[nr-1] == '\n') 9893bbe3f67SBaptiste Daroussin nr--; 9903bbe3f67SBaptiste Daroussin line[nr] = '\0'; 9913bbe3f67SBaptiste Daroussin return (line); 9923bbe3f67SBaptiste Daroussin } 9933bbe3f67SBaptiste Daroussin 9949488de00SKyle Evans static bool 9959488de00SKyle Evans ignoreline_pattern(char *line) 9963bbe3f67SBaptiste Daroussin { 9973bbe3f67SBaptiste Daroussin int ret; 9983bbe3f67SBaptiste Daroussin 9993bbe3f67SBaptiste Daroussin ret = regexec(&ignore_re, line, 0, NULL, 0); 10003bbe3f67SBaptiste Daroussin return (ret == 0); /* if it matched, it should be ignored. */ 10013bbe3f67SBaptiste Daroussin } 10023bbe3f67SBaptiste Daroussin 10039488de00SKyle Evans static bool 10049488de00SKyle Evans ignoreline(char *line, bool skip_blanks) 10059488de00SKyle Evans { 10069488de00SKyle Evans 10073736b2ddSJohn Baldwin if (skip_blanks && *line == '\0') 10083736b2ddSJohn Baldwin return (true); 10093736b2ddSJohn Baldwin if (ignore_pats != NULL && ignoreline_pattern(line)) 10103736b2ddSJohn Baldwin return (true); 10119488de00SKyle Evans return (false); 10129488de00SKyle Evans } 10139488de00SKyle Evans 10143bbe3f67SBaptiste Daroussin /* 10153bbe3f67SBaptiste Daroussin * Indicate that there is a difference between lines a and b of the from file 10163bbe3f67SBaptiste Daroussin * to get to lines c to d of the to file. If a is greater then b then there 10173bbe3f67SBaptiste Daroussin * are no lines in the from file involved and this means that there were 10183bbe3f67SBaptiste Daroussin * lines appended (beginning at b). If c is greater than d then there are 10193bbe3f67SBaptiste Daroussin * lines missing from the to file. 10203bbe3f67SBaptiste Daroussin */ 10213bbe3f67SBaptiste Daroussin static void 10223bbe3f67SBaptiste Daroussin change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d, 10233bbe3f67SBaptiste Daroussin int *pflags) 10243bbe3f67SBaptiste Daroussin { 10253bbe3f67SBaptiste Daroussin static size_t max_context = 64; 1026fddcb7b8SBaptiste Daroussin long curpos; 102764793e74SBaptiste Daroussin int i, nc; 1028fddcb7b8SBaptiste Daroussin const char *walk; 10293736b2ddSJohn Baldwin bool skip_blanks, ignore; 10303bbe3f67SBaptiste Daroussin 10319488de00SKyle Evans skip_blanks = (*pflags & D_SKIPBLANKLINES); 10323bbe3f67SBaptiste Daroussin restart: 1033fddcb7b8SBaptiste Daroussin if ((diff_format != D_IFDEF || diff_format == D_GFORMAT) && 1034fddcb7b8SBaptiste Daroussin a > b && c > d) 10353bbe3f67SBaptiste Daroussin return; 10369488de00SKyle Evans if (ignore_pats != NULL || skip_blanks) { 10373bbe3f67SBaptiste Daroussin char *line; 10383bbe3f67SBaptiste Daroussin /* 103903582021SPiotr Pawel Stefaniak * All lines in the change, insert, or delete must match an ignore 104003582021SPiotr Pawel Stefaniak * pattern for the change to be ignored. 10413bbe3f67SBaptiste Daroussin */ 10423bbe3f67SBaptiste Daroussin if (a <= b) { /* Changes and deletes. */ 10433bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 10443bbe3f67SBaptiste Daroussin line = preadline(fileno(f1), 10453bbe3f67SBaptiste Daroussin ixold[i] - ixold[i - 1], ixold[i - 1]); 10463736b2ddSJohn Baldwin ignore = ignoreline(line, skip_blanks); 10473736b2ddSJohn Baldwin free(line); 10483736b2ddSJohn Baldwin if (!ignore) 10493bbe3f67SBaptiste Daroussin goto proceed; 10503bbe3f67SBaptiste Daroussin } 10513bbe3f67SBaptiste Daroussin } 10523bbe3f67SBaptiste Daroussin if (a > b || c <= d) { /* Changes and inserts. */ 10533bbe3f67SBaptiste Daroussin for (i = c; i <= d; i++) { 10543bbe3f67SBaptiste Daroussin line = preadline(fileno(f2), 10553bbe3f67SBaptiste Daroussin ixnew[i] - ixnew[i - 1], ixnew[i - 1]); 10563736b2ddSJohn Baldwin ignore = ignoreline(line, skip_blanks); 10573736b2ddSJohn Baldwin free(line); 10583736b2ddSJohn Baldwin if (!ignore) 10593bbe3f67SBaptiste Daroussin goto proceed; 10603bbe3f67SBaptiste Daroussin } 10613bbe3f67SBaptiste Daroussin } 10623bbe3f67SBaptiste Daroussin return; 10633bbe3f67SBaptiste Daroussin } 10643bbe3f67SBaptiste Daroussin proceed: 10654d8c5790SEnji Cooper if (*pflags & D_HEADER && diff_format != D_BRIEF) { 10667a57c9cbSBaptiste Daroussin printf("%s %s %s\n", diffargs, file1, file2); 10673bbe3f67SBaptiste Daroussin *pflags &= ~D_HEADER; 10683bbe3f67SBaptiste Daroussin } 10693bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) { 10703bbe3f67SBaptiste Daroussin /* 10713bbe3f67SBaptiste Daroussin * Allocate change records as needed. 10723bbe3f67SBaptiste Daroussin */ 10732171b2cbSPiotr Pawel Stefaniak if (context_vec_start == NULL || 10742171b2cbSPiotr Pawel Stefaniak context_vec_ptr == context_vec_end - 1) { 10752171b2cbSPiotr Pawel Stefaniak ptrdiff_t offset = -1; 10762171b2cbSPiotr Pawel Stefaniak 10772171b2cbSPiotr Pawel Stefaniak if (context_vec_start != NULL) 10782171b2cbSPiotr Pawel Stefaniak offset = context_vec_ptr - context_vec_start; 10793bbe3f67SBaptiste Daroussin max_context <<= 1; 10803bbe3f67SBaptiste Daroussin context_vec_start = xreallocarray(context_vec_start, 10813bbe3f67SBaptiste Daroussin max_context, sizeof(*context_vec_start)); 10823bbe3f67SBaptiste Daroussin context_vec_end = context_vec_start + max_context; 10833bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start + offset; 10843bbe3f67SBaptiste Daroussin } 10853bbe3f67SBaptiste Daroussin if (anychange == 0) { 10863bbe3f67SBaptiste Daroussin /* 10873bbe3f67SBaptiste Daroussin * Print the context/unidiff header first time through. 10883bbe3f67SBaptiste Daroussin */ 10893bbe3f67SBaptiste Daroussin print_header(file1, file2); 10903bbe3f67SBaptiste Daroussin anychange = 1; 10913bbe3f67SBaptiste Daroussin } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 && 10923bbe3f67SBaptiste Daroussin c > context_vec_ptr->d + (2 * diff_context) + 1) { 10933bbe3f67SBaptiste Daroussin /* 10943bbe3f67SBaptiste Daroussin * If this change is more than 'diff_context' lines from the 10953bbe3f67SBaptiste Daroussin * previous change, dump the record and reset it. 10963bbe3f67SBaptiste Daroussin */ 10973bbe3f67SBaptiste Daroussin if (diff_format == D_CONTEXT) 10983bbe3f67SBaptiste Daroussin dump_context_vec(f1, f2, *pflags); 10993bbe3f67SBaptiste Daroussin else 11003bbe3f67SBaptiste Daroussin dump_unified_vec(f1, f2, *pflags); 11013bbe3f67SBaptiste Daroussin } 11023bbe3f67SBaptiste Daroussin context_vec_ptr++; 11033bbe3f67SBaptiste Daroussin context_vec_ptr->a = a; 11043bbe3f67SBaptiste Daroussin context_vec_ptr->b = b; 11053bbe3f67SBaptiste Daroussin context_vec_ptr->c = c; 11063bbe3f67SBaptiste Daroussin context_vec_ptr->d = d; 11073bbe3f67SBaptiste Daroussin return; 11083bbe3f67SBaptiste Daroussin } 11093bbe3f67SBaptiste Daroussin if (anychange == 0) 11103bbe3f67SBaptiste Daroussin anychange = 1; 11113bbe3f67SBaptiste Daroussin switch (diff_format) { 11123bbe3f67SBaptiste Daroussin case D_BRIEF: 11133bbe3f67SBaptiste Daroussin return; 11143bbe3f67SBaptiste Daroussin case D_NORMAL: 11153bbe3f67SBaptiste Daroussin case D_EDIT: 11163bbe3f67SBaptiste Daroussin range(a, b, ","); 11177a57c9cbSBaptiste Daroussin printf("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11183bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL) 11193bbe3f67SBaptiste Daroussin range(c, d, ","); 11207a57c9cbSBaptiste Daroussin printf("\n"); 11213bbe3f67SBaptiste Daroussin break; 11223bbe3f67SBaptiste Daroussin case D_REVERSE: 11237a57c9cbSBaptiste Daroussin printf("%c", a > b ? 'a' : c > d ? 'd' : 'c'); 11243bbe3f67SBaptiste Daroussin range(a, b, " "); 11257a57c9cbSBaptiste Daroussin printf("\n"); 11263bbe3f67SBaptiste Daroussin break; 11273bbe3f67SBaptiste Daroussin case D_NREVERSE: 11283bbe3f67SBaptiste Daroussin if (a > b) 11297a57c9cbSBaptiste Daroussin printf("a%d %d\n", b, d - c + 1); 11303bbe3f67SBaptiste Daroussin else { 11317a57c9cbSBaptiste Daroussin printf("d%d %d\n", a, b - a + 1); 11323bbe3f67SBaptiste Daroussin if (!(c > d)) 11333bbe3f67SBaptiste Daroussin /* add changed lines */ 11347a57c9cbSBaptiste Daroussin printf("a%d %d\n", b, d - c + 1); 11353bbe3f67SBaptiste Daroussin } 11363bbe3f67SBaptiste Daroussin break; 11373bbe3f67SBaptiste Daroussin } 1138fddcb7b8SBaptiste Daroussin if (diff_format == D_GFORMAT) { 1139fddcb7b8SBaptiste Daroussin curpos = ftell(f1); 1140fddcb7b8SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 1141fddcb7b8SBaptiste Daroussin nc = ixold[a > b ? b : a - 1] - curpos; 1142fddcb7b8SBaptiste Daroussin for (i = 0; i < nc; i++) 11437a57c9cbSBaptiste Daroussin printf("%c", getc(f1)); 1144fddcb7b8SBaptiste Daroussin for (walk = group_format; *walk != '\0'; walk++) { 1145fddcb7b8SBaptiste Daroussin if (*walk == '%') { 1146fddcb7b8SBaptiste Daroussin walk++; 1147fddcb7b8SBaptiste Daroussin switch (*walk) { 1148fddcb7b8SBaptiste Daroussin case '<': 1149fddcb7b8SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 1150fddcb7b8SBaptiste Daroussin break; 1151fddcb7b8SBaptiste Daroussin case '>': 1152fddcb7b8SBaptiste Daroussin fetch(ixnew, c, d, f2, '>', 0, *pflags); 1153fddcb7b8SBaptiste Daroussin break; 1154fddcb7b8SBaptiste Daroussin default: 11557a57c9cbSBaptiste Daroussin printf("%%%c", *walk); 1156fddcb7b8SBaptiste Daroussin break; 1157fddcb7b8SBaptiste Daroussin } 1158fddcb7b8SBaptiste Daroussin continue; 1159fddcb7b8SBaptiste Daroussin } 11607a57c9cbSBaptiste Daroussin printf("%c", *walk); 1161fddcb7b8SBaptiste Daroussin } 1162fddcb7b8SBaptiste Daroussin } 116364793e74SBaptiste Daroussin if (diff_format == D_SIDEBYSIDE) { 1164f38702e5SCameron Katri if (color && a > b) 1165f38702e5SCameron Katri printf("\033[%sm", add_code); 1166f38702e5SCameron Katri else if (color && c > d) 1167f38702e5SCameron Katri printf("\033[%sm", del_code); 116864793e74SBaptiste Daroussin if (a > b) { 1169*53de23f4SDag-Erling Smørgrav print_space(0, hw + lpad, *pflags); 117064793e74SBaptiste Daroussin } else { 117164793e74SBaptiste Daroussin nc = fetch(ixold, a, b, f1, '\0', 1, *pflags); 1172*53de23f4SDag-Erling Smørgrav print_space(nc, hw - nc + lpad, *pflags); 117364793e74SBaptiste Daroussin } 1174f38702e5SCameron Katri if (color && a > b) 1175f38702e5SCameron Katri printf("\033[%sm", add_code); 1176f38702e5SCameron Katri else if (color && c > d) 1177f38702e5SCameron Katri printf("\033[%sm", del_code); 11787a57c9cbSBaptiste Daroussin printf("%c", (a > b) ? '>' : ((c > d) ? '<' : '|')); 1179f38702e5SCameron Katri if (color && c > d) 1180f38702e5SCameron Katri printf("\033[m"); 1181*53de23f4SDag-Erling Smørgrav print_space(hw + lpad + 1, rpad, *pflags); 118264793e74SBaptiste Daroussin fetch(ixnew, c, d, f2, '\0', 0, *pflags); 11837a57c9cbSBaptiste Daroussin printf("\n"); 118464793e74SBaptiste Daroussin } 11853bbe3f67SBaptiste Daroussin if (diff_format == D_NORMAL || diff_format == D_IFDEF) { 11863bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '<', 1, *pflags); 11873bbe3f67SBaptiste Daroussin if (a <= b && c <= d && diff_format == D_NORMAL) 11887a57c9cbSBaptiste Daroussin printf("---\n"); 11893bbe3f67SBaptiste Daroussin } 119064793e74SBaptiste Daroussin if (diff_format != D_GFORMAT && diff_format != D_SIDEBYSIDE) 119164793e74SBaptiste Daroussin fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags); 119264793e74SBaptiste Daroussin if (edoffset != 0 && diff_format == D_EDIT) { 11933bbe3f67SBaptiste Daroussin /* 119403582021SPiotr Pawel Stefaniak * A non-zero edoffset value for D_EDIT indicates that the last line 119503582021SPiotr Pawel Stefaniak * printed was a bare dot (".") that has been escaped as ".." to 119603582021SPiotr Pawel Stefaniak * prevent ed(1) from misinterpreting it. We have to add a 119703582021SPiotr Pawel Stefaniak * substitute command to change this back and restart where we left 119803582021SPiotr Pawel Stefaniak * off. 11993bbe3f67SBaptiste Daroussin */ 12007a57c9cbSBaptiste Daroussin printf(".\n"); 12017a57c9cbSBaptiste Daroussin printf("%ds/.//\n", a + edoffset - 1); 120264793e74SBaptiste Daroussin b = a + edoffset - 1; 12033bbe3f67SBaptiste Daroussin a = b + 1; 120464793e74SBaptiste Daroussin c += edoffset; 12053bbe3f67SBaptiste Daroussin goto restart; 12063bbe3f67SBaptiste Daroussin } 12073bbe3f67SBaptiste Daroussin if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d) 12087a57c9cbSBaptiste Daroussin printf(".\n"); 12093bbe3f67SBaptiste Daroussin if (inifdef) { 12107a57c9cbSBaptiste Daroussin printf("#endif /* %s */\n", ifdefname); 12113bbe3f67SBaptiste Daroussin inifdef = 0; 12123bbe3f67SBaptiste Daroussin } 12133bbe3f67SBaptiste Daroussin } 12143bbe3f67SBaptiste Daroussin 12153bbe3f67SBaptiste Daroussin static int 12163bbe3f67SBaptiste Daroussin fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags) 12173bbe3f67SBaptiste Daroussin { 121864793e74SBaptiste Daroussin int i, j, c, lastc, col, nc, newcol; 12193bbe3f67SBaptiste Daroussin 122064793e74SBaptiste Daroussin edoffset = 0; 122164793e74SBaptiste Daroussin nc = 0; 12223bbe3f67SBaptiste Daroussin /* 12233bbe3f67SBaptiste Daroussin * When doing #ifdef's, copy down to current line 12243bbe3f67SBaptiste Daroussin * if this is the first file, so that stuff makes it to output. 12253bbe3f67SBaptiste Daroussin */ 1226fddcb7b8SBaptiste Daroussin if ((diff_format == D_IFDEF) && oldfile) { 12273bbe3f67SBaptiste Daroussin long curpos = ftell(lb); 12283bbe3f67SBaptiste Daroussin /* print through if append (a>b), else to (nb: 0 vs 1 orig) */ 12293bbe3f67SBaptiste Daroussin nc = f[a > b ? b : a - 1] - curpos; 12303bbe3f67SBaptiste Daroussin for (i = 0; i < nc; i++) 12317a57c9cbSBaptiste Daroussin printf("%c", getc(lb)); 12323bbe3f67SBaptiste Daroussin } 12333bbe3f67SBaptiste Daroussin if (a > b) 12343bbe3f67SBaptiste Daroussin return (0); 12353bbe3f67SBaptiste Daroussin if (diff_format == D_IFDEF) { 12363bbe3f67SBaptiste Daroussin if (inifdef) { 12377a57c9cbSBaptiste Daroussin printf("#else /* %s%s */\n", 12383bbe3f67SBaptiste Daroussin oldfile == 1 ? "!" : "", ifdefname); 12393bbe3f67SBaptiste Daroussin } else { 12403bbe3f67SBaptiste Daroussin if (oldfile) 12417a57c9cbSBaptiste Daroussin printf("#ifndef %s\n", ifdefname); 12423bbe3f67SBaptiste Daroussin else 12437a57c9cbSBaptiste Daroussin printf("#ifdef %s\n", ifdefname); 12443bbe3f67SBaptiste Daroussin } 12453bbe3f67SBaptiste Daroussin inifdef = 1 + oldfile; 12463bbe3f67SBaptiste Daroussin } 12473bbe3f67SBaptiste Daroussin for (i = a; i <= b; i++) { 12483bbe3f67SBaptiste Daroussin fseek(lb, f[i - 1], SEEK_SET); 124903582021SPiotr Pawel Stefaniak nc = f[i] - f[i - 1]; 125064793e74SBaptiste Daroussin if (diff_format == D_SIDEBYSIDE && hw < nc) 125164793e74SBaptiste Daroussin nc = hw; 125203582021SPiotr Pawel Stefaniak if (diff_format != D_IFDEF && diff_format != D_GFORMAT && 1253fddcb7b8SBaptiste Daroussin ch != '\0') { 1254f38702e5SCameron Katri if (color && (ch == '>' || ch == '+')) 1255f38702e5SCameron Katri printf("\033[%sm", add_code); 1256f38702e5SCameron Katri else if (color && (ch == '<' || ch == '-')) 1257f38702e5SCameron Katri printf("\033[%sm", del_code); 12587a57c9cbSBaptiste Daroussin printf("%c", ch); 125964793e74SBaptiste Daroussin if (Tflag && (diff_format == D_NORMAL || 126064793e74SBaptiste Daroussin diff_format == D_CONTEXT || 126164793e74SBaptiste Daroussin diff_format == D_UNIFIED)) 12627a57c9cbSBaptiste Daroussin printf("\t"); 12633bbe3f67SBaptiste Daroussin else if (diff_format != D_UNIFIED) 12647a57c9cbSBaptiste Daroussin printf(" "); 12653bbe3f67SBaptiste Daroussin } 126654d65fddSKyle Evans col = j = 0; 126754d65fddSKyle Evans lastc = '\0'; 126854d65fddSKyle Evans while (j < nc && (hw == 0 || col < hw)) { 1269af2f0164SPiotr Pawel Stefaniak c = getc(lb); 1270af2f0164SPiotr Pawel Stefaniak if (flags & D_STRIPCR && c == '\r') { 1271af2f0164SPiotr Pawel Stefaniak if ((c = getc(lb)) == '\n') 1272af2f0164SPiotr Pawel Stefaniak j++; 1273af2f0164SPiotr Pawel Stefaniak else { 1274af2f0164SPiotr Pawel Stefaniak ungetc(c, lb); 1275af2f0164SPiotr Pawel Stefaniak c = '\r'; 1276af2f0164SPiotr Pawel Stefaniak } 1277af2f0164SPiotr Pawel Stefaniak } 1278af2f0164SPiotr Pawel Stefaniak if (c == EOF) { 127964793e74SBaptiste Daroussin if (diff_format == D_EDIT || 128064793e74SBaptiste Daroussin diff_format == D_REVERSE || 12813bbe3f67SBaptiste Daroussin diff_format == D_NREVERSE) 12823bbe3f67SBaptiste Daroussin warnx("No newline at end of file"); 12833bbe3f67SBaptiste Daroussin else 128403582021SPiotr Pawel Stefaniak printf("\n\\ No newline at end of file\n"); 128503582021SPiotr Pawel Stefaniak return (col); 12863bbe3f67SBaptiste Daroussin } 128764793e74SBaptiste Daroussin if (c == '\t') { 1288*53de23f4SDag-Erling Smørgrav /* 1289*53de23f4SDag-Erling Smørgrav * Calculate where the tab would bring us. 1290*53de23f4SDag-Erling Smørgrav * If it would take us to the end of the 1291*53de23f4SDag-Erling Smørgrav * column, either clip it (if expanding 1292*53de23f4SDag-Erling Smørgrav * tabs) or return right away (if not). 1293*53de23f4SDag-Erling Smørgrav */ 1294*53de23f4SDag-Erling Smørgrav newcol = roundup(col + 1, tabsize); 1295*53de23f4SDag-Erling Smørgrav if ((flags & D_EXPANDTABS) == 0) { 1296*53de23f4SDag-Erling Smørgrav if (hw > 0 && newcol >= hw) 1297*53de23f4SDag-Erling Smørgrav return (col); 12987a57c9cbSBaptiste Daroussin printf("\t"); 129964793e74SBaptiste Daroussin } else { 1300*53de23f4SDag-Erling Smørgrav if (hw > 0 && newcol > hw) 1301*53de23f4SDag-Erling Smørgrav newcol = hw; 1302*53de23f4SDag-Erling Smørgrav printf("%*s", newcol - col, ""); 130364793e74SBaptiste Daroussin } 1304*53de23f4SDag-Erling Smørgrav col = newcol; 13053bbe3f67SBaptiste Daroussin } else { 130603582021SPiotr Pawel Stefaniak if (diff_format == D_EDIT && j == 1 && c == '\n' && 130703582021SPiotr Pawel Stefaniak lastc == '.') { 13083bbe3f67SBaptiste Daroussin /* 130903582021SPiotr Pawel Stefaniak * Don't print a bare "." line since that will confuse 131003582021SPiotr Pawel Stefaniak * ed(1). Print ".." instead and set the, global variable 131103582021SPiotr Pawel Stefaniak * edoffset to an offset from which to restart. The 131203582021SPiotr Pawel Stefaniak * caller must check the value of edoffset 13133bbe3f67SBaptiste Daroussin */ 13147a57c9cbSBaptiste Daroussin printf(".\n"); 131564793e74SBaptiste Daroussin edoffset = i - a + 1; 131603582021SPiotr Pawel Stefaniak return (edoffset); 13173bbe3f67SBaptiste Daroussin } 131864793e74SBaptiste Daroussin /* when side-by-side, do not print a newline */ 131964793e74SBaptiste Daroussin if (diff_format != D_SIDEBYSIDE || c != '\n') { 1320f38702e5SCameron Katri if (color && c == '\n') 1321f38702e5SCameron Katri printf("\033[m%c", c); 1322f38702e5SCameron Katri else 13237a57c9cbSBaptiste Daroussin printf("%c", c); 13243bbe3f67SBaptiste Daroussin col++; 13253bbe3f67SBaptiste Daroussin } 13263bbe3f67SBaptiste Daroussin } 132754d65fddSKyle Evans 132854d65fddSKyle Evans j++; 132954d65fddSKyle Evans lastc = c; 13303bbe3f67SBaptiste Daroussin } 133164793e74SBaptiste Daroussin } 1332f38702e5SCameron Katri if (color && diff_format == D_SIDEBYSIDE) 1333f38702e5SCameron Katri printf("\033[m"); 133403582021SPiotr Pawel Stefaniak return (col); 13353bbe3f67SBaptiste Daroussin } 13363bbe3f67SBaptiste Daroussin 13373bbe3f67SBaptiste Daroussin /* 13383bbe3f67SBaptiste Daroussin * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578. 13393bbe3f67SBaptiste Daroussin */ 13403cbf98e2SPiotr Pawel Stefaniak static enum readhash 13413cbf98e2SPiotr Pawel Stefaniak readhash(FILE *f, int flags, unsigned *hash) 13423bbe3f67SBaptiste Daroussin { 13433bbe3f67SBaptiste Daroussin int i, t, space; 1344c78f449dSAlex Richardson unsigned sum; 13453bbe3f67SBaptiste Daroussin 13463bbe3f67SBaptiste Daroussin sum = 1; 13473bbe3f67SBaptiste Daroussin space = 0; 13483bbe3f67SBaptiste Daroussin for (i = 0;;) { 13493bbe3f67SBaptiste Daroussin switch (t = getc(f)) { 13503cbf98e2SPiotr Pawel Stefaniak case '\0': 13513cbf98e2SPiotr Pawel Stefaniak if ((flags & D_FORCEASCII) == 0) 13523cbf98e2SPiotr Pawel Stefaniak return (RH_BINARY); 13534e077171SJohn Baldwin goto hashchar; 13543bbe3f67SBaptiste Daroussin case '\r': 1355e43239f5SBaptiste Daroussin if (flags & D_STRIPCR) { 1356e43239f5SBaptiste Daroussin t = getc(f); 1357e43239f5SBaptiste Daroussin if (t == '\n') 1358e43239f5SBaptiste Daroussin break; 1359e43239f5SBaptiste Daroussin ungetc(t, f); 1360e43239f5SBaptiste Daroussin } 1361e43239f5SBaptiste Daroussin /* FALLTHROUGH */ 13623bbe3f67SBaptiste Daroussin case '\t': 13633bbe3f67SBaptiste Daroussin case '\v': 13643bbe3f67SBaptiste Daroussin case '\f': 13653bbe3f67SBaptiste Daroussin case ' ': 1366e43239f5SBaptiste Daroussin if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) != 0) { 13673bbe3f67SBaptiste Daroussin space++; 13683bbe3f67SBaptiste Daroussin continue; 1369e43239f5SBaptiste Daroussin } 1370e43239f5SBaptiste Daroussin /* FALLTHROUGH */ 13713bbe3f67SBaptiste Daroussin default: 13724e077171SJohn Baldwin hashchar: 13733bbe3f67SBaptiste Daroussin if (space && (flags & D_IGNOREBLANKS) == 0) { 13743bbe3f67SBaptiste Daroussin i++; 13753bbe3f67SBaptiste Daroussin space = 0; 13763bbe3f67SBaptiste Daroussin } 13770118df5eSBaptiste Daroussin sum = sum * 127 + chrtran(t); 13783bbe3f67SBaptiste Daroussin i++; 13793bbe3f67SBaptiste Daroussin continue; 13803bbe3f67SBaptiste Daroussin case EOF: 13813bbe3f67SBaptiste Daroussin if (i == 0) 13823cbf98e2SPiotr Pawel Stefaniak return (RH_EOF); 13833bbe3f67SBaptiste Daroussin /* FALLTHROUGH */ 13843bbe3f67SBaptiste Daroussin case '\n': 13853bbe3f67SBaptiste Daroussin break; 13863bbe3f67SBaptiste Daroussin } 13873bbe3f67SBaptiste Daroussin break; 13883bbe3f67SBaptiste Daroussin } 13893cbf98e2SPiotr Pawel Stefaniak *hash = sum; 13903cbf98e2SPiotr Pawel Stefaniak return (RH_OK); 13913bbe3f67SBaptiste Daroussin } 13923bbe3f67SBaptiste Daroussin 13933bbe3f67SBaptiste Daroussin static int 13943bbe3f67SBaptiste Daroussin asciifile(FILE *f) 13953bbe3f67SBaptiste Daroussin { 13963bbe3f67SBaptiste Daroussin unsigned char buf[BUFSIZ]; 13973bbe3f67SBaptiste Daroussin size_t cnt; 13983bbe3f67SBaptiste Daroussin 13993bbe3f67SBaptiste Daroussin if (f == NULL) 14003bbe3f67SBaptiste Daroussin return (1); 14013bbe3f67SBaptiste Daroussin 14023bbe3f67SBaptiste Daroussin rewind(f); 14033bbe3f67SBaptiste Daroussin cnt = fread(buf, 1, sizeof(buf), f); 14043bbe3f67SBaptiste Daroussin return (memchr(buf, '\0', cnt) == NULL); 14053bbe3f67SBaptiste Daroussin } 14063bbe3f67SBaptiste Daroussin 14073bbe3f67SBaptiste Daroussin #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre) - 1) == 0) 14083bbe3f67SBaptiste Daroussin 14093bbe3f67SBaptiste Daroussin static char * 14103bbe3f67SBaptiste Daroussin match_function(const long *f, int pos, FILE *fp) 14113bbe3f67SBaptiste Daroussin { 14123bbe3f67SBaptiste Daroussin unsigned char buf[FUNCTION_CONTEXT_SIZE]; 14133bbe3f67SBaptiste Daroussin size_t nc; 14143bbe3f67SBaptiste Daroussin int last = lastline; 14153bbe3f67SBaptiste Daroussin const char *state = NULL; 14163bbe3f67SBaptiste Daroussin 14173bbe3f67SBaptiste Daroussin lastline = pos; 14187760b854SPiotr Pawel Stefaniak for (; pos > last; pos--) { 14193bbe3f67SBaptiste Daroussin fseek(fp, f[pos - 1], SEEK_SET); 14203bbe3f67SBaptiste Daroussin nc = f[pos] - f[pos - 1]; 14213bbe3f67SBaptiste Daroussin if (nc >= sizeof(buf)) 14223bbe3f67SBaptiste Daroussin nc = sizeof(buf) - 1; 14233bbe3f67SBaptiste Daroussin nc = fread(buf, 1, nc, fp); 14247760b854SPiotr Pawel Stefaniak if (nc == 0) 14257760b854SPiotr Pawel Stefaniak continue; 14263bbe3f67SBaptiste Daroussin buf[nc] = '\0'; 14273bbe3f67SBaptiste Daroussin buf[strcspn(buf, "\n")] = '\0'; 1428e51aabf8SPiotr Pawel Stefaniak if (most_recent_pat != NULL) { 1429e51aabf8SPiotr Pawel Stefaniak int ret = regexec(&most_recent_re, buf, 0, NULL, 0); 1430e51aabf8SPiotr Pawel Stefaniak 1431e51aabf8SPiotr Pawel Stefaniak if (ret != 0) 1432e51aabf8SPiotr Pawel Stefaniak continue; 1433e51aabf8SPiotr Pawel Stefaniak strlcpy(lastbuf, buf, sizeof(lastbuf)); 1434e51aabf8SPiotr Pawel Stefaniak lastmatchline = pos; 1435e51aabf8SPiotr Pawel Stefaniak return (lastbuf); 14368f79bd9bSTom Jones } else if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$' 14378f79bd9bSTom Jones || buf[0] == '-' || buf[0] == '+') { 14383bbe3f67SBaptiste Daroussin if (begins_with(buf, "private:")) { 14393bbe3f67SBaptiste Daroussin if (!state) 14403bbe3f67SBaptiste Daroussin state = " (private)"; 14413bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "protected:")) { 14423bbe3f67SBaptiste Daroussin if (!state) 14433bbe3f67SBaptiste Daroussin state = " (protected)"; 14443bbe3f67SBaptiste Daroussin } else if (begins_with(buf, "public:")) { 14453bbe3f67SBaptiste Daroussin if (!state) 14463bbe3f67SBaptiste Daroussin state = " (public)"; 14473bbe3f67SBaptiste Daroussin } else { 144803582021SPiotr Pawel Stefaniak strlcpy(lastbuf, buf, sizeof(lastbuf)); 14493bbe3f67SBaptiste Daroussin if (state) 145003582021SPiotr Pawel Stefaniak strlcat(lastbuf, state, sizeof(lastbuf)); 14513bbe3f67SBaptiste Daroussin lastmatchline = pos; 145203582021SPiotr Pawel Stefaniak return (lastbuf); 14533bbe3f67SBaptiste Daroussin } 14543bbe3f67SBaptiste Daroussin } 14553bbe3f67SBaptiste Daroussin } 145603582021SPiotr Pawel Stefaniak return (lastmatchline > 0 ? lastbuf : NULL); 14573bbe3f67SBaptiste Daroussin } 14583bbe3f67SBaptiste Daroussin 14593bbe3f67SBaptiste Daroussin /* dump accumulated "context" diff changes */ 14603bbe3f67SBaptiste Daroussin static void 14613bbe3f67SBaptiste Daroussin dump_context_vec(FILE *f1, FILE *f2, int flags) 14623bbe3f67SBaptiste Daroussin { 14633bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 14643bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd, do_output; 14653bbe3f67SBaptiste Daroussin int a, b, c, d; 14663bbe3f67SBaptiste Daroussin char ch, *f; 14673bbe3f67SBaptiste Daroussin 14683bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 14693bbe3f67SBaptiste Daroussin return; 14703bbe3f67SBaptiste Daroussin 14713bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 147242c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 147342c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 147442c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 147542c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 14763bbe3f67SBaptiste Daroussin 14777a57c9cbSBaptiste Daroussin printf("***************"); 1478e51aabf8SPiotr Pawel Stefaniak if (flags & (D_PROTOTYPE | D_MATCHLAST)) { 14794be7d087STom Jones f = match_function(ixold, cvp->a - 1, f1); 14803bbe3f67SBaptiste Daroussin if (f != NULL) 14817a57c9cbSBaptiste Daroussin printf(" %s", f); 14823bbe3f67SBaptiste Daroussin } 14837a57c9cbSBaptiste Daroussin printf("\n*** "); 14843bbe3f67SBaptiste Daroussin range(lowa, upb, ","); 14857a57c9cbSBaptiste Daroussin printf(" ****\n"); 14863bbe3f67SBaptiste Daroussin 14873bbe3f67SBaptiste Daroussin /* 14883bbe3f67SBaptiste Daroussin * Output changes to the "old" file. The first loop suppresses 14893bbe3f67SBaptiste Daroussin * output if there were no changes to the "old" file (we'll see 14903bbe3f67SBaptiste Daroussin * the "old" lines as context in the "new" list). 14913bbe3f67SBaptiste Daroussin */ 14923bbe3f67SBaptiste Daroussin do_output = 0; 14933bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) 14943bbe3f67SBaptiste Daroussin if (cvp->a <= cvp->b) { 14953bbe3f67SBaptiste Daroussin cvp = context_vec_start; 14963bbe3f67SBaptiste Daroussin do_output++; 14973bbe3f67SBaptiste Daroussin break; 14983bbe3f67SBaptiste Daroussin } 14993bbe3f67SBaptiste Daroussin if (do_output) { 15003bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 15013bbe3f67SBaptiste Daroussin a = cvp->a; 15023bbe3f67SBaptiste Daroussin b = cvp->b; 15033bbe3f67SBaptiste Daroussin c = cvp->c; 15043bbe3f67SBaptiste Daroussin d = cvp->d; 15053bbe3f67SBaptiste Daroussin 15063bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15073bbe3f67SBaptiste Daroussin ch = 'c'; 15083bbe3f67SBaptiste Daroussin else 15093bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15103bbe3f67SBaptiste Daroussin 15113bbe3f67SBaptiste Daroussin if (ch == 'a') 15123bbe3f67SBaptiste Daroussin fetch(ixold, lowa, b, f1, ' ', 0, flags); 15133bbe3f67SBaptiste Daroussin else { 15143bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 15153bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, 15163bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '-', 0, flags); 15173bbe3f67SBaptiste Daroussin } 15183bbe3f67SBaptiste Daroussin lowa = b + 1; 15193bbe3f67SBaptiste Daroussin cvp++; 15203bbe3f67SBaptiste Daroussin } 15213bbe3f67SBaptiste Daroussin fetch(ixold, b + 1, upb, f1, ' ', 0, flags); 15223bbe3f67SBaptiste Daroussin } 15233bbe3f67SBaptiste Daroussin /* output changes to the "new" file */ 15247a57c9cbSBaptiste Daroussin printf("--- "); 15253bbe3f67SBaptiste Daroussin range(lowc, upd, ","); 15267a57c9cbSBaptiste Daroussin printf(" ----\n"); 15273bbe3f67SBaptiste Daroussin 15283bbe3f67SBaptiste Daroussin do_output = 0; 15293bbe3f67SBaptiste Daroussin for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++) 15303bbe3f67SBaptiste Daroussin if (cvp->c <= cvp->d) { 15313bbe3f67SBaptiste Daroussin cvp = context_vec_start; 15323bbe3f67SBaptiste Daroussin do_output++; 15333bbe3f67SBaptiste Daroussin break; 15343bbe3f67SBaptiste Daroussin } 15353bbe3f67SBaptiste Daroussin if (do_output) { 15363bbe3f67SBaptiste Daroussin while (cvp <= context_vec_ptr) { 15373bbe3f67SBaptiste Daroussin a = cvp->a; 15383bbe3f67SBaptiste Daroussin b = cvp->b; 15393bbe3f67SBaptiste Daroussin c = cvp->c; 15403bbe3f67SBaptiste Daroussin d = cvp->d; 15413bbe3f67SBaptiste Daroussin 15423bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 15433bbe3f67SBaptiste Daroussin ch = 'c'; 15443bbe3f67SBaptiste Daroussin else 15453bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 15463bbe3f67SBaptiste Daroussin 15473bbe3f67SBaptiste Daroussin if (ch == 'd') 15483bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, d, f2, ' ', 0, flags); 15493bbe3f67SBaptiste Daroussin else { 15503bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 15513bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, 15523bbe3f67SBaptiste Daroussin ch == 'c' ? '!' : '+', 0, flags); 15533bbe3f67SBaptiste Daroussin } 15543bbe3f67SBaptiste Daroussin lowc = d + 1; 15553bbe3f67SBaptiste Daroussin cvp++; 15563bbe3f67SBaptiste Daroussin } 15573bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 15583bbe3f67SBaptiste Daroussin } 15593bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 15603bbe3f67SBaptiste Daroussin } 15613bbe3f67SBaptiste Daroussin 15623bbe3f67SBaptiste Daroussin /* dump accumulated "unified" diff changes */ 15633bbe3f67SBaptiste Daroussin static void 15643bbe3f67SBaptiste Daroussin dump_unified_vec(FILE *f1, FILE *f2, int flags) 15653bbe3f67SBaptiste Daroussin { 15663bbe3f67SBaptiste Daroussin struct context_vec *cvp = context_vec_start; 15673bbe3f67SBaptiste Daroussin int lowa, upb, lowc, upd; 15683bbe3f67SBaptiste Daroussin int a, b, c, d; 15693bbe3f67SBaptiste Daroussin char ch, *f; 15703bbe3f67SBaptiste Daroussin 15713bbe3f67SBaptiste Daroussin if (context_vec_start > context_vec_ptr) 15723bbe3f67SBaptiste Daroussin return; 15733bbe3f67SBaptiste Daroussin 15743bbe3f67SBaptiste Daroussin b = d = 0; /* gcc */ 157542c88c41SBaptiste Daroussin lowa = MAX(1, cvp->a - diff_context); 157642c88c41SBaptiste Daroussin upb = MIN(len[0], context_vec_ptr->b + diff_context); 157742c88c41SBaptiste Daroussin lowc = MAX(1, cvp->c - diff_context); 157842c88c41SBaptiste Daroussin upd = MIN(len[1], context_vec_ptr->d + diff_context); 15793bbe3f67SBaptiste Daroussin 15807a57c9cbSBaptiste Daroussin printf("@@ -"); 15813bbe3f67SBaptiste Daroussin uni_range(lowa, upb); 15827a57c9cbSBaptiste Daroussin printf(" +"); 15833bbe3f67SBaptiste Daroussin uni_range(lowc, upd); 15847a57c9cbSBaptiste Daroussin printf(" @@"); 1585e51aabf8SPiotr Pawel Stefaniak if (flags & (D_PROTOTYPE | D_MATCHLAST)) { 15864be7d087STom Jones f = match_function(ixold, cvp->a - 1, f1); 15873bbe3f67SBaptiste Daroussin if (f != NULL) 15887a57c9cbSBaptiste Daroussin printf(" %s", f); 15893bbe3f67SBaptiste Daroussin } 15907a57c9cbSBaptiste Daroussin printf("\n"); 15913bbe3f67SBaptiste Daroussin 15923bbe3f67SBaptiste Daroussin /* 15933bbe3f67SBaptiste Daroussin * Output changes in "unified" diff format--the old and new lines 15943bbe3f67SBaptiste Daroussin * are printed together. 15953bbe3f67SBaptiste Daroussin */ 15963bbe3f67SBaptiste Daroussin for (; cvp <= context_vec_ptr; cvp++) { 15973bbe3f67SBaptiste Daroussin a = cvp->a; 15983bbe3f67SBaptiste Daroussin b = cvp->b; 15993bbe3f67SBaptiste Daroussin c = cvp->c; 16003bbe3f67SBaptiste Daroussin d = cvp->d; 16013bbe3f67SBaptiste Daroussin 16023bbe3f67SBaptiste Daroussin /* 16033bbe3f67SBaptiste Daroussin * c: both new and old changes 16043bbe3f67SBaptiste Daroussin * d: only changes in the old file 16053bbe3f67SBaptiste Daroussin * a: only changes in the new file 16063bbe3f67SBaptiste Daroussin */ 16073bbe3f67SBaptiste Daroussin if (a <= b && c <= d) 16083bbe3f67SBaptiste Daroussin ch = 'c'; 16093bbe3f67SBaptiste Daroussin else 16103bbe3f67SBaptiste Daroussin ch = (a <= b) ? 'd' : 'a'; 16113bbe3f67SBaptiste Daroussin 16123bbe3f67SBaptiste Daroussin switch (ch) { 16133bbe3f67SBaptiste Daroussin case 'c': 16143bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 16153bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 16163bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 16173bbe3f67SBaptiste Daroussin break; 16183bbe3f67SBaptiste Daroussin case 'd': 16193bbe3f67SBaptiste Daroussin fetch(ixold, lowa, a - 1, f1, ' ', 0, flags); 16203bbe3f67SBaptiste Daroussin fetch(ixold, a, b, f1, '-', 0, flags); 16213bbe3f67SBaptiste Daroussin break; 16223bbe3f67SBaptiste Daroussin case 'a': 16233bbe3f67SBaptiste Daroussin fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags); 16243bbe3f67SBaptiste Daroussin fetch(ixnew, c, d, f2, '+', 0, flags); 16253bbe3f67SBaptiste Daroussin break; 16263bbe3f67SBaptiste Daroussin } 16273bbe3f67SBaptiste Daroussin lowa = b + 1; 16283bbe3f67SBaptiste Daroussin lowc = d + 1; 16293bbe3f67SBaptiste Daroussin } 16303bbe3f67SBaptiste Daroussin fetch(ixnew, d + 1, upd, f2, ' ', 0, flags); 16313bbe3f67SBaptiste Daroussin 16323bbe3f67SBaptiste Daroussin context_vec_ptr = context_vec_start - 1; 16333bbe3f67SBaptiste Daroussin } 16343bbe3f67SBaptiste Daroussin 16353bbe3f67SBaptiste Daroussin static void 16363bbe3f67SBaptiste Daroussin print_header(const char *file1, const char *file2) 16373bbe3f67SBaptiste Daroussin { 16383bbe3f67SBaptiste Daroussin const char *time_format; 16396100374cSJohn Baldwin char buf[256]; 164058cf4d86SJilles Tjoelker struct tm tm1, tm2, *tm_ptr1, *tm_ptr2; 1641385a67dcSJilles Tjoelker int nsec1 = stb1.st_mtim.tv_nsec; 1642385a67dcSJilles Tjoelker int nsec2 = stb2.st_mtim.tv_nsec; 16433bbe3f67SBaptiste Daroussin 16443bbe3f67SBaptiste Daroussin time_format = "%Y-%m-%d %H:%M:%S"; 16453bbe3f67SBaptiste Daroussin 16463bbe3f67SBaptiste Daroussin if (cflag) 16473bbe3f67SBaptiste Daroussin time_format = "%c"; 164858cf4d86SJilles Tjoelker tm_ptr1 = localtime_r(&stb1.st_mtime, &tm1); 164958cf4d86SJilles Tjoelker tm_ptr2 = localtime_r(&stb2.st_mtime, &tm2); 16503bbe3f67SBaptiste Daroussin if (label[0] != NULL) 16517a57c9cbSBaptiste Daroussin printf("%s %s\n", diff_format == D_CONTEXT ? "***" : "---", 16523bbe3f67SBaptiste Daroussin label[0]); 16536100374cSJohn Baldwin else { 16546100374cSJohn Baldwin strftime(buf, sizeof(buf), time_format, tm_ptr1); 16556100374cSJohn Baldwin printf("%s %s\t%s", diff_format == D_CONTEXT ? "***" : "---", 16566100374cSJohn Baldwin file1, buf); 16576100374cSJohn Baldwin if (!cflag) { 16586100374cSJohn Baldwin strftime(buf, sizeof(buf), "%z", tm_ptr1); 16596100374cSJohn Baldwin printf(".%.9d %s", nsec1, buf); 16606100374cSJohn Baldwin } 16616100374cSJohn Baldwin printf("\n"); 16626100374cSJohn Baldwin } 16633bbe3f67SBaptiste Daroussin if (label[1] != NULL) 16647a57c9cbSBaptiste Daroussin printf("%s %s\n", diff_format == D_CONTEXT ? "---" : "+++", 16653bbe3f67SBaptiste Daroussin label[1]); 16666100374cSJohn Baldwin else { 16676100374cSJohn Baldwin strftime(buf, sizeof(buf), time_format, tm_ptr2); 16686100374cSJohn Baldwin printf("%s %s\t%s", diff_format == D_CONTEXT ? "---" : "+++", 16696100374cSJohn Baldwin file2, buf); 16706100374cSJohn Baldwin if (!cflag) { 16716100374cSJohn Baldwin strftime(buf, sizeof(buf), "%z", tm_ptr2); 16726100374cSJohn Baldwin printf(".%.9d %s", nsec2, buf); 16736100374cSJohn Baldwin } 16746100374cSJohn Baldwin printf("\n"); 16756100374cSJohn Baldwin } 16763bbe3f67SBaptiste Daroussin } 167764793e74SBaptiste Daroussin 167864793e74SBaptiste Daroussin /* 167964793e74SBaptiste Daroussin * Prints n number of space characters either by using tab 168064793e74SBaptiste Daroussin * or single space characters. 168164793e74SBaptiste Daroussin * nc is the preceding number of characters 168264793e74SBaptiste Daroussin */ 168364793e74SBaptiste Daroussin static void 1684*53de23f4SDag-Erling Smørgrav print_space(int nc, int n, int flags) 1685*53de23f4SDag-Erling Smørgrav { 1686*53de23f4SDag-Erling Smørgrav int col, newcol, tabstop; 168764793e74SBaptiste Daroussin 1688*53de23f4SDag-Erling Smørgrav col = nc; 1689*53de23f4SDag-Erling Smørgrav newcol = nc + n; 1690*53de23f4SDag-Erling Smørgrav /* first, use tabs if allowed */ 169164793e74SBaptiste Daroussin if ((flags & D_EXPANDTABS) == 0) { 1692*53de23f4SDag-Erling Smørgrav while ((tabstop = roundup(col + 1, tabsize)) <= newcol) { 16937a57c9cbSBaptiste Daroussin printf("\t"); 1694*53de23f4SDag-Erling Smørgrav col = tabstop; 169564793e74SBaptiste Daroussin } 169664793e74SBaptiste Daroussin } 1697*53de23f4SDag-Erling Smørgrav /* finish with spaces */ 1698*53de23f4SDag-Erling Smørgrav printf("%*s", newcol - col, ""); 169964793e74SBaptiste Daroussin } 1700