1 574ed2c3 2017-11-29 stsp /* $OpenBSD: diffreg.c,v 1.91 2016/03/01 20:57:35 natano Exp $ */
4 574ed2c3 2017-11-29 stsp * Copyright (C) Caldera International Inc. 2001-2002.
5 574ed2c3 2017-11-29 stsp * All rights reserved.
7 574ed2c3 2017-11-29 stsp * Redistribution and use in source and binary forms, with or without
8 574ed2c3 2017-11-29 stsp * modification, are permitted provided that the following conditions
10 574ed2c3 2017-11-29 stsp * 1. Redistributions of source code and documentation must retain the above
11 574ed2c3 2017-11-29 stsp * copyright notice, this list of conditions and the following disclaimer.
12 574ed2c3 2017-11-29 stsp * 2. Redistributions in binary form must reproduce the above copyright
13 574ed2c3 2017-11-29 stsp * notice, this list of conditions and the following disclaimer in the
14 574ed2c3 2017-11-29 stsp * documentation and/or other materials provided with the distribution.
15 574ed2c3 2017-11-29 stsp * 3. All advertising materials mentioning features or use of this software
16 574ed2c3 2017-11-29 stsp * must display the following acknowledgement:
17 574ed2c3 2017-11-29 stsp * This product includes software developed or owned by Caldera
18 574ed2c3 2017-11-29 stsp * International, Inc.
19 574ed2c3 2017-11-29 stsp * 4. Neither the name of Caldera International, Inc. nor the names of other
20 574ed2c3 2017-11-29 stsp * contributors may be used to endorse or promote products derived from
21 574ed2c3 2017-11-29 stsp * this software without specific prior written permission.
23 574ed2c3 2017-11-29 stsp * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24 574ed2c3 2017-11-29 stsp * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25 574ed2c3 2017-11-29 stsp * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 574ed2c3 2017-11-29 stsp * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 574ed2c3 2017-11-29 stsp * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28 574ed2c3 2017-11-29 stsp * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29 574ed2c3 2017-11-29 stsp * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30 574ed2c3 2017-11-29 stsp * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 574ed2c3 2017-11-29 stsp * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32 574ed2c3 2017-11-29 stsp * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33 574ed2c3 2017-11-29 stsp * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 574ed2c3 2017-11-29 stsp * POSSIBILITY OF SUCH DAMAGE.
37 574ed2c3 2017-11-29 stsp * Copyright (c) 1991, 1993
38 574ed2c3 2017-11-29 stsp * The Regents of the University of California. All rights reserved.
40 574ed2c3 2017-11-29 stsp * Redistribution and use in source and binary forms, with or without
41 574ed2c3 2017-11-29 stsp * modification, are permitted provided that the following conditions
43 574ed2c3 2017-11-29 stsp * 1. Redistributions of source code must retain the above copyright
44 574ed2c3 2017-11-29 stsp * notice, this list of conditions and the following disclaimer.
45 574ed2c3 2017-11-29 stsp * 2. Redistributions in binary form must reproduce the above copyright
46 574ed2c3 2017-11-29 stsp * notice, this list of conditions and the following disclaimer in the
47 574ed2c3 2017-11-29 stsp * documentation and/or other materials provided with the distribution.
48 574ed2c3 2017-11-29 stsp * 3. Neither the name of the University nor the names of its contributors
49 574ed2c3 2017-11-29 stsp * may be used to endorse or promote products derived from this software
50 574ed2c3 2017-11-29 stsp * without specific prior written permission.
52 574ed2c3 2017-11-29 stsp * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53 574ed2c3 2017-11-29 stsp * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54 574ed2c3 2017-11-29 stsp * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55 574ed2c3 2017-11-29 stsp * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56 574ed2c3 2017-11-29 stsp * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57 574ed2c3 2017-11-29 stsp * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 574ed2c3 2017-11-29 stsp * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 574ed2c3 2017-11-29 stsp * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 574ed2c3 2017-11-29 stsp * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 574ed2c3 2017-11-29 stsp * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
62 574ed2c3 2017-11-29 stsp * SUCH DAMAGE.
64 574ed2c3 2017-11-29 stsp * @(#)diffreg.c 8.1 (Berkeley) 6/6/93
67 574ed2c3 2017-11-29 stsp #include <sys/stat.h>
68 574ed2c3 2017-11-29 stsp #include <sys/wait.h>
69 7d283eee 2017-11-29 stsp #include <sys/queue.h>
71 574ed2c3 2017-11-29 stsp #include <ctype.h>
72 574ed2c3 2017-11-29 stsp #include <err.h>
73 574ed2c3 2017-11-29 stsp #include <errno.h>
74 574ed2c3 2017-11-29 stsp #include <fcntl.h>
75 574ed2c3 2017-11-29 stsp #include <paths.h>
76 574ed2c3 2017-11-29 stsp #include <stddef.h>
77 574ed2c3 2017-11-29 stsp #include <stdint.h>
78 574ed2c3 2017-11-29 stsp #include <stdio.h>
79 574ed2c3 2017-11-29 stsp #include <stdlib.h>
80 574ed2c3 2017-11-29 stsp #include <string.h>
81 574ed2c3 2017-11-29 stsp #include <unistd.h>
82 574ed2c3 2017-11-29 stsp #include <limits.h>
83 7d283eee 2017-11-29 stsp #include <sha1.h>
84 7d283eee 2017-11-29 stsp #include <zlib.h>
86 7d283eee 2017-11-29 stsp #include "got_error.h"
87 7d283eee 2017-11-29 stsp #include "got_object.h"
88 7d283eee 2017-11-29 stsp #include "got_diff.h"
90 574ed2c3 2017-11-29 stsp #include "diff.h"
91 574ed2c3 2017-11-29 stsp #include "xmalloc.h"
93 574ed2c3 2017-11-29 stsp #define MINIMUM(a, b) (((a) < (b)) ? (a) : (b))
94 574ed2c3 2017-11-29 stsp #define MAXIMUM(a, b) (((a) > (b)) ? (a) : (b))
97 574ed2c3 2017-11-29 stsp * diff - compare two files.
101 574ed2c3 2017-11-29 stsp * Uses an algorithm due to Harold Stone, which finds
102 574ed2c3 2017-11-29 stsp * a pair of longest identical subsequences in the two
105 574ed2c3 2017-11-29 stsp * The major goal is to generate the match vector J.
106 574ed2c3 2017-11-29 stsp * J[i] is the index of the line in file1 corresponding
107 574ed2c3 2017-11-29 stsp * to line i file0. J[i] = 0 if there is no
108 574ed2c3 2017-11-29 stsp * such line in file1.
110 574ed2c3 2017-11-29 stsp * Lines are hashed so as to work in core. All potential
111 574ed2c3 2017-11-29 stsp * matches are located by sorting the lines of each file
112 574ed2c3 2017-11-29 stsp * on the hash (called ``value''). In particular, this
113 574ed2c3 2017-11-29 stsp * collects the equivalence classes in file1 together.
114 574ed2c3 2017-11-29 stsp * Subroutine equiv replaces the value of each line in
115 574ed2c3 2017-11-29 stsp * file0 by the index of the first element of its
116 574ed2c3 2017-11-29 stsp * matching equivalence in (the reordered) file1.
117 574ed2c3 2017-11-29 stsp * To save space equiv squeezes file1 into a single
118 574ed2c3 2017-11-29 stsp * array member in which the equivalence classes
119 574ed2c3 2017-11-29 stsp * are simply concatenated, except that their first
120 574ed2c3 2017-11-29 stsp * members are flagged by changing sign.
122 574ed2c3 2017-11-29 stsp * Next the indices that point into member are unsorted into
123 574ed2c3 2017-11-29 stsp * array class according to the original order of file0.
125 574ed2c3 2017-11-29 stsp * The cleverness lies in routine stone. This marches
126 574ed2c3 2017-11-29 stsp * through the lines of file0, developing a vector klist
127 574ed2c3 2017-11-29 stsp * of "k-candidates". At step i a k-candidate is a matched
128 574ed2c3 2017-11-29 stsp * pair of lines x,y (x in file0 y in file1) such that
129 574ed2c3 2017-11-29 stsp * there is a common subsequence of length k
130 574ed2c3 2017-11-29 stsp * between the first i lines of file0 and the first y
131 574ed2c3 2017-11-29 stsp * lines of file1, but there is no such subsequence for
132 574ed2c3 2017-11-29 stsp * any smaller y. x is the earliest possible mate to y
133 574ed2c3 2017-11-29 stsp * that occurs in such a subsequence.
135 574ed2c3 2017-11-29 stsp * Whenever any of the members of the equivalence class of
136 574ed2c3 2017-11-29 stsp * lines in file1 matable to a line in file0 has serial number
137 574ed2c3 2017-11-29 stsp * less than the y of some k-candidate, that k-candidate
138 574ed2c3 2017-11-29 stsp * with the smallest such y is replaced. The new
139 574ed2c3 2017-11-29 stsp * k-candidate is chained (via pred) to the current
140 574ed2c3 2017-11-29 stsp * k-1 candidate so that the actual subsequence can
141 574ed2c3 2017-11-29 stsp * be recovered. When a member has serial number greater
142 574ed2c3 2017-11-29 stsp * that the y of all k-candidates, the klist is extended.
143 574ed2c3 2017-11-29 stsp * At the end, the longest subsequence is pulled out
144 574ed2c3 2017-11-29 stsp * and placed in the array J by unravel
146 574ed2c3 2017-11-29 stsp * With J in hand, the matches there recorded are
147 574ed2c3 2017-11-29 stsp * check'ed against reality to assure that no spurious
148 574ed2c3 2017-11-29 stsp * matches have crept in due to hashing. If they have,
149 574ed2c3 2017-11-29 stsp * they are broken, and "jackpot" is recorded--a harmless
150 574ed2c3 2017-11-29 stsp * matter except that a true match for a spuriously
151 574ed2c3 2017-11-29 stsp * mated line may now be unnecessarily reported as a change.
153 574ed2c3 2017-11-29 stsp * Much of the complexity of the program comes simply
154 574ed2c3 2017-11-29 stsp * from trying to minimize core utilization and
155 574ed2c3 2017-11-29 stsp * maximize the range of doable problems by dynamically
156 574ed2c3 2017-11-29 stsp * allocating what is needed and reusing what is not.
157 574ed2c3 2017-11-29 stsp * The core requirements for problems larger than somewhat
158 574ed2c3 2017-11-29 stsp * are (in words) 2*length(file0) + length(file1) +
159 574ed2c3 2017-11-29 stsp * 3*(number of k-candidates installed), typically about
160 574ed2c3 2017-11-29 stsp * 6n words for files of length n.
163 574ed2c3 2017-11-29 stsp struct cand {
169 574ed2c3 2017-11-29 stsp struct line {
170 574ed2c3 2017-11-29 stsp int serial;
175 574ed2c3 2017-11-29 stsp * The following struct is used to record change information when
176 574ed2c3 2017-11-29 stsp * doing a "context" or "unified" diff. (see routine "change" to
177 574ed2c3 2017-11-29 stsp * understand the highly mnemonic field names)
179 574ed2c3 2017-11-29 stsp struct context_vec {
180 574ed2c3 2017-11-29 stsp int a; /* start line in old file */
181 574ed2c3 2017-11-29 stsp int b; /* end line in old file */
182 574ed2c3 2017-11-29 stsp int c; /* start line in new file */
183 574ed2c3 2017-11-29 stsp int d; /* end line in new file */
186 574ed2c3 2017-11-29 stsp #define diff_output printf
187 574ed2c3 2017-11-29 stsp static FILE *opentemp(const char *);
188 ed9e98a8 2017-11-29 stsp static void output(struct got_diff_state *, char *, FILE *, char *, FILE *, int);
189 ed9e98a8 2017-11-29 stsp static void check(struct got_diff_state *, FILE *, FILE *, int);
190 574ed2c3 2017-11-29 stsp static void range(int, int, char *);
191 574ed2c3 2017-11-29 stsp static void uni_range(int, int);
192 ed9e98a8 2017-11-29 stsp static void dump_context_vec(struct got_diff_state *, FILE *, FILE *, int);
193 ed9e98a8 2017-11-29 stsp static void dump_unified_vec(struct got_diff_state *, FILE *, FILE *, int);
194 ed9e98a8 2017-11-29 stsp static void prepare(struct got_diff_state *, int, FILE *, off_t, int);
195 ed9e98a8 2017-11-29 stsp static void prune(struct got_diff_state *);
196 574ed2c3 2017-11-29 stsp static void equiv(struct line *, int, struct line *, int, int *);
197 ed9e98a8 2017-11-29 stsp static void unravel(struct got_diff_state *, int);
198 574ed2c3 2017-11-29 stsp static void unsort(struct line *, int, int *);
199 ed9e98a8 2017-11-29 stsp static void change(struct got_diff_state *, char *, FILE *, char *, FILE *, int, int, int, int, int *);
200 574ed2c3 2017-11-29 stsp static void sort(struct line *, int);
201 574ed2c3 2017-11-29 stsp static void print_header(const char *, const char *);
202 574ed2c3 2017-11-29 stsp static int ignoreline(char *);
203 574ed2c3 2017-11-29 stsp static int asciifile(FILE *);
204 ed9e98a8 2017-11-29 stsp static int fetch(struct got_diff_state *, long *, int, int, FILE *, int, int, int);
205 ed9e98a8 2017-11-29 stsp static int newcand(struct got_diff_state *, int, int, int);
206 ed9e98a8 2017-11-29 stsp static int search(struct got_diff_state *, int *, int, int);
207 574ed2c3 2017-11-29 stsp static int skipline(FILE *);
208 574ed2c3 2017-11-29 stsp static int isqrt(int);
209 ed9e98a8 2017-11-29 stsp static int stone(struct got_diff_state *, int *, int, int *, int *, int);
210 ed9e98a8 2017-11-29 stsp static int readhash(struct got_diff_state *, FILE *, int);
211 574ed2c3 2017-11-29 stsp static int files_differ(FILE *, FILE *, int);
212 ed9e98a8 2017-11-29 stsp static char *match_function(struct got_diff_state *, const long *, int, FILE *);
213 574ed2c3 2017-11-29 stsp static char *preadline(int, size_t, off_t);
215 cb056f1e 2017-11-29 stsp struct diff_args {
217 cb056f1e 2017-11-29 stsp int diff_format, diff_context, status;
218 cb056f1e 2017-11-29 stsp char *ifdefname, *diffargs, *label[2], *ignore_pats;
219 cb056f1e 2017-11-29 stsp struct stat stb1, stb2;
220 cb056f1e 2017-11-29 stsp } diff_args;
223 574ed2c3 2017-11-29 stsp * chrtran points to one of 2 translation tables: cup2low if folding upper to
224 574ed2c3 2017-11-29 stsp * lower case clow2low if not folding case
226 574ed2c3 2017-11-29 stsp u_char clow2low[256] = {
227 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
228 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
229 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
230 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
231 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
232 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
233 574ed2c3 2017-11-29 stsp 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
234 574ed2c3 2017-11-29 stsp 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
235 574ed2c3 2017-11-29 stsp 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
236 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
237 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
238 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
239 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
240 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
241 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
242 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
243 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
244 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
245 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
246 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
247 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
248 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
249 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
250 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
253 574ed2c3 2017-11-29 stsp u_char cup2low[256] = {
254 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
255 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
256 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
257 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
258 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
259 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61,
260 574ed2c3 2017-11-29 stsp 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
261 574ed2c3 2017-11-29 stsp 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
262 574ed2c3 2017-11-29 stsp 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62,
263 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
264 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
265 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
266 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
267 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
268 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
269 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
270 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
271 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
272 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
273 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
274 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
275 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
276 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
277 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
280 7d283eee 2017-11-29 stsp const struct got_error *
281 ed9e98a8 2017-11-29 stsp got_diffreg(int *rval, char *file1, char *file2, int flags,
282 ed9e98a8 2017-11-29 stsp struct got_diff_state *ds)
284 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
285 574ed2c3 2017-11-29 stsp FILE *f1, *f2;
288 cb056f1e 2017-11-29 stsp diff_args.diff_format = D_UNIFIED;
290 7d283eee 2017-11-29 stsp if (strcmp(file1, "-") == 0)
291 cb056f1e 2017-11-29 stsp fstat(STDIN_FILENO, &diff_args.stb1);
292 cb056f1e 2017-11-29 stsp else if (stat(file1, &diff_args.stb1) != 0)
293 7d283eee 2017-11-29 stsp return got_error(GOT_ERR_BAD_PATH);
295 7d283eee 2017-11-29 stsp if (strcmp(file2, "-") == 0)
296 cb056f1e 2017-11-29 stsp fstat(STDIN_FILENO, &diff_args.stb2);
297 cb056f1e 2017-11-29 stsp else if (stat(file2, &diff_args.stb2) != 0)
298 7d283eee 2017-11-29 stsp return got_error(GOT_ERR_BAD_PATH);
300 574ed2c3 2017-11-29 stsp f1 = f2 = NULL;
301 7d283eee 2017-11-29 stsp *rval = D_SAME;
302 ed9e98a8 2017-11-29 stsp ds->anychange = 0;
303 ed9e98a8 2017-11-29 stsp ds->lastline = 0;
304 ed9e98a8 2017-11-29 stsp ds->lastmatchline = 0;
305 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
306 ed9e98a8 2017-11-29 stsp if (flags & D_IGNORECASE)
307 ed9e98a8 2017-11-29 stsp ds->chrtran = cup2low;
309 ed9e98a8 2017-11-29 stsp ds->chrtran = clow2low;
310 cb056f1e 2017-11-29 stsp if (S_ISDIR(diff_args.stb1.st_mode) != S_ISDIR(diff_args.stb2.st_mode)) {
311 cb056f1e 2017-11-29 stsp *rval = (S_ISDIR(diff_args.stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
312 7d283eee 2017-11-29 stsp return NULL;
314 574ed2c3 2017-11-29 stsp if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0)
315 574ed2c3 2017-11-29 stsp goto closem;
317 574ed2c3 2017-11-29 stsp if (flags & D_EMPTY1)
318 574ed2c3 2017-11-29 stsp f1 = fopen(_PATH_DEVNULL, "r");
320 cb056f1e 2017-11-29 stsp if (!S_ISREG(diff_args.stb1.st_mode)) {
321 574ed2c3 2017-11-29 stsp if ((f1 = opentemp(file1)) == NULL ||
322 cb056f1e 2017-11-29 stsp fstat(fileno(f1), &diff_args.stb1) < 0) {
323 cb056f1e 2017-11-29 stsp diff_args.status |= 2;
324 574ed2c3 2017-11-29 stsp goto closem;
326 574ed2c3 2017-11-29 stsp } else if (strcmp(file1, "-") == 0)
327 574ed2c3 2017-11-29 stsp f1 = stdin;
329 574ed2c3 2017-11-29 stsp f1 = fopen(file1, "r");
331 574ed2c3 2017-11-29 stsp if (f1 == NULL) {
332 cb056f1e 2017-11-29 stsp diff_args.status |= 2;
333 574ed2c3 2017-11-29 stsp goto closem;
336 574ed2c3 2017-11-29 stsp if (flags & D_EMPTY2)
337 574ed2c3 2017-11-29 stsp f2 = fopen(_PATH_DEVNULL, "r");
339 cb056f1e 2017-11-29 stsp if (!S_ISREG(diff_args.stb2.st_mode)) {
340 574ed2c3 2017-11-29 stsp if ((f2 = opentemp(file2)) == NULL ||
341 cb056f1e 2017-11-29 stsp fstat(fileno(f2), &diff_args.stb2) < 0) {
342 cb056f1e 2017-11-29 stsp diff_args.status |= 2;
343 574ed2c3 2017-11-29 stsp goto closem;
345 574ed2c3 2017-11-29 stsp } else if (strcmp(file2, "-") == 0)
346 574ed2c3 2017-11-29 stsp f2 = stdin;
348 574ed2c3 2017-11-29 stsp f2 = fopen(file2, "r");
350 574ed2c3 2017-11-29 stsp if (f2 == NULL) {
351 cb056f1e 2017-11-29 stsp diff_args.status |= 2;
352 574ed2c3 2017-11-29 stsp goto closem;
355 574ed2c3 2017-11-29 stsp switch (files_differ(f1, f2, flags)) {
357 574ed2c3 2017-11-29 stsp goto closem;
361 574ed2c3 2017-11-29 stsp /* error */
362 cb056f1e 2017-11-29 stsp diff_args.status |= 2;
363 574ed2c3 2017-11-29 stsp goto closem;
366 574ed2c3 2017-11-29 stsp if ((flags & D_FORCEASCII) == 0 &&
367 574ed2c3 2017-11-29 stsp (!asciifile(f1) || !asciifile(f2))) {
368 7d283eee 2017-11-29 stsp *rval = D_BINARY;
369 cb056f1e 2017-11-29 stsp diff_args.status |= 1;
370 574ed2c3 2017-11-29 stsp goto closem;
372 ed9e98a8 2017-11-29 stsp prepare(ds, 0, f1, diff_args.stb1.st_size, flags);
373 ed9e98a8 2017-11-29 stsp prepare(ds, 1, f2, diff_args.stb2.st_size, flags);
376 ed9e98a8 2017-11-29 stsp sort(ds->sfile[0], ds->slen[0]);
377 ed9e98a8 2017-11-29 stsp sort(ds->sfile[1], ds->slen[1]);
379 ed9e98a8 2017-11-29 stsp ds->member = (int *)ds->file[1];
380 ed9e98a8 2017-11-29 stsp equiv(ds->sfile[0], ds->slen[0], ds->sfile[1], ds->slen[1], ds->member);
381 ed9e98a8 2017-11-29 stsp ds->member = reallocarray(ds->member, ds->slen[1] + 2, sizeof(*ds->member));
382 ed9e98a8 2017-11-29 stsp if (ds->member == NULL) {
383 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
384 7d283eee 2017-11-29 stsp goto closem;
387 ed9e98a8 2017-11-29 stsp ds->class = (int *)ds->file[0];
388 ed9e98a8 2017-11-29 stsp unsort(ds->sfile[0], ds->slen[0], ds->class);
389 ed9e98a8 2017-11-29 stsp ds->class = reallocarray(ds->class, ds->slen[0] + 2, sizeof(*ds->class));
390 ed9e98a8 2017-11-29 stsp if (ds->class == NULL) {
391 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
392 7d283eee 2017-11-29 stsp goto closem;
395 ed9e98a8 2017-11-29 stsp ds->klist = calloc(ds->slen[0] + 2, sizeof(*ds->klist));
396 ed9e98a8 2017-11-29 stsp if (ds->klist == NULL) {
397 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
398 7d283eee 2017-11-29 stsp goto closem;
400 ed9e98a8 2017-11-29 stsp ds->clen = 0;
401 ed9e98a8 2017-11-29 stsp ds->clistlen = 100;
402 ed9e98a8 2017-11-29 stsp ds->clist = calloc(ds->clistlen, sizeof(*ds->clist));
403 ed9e98a8 2017-11-29 stsp if (ds->clist == NULL) {
404 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
405 7d283eee 2017-11-29 stsp goto closem;
407 ed9e98a8 2017-11-29 stsp i = stone(ds, ds->class, ds->slen[0], ds->member, ds->klist, flags);
408 ed9e98a8 2017-11-29 stsp free(ds->member);
409 ed9e98a8 2017-11-29 stsp free(ds->class);
411 ed9e98a8 2017-11-29 stsp ds->J = reallocarray(ds->J, ds->len[0] + 2, sizeof(*ds->J));
412 ed9e98a8 2017-11-29 stsp if (ds->J == NULL) {
413 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
414 7d283eee 2017-11-29 stsp goto closem;
416 ed9e98a8 2017-11-29 stsp unravel(ds, ds->klist[i]);
417 ed9e98a8 2017-11-29 stsp free(ds->clist);
418 ed9e98a8 2017-11-29 stsp ds->clist = NULL;
419 ed9e98a8 2017-11-29 stsp free(ds->klist);
420 ed9e98a8 2017-11-29 stsp ds->klist = NULL;
422 ed9e98a8 2017-11-29 stsp ds->ixold = reallocarray(ds->ixold, ds->len[0] + 2, sizeof(*ds->ixold));
423 ed9e98a8 2017-11-29 stsp if (ds->ixold == NULL) {
424 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
425 7d283eee 2017-11-29 stsp goto closem;
427 ed9e98a8 2017-11-29 stsp ds->ixnew = reallocarray(ds->ixnew, ds->len[1] + 2, sizeof(*ds->ixnew));
428 ed9e98a8 2017-11-29 stsp if (ds->ixnew == NULL) {
429 7d283eee 2017-11-29 stsp err = got_error(GOT_ERR_NO_MEM);
430 7d283eee 2017-11-29 stsp goto closem;
432 ed9e98a8 2017-11-29 stsp check(ds, f1, f2, flags);
433 ed9e98a8 2017-11-29 stsp output(ds, file1, f1, file2, f2, flags);
435 ed9e98a8 2017-11-29 stsp if (ds->anychange) {
436 cb056f1e 2017-11-29 stsp diff_args.status |= 1;
437 7d283eee 2017-11-29 stsp if (*rval == D_SAME)
438 7d283eee 2017-11-29 stsp *rval = D_DIFFER;
440 574ed2c3 2017-11-29 stsp if (f1 != NULL)
441 574ed2c3 2017-11-29 stsp fclose(f1);
442 574ed2c3 2017-11-29 stsp if (f2 != NULL)
443 574ed2c3 2017-11-29 stsp fclose(f2);
445 7d283eee 2017-11-29 stsp return (err);
449 574ed2c3 2017-11-29 stsp * Check to see if the given files differ.
450 574ed2c3 2017-11-29 stsp * Returns 0 if they are the same, 1 if different, and -1 on error.
451 574ed2c3 2017-11-29 stsp * XXX - could use code from cmp(1) [faster]
454 574ed2c3 2017-11-29 stsp files_differ(FILE *f1, FILE *f2, int flags)
456 574ed2c3 2017-11-29 stsp char buf1[BUFSIZ], buf2[BUFSIZ];
457 574ed2c3 2017-11-29 stsp size_t i, j;
459 cb056f1e 2017-11-29 stsp if ((flags & (D_EMPTY1|D_EMPTY2)) || diff_args.stb1.st_size != diff_args.stb2.st_size ||
460 cb056f1e 2017-11-29 stsp (diff_args.stb1.st_mode & S_IFMT) != (diff_args.stb2.st_mode & S_IFMT))
461 574ed2c3 2017-11-29 stsp return (1);
463 574ed2c3 2017-11-29 stsp i = fread(buf1, 1, sizeof(buf1), f1);
464 574ed2c3 2017-11-29 stsp j = fread(buf2, 1, sizeof(buf2), f2);
465 574ed2c3 2017-11-29 stsp if ((!i && ferror(f1)) || (!j && ferror(f2)))
466 574ed2c3 2017-11-29 stsp return (-1);
467 574ed2c3 2017-11-29 stsp if (i != j)
468 574ed2c3 2017-11-29 stsp return (1);
469 574ed2c3 2017-11-29 stsp if (i == 0)
470 574ed2c3 2017-11-29 stsp return (0);
471 574ed2c3 2017-11-29 stsp if (memcmp(buf1, buf2, i) != 0)
472 574ed2c3 2017-11-29 stsp return (1);
476 574ed2c3 2017-11-29 stsp static FILE *
477 574ed2c3 2017-11-29 stsp opentemp(const char *file)
479 574ed2c3 2017-11-29 stsp char buf[BUFSIZ], tempfile[PATH_MAX];
480 574ed2c3 2017-11-29 stsp ssize_t nread;
481 574ed2c3 2017-11-29 stsp int ifd, ofd;
483 574ed2c3 2017-11-29 stsp if (strcmp(file, "-") == 0)
484 574ed2c3 2017-11-29 stsp ifd = STDIN_FILENO;
485 574ed2c3 2017-11-29 stsp else if ((ifd = open(file, O_RDONLY, 0644)) < 0)
486 574ed2c3 2017-11-29 stsp return (NULL);
488 574ed2c3 2017-11-29 stsp (void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile));
490 574ed2c3 2017-11-29 stsp if ((ofd = mkstemp(tempfile)) < 0) {
491 574ed2c3 2017-11-29 stsp close(ifd);
492 574ed2c3 2017-11-29 stsp return (NULL);
494 574ed2c3 2017-11-29 stsp unlink(tempfile);
495 574ed2c3 2017-11-29 stsp while ((nread = read(ifd, buf, BUFSIZ)) > 0) {
496 574ed2c3 2017-11-29 stsp if (write(ofd, buf, nread) != nread) {
497 574ed2c3 2017-11-29 stsp close(ifd);
498 574ed2c3 2017-11-29 stsp close(ofd);
499 574ed2c3 2017-11-29 stsp return (NULL);
502 574ed2c3 2017-11-29 stsp close(ifd);
503 574ed2c3 2017-11-29 stsp lseek(ofd, (off_t)0, SEEK_SET);
504 574ed2c3 2017-11-29 stsp return (fdopen(ofd, "r"));
508 574ed2c3 2017-11-29 stsp splice(char *dir, char *file)
510 574ed2c3 2017-11-29 stsp char *tail, *buf;
511 574ed2c3 2017-11-29 stsp size_t dirlen;
513 574ed2c3 2017-11-29 stsp dirlen = strlen(dir);
514 574ed2c3 2017-11-29 stsp while (dirlen != 0 && dir[dirlen - 1] == '/')
516 574ed2c3 2017-11-29 stsp if ((tail = strrchr(file, '/')) == NULL)
517 574ed2c3 2017-11-29 stsp tail = file;
520 574ed2c3 2017-11-29 stsp xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail);
521 574ed2c3 2017-11-29 stsp return (buf);
524 574ed2c3 2017-11-29 stsp static void
525 ed9e98a8 2017-11-29 stsp prepare(struct got_diff_state *ds, int i, FILE *fd, off_t filesize, int flags)
527 574ed2c3 2017-11-29 stsp struct line *p;
531 574ed2c3 2017-11-29 stsp rewind(fd);
533 574ed2c3 2017-11-29 stsp sz = (filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25;
534 574ed2c3 2017-11-29 stsp if (sz < 100)
537 574ed2c3 2017-11-29 stsp p = xcalloc(sz + 3, sizeof(*p));
538 ed9e98a8 2017-11-29 stsp for (j = 0; (h = readhash(ds, fd, flags));) {
539 574ed2c3 2017-11-29 stsp if (j == sz) {
540 574ed2c3 2017-11-29 stsp sz = sz * 3 / 2;
541 574ed2c3 2017-11-29 stsp p = xreallocarray(p, sz + 3, sizeof(*p));
543 574ed2c3 2017-11-29 stsp p[++j].value = h;
545 ed9e98a8 2017-11-29 stsp ds->len[i] = j;
546 ed9e98a8 2017-11-29 stsp ds->file[i] = p;
549 574ed2c3 2017-11-29 stsp static void
550 ed9e98a8 2017-11-29 stsp prune(struct got_diff_state *ds)
554 ed9e98a8 2017-11-29 stsp for (ds->pref = 0; ds->pref < ds->len[0] && ds->pref < ds->len[1] &&
555 ed9e98a8 2017-11-29 stsp ds->file[0][ds->pref + 1].value == ds->file[1][ds->pref + 1].value;
556 ed9e98a8 2017-11-29 stsp ds->pref++)
558 ed9e98a8 2017-11-29 stsp for (ds->suff = 0; ds->suff < ds->len[0] - ds->pref && ds->suff < ds->len[1] - ds->pref &&
559 ed9e98a8 2017-11-29 stsp ds->file[0][ds->len[0] - ds->suff].value == ds->file[1][ds->len[1] - ds->suff].value;
560 ed9e98a8 2017-11-29 stsp ds->suff++)
562 574ed2c3 2017-11-29 stsp for (j = 0; j < 2; j++) {
563 ed9e98a8 2017-11-29 stsp ds->sfile[j] = ds->file[j] + ds->pref;
564 ed9e98a8 2017-11-29 stsp ds->slen[j] = ds->len[j] - ds->pref - ds->suff;
565 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->slen[j]; i++)
566 ed9e98a8 2017-11-29 stsp ds->sfile[j][i].serial = i;
570 574ed2c3 2017-11-29 stsp static void
571 574ed2c3 2017-11-29 stsp equiv(struct line *a, int n, struct line *b, int m, int *c)
576 574ed2c3 2017-11-29 stsp while (i <= n && j <= m) {
577 574ed2c3 2017-11-29 stsp if (a[i].value < b[j].value)
578 574ed2c3 2017-11-29 stsp a[i++].value = 0;
579 574ed2c3 2017-11-29 stsp else if (a[i].value == b[j].value)
580 574ed2c3 2017-11-29 stsp a[i++].value = j;
584 574ed2c3 2017-11-29 stsp while (i <= n)
585 574ed2c3 2017-11-29 stsp a[i++].value = 0;
586 574ed2c3 2017-11-29 stsp b[m + 1].value = 0;
588 574ed2c3 2017-11-29 stsp while (++j <= m) {
589 574ed2c3 2017-11-29 stsp c[j] = -b[j].serial;
590 574ed2c3 2017-11-29 stsp while (b[j + 1].value == b[j].value) {
592 574ed2c3 2017-11-29 stsp c[j] = b[j].serial;
598 574ed2c3 2017-11-29 stsp /* Code taken from ping.c */
600 574ed2c3 2017-11-29 stsp isqrt(int n)
602 574ed2c3 2017-11-29 stsp int y, x = 1;
604 574ed2c3 2017-11-29 stsp if (n == 0)
605 574ed2c3 2017-11-29 stsp return (0);
607 574ed2c3 2017-11-29 stsp do { /* newton was a stinker */
612 574ed2c3 2017-11-29 stsp } while ((x - y) > 1 || (x - y) < -1);
614 574ed2c3 2017-11-29 stsp return (x);
618 ed9e98a8 2017-11-29 stsp stone(struct got_diff_state *ds, int *a, int n, int *b, int *c, int flags)
620 574ed2c3 2017-11-29 stsp int i, k, y, j, l;
621 574ed2c3 2017-11-29 stsp int oldc, tc, oldl, sq;
622 574ed2c3 2017-11-29 stsp u_int numtries, bound;
624 574ed2c3 2017-11-29 stsp if (flags & D_MINIMAL)
625 574ed2c3 2017-11-29 stsp bound = UINT_MAX;
627 574ed2c3 2017-11-29 stsp sq = isqrt(n);
628 574ed2c3 2017-11-29 stsp bound = MAXIMUM(256, sq);
632 ed9e98a8 2017-11-29 stsp c[0] = newcand(ds, 0, 0, 0);
633 574ed2c3 2017-11-29 stsp for (i = 1; i <= n; i++) {
635 574ed2c3 2017-11-29 stsp if (j == 0)
639 574ed2c3 2017-11-29 stsp oldc = c[0];
640 574ed2c3 2017-11-29 stsp numtries = 0;
642 ed9e98a8 2017-11-29 stsp if (y <= ds->clist[oldc].y)
644 ed9e98a8 2017-11-29 stsp l = search(ds, c, k, y);
645 574ed2c3 2017-11-29 stsp if (l != oldl + 1)
646 574ed2c3 2017-11-29 stsp oldc = c[l - 1];
647 574ed2c3 2017-11-29 stsp if (l <= k) {
648 ed9e98a8 2017-11-29 stsp if (ds->clist[c[l]].y <= y)
651 ed9e98a8 2017-11-29 stsp c[l] = newcand(ds, i, y, oldc);
654 574ed2c3 2017-11-29 stsp numtries++;
656 ed9e98a8 2017-11-29 stsp c[l] = newcand(ds, i, y, oldc);
660 574ed2c3 2017-11-29 stsp } while ((y = b[++j]) > 0 && numtries < bound);
662 574ed2c3 2017-11-29 stsp return (k);
666 ed9e98a8 2017-11-29 stsp newcand(struct got_diff_state *ds, int x, int y, int pred)
668 574ed2c3 2017-11-29 stsp struct cand *q;
670 ed9e98a8 2017-11-29 stsp if (ds->clen == ds->clistlen) {
671 ed9e98a8 2017-11-29 stsp ds->clistlen = ds->clistlen * 11 / 10;
672 ed9e98a8 2017-11-29 stsp ds->clist = xreallocarray(ds->clist, ds->clistlen, sizeof(*ds->clist));
674 ed9e98a8 2017-11-29 stsp q = ds->clist + ds->clen;
677 574ed2c3 2017-11-29 stsp q->pred = pred;
678 ed9e98a8 2017-11-29 stsp return (ds->clen++);
682 ed9e98a8 2017-11-29 stsp search(struct got_diff_state *ds, int *c, int k, int y)
684 574ed2c3 2017-11-29 stsp int i, j, l, t;
686 ed9e98a8 2017-11-29 stsp if (ds->clist[c[k]].y < y) /* quick look for typical case */
687 574ed2c3 2017-11-29 stsp return (k + 1);
691 574ed2c3 2017-11-29 stsp l = (i + j) / 2;
692 574ed2c3 2017-11-29 stsp if (l <= i)
694 ed9e98a8 2017-11-29 stsp t = ds->clist[c[l]].y;
697 574ed2c3 2017-11-29 stsp else if (t < y)
700 574ed2c3 2017-11-29 stsp return (l);
702 574ed2c3 2017-11-29 stsp return (l + 1);
705 574ed2c3 2017-11-29 stsp static void
706 ed9e98a8 2017-11-29 stsp unravel(struct got_diff_state *ds, int p)
708 574ed2c3 2017-11-29 stsp struct cand *q;
711 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->len[0]; i++)
712 ed9e98a8 2017-11-29 stsp ds->J[i] = i <= ds->pref ? i :
713 ed9e98a8 2017-11-29 stsp i > ds->len[0] - ds->suff ? i + ds->len[1] - ds->len[0] : 0;
714 ed9e98a8 2017-11-29 stsp for (q = ds->clist + p; q->y != 0; q = ds->clist + q->pred)
715 ed9e98a8 2017-11-29 stsp ds->J[q->x + ds->pref] = q->y + ds->pref;
719 574ed2c3 2017-11-29 stsp * Check does double duty:
720 574ed2c3 2017-11-29 stsp * 1. ferret out any fortuitous correspondences due
721 574ed2c3 2017-11-29 stsp * to confounding by hashing (which result in "jackpot")
722 574ed2c3 2017-11-29 stsp * 2. collect random access indexes to the two files
724 574ed2c3 2017-11-29 stsp static void
725 ed9e98a8 2017-11-29 stsp check(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
727 574ed2c3 2017-11-29 stsp int i, j, jackpot, c, d;
728 574ed2c3 2017-11-29 stsp long ctold, ctnew;
730 574ed2c3 2017-11-29 stsp rewind(f1);
731 574ed2c3 2017-11-29 stsp rewind(f2);
733 ed9e98a8 2017-11-29 stsp ds->ixold[0] = ds->ixnew[0] = 0;
734 574ed2c3 2017-11-29 stsp jackpot = 0;
735 574ed2c3 2017-11-29 stsp ctold = ctnew = 0;
736 ed9e98a8 2017-11-29 stsp for (i = 1; i <= ds->len[0]; i++) {
737 ed9e98a8 2017-11-29 stsp if (ds->J[i] == 0) {
738 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold += skipline(f1);
741 ed9e98a8 2017-11-29 stsp while (j < ds->J[i]) {
742 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
745 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE)) {
747 574ed2c3 2017-11-29 stsp c = getc(f1);
748 574ed2c3 2017-11-29 stsp d = getc(f2);
750 574ed2c3 2017-11-29 stsp * GNU diff ignores a missing newline
751 574ed2c3 2017-11-29 stsp * in one file for -b or -w.
753 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) {
754 574ed2c3 2017-11-29 stsp if (c == EOF && d == '\n') {
757 574ed2c3 2017-11-29 stsp } else if (c == '\n' && d == EOF) {
764 574ed2c3 2017-11-29 stsp if ((flags & D_FOLDBLANKS) && isspace(c) &&
765 574ed2c3 2017-11-29 stsp isspace(d)) {
767 574ed2c3 2017-11-29 stsp if (c == '\n')
770 574ed2c3 2017-11-29 stsp } while (isspace(c = getc(f1)));
772 574ed2c3 2017-11-29 stsp if (d == '\n')
775 574ed2c3 2017-11-29 stsp } while (isspace(d = getc(f2)));
776 574ed2c3 2017-11-29 stsp } else if ((flags & D_IGNOREBLANKS)) {
777 574ed2c3 2017-11-29 stsp while (isspace(c) && c != '\n') {
778 574ed2c3 2017-11-29 stsp c = getc(f1);
781 574ed2c3 2017-11-29 stsp while (isspace(d) && d != '\n') {
782 574ed2c3 2017-11-29 stsp d = getc(f2);
786 ed9e98a8 2017-11-29 stsp if (ds->chrtran[c] != ds->chrtran[d]) {
788 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
789 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
790 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
791 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
792 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
795 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
802 574ed2c3 2017-11-29 stsp if ((c = getc(f1)) != (d = getc(f2))) {
803 574ed2c3 2017-11-29 stsp /* jackpot++; */
804 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
805 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
806 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
807 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
808 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
811 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
815 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold;
816 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew;
819 ed9e98a8 2017-11-29 stsp for (; j <= ds->len[1]; j++)
820 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
822 574ed2c3 2017-11-29 stsp * if (jackpot)
823 574ed2c3 2017-11-29 stsp * fprintf(stderr, "jackpot\n");
827 574ed2c3 2017-11-29 stsp /* shellsort CACM #201 */
828 574ed2c3 2017-11-29 stsp static void
829 574ed2c3 2017-11-29 stsp sort(struct line *a, int n)
831 574ed2c3 2017-11-29 stsp struct line *ai, *aim, w;
832 574ed2c3 2017-11-29 stsp int j, m = 0, k;
834 574ed2c3 2017-11-29 stsp if (n == 0)
836 574ed2c3 2017-11-29 stsp for (j = 1; j <= n; j *= 2)
837 574ed2c3 2017-11-29 stsp m = 2 * j - 1;
838 574ed2c3 2017-11-29 stsp for (m /= 2; m != 0; m /= 2) {
840 574ed2c3 2017-11-29 stsp for (j = 1; j <= k; j++) {
841 574ed2c3 2017-11-29 stsp for (ai = &a[j]; ai > a; ai -= m) {
842 574ed2c3 2017-11-29 stsp aim = &ai[m];
843 574ed2c3 2017-11-29 stsp if (aim < ai)
844 574ed2c3 2017-11-29 stsp break; /* wraparound */
845 574ed2c3 2017-11-29 stsp if (aim->value > ai[0].value ||
846 574ed2c3 2017-11-29 stsp (aim->value == ai[0].value &&
847 574ed2c3 2017-11-29 stsp aim->serial > ai[0].serial))
849 574ed2c3 2017-11-29 stsp w.value = ai[0].value;
850 574ed2c3 2017-11-29 stsp ai[0].value = aim->value;
851 574ed2c3 2017-11-29 stsp aim->value = w.value;
852 574ed2c3 2017-11-29 stsp w.serial = ai[0].serial;
853 574ed2c3 2017-11-29 stsp ai[0].serial = aim->serial;
854 574ed2c3 2017-11-29 stsp aim->serial = w.serial;
860 574ed2c3 2017-11-29 stsp static void
861 574ed2c3 2017-11-29 stsp unsort(struct line *f, int l, int *b)
865 574ed2c3 2017-11-29 stsp a = xcalloc(l + 1, sizeof(*a));
866 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
867 574ed2c3 2017-11-29 stsp a[f[i].serial] = f[i].value;
868 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
869 574ed2c3 2017-11-29 stsp b[i] = a[i];
874 574ed2c3 2017-11-29 stsp skipline(FILE *f)
878 574ed2c3 2017-11-29 stsp for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
880 574ed2c3 2017-11-29 stsp return (i);
883 574ed2c3 2017-11-29 stsp static void
884 ed9e98a8 2017-11-29 stsp output(struct got_diff_state *ds, char *file1, FILE *f1, char *file2, FILE *f2,
887 574ed2c3 2017-11-29 stsp int m, i0, i1, j0, j1;
889 574ed2c3 2017-11-29 stsp rewind(f1);
890 574ed2c3 2017-11-29 stsp rewind(f2);
891 ed9e98a8 2017-11-29 stsp m = ds->len[0];
892 ed9e98a8 2017-11-29 stsp ds->J[0] = 0;
893 ed9e98a8 2017-11-29 stsp ds->J[m + 1] = ds->len[1] + 1;
894 cb056f1e 2017-11-29 stsp if (diff_args.diff_format != D_EDIT) {
895 574ed2c3 2017-11-29 stsp for (i0 = 1; i0 <= m; i0 = i1 + 1) {
896 ed9e98a8 2017-11-29 stsp while (i0 <= m && ds->J[i0] == ds->J[i0 - 1] + 1)
898 ed9e98a8 2017-11-29 stsp j0 = ds->J[i0 - 1] + 1;
899 574ed2c3 2017-11-29 stsp i1 = i0 - 1;
900 ed9e98a8 2017-11-29 stsp while (i1 < m && ds->J[i1 + 1] == 0)
902 ed9e98a8 2017-11-29 stsp j1 = ds->J[i1 + 1] - 1;
903 ed9e98a8 2017-11-29 stsp ds->J[i1] = j1;
904 ed9e98a8 2017-11-29 stsp change(ds, file1, f1, file2, f2, i0, i1, j0, j1, &flags);
907 574ed2c3 2017-11-29 stsp for (i0 = m; i0 >= 1; i0 = i1 - 1) {
908 ed9e98a8 2017-11-29 stsp while (i0 >= 1 && ds->J[i0] == ds->J[i0 + 1] - 1 && ds->J[i0] != 0)
910 ed9e98a8 2017-11-29 stsp j0 = ds->J[i0 + 1] - 1;
911 574ed2c3 2017-11-29 stsp i1 = i0 + 1;
912 ed9e98a8 2017-11-29 stsp while (i1 > 1 && ds->J[i1 - 1] == 0)
914 ed9e98a8 2017-11-29 stsp j1 = ds->J[i1 - 1] + 1;
915 ed9e98a8 2017-11-29 stsp ds->J[i1] = j1;
916 ed9e98a8 2017-11-29 stsp change(ds, file1, f1, file2, f2, i1, i0, j1, j0, &flags);
919 574ed2c3 2017-11-29 stsp if (m == 0)
920 ed9e98a8 2017-11-29 stsp change(ds, file1, f1, file2, f2, 1, 0, 1, ds->len[1], &flags);
921 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_IFDEF) {
923 574ed2c3 2017-11-29 stsp #define c i0
924 574ed2c3 2017-11-29 stsp if ((c = getc(f1)) == EOF)
926 574ed2c3 2017-11-29 stsp diff_output("%c", c);
930 ed9e98a8 2017-11-29 stsp if (ds->anychange != 0) {
931 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_CONTEXT)
932 ed9e98a8 2017-11-29 stsp dump_context_vec(ds, f1, f2, flags);
933 cb056f1e 2017-11-29 stsp else if (diff_args.diff_format == D_UNIFIED)
934 ed9e98a8 2017-11-29 stsp dump_unified_vec(ds, f1, f2, flags);
938 574ed2c3 2017-11-29 stsp static void
939 574ed2c3 2017-11-29 stsp range(int a, int b, char *separator)
941 574ed2c3 2017-11-29 stsp diff_output("%d", a > b ? b : a);
943 574ed2c3 2017-11-29 stsp diff_output("%s%d", separator, b);
946 574ed2c3 2017-11-29 stsp static void
947 574ed2c3 2017-11-29 stsp uni_range(int a, int b)
950 574ed2c3 2017-11-29 stsp diff_output("%d,%d", a, b - a + 1);
951 574ed2c3 2017-11-29 stsp else if (a == b)
952 574ed2c3 2017-11-29 stsp diff_output("%d", b);
954 574ed2c3 2017-11-29 stsp diff_output("%d,0", b);
957 574ed2c3 2017-11-29 stsp static char *
958 574ed2c3 2017-11-29 stsp preadline(int fd, size_t rlen, off_t off)
960 574ed2c3 2017-11-29 stsp char *line;
961 574ed2c3 2017-11-29 stsp ssize_t nr;
963 574ed2c3 2017-11-29 stsp line = xmalloc(rlen + 1);
964 574ed2c3 2017-11-29 stsp if ((nr = pread(fd, line, rlen, off)) < 0)
965 574ed2c3 2017-11-29 stsp err(2, "preadline");
966 574ed2c3 2017-11-29 stsp if (nr > 0 && line[nr-1] == '\n')
968 574ed2c3 2017-11-29 stsp line[nr] = '\0';
969 574ed2c3 2017-11-29 stsp return (line);
973 574ed2c3 2017-11-29 stsp ignoreline(char *line)
975 7d283eee 2017-11-29 stsp return 0; /* do not ignore any lines */
979 574ed2c3 2017-11-29 stsp * Indicate that there is a difference between lines a and b of the from file
980 574ed2c3 2017-11-29 stsp * to get to lines c to d of the to file. If a is greater then b then there
981 574ed2c3 2017-11-29 stsp * are no lines in the from file involved and this means that there were
982 574ed2c3 2017-11-29 stsp * lines appended (beginning at b). If c is greater than d then there are
983 574ed2c3 2017-11-29 stsp * lines missing from the to file.
985 574ed2c3 2017-11-29 stsp static void
986 ed9e98a8 2017-11-29 stsp change(struct got_diff_state *ds, char *file1, FILE *f1, char *file2, FILE *f2,
987 ed9e98a8 2017-11-29 stsp int a, int b, int c, int d, int *pflags)
989 574ed2c3 2017-11-29 stsp static size_t max_context = 64;
993 cb056f1e 2017-11-29 stsp if (diff_args.diff_format != D_IFDEF && a > b && c > d)
995 cb056f1e 2017-11-29 stsp if (diff_args.ignore_pats != NULL) {
996 574ed2c3 2017-11-29 stsp char *line;
998 574ed2c3 2017-11-29 stsp * All lines in the change, insert, or delete must
999 574ed2c3 2017-11-29 stsp * match an ignore pattern for the change to be
1000 574ed2c3 2017-11-29 stsp * ignored.
1002 574ed2c3 2017-11-29 stsp if (a <= b) { /* Changes and deletes. */
1003 574ed2c3 2017-11-29 stsp for (i = a; i <= b; i++) {
1004 574ed2c3 2017-11-29 stsp line = preadline(fileno(f1),
1005 ed9e98a8 2017-11-29 stsp ds->ixold[i] - ds->ixold[i - 1], ds->ixold[i - 1]);
1006 574ed2c3 2017-11-29 stsp if (!ignoreline(line))
1007 574ed2c3 2017-11-29 stsp goto proceed;
1010 574ed2c3 2017-11-29 stsp if (a > b || c <= d) { /* Changes and inserts. */
1011 574ed2c3 2017-11-29 stsp for (i = c; i <= d; i++) {
1012 574ed2c3 2017-11-29 stsp line = preadline(fileno(f2),
1013 ed9e98a8 2017-11-29 stsp ds->ixnew[i] - ds->ixnew[i - 1], ds->ixnew[i - 1]);
1014 574ed2c3 2017-11-29 stsp if (!ignoreline(line))
1015 574ed2c3 2017-11-29 stsp goto proceed;
1021 574ed2c3 2017-11-29 stsp if (*pflags & D_HEADER) {
1022 cb056f1e 2017-11-29 stsp diff_output("%s %s %s\n", diff_args.diffargs, file1, file2);
1023 574ed2c3 2017-11-29 stsp *pflags &= ~D_HEADER;
1025 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_CONTEXT || diff_args.diff_format == D_UNIFIED) {
1027 574ed2c3 2017-11-29 stsp * Allocate change records as needed.
1029 ed9e98a8 2017-11-29 stsp if (ds->context_vec_ptr == ds->context_vec_end - 1) {
1030 ed9e98a8 2017-11-29 stsp ptrdiff_t offset = ds->context_vec_ptr - ds->context_vec_start;
1031 574ed2c3 2017-11-29 stsp max_context <<= 1;
1032 ed9e98a8 2017-11-29 stsp ds->context_vec_start = xreallocarray(ds->context_vec_start,
1033 ed9e98a8 2017-11-29 stsp max_context, sizeof(*ds->context_vec_start));
1034 ed9e98a8 2017-11-29 stsp ds->context_vec_end = ds->context_vec_start + max_context;
1035 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start + offset;
1037 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0) {
1039 574ed2c3 2017-11-29 stsp * Print the context/unidiff header first time through.
1041 574ed2c3 2017-11-29 stsp print_header(file1, file2);
1042 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
1043 ed9e98a8 2017-11-29 stsp } else if (a > ds->context_vec_ptr->b + (2 * diff_args.diff_context) + 1 &&
1044 ed9e98a8 2017-11-29 stsp c > ds->context_vec_ptr->d + (2 * diff_args.diff_context) + 1) {
1046 574ed2c3 2017-11-29 stsp * If this change is more than 'diff_context' lines from the
1047 574ed2c3 2017-11-29 stsp * previous change, dump the record and reset it.
1049 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_CONTEXT)
1050 ed9e98a8 2017-11-29 stsp dump_context_vec(ds, f1, f2, *pflags);
1052 ed9e98a8 2017-11-29 stsp dump_unified_vec(ds, f1, f2, *pflags);
1054 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr++;
1055 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->a = a;
1056 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->b = b;
1057 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->c = c;
1058 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->d = d;
1061 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0)
1062 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
1063 cb056f1e 2017-11-29 stsp switch (diff_args.diff_format) {
1064 574ed2c3 2017-11-29 stsp case D_BRIEF:
1066 574ed2c3 2017-11-29 stsp case D_NORMAL:
1067 574ed2c3 2017-11-29 stsp case D_EDIT:
1068 574ed2c3 2017-11-29 stsp range(a, b, ",");
1069 574ed2c3 2017-11-29 stsp diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
1070 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_NORMAL)
1071 574ed2c3 2017-11-29 stsp range(c, d, ",");
1072 574ed2c3 2017-11-29 stsp diff_output("\n");
1074 574ed2c3 2017-11-29 stsp case D_REVERSE:
1075 574ed2c3 2017-11-29 stsp diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
1076 574ed2c3 2017-11-29 stsp range(a, b, " ");
1077 574ed2c3 2017-11-29 stsp diff_output("\n");
1079 574ed2c3 2017-11-29 stsp case D_NREVERSE:
1080 574ed2c3 2017-11-29 stsp if (a > b)
1081 574ed2c3 2017-11-29 stsp diff_output("a%d %d\n", b, d - c + 1);
1083 574ed2c3 2017-11-29 stsp diff_output("d%d %d\n", a, b - a + 1);
1084 574ed2c3 2017-11-29 stsp if (!(c > d))
1085 574ed2c3 2017-11-29 stsp /* add changed lines */
1086 574ed2c3 2017-11-29 stsp diff_output("a%d %d\n", b, d - c + 1);
1090 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_NORMAL || diff_args.diff_format == D_IFDEF) {
1091 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, a, b, f1, '<', 1, *pflags);
1092 cb056f1e 2017-11-29 stsp if (a <= b && c <= d && diff_args.diff_format == D_NORMAL)
1093 574ed2c3 2017-11-29 stsp diff_output("---\n");
1095 ed9e98a8 2017-11-29 stsp i = fetch(ds, ds->ixnew, c, d, f2, diff_args.diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
1096 cb056f1e 2017-11-29 stsp if (i != 0 && diff_args.diff_format == D_EDIT) {
1098 574ed2c3 2017-11-29 stsp * A non-zero return value for D_EDIT indicates that the
1099 574ed2c3 2017-11-29 stsp * last line printed was a bare dot (".") that has been
1100 574ed2c3 2017-11-29 stsp * escaped as ".." to prevent ed(1) from misinterpreting
1101 574ed2c3 2017-11-29 stsp * it. We have to add a substitute command to change this
1102 574ed2c3 2017-11-29 stsp * back and restart where we left off.
1104 574ed2c3 2017-11-29 stsp diff_output(".\n");
1105 574ed2c3 2017-11-29 stsp diff_output("%ds/.//\n", a + i - 1);
1106 574ed2c3 2017-11-29 stsp b = a + i - 1;
1107 574ed2c3 2017-11-29 stsp a = b + 1;
1109 574ed2c3 2017-11-29 stsp goto restart;
1111 cb056f1e 2017-11-29 stsp if ((diff_args.diff_format == D_EDIT || diff_args.diff_format == D_REVERSE) && c <= d)
1112 574ed2c3 2017-11-29 stsp diff_output(".\n");
1113 ed9e98a8 2017-11-29 stsp if (ds->inifdef) {
1114 cb056f1e 2017-11-29 stsp diff_output("#endif /* %s */\n", diff_args.ifdefname);
1115 ed9e98a8 2017-11-29 stsp ds->inifdef = 0;
1119 574ed2c3 2017-11-29 stsp static int
1120 ed9e98a8 2017-11-29 stsp fetch(struct got_diff_state *ds, long *f, int a, int b, FILE *lb, int ch,
1121 ed9e98a8 2017-11-29 stsp int oldfile, int flags)
1123 574ed2c3 2017-11-29 stsp int i, j, c, lastc, col, nc;
1126 574ed2c3 2017-11-29 stsp * When doing #ifdef's, copy down to current line
1127 574ed2c3 2017-11-29 stsp * if this is the first file, so that stuff makes it to output.
1129 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_IFDEF && oldfile) {
1130 574ed2c3 2017-11-29 stsp long curpos = ftell(lb);
1131 574ed2c3 2017-11-29 stsp /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1132 574ed2c3 2017-11-29 stsp nc = f[a > b ? b : a - 1] - curpos;
1133 574ed2c3 2017-11-29 stsp for (i = 0; i < nc; i++)
1134 574ed2c3 2017-11-29 stsp diff_output("%c", getc(lb));
1136 574ed2c3 2017-11-29 stsp if (a > b)
1137 574ed2c3 2017-11-29 stsp return (0);
1138 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_IFDEF) {
1139 ed9e98a8 2017-11-29 stsp if (ds->inifdef) {
1140 574ed2c3 2017-11-29 stsp diff_output("#else /* %s%s */\n",
1141 cb056f1e 2017-11-29 stsp oldfile == 1 ? "!" : "", diff_args.ifdefname);
1143 574ed2c3 2017-11-29 stsp if (oldfile)
1144 cb056f1e 2017-11-29 stsp diff_output("#ifndef %s\n", diff_args.ifdefname);
1146 cb056f1e 2017-11-29 stsp diff_output("#ifdef %s\n", diff_args.ifdefname);
1148 ed9e98a8 2017-11-29 stsp ds->inifdef = 1 + oldfile;
1150 574ed2c3 2017-11-29 stsp for (i = a; i <= b; i++) {
1151 574ed2c3 2017-11-29 stsp fseek(lb, f[i - 1], SEEK_SET);
1152 574ed2c3 2017-11-29 stsp nc = f[i] - f[i - 1];
1153 cb056f1e 2017-11-29 stsp if (diff_args.diff_format != D_IFDEF && ch != '\0') {
1154 574ed2c3 2017-11-29 stsp diff_output("%c", ch);
1155 cb056f1e 2017-11-29 stsp if (diff_args.Tflag && (diff_args.diff_format == D_NORMAL || diff_args.diff_format == D_CONTEXT
1156 cb056f1e 2017-11-29 stsp || diff_args.diff_format == D_UNIFIED))
1157 574ed2c3 2017-11-29 stsp diff_output("\t");
1158 cb056f1e 2017-11-29 stsp else if (diff_args.diff_format != D_UNIFIED)
1159 574ed2c3 2017-11-29 stsp diff_output(" ");
1162 574ed2c3 2017-11-29 stsp for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
1163 574ed2c3 2017-11-29 stsp if ((c = getc(lb)) == EOF) {
1164 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_EDIT || diff_args.diff_format == D_REVERSE ||
1165 cb056f1e 2017-11-29 stsp diff_args.diff_format == D_NREVERSE)
1166 574ed2c3 2017-11-29 stsp warnx("No newline at end of file");
1168 574ed2c3 2017-11-29 stsp diff_output("\n\\ No newline at end of "
1169 574ed2c3 2017-11-29 stsp "file\n");
1170 574ed2c3 2017-11-29 stsp return (0);
1172 574ed2c3 2017-11-29 stsp if (c == '\t' && (flags & D_EXPANDTABS)) {
1174 574ed2c3 2017-11-29 stsp diff_output(" ");
1175 574ed2c3 2017-11-29 stsp } while (++col & 7);
1177 cb056f1e 2017-11-29 stsp if (diff_args.diff_format == D_EDIT && j == 1 && c == '\n'
1178 574ed2c3 2017-11-29 stsp && lastc == '.') {
1180 574ed2c3 2017-11-29 stsp * Don't print a bare "." line
1181 574ed2c3 2017-11-29 stsp * since that will confuse ed(1).
1182 574ed2c3 2017-11-29 stsp * Print ".." instead and return,
1183 574ed2c3 2017-11-29 stsp * giving the caller an offset
1184 574ed2c3 2017-11-29 stsp * from which to restart.
1186 574ed2c3 2017-11-29 stsp diff_output(".\n");
1187 574ed2c3 2017-11-29 stsp return (i - a + 1);
1189 574ed2c3 2017-11-29 stsp diff_output("%c", c);
1194 574ed2c3 2017-11-29 stsp return (0);
1198 574ed2c3 2017-11-29 stsp * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1200 574ed2c3 2017-11-29 stsp static int
1201 ed9e98a8 2017-11-29 stsp readhash(struct got_diff_state *ds, FILE *f, int flags)
1203 574ed2c3 2017-11-29 stsp int i, t, space;
1207 574ed2c3 2017-11-29 stsp space = 0;
1208 574ed2c3 2017-11-29 stsp if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) {
1209 574ed2c3 2017-11-29 stsp if (flags & D_IGNORECASE)
1210 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1211 574ed2c3 2017-11-29 stsp if (t == EOF) {
1212 574ed2c3 2017-11-29 stsp if (i == 0)
1213 574ed2c3 2017-11-29 stsp return (0);
1216 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1219 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1220 574ed2c3 2017-11-29 stsp if (t == EOF) {
1221 574ed2c3 2017-11-29 stsp if (i == 0)
1222 574ed2c3 2017-11-29 stsp return (0);
1225 574ed2c3 2017-11-29 stsp sum = sum * 127 + t;
1228 574ed2c3 2017-11-29 stsp for (i = 0;;) {
1229 574ed2c3 2017-11-29 stsp switch (t = getc(f)) {
1230 574ed2c3 2017-11-29 stsp case '\t':
1231 574ed2c3 2017-11-29 stsp case '\r':
1232 574ed2c3 2017-11-29 stsp case '\v':
1233 574ed2c3 2017-11-29 stsp case '\f':
1238 574ed2c3 2017-11-29 stsp if (space && (flags & D_IGNOREBLANKS) == 0) {
1240 574ed2c3 2017-11-29 stsp space = 0;
1242 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1246 574ed2c3 2017-11-29 stsp if (i == 0)
1247 574ed2c3 2017-11-29 stsp return (0);
1248 574ed2c3 2017-11-29 stsp /* FALLTHROUGH */
1249 574ed2c3 2017-11-29 stsp case '\n':
1256 574ed2c3 2017-11-29 stsp * There is a remote possibility that we end up with a zero sum.
1257 574ed2c3 2017-11-29 stsp * Zero is used as an EOF marker, so return 1 instead.
1259 574ed2c3 2017-11-29 stsp return (sum == 0 ? 1 : sum);
1262 574ed2c3 2017-11-29 stsp static int
1263 574ed2c3 2017-11-29 stsp asciifile(FILE *f)
1265 574ed2c3 2017-11-29 stsp unsigned char buf[BUFSIZ];
1266 574ed2c3 2017-11-29 stsp size_t cnt;
1268 574ed2c3 2017-11-29 stsp if (f == NULL)
1269 574ed2c3 2017-11-29 stsp return (1);
1271 574ed2c3 2017-11-29 stsp rewind(f);
1272 574ed2c3 2017-11-29 stsp cnt = fread(buf, 1, sizeof(buf), f);
1273 574ed2c3 2017-11-29 stsp return (memchr(buf, '\0', cnt) == NULL);
1276 574ed2c3 2017-11-29 stsp #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)
1278 574ed2c3 2017-11-29 stsp static char *
1279 ed9e98a8 2017-11-29 stsp match_function(struct got_diff_state *ds, const long *f, int pos, FILE *fp)
1281 574ed2c3 2017-11-29 stsp unsigned char buf[FUNCTION_CONTEXT_SIZE];
1282 574ed2c3 2017-11-29 stsp size_t nc;
1283 ed9e98a8 2017-11-29 stsp int last = ds->lastline;
1284 574ed2c3 2017-11-29 stsp char *state = NULL;
1286 ed9e98a8 2017-11-29 stsp ds->lastline = pos;
1287 574ed2c3 2017-11-29 stsp while (pos > last) {
1288 574ed2c3 2017-11-29 stsp fseek(fp, f[pos - 1], SEEK_SET);
1289 574ed2c3 2017-11-29 stsp nc = f[pos] - f[pos - 1];
1290 574ed2c3 2017-11-29 stsp if (nc >= sizeof(buf))
1291 574ed2c3 2017-11-29 stsp nc = sizeof(buf) - 1;
1292 574ed2c3 2017-11-29 stsp nc = fread(buf, 1, nc, fp);
1293 574ed2c3 2017-11-29 stsp if (nc > 0) {
1294 574ed2c3 2017-11-29 stsp buf[nc] = '\0';
1295 574ed2c3 2017-11-29 stsp buf[strcspn(buf, "\n")] = '\0';
1296 574ed2c3 2017-11-29 stsp if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1297 574ed2c3 2017-11-29 stsp if (begins_with(buf, "private:")) {
1298 574ed2c3 2017-11-29 stsp if (!state)
1299 574ed2c3 2017-11-29 stsp state = " (private)";
1300 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "protected:")) {
1301 574ed2c3 2017-11-29 stsp if (!state)
1302 574ed2c3 2017-11-29 stsp state = " (protected)";
1303 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "public:")) {
1304 574ed2c3 2017-11-29 stsp if (!state)
1305 574ed2c3 2017-11-29 stsp state = " (public)";
1307 ed9e98a8 2017-11-29 stsp strlcpy(ds->lastbuf, buf, sizeof ds->lastbuf);
1308 574ed2c3 2017-11-29 stsp if (state)
1309 ed9e98a8 2017-11-29 stsp strlcat(ds->lastbuf, state,
1310 ed9e98a8 2017-11-29 stsp sizeof ds->lastbuf);
1311 ed9e98a8 2017-11-29 stsp ds->lastmatchline = pos;
1312 ed9e98a8 2017-11-29 stsp return ds->lastbuf;
1318 ed9e98a8 2017-11-29 stsp return ds->lastmatchline > 0 ? ds->lastbuf : NULL;
1321 574ed2c3 2017-11-29 stsp /* dump accumulated "context" diff changes */
1322 574ed2c3 2017-11-29 stsp static void
1323 ed9e98a8 2017-11-29 stsp dump_context_vec(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
1325 ed9e98a8 2017-11-29 stsp struct context_vec *cvp = ds->context_vec_start;
1326 574ed2c3 2017-11-29 stsp int lowa, upb, lowc, upd, do_output;
1327 574ed2c3 2017-11-29 stsp int a, b, c, d;
1328 574ed2c3 2017-11-29 stsp char ch, *f;
1330 ed9e98a8 2017-11-29 stsp if (ds->context_vec_start > ds->context_vec_ptr)
1333 574ed2c3 2017-11-29 stsp b = d = 0; /* gcc */
1334 cb056f1e 2017-11-29 stsp lowa = MAXIMUM(1, cvp->a - diff_args.diff_context);
1335 ed9e98a8 2017-11-29 stsp upb = MINIMUM(ds->len[0], ds->context_vec_ptr->b + diff_args.diff_context);
1336 cb056f1e 2017-11-29 stsp lowc = MAXIMUM(1, cvp->c - diff_args.diff_context);
1337 ed9e98a8 2017-11-29 stsp upd = MINIMUM(ds->len[1], ds->context_vec_ptr->d + diff_args.diff_context);
1339 574ed2c3 2017-11-29 stsp diff_output("***************");
1340 574ed2c3 2017-11-29 stsp if ((flags & D_PROTOTYPE)) {
1341 ed9e98a8 2017-11-29 stsp f = match_function(ds, ds->ixold, lowa-1, f1);
1342 574ed2c3 2017-11-29 stsp if (f != NULL)
1343 574ed2c3 2017-11-29 stsp diff_output(" %s", f);
1345 574ed2c3 2017-11-29 stsp diff_output("\n*** ");
1346 574ed2c3 2017-11-29 stsp range(lowa, upb, ",");
1347 574ed2c3 2017-11-29 stsp diff_output(" ****\n");
1350 574ed2c3 2017-11-29 stsp * Output changes to the "old" file. The first loop suppresses
1351 574ed2c3 2017-11-29 stsp * output if there were no changes to the "old" file (we'll see
1352 574ed2c3 2017-11-29 stsp * the "old" lines as context in the "new" list).
1354 574ed2c3 2017-11-29 stsp do_output = 0;
1355 ed9e98a8 2017-11-29 stsp for (; cvp <= ds->context_vec_ptr; cvp++)
1356 574ed2c3 2017-11-29 stsp if (cvp->a <= cvp->b) {
1357 ed9e98a8 2017-11-29 stsp cvp = ds->context_vec_start;
1358 574ed2c3 2017-11-29 stsp do_output++;
1361 574ed2c3 2017-11-29 stsp if (do_output) {
1362 ed9e98a8 2017-11-29 stsp while (cvp <= ds->context_vec_ptr) {
1363 574ed2c3 2017-11-29 stsp a = cvp->a;
1364 574ed2c3 2017-11-29 stsp b = cvp->b;
1365 574ed2c3 2017-11-29 stsp c = cvp->c;
1366 574ed2c3 2017-11-29 stsp d = cvp->d;
1368 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1371 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1373 574ed2c3 2017-11-29 stsp if (ch == 'a')
1374 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, lowa, b, f1, ' ', 0, flags);
1376 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1377 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, a, b, f1,
1378 574ed2c3 2017-11-29 stsp ch == 'c' ? '!' : '-', 0, flags);
1380 574ed2c3 2017-11-29 stsp lowa = b + 1;
1383 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, b + 1, upb, f1, ' ', 0, flags);
1385 574ed2c3 2017-11-29 stsp /* output changes to the "new" file */
1386 574ed2c3 2017-11-29 stsp diff_output("--- ");
1387 574ed2c3 2017-11-29 stsp range(lowc, upd, ",");
1388 574ed2c3 2017-11-29 stsp diff_output(" ----\n");
1390 574ed2c3 2017-11-29 stsp do_output = 0;
1391 ed9e98a8 2017-11-29 stsp for (cvp = ds->context_vec_start; cvp <= ds->context_vec_ptr; cvp++)
1392 574ed2c3 2017-11-29 stsp if (cvp->c <= cvp->d) {
1393 ed9e98a8 2017-11-29 stsp cvp = ds->context_vec_start;
1394 574ed2c3 2017-11-29 stsp do_output++;
1397 574ed2c3 2017-11-29 stsp if (do_output) {
1398 ed9e98a8 2017-11-29 stsp while (cvp <= ds->context_vec_ptr) {
1399 574ed2c3 2017-11-29 stsp a = cvp->a;
1400 574ed2c3 2017-11-29 stsp b = cvp->b;
1401 574ed2c3 2017-11-29 stsp c = cvp->c;
1402 574ed2c3 2017-11-29 stsp d = cvp->d;
1404 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1407 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1409 574ed2c3 2017-11-29 stsp if (ch == 'd')
1410 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, lowc, d, f2, ' ', 0, flags);
1412 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, lowc, c - 1, f2, ' ', 0, flags);
1413 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, c, d, f2,
1414 574ed2c3 2017-11-29 stsp ch == 'c' ? '!' : '+', 0, flags);
1416 574ed2c3 2017-11-29 stsp lowc = d + 1;
1419 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, d + 1, upd, f2, ' ', 0, flags);
1421 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
1424 574ed2c3 2017-11-29 stsp /* dump accumulated "unified" diff changes */
1425 574ed2c3 2017-11-29 stsp static void
1426 ed9e98a8 2017-11-29 stsp dump_unified_vec(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
1428 ed9e98a8 2017-11-29 stsp struct context_vec *cvp = ds->context_vec_start;
1429 574ed2c3 2017-11-29 stsp int lowa, upb, lowc, upd;
1430 574ed2c3 2017-11-29 stsp int a, b, c, d;
1431 574ed2c3 2017-11-29 stsp char ch, *f;
1433 ed9e98a8 2017-11-29 stsp if (ds->context_vec_start > ds->context_vec_ptr)
1436 574ed2c3 2017-11-29 stsp b = d = 0; /* gcc */
1437 cb056f1e 2017-11-29 stsp lowa = MAXIMUM(1, cvp->a - diff_args.diff_context);
1438 ed9e98a8 2017-11-29 stsp upb = MINIMUM(ds->len[0], ds->context_vec_ptr->b + diff_args.diff_context);
1439 cb056f1e 2017-11-29 stsp lowc = MAXIMUM(1, cvp->c - diff_args.diff_context);
1440 ed9e98a8 2017-11-29 stsp upd = MINIMUM(ds->len[1], ds->context_vec_ptr->d + diff_args.diff_context);
1442 574ed2c3 2017-11-29 stsp diff_output("@@ -");
1443 574ed2c3 2017-11-29 stsp uni_range(lowa, upb);
1444 574ed2c3 2017-11-29 stsp diff_output(" +");
1445 574ed2c3 2017-11-29 stsp uni_range(lowc, upd);
1446 574ed2c3 2017-11-29 stsp diff_output(" @@");
1447 574ed2c3 2017-11-29 stsp if ((flags & D_PROTOTYPE)) {
1448 ed9e98a8 2017-11-29 stsp f = match_function(ds, ds->ixold, lowa-1, f1);
1449 574ed2c3 2017-11-29 stsp if (f != NULL)
1450 574ed2c3 2017-11-29 stsp diff_output(" %s", f);
1452 574ed2c3 2017-11-29 stsp diff_output("\n");
1455 574ed2c3 2017-11-29 stsp * Output changes in "unified" diff format--the old and new lines
1456 574ed2c3 2017-11-29 stsp * are printed together.
1458 ed9e98a8 2017-11-29 stsp for (; cvp <= ds->context_vec_ptr; cvp++) {
1459 574ed2c3 2017-11-29 stsp a = cvp->a;
1460 574ed2c3 2017-11-29 stsp b = cvp->b;
1461 574ed2c3 2017-11-29 stsp c = cvp->c;
1462 574ed2c3 2017-11-29 stsp d = cvp->d;
1465 574ed2c3 2017-11-29 stsp * c: both new and old changes
1466 574ed2c3 2017-11-29 stsp * d: only changes in the old file
1467 574ed2c3 2017-11-29 stsp * a: only changes in the new file
1469 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1472 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1474 574ed2c3 2017-11-29 stsp switch (ch) {
1476 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1477 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, a, b, f1, '-', 0, flags);
1478 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, c, d, f2, '+', 0, flags);
1481 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1482 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixold, a, b, f1, '-', 0, flags);
1485 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, lowc, c - 1, f2, ' ', 0, flags);
1486 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, c, d, f2, '+', 0, flags);
1489 574ed2c3 2017-11-29 stsp lowa = b + 1;
1490 574ed2c3 2017-11-29 stsp lowc = d + 1;
1492 ed9e98a8 2017-11-29 stsp fetch(ds, ds->ixnew, d + 1, upd, f2, ' ', 0, flags);
1494 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
1497 574ed2c3 2017-11-29 stsp static void
1498 574ed2c3 2017-11-29 stsp print_header(const char *file1, const char *file2)
1500 cb056f1e 2017-11-29 stsp if (diff_args.label[0] != NULL)
1501 cb056f1e 2017-11-29 stsp diff_output("%s %s\n", diff_args.diff_format == D_CONTEXT ? "***" : "---",
1502 cb056f1e 2017-11-29 stsp diff_args.label[0]);
1504 cb056f1e 2017-11-29 stsp diff_output("%s %s\t%s", diff_args.diff_format == D_CONTEXT ? "***" : "---",
1505 cb056f1e 2017-11-29 stsp file1, ctime(&diff_args.stb1.st_mtime));
1506 cb056f1e 2017-11-29 stsp if (diff_args.label[1] != NULL)
1507 cb056f1e 2017-11-29 stsp diff_output("%s %s\n", diff_args.diff_format == D_CONTEXT ? "---" : "+++",
1508 cb056f1e 2017-11-29 stsp diff_args.label[1]);
1510 cb056f1e 2017-11-29 stsp diff_output("%s %s\t%s", diff_args.diff_format == D_CONTEXT ? "---" : "+++",
1511 cb056f1e 2017-11-29 stsp file2, ctime(&diff_args.stb2.st_mtime));
