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 cb74ff21 2017-11-30 stsp #include <stdarg.h>
77 574ed2c3 2017-11-29 stsp #include <stddef.h>
78 574ed2c3 2017-11-29 stsp #include <stdint.h>
79 574ed2c3 2017-11-29 stsp #include <stdio.h>
80 574ed2c3 2017-11-29 stsp #include <stdlib.h>
81 574ed2c3 2017-11-29 stsp #include <string.h>
82 574ed2c3 2017-11-29 stsp #include <unistd.h>
83 574ed2c3 2017-11-29 stsp #include <limits.h>
84 7d283eee 2017-11-29 stsp #include <sha1.h>
85 7d283eee 2017-11-29 stsp #include <zlib.h>
87 7d283eee 2017-11-29 stsp #include "got_error.h"
88 7d283eee 2017-11-29 stsp #include "got_object.h"
89 7d283eee 2017-11-29 stsp #include "got_diff.h"
91 718b3ab0 2018-03-17 stsp #include "got_lib_diff.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 cb74ff21 2017-11-30 stsp static void diff_output(FILE *, const char *, ...);
187 322260e1 2018-01-26 mpi static int output(FILE *, struct got_diff_state *, struct got_diff_args *, const char *, FILE *, const char *, FILE *, int);
188 ed9e98a8 2017-11-29 stsp static void check(struct got_diff_state *, FILE *, FILE *, int);
189 cb74ff21 2017-11-30 stsp static void range(FILE *, int, int, char *);
190 cb74ff21 2017-11-30 stsp static void uni_range(FILE *, int, int);
191 cb74ff21 2017-11-30 stsp static void dump_context_vec(FILE *, struct got_diff_state *, struct got_diff_args *, FILE *, FILE *, int);
192 cb74ff21 2017-11-30 stsp static void dump_unified_vec(FILE *, struct got_diff_state *, struct got_diff_args *, FILE *, FILE *, int);
193 322260e1 2018-01-26 mpi static int prepare(struct got_diff_state *, int, FILE *, off_t, int);
194 ed9e98a8 2017-11-29 stsp static void prune(struct got_diff_state *);
195 574ed2c3 2017-11-29 stsp static void equiv(struct line *, int, struct line *, int, int *);
196 ed9e98a8 2017-11-29 stsp static void unravel(struct got_diff_state *, int);
197 322260e1 2018-01-26 mpi static int unsort(struct line *, int, int *);
198 322260e1 2018-01-26 mpi static int change(FILE *, struct got_diff_state *, struct got_diff_args *, const char *, FILE *, const char *, FILE *, int, int, int, int, int *);
199 574ed2c3 2017-11-29 stsp static void sort(struct line *, int);
200 cb74ff21 2017-11-30 stsp static void print_header(FILE *, struct got_diff_state *, struct got_diff_args *, const char *, const char *);
201 574ed2c3 2017-11-29 stsp static int ignoreline(char *);
202 574ed2c3 2017-11-29 stsp static int asciifile(FILE *);
203 cb74ff21 2017-11-30 stsp static int fetch(FILE *, struct got_diff_state *, struct got_diff_args *, long *, int, int, FILE *, int, int, int);
204 322260e1 2018-01-26 mpi static int newcand(struct got_diff_state *, int, int, int, int *);
205 ed9e98a8 2017-11-29 stsp static int search(struct got_diff_state *, int *, int, int);
206 574ed2c3 2017-11-29 stsp static int skipline(FILE *);
207 574ed2c3 2017-11-29 stsp static int isqrt(int);
208 ed9e98a8 2017-11-29 stsp static int stone(struct got_diff_state *, int *, int, int *, int *, int);
209 ed9e98a8 2017-11-29 stsp static int readhash(struct got_diff_state *, FILE *, int);
210 1c7f0520 2017-11-29 stsp static int files_differ(struct got_diff_state *, FILE *, FILE *, int);
211 ed9e98a8 2017-11-29 stsp static char *match_function(struct got_diff_state *, const long *, int, FILE *);
212 574ed2c3 2017-11-29 stsp static char *preadline(int, size_t, off_t);
215 574ed2c3 2017-11-29 stsp * chrtran points to one of 2 translation tables: cup2low if folding upper to
216 574ed2c3 2017-11-29 stsp * lower case clow2low if not folding case
218 574ed2c3 2017-11-29 stsp u_char clow2low[256] = {
219 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
220 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
221 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
222 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
223 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
224 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
225 574ed2c3 2017-11-29 stsp 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
226 574ed2c3 2017-11-29 stsp 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
227 574ed2c3 2017-11-29 stsp 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
228 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
229 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
230 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
231 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
232 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
233 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
234 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
235 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
236 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
237 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
238 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
239 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
240 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
241 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
242 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
245 574ed2c3 2017-11-29 stsp u_char cup2low[256] = {
246 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
247 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
248 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
249 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
250 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
251 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61,
252 574ed2c3 2017-11-29 stsp 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
253 574ed2c3 2017-11-29 stsp 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
254 574ed2c3 2017-11-29 stsp 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62,
255 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
256 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
257 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
258 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
259 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
260 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
261 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
262 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
263 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
264 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
265 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
266 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
267 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
268 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
269 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
272 cb74ff21 2017-11-30 stsp static void
273 cb74ff21 2017-11-30 stsp diff_output(FILE *outfile, const char *fmt, ...)
275 cb74ff21 2017-11-30 stsp va_list ap;
277 cb74ff21 2017-11-30 stsp va_start(ap, fmt);
278 cb74ff21 2017-11-30 stsp vfprintf(outfile, fmt, ap);
279 cb74ff21 2017-11-30 stsp va_end(ap);
282 7d283eee 2017-11-29 stsp const struct got_error *
283 f9d67749 2017-11-30 stsp got_diffreg(int *rval, FILE *f1, FILE *f2, int flags,
284 cb74ff21 2017-11-30 stsp struct got_diff_args *args, struct got_diff_state *ds, FILE *outfile)
286 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
289 7d283eee 2017-11-29 stsp *rval = D_SAME;
290 ed9e98a8 2017-11-29 stsp ds->anychange = 0;
291 ed9e98a8 2017-11-29 stsp ds->lastline = 0;
292 ed9e98a8 2017-11-29 stsp ds->lastmatchline = 0;
293 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
294 76735683 2018-04-02 stsp ds->max_context = 64;
295 ed9e98a8 2017-11-29 stsp if (flags & D_IGNORECASE)
296 ed9e98a8 2017-11-29 stsp ds->chrtran = cup2low;
298 ed9e98a8 2017-11-29 stsp ds->chrtran = clow2low;
299 1c7f0520 2017-11-29 stsp if (S_ISDIR(ds->stb1.st_mode) != S_ISDIR(ds->stb2.st_mode)) {
300 1c7f0520 2017-11-29 stsp *rval = (S_ISDIR(ds->stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
301 7d283eee 2017-11-29 stsp return NULL;
303 ecf6e46e 2018-04-01 stsp if (flags & D_EMPTY1) {
304 574ed2c3 2017-11-29 stsp f1 = fopen(_PATH_DEVNULL, "r");
305 bb5dcc10 2018-04-01 stsp if (f1 == NULL) {
306 bb5dcc10 2018-04-01 stsp err = got_error_from_errno();
307 bb5dcc10 2018-04-01 stsp goto closem;
310 f9d67749 2017-11-30 stsp else if (f1 == NULL) {
311 8ba9a219 2017-11-29 stsp args->status |= 2;
312 574ed2c3 2017-11-29 stsp goto closem;
315 ecf6e46e 2018-04-01 stsp if (flags & D_EMPTY2) {
316 574ed2c3 2017-11-29 stsp f2 = fopen(_PATH_DEVNULL, "r");
317 bb5dcc10 2018-04-01 stsp if (f2 == NULL) {
318 bb5dcc10 2018-04-01 stsp err = got_error_from_errno();
319 bb5dcc10 2018-04-01 stsp goto closem;
321 ecf6e46e 2018-04-01 stsp } else if (f2 == NULL) {
322 8ba9a219 2017-11-29 stsp args->status |= 2;
323 574ed2c3 2017-11-29 stsp goto closem;
326 1c7f0520 2017-11-29 stsp switch (files_differ(ds, f1, f2, flags)) {
328 574ed2c3 2017-11-29 stsp goto closem;
332 574ed2c3 2017-11-29 stsp /* error */
333 8ba9a219 2017-11-29 stsp args->status |= 2;
334 574ed2c3 2017-11-29 stsp goto closem;
337 574ed2c3 2017-11-29 stsp if ((flags & D_FORCEASCII) == 0 &&
338 574ed2c3 2017-11-29 stsp (!asciifile(f1) || !asciifile(f2))) {
339 7d283eee 2017-11-29 stsp *rval = D_BINARY;
340 8ba9a219 2017-11-29 stsp args->status |= 1;
341 574ed2c3 2017-11-29 stsp goto closem;
343 322260e1 2018-01-26 mpi if (prepare(ds, 0, f1, ds->stb1.st_size, flags)) {
344 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
345 322260e1 2018-01-26 mpi goto closem;
347 322260e1 2018-01-26 mpi if (prepare(ds, 1, f2, ds->stb2.st_size, flags)) {
348 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
349 322260e1 2018-01-26 mpi goto closem;
353 ed9e98a8 2017-11-29 stsp sort(ds->sfile[0], ds->slen[0]);
354 ed9e98a8 2017-11-29 stsp sort(ds->sfile[1], ds->slen[1]);
356 ed9e98a8 2017-11-29 stsp ds->member = (int *)ds->file[1];
357 ed9e98a8 2017-11-29 stsp equiv(ds->sfile[0], ds->slen[0], ds->sfile[1], ds->slen[1], ds->member);
358 ed9e98a8 2017-11-29 stsp ds->member = reallocarray(ds->member, ds->slen[1] + 2, sizeof(*ds->member));
359 ed9e98a8 2017-11-29 stsp if (ds->member == NULL) {
360 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
361 7d283eee 2017-11-29 stsp goto closem;
364 ed9e98a8 2017-11-29 stsp ds->class = (int *)ds->file[0];
365 322260e1 2018-01-26 mpi if (unsort(ds->sfile[0], ds->slen[0], ds->class)) {
366 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
367 322260e1 2018-01-26 mpi goto closem;
369 ed9e98a8 2017-11-29 stsp ds->class = reallocarray(ds->class, ds->slen[0] + 2, sizeof(*ds->class));
370 ed9e98a8 2017-11-29 stsp if (ds->class == NULL) {
371 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
372 7d283eee 2017-11-29 stsp goto closem;
375 ed9e98a8 2017-11-29 stsp ds->klist = calloc(ds->slen[0] + 2, sizeof(*ds->klist));
376 ed9e98a8 2017-11-29 stsp if (ds->klist == NULL) {
377 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
378 7d283eee 2017-11-29 stsp goto closem;
380 ed9e98a8 2017-11-29 stsp ds->clen = 0;
381 ed9e98a8 2017-11-29 stsp ds->clistlen = 100;
382 ed9e98a8 2017-11-29 stsp ds->clist = calloc(ds->clistlen, sizeof(*ds->clist));
383 ed9e98a8 2017-11-29 stsp if (ds->clist == NULL) {
384 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
385 7d283eee 2017-11-29 stsp goto closem;
387 ed9e98a8 2017-11-29 stsp i = stone(ds, ds->class, ds->slen[0], ds->member, ds->klist, flags);
388 0a585a0d 2018-03-17 stsp if (i < 0) {
389 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
390 0a585a0d 2018-03-17 stsp free(ds->member);
391 0a585a0d 2018-03-17 stsp free(ds->class);
392 322260e1 2018-01-26 mpi goto closem;
394 0a585a0d 2018-03-17 stsp free(ds->member);
395 0a585a0d 2018-03-17 stsp free(ds->class);
397 ed9e98a8 2017-11-29 stsp ds->J = reallocarray(ds->J, ds->len[0] + 2, sizeof(*ds->J));
398 ed9e98a8 2017-11-29 stsp if (ds->J == NULL) {
399 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
400 7d283eee 2017-11-29 stsp goto closem;
402 ed9e98a8 2017-11-29 stsp unravel(ds, ds->klist[i]);
403 ed9e98a8 2017-11-29 stsp free(ds->clist);
404 ed9e98a8 2017-11-29 stsp ds->clist = NULL;
405 ed9e98a8 2017-11-29 stsp free(ds->klist);
406 ed9e98a8 2017-11-29 stsp ds->klist = NULL;
408 ed9e98a8 2017-11-29 stsp ds->ixold = reallocarray(ds->ixold, ds->len[0] + 2, sizeof(*ds->ixold));
409 ed9e98a8 2017-11-29 stsp if (ds->ixold == NULL) {
410 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
411 7d283eee 2017-11-29 stsp goto closem;
413 ed9e98a8 2017-11-29 stsp ds->ixnew = reallocarray(ds->ixnew, ds->len[1] + 2, sizeof(*ds->ixnew));
414 ed9e98a8 2017-11-29 stsp if (ds->ixnew == NULL) {
415 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
416 7d283eee 2017-11-29 stsp goto closem;
418 ed9e98a8 2017-11-29 stsp check(ds, f1, f2, flags);
419 322260e1 2018-01-26 mpi if (output(outfile, ds, args, args->label[0], f1, args->label[1], f2,
421 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
423 ed9e98a8 2017-11-29 stsp if (ds->anychange) {
424 8ba9a219 2017-11-29 stsp args->status |= 1;
425 7d283eee 2017-11-29 stsp if (*rval == D_SAME)
426 7d283eee 2017-11-29 stsp *rval = D_DIFFER;
428 574ed2c3 2017-11-29 stsp if (f1 != NULL)
429 574ed2c3 2017-11-29 stsp fclose(f1);
430 574ed2c3 2017-11-29 stsp if (f2 != NULL)
431 574ed2c3 2017-11-29 stsp fclose(f2);
433 7d283eee 2017-11-29 stsp return (err);
437 574ed2c3 2017-11-29 stsp * Check to see if the given files differ.
438 574ed2c3 2017-11-29 stsp * Returns 0 if they are the same, 1 if different, and -1 on error.
439 574ed2c3 2017-11-29 stsp * XXX - could use code from cmp(1) [faster]
442 1c7f0520 2017-11-29 stsp files_differ(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
444 574ed2c3 2017-11-29 stsp char buf1[BUFSIZ], buf2[BUFSIZ];
445 574ed2c3 2017-11-29 stsp size_t i, j;
447 1c7f0520 2017-11-29 stsp if ((flags & (D_EMPTY1|D_EMPTY2)) || ds->stb1.st_size != ds->stb2.st_size ||
448 1c7f0520 2017-11-29 stsp (ds->stb1.st_mode & S_IFMT) != (ds->stb2.st_mode & S_IFMT))
449 574ed2c3 2017-11-29 stsp return (1);
451 574ed2c3 2017-11-29 stsp i = fread(buf1, 1, sizeof(buf1), f1);
452 574ed2c3 2017-11-29 stsp j = fread(buf2, 1, sizeof(buf2), f2);
453 574ed2c3 2017-11-29 stsp if ((!i && ferror(f1)) || (!j && ferror(f2)))
454 574ed2c3 2017-11-29 stsp return (-1);
455 574ed2c3 2017-11-29 stsp if (i != j)
456 574ed2c3 2017-11-29 stsp return (1);
457 574ed2c3 2017-11-29 stsp if (i == 0)
458 574ed2c3 2017-11-29 stsp return (0);
459 574ed2c3 2017-11-29 stsp if (memcmp(buf1, buf2, i) != 0)
460 574ed2c3 2017-11-29 stsp return (1);
465 ed9e98a8 2017-11-29 stsp prepare(struct got_diff_state *ds, int i, FILE *fd, off_t filesize, int flags)
467 574ed2c3 2017-11-29 stsp struct line *p;
471 574ed2c3 2017-11-29 stsp rewind(fd);
473 574ed2c3 2017-11-29 stsp sz = (filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25;
474 574ed2c3 2017-11-29 stsp if (sz < 100)
477 322260e1 2018-01-26 mpi p = calloc(sz + 3, sizeof(*p));
478 322260e1 2018-01-26 mpi if (p == NULL)
479 322260e1 2018-01-26 mpi return (-1);
480 ed9e98a8 2017-11-29 stsp for (j = 0; (h = readhash(ds, fd, flags));) {
481 574ed2c3 2017-11-29 stsp if (j == sz) {
482 574ed2c3 2017-11-29 stsp sz = sz * 3 / 2;
483 322260e1 2018-01-26 mpi p = reallocarray(p, sz + 3, sizeof(*p));
484 322260e1 2018-01-26 mpi if (p == NULL)
485 322260e1 2018-01-26 mpi return (-1);
487 574ed2c3 2017-11-29 stsp p[++j].value = h;
489 ed9e98a8 2017-11-29 stsp ds->len[i] = j;
490 ed9e98a8 2017-11-29 stsp ds->file[i] = p;
495 574ed2c3 2017-11-29 stsp static void
496 ed9e98a8 2017-11-29 stsp prune(struct got_diff_state *ds)
500 ed9e98a8 2017-11-29 stsp for (ds->pref = 0; ds->pref < ds->len[0] && ds->pref < ds->len[1] &&
501 ed9e98a8 2017-11-29 stsp ds->file[0][ds->pref + 1].value == ds->file[1][ds->pref + 1].value;
502 ed9e98a8 2017-11-29 stsp ds->pref++)
504 ed9e98a8 2017-11-29 stsp for (ds->suff = 0; ds->suff < ds->len[0] - ds->pref && ds->suff < ds->len[1] - ds->pref &&
505 ed9e98a8 2017-11-29 stsp ds->file[0][ds->len[0] - ds->suff].value == ds->file[1][ds->len[1] - ds->suff].value;
506 ed9e98a8 2017-11-29 stsp ds->suff++)
508 574ed2c3 2017-11-29 stsp for (j = 0; j < 2; j++) {
509 ed9e98a8 2017-11-29 stsp ds->sfile[j] = ds->file[j] + ds->pref;
510 ed9e98a8 2017-11-29 stsp ds->slen[j] = ds->len[j] - ds->pref - ds->suff;
511 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->slen[j]; i++)
512 ed9e98a8 2017-11-29 stsp ds->sfile[j][i].serial = i;
516 574ed2c3 2017-11-29 stsp static void
517 574ed2c3 2017-11-29 stsp equiv(struct line *a, int n, struct line *b, int m, int *c)
522 574ed2c3 2017-11-29 stsp while (i <= n && j <= m) {
523 574ed2c3 2017-11-29 stsp if (a[i].value < b[j].value)
524 574ed2c3 2017-11-29 stsp a[i++].value = 0;
525 574ed2c3 2017-11-29 stsp else if (a[i].value == b[j].value)
526 574ed2c3 2017-11-29 stsp a[i++].value = j;
530 574ed2c3 2017-11-29 stsp while (i <= n)
531 574ed2c3 2017-11-29 stsp a[i++].value = 0;
532 574ed2c3 2017-11-29 stsp b[m + 1].value = 0;
534 574ed2c3 2017-11-29 stsp while (++j <= m) {
535 574ed2c3 2017-11-29 stsp c[j] = -b[j].serial;
536 574ed2c3 2017-11-29 stsp while (b[j + 1].value == b[j].value) {
538 574ed2c3 2017-11-29 stsp c[j] = b[j].serial;
544 574ed2c3 2017-11-29 stsp /* Code taken from ping.c */
546 574ed2c3 2017-11-29 stsp isqrt(int n)
548 574ed2c3 2017-11-29 stsp int y, x = 1;
550 574ed2c3 2017-11-29 stsp if (n == 0)
551 574ed2c3 2017-11-29 stsp return (0);
553 574ed2c3 2017-11-29 stsp do { /* newton was a stinker */
558 574ed2c3 2017-11-29 stsp } while ((x - y) > 1 || (x - y) < -1);
560 574ed2c3 2017-11-29 stsp return (x);
564 ed9e98a8 2017-11-29 stsp stone(struct got_diff_state *ds, int *a, int n, int *b, int *c, int flags)
566 574ed2c3 2017-11-29 stsp int i, k, y, j, l;
567 574ed2c3 2017-11-29 stsp int oldc, tc, oldl, sq;
568 574ed2c3 2017-11-29 stsp u_int numtries, bound;
571 574ed2c3 2017-11-29 stsp if (flags & D_MINIMAL)
572 574ed2c3 2017-11-29 stsp bound = UINT_MAX;
574 574ed2c3 2017-11-29 stsp sq = isqrt(n);
575 574ed2c3 2017-11-29 stsp bound = MAXIMUM(256, sq);
579 322260e1 2018-01-26 mpi c[0] = newcand(ds, 0, 0, 0, &error);
582 574ed2c3 2017-11-29 stsp for (i = 1; i <= n; i++) {
584 574ed2c3 2017-11-29 stsp if (j == 0)
588 574ed2c3 2017-11-29 stsp oldc = c[0];
589 574ed2c3 2017-11-29 stsp numtries = 0;
591 ed9e98a8 2017-11-29 stsp if (y <= ds->clist[oldc].y)
593 ed9e98a8 2017-11-29 stsp l = search(ds, c, k, y);
594 574ed2c3 2017-11-29 stsp if (l != oldl + 1)
595 574ed2c3 2017-11-29 stsp oldc = c[l - 1];
596 574ed2c3 2017-11-29 stsp if (l <= k) {
597 ed9e98a8 2017-11-29 stsp if (ds->clist[c[l]].y <= y)
600 322260e1 2018-01-26 mpi c[l] = newcand(ds, i, y, oldc, &error);
605 574ed2c3 2017-11-29 stsp numtries++;
607 322260e1 2018-01-26 mpi c[l] = newcand(ds, i, y, oldc, &error);
613 574ed2c3 2017-11-29 stsp } while ((y = b[++j]) > 0 && numtries < bound);
615 574ed2c3 2017-11-29 stsp return (k);
619 322260e1 2018-01-26 mpi newcand(struct got_diff_state *ds, int x, int y, int pred, int *errorp)
621 574ed2c3 2017-11-29 stsp struct cand *q;
623 ed9e98a8 2017-11-29 stsp if (ds->clen == ds->clistlen) {
624 ed9e98a8 2017-11-29 stsp ds->clistlen = ds->clistlen * 11 / 10;
625 322260e1 2018-01-26 mpi ds->clist = reallocarray(ds->clist, ds->clistlen,
626 322260e1 2018-01-26 mpi sizeof(*ds->clist));
627 322260e1 2018-01-26 mpi if (ds->clist == NULL) {
628 322260e1 2018-01-26 mpi *errorp = -1;
632 ed9e98a8 2017-11-29 stsp q = ds->clist + ds->clen;
635 574ed2c3 2017-11-29 stsp q->pred = pred;
636 322260e1 2018-01-26 mpi *errorp = 0;
637 ed9e98a8 2017-11-29 stsp return (ds->clen++);
641 ed9e98a8 2017-11-29 stsp search(struct got_diff_state *ds, int *c, int k, int y)
643 574ed2c3 2017-11-29 stsp int i, j, l, t;
645 ed9e98a8 2017-11-29 stsp if (ds->clist[c[k]].y < y) /* quick look for typical case */
646 574ed2c3 2017-11-29 stsp return (k + 1);
650 574ed2c3 2017-11-29 stsp l = (i + j) / 2;
651 574ed2c3 2017-11-29 stsp if (l <= i)
653 ed9e98a8 2017-11-29 stsp t = ds->clist[c[l]].y;
656 574ed2c3 2017-11-29 stsp else if (t < y)
659 574ed2c3 2017-11-29 stsp return (l);
661 574ed2c3 2017-11-29 stsp return (l + 1);
664 574ed2c3 2017-11-29 stsp static void
665 ed9e98a8 2017-11-29 stsp unravel(struct got_diff_state *ds, int p)
667 574ed2c3 2017-11-29 stsp struct cand *q;
670 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->len[0]; i++)
671 ed9e98a8 2017-11-29 stsp ds->J[i] = i <= ds->pref ? i :
672 ed9e98a8 2017-11-29 stsp i > ds->len[0] - ds->suff ? i + ds->len[1] - ds->len[0] : 0;
673 ed9e98a8 2017-11-29 stsp for (q = ds->clist + p; q->y != 0; q = ds->clist + q->pred)
674 ed9e98a8 2017-11-29 stsp ds->J[q->x + ds->pref] = q->y + ds->pref;
678 574ed2c3 2017-11-29 stsp * Check does double duty:
679 574ed2c3 2017-11-29 stsp * 1. ferret out any fortuitous correspondences due
680 574ed2c3 2017-11-29 stsp * to confounding by hashing (which result in "jackpot")
681 574ed2c3 2017-11-29 stsp * 2. collect random access indexes to the two files
683 574ed2c3 2017-11-29 stsp static void
684 ed9e98a8 2017-11-29 stsp check(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
686 574ed2c3 2017-11-29 stsp int i, j, jackpot, c, d;
687 574ed2c3 2017-11-29 stsp long ctold, ctnew;
689 574ed2c3 2017-11-29 stsp rewind(f1);
690 574ed2c3 2017-11-29 stsp rewind(f2);
692 ed9e98a8 2017-11-29 stsp ds->ixold[0] = ds->ixnew[0] = 0;
693 574ed2c3 2017-11-29 stsp jackpot = 0;
694 574ed2c3 2017-11-29 stsp ctold = ctnew = 0;
695 ed9e98a8 2017-11-29 stsp for (i = 1; i <= ds->len[0]; i++) {
696 ed9e98a8 2017-11-29 stsp if (ds->J[i] == 0) {
697 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold += skipline(f1);
700 ed9e98a8 2017-11-29 stsp while (j < ds->J[i]) {
701 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
704 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE)) {
706 574ed2c3 2017-11-29 stsp c = getc(f1);
707 574ed2c3 2017-11-29 stsp d = getc(f2);
709 574ed2c3 2017-11-29 stsp * GNU diff ignores a missing newline
710 574ed2c3 2017-11-29 stsp * in one file for -b or -w.
712 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) {
713 574ed2c3 2017-11-29 stsp if (c == EOF && d == '\n') {
716 574ed2c3 2017-11-29 stsp } else if (c == '\n' && d == EOF) {
723 574ed2c3 2017-11-29 stsp if ((flags & D_FOLDBLANKS) && isspace(c) &&
724 574ed2c3 2017-11-29 stsp isspace(d)) {
726 574ed2c3 2017-11-29 stsp if (c == '\n')
729 574ed2c3 2017-11-29 stsp } while (isspace(c = getc(f1)));
731 574ed2c3 2017-11-29 stsp if (d == '\n')
734 574ed2c3 2017-11-29 stsp } while (isspace(d = getc(f2)));
735 574ed2c3 2017-11-29 stsp } else if ((flags & D_IGNOREBLANKS)) {
736 574ed2c3 2017-11-29 stsp while (isspace(c) && c != '\n') {
737 574ed2c3 2017-11-29 stsp c = getc(f1);
740 574ed2c3 2017-11-29 stsp while (isspace(d) && d != '\n') {
741 574ed2c3 2017-11-29 stsp d = getc(f2);
745 ed9e98a8 2017-11-29 stsp if (ds->chrtran[c] != ds->chrtran[d]) {
747 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
748 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
749 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
750 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
751 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
754 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
761 574ed2c3 2017-11-29 stsp if ((c = getc(f1)) != (d = getc(f2))) {
762 574ed2c3 2017-11-29 stsp /* jackpot++; */
763 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
764 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
765 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
766 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
767 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
770 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
774 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold;
775 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew;
778 ed9e98a8 2017-11-29 stsp for (; j <= ds->len[1]; j++)
779 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
781 574ed2c3 2017-11-29 stsp * if (jackpot)
782 574ed2c3 2017-11-29 stsp * fprintf(stderr, "jackpot\n");
786 574ed2c3 2017-11-29 stsp /* shellsort CACM #201 */
787 574ed2c3 2017-11-29 stsp static void
788 574ed2c3 2017-11-29 stsp sort(struct line *a, int n)
790 574ed2c3 2017-11-29 stsp struct line *ai, *aim, w;
791 574ed2c3 2017-11-29 stsp int j, m = 0, k;
793 574ed2c3 2017-11-29 stsp if (n == 0)
795 574ed2c3 2017-11-29 stsp for (j = 1; j <= n; j *= 2)
796 574ed2c3 2017-11-29 stsp m = 2 * j - 1;
797 574ed2c3 2017-11-29 stsp for (m /= 2; m != 0; m /= 2) {
799 574ed2c3 2017-11-29 stsp for (j = 1; j <= k; j++) {
800 574ed2c3 2017-11-29 stsp for (ai = &a[j]; ai > a; ai -= m) {
801 574ed2c3 2017-11-29 stsp aim = &ai[m];
802 574ed2c3 2017-11-29 stsp if (aim < ai)
803 574ed2c3 2017-11-29 stsp break; /* wraparound */
804 574ed2c3 2017-11-29 stsp if (aim->value > ai[0].value ||
805 574ed2c3 2017-11-29 stsp (aim->value == ai[0].value &&
806 574ed2c3 2017-11-29 stsp aim->serial > ai[0].serial))
808 574ed2c3 2017-11-29 stsp w.value = ai[0].value;
809 574ed2c3 2017-11-29 stsp ai[0].value = aim->value;
810 574ed2c3 2017-11-29 stsp aim->value = w.value;
811 574ed2c3 2017-11-29 stsp w.serial = ai[0].serial;
812 574ed2c3 2017-11-29 stsp ai[0].serial = aim->serial;
813 574ed2c3 2017-11-29 stsp aim->serial = w.serial;
820 574ed2c3 2017-11-29 stsp unsort(struct line *f, int l, int *b)
824 322260e1 2018-01-26 mpi a = calloc(l + 1, sizeof(*a));
825 322260e1 2018-01-26 mpi if (a == NULL)
826 322260e1 2018-01-26 mpi return (-1);
827 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
828 574ed2c3 2017-11-29 stsp a[f[i].serial] = f[i].value;
829 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
830 574ed2c3 2017-11-29 stsp b[i] = a[i];
837 574ed2c3 2017-11-29 stsp skipline(FILE *f)
841 574ed2c3 2017-11-29 stsp for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
843 574ed2c3 2017-11-29 stsp return (i);
847 cb74ff21 2017-11-30 stsp output(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
848 f9d67749 2017-11-30 stsp const char *file1, FILE *f1, const char *file2, FILE *f2, int flags)
850 574ed2c3 2017-11-29 stsp int m, i0, i1, j0, j1;
851 322260e1 2018-01-26 mpi int error = 0;
853 574ed2c3 2017-11-29 stsp rewind(f1);
854 574ed2c3 2017-11-29 stsp rewind(f2);
855 ed9e98a8 2017-11-29 stsp m = ds->len[0];
856 ed9e98a8 2017-11-29 stsp ds->J[0] = 0;
857 ed9e98a8 2017-11-29 stsp ds->J[m + 1] = ds->len[1] + 1;
858 8ba9a219 2017-11-29 stsp if (args->diff_format != D_EDIT) {
859 574ed2c3 2017-11-29 stsp for (i0 = 1; i0 <= m; i0 = i1 + 1) {
860 ed9e98a8 2017-11-29 stsp while (i0 <= m && ds->J[i0] == ds->J[i0 - 1] + 1)
862 ed9e98a8 2017-11-29 stsp j0 = ds->J[i0 - 1] + 1;
863 574ed2c3 2017-11-29 stsp i1 = i0 - 1;
864 ed9e98a8 2017-11-29 stsp while (i1 < m && ds->J[i1 + 1] == 0)
866 ed9e98a8 2017-11-29 stsp j1 = ds->J[i1 + 1] - 1;
867 ed9e98a8 2017-11-29 stsp ds->J[i1] = j1;
868 322260e1 2018-01-26 mpi error = change(outfile, ds, args, file1, f1, file2, f2,
869 322260e1 2018-01-26 mpi i0, i1, j0, j1, &flags);
871 322260e1 2018-01-26 mpi return (error);
874 574ed2c3 2017-11-29 stsp for (i0 = m; i0 >= 1; i0 = i1 - 1) {
875 ed9e98a8 2017-11-29 stsp while (i0 >= 1 && ds->J[i0] == ds->J[i0 + 1] - 1 && ds->J[i0] != 0)
877 ed9e98a8 2017-11-29 stsp j0 = ds->J[i0 + 1] - 1;
878 574ed2c3 2017-11-29 stsp i1 = i0 + 1;
879 ed9e98a8 2017-11-29 stsp while (i1 > 1 && ds->J[i1 - 1] == 0)
881 ed9e98a8 2017-11-29 stsp j1 = ds->J[i1 - 1] + 1;
882 ed9e98a8 2017-11-29 stsp ds->J[i1] = j1;
883 322260e1 2018-01-26 mpi change(outfile, ds, args, file1, f1, file2, f2, i1, i0,
884 322260e1 2018-01-26 mpi j1, j0, &flags);
886 322260e1 2018-01-26 mpi return (error);
889 322260e1 2018-01-26 mpi if (m == 0) {
890 322260e1 2018-01-26 mpi error = change(outfile, ds, args, file1, f1, file2, f2, 1, 0,
891 322260e1 2018-01-26 mpi 1, ds->len[1], &flags);
893 322260e1 2018-01-26 mpi return (error);
895 8ba9a219 2017-11-29 stsp if (args->diff_format == D_IFDEF) {
897 574ed2c3 2017-11-29 stsp #define c i0
898 574ed2c3 2017-11-29 stsp if ((c = getc(f1)) == EOF)
900 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", c);
904 ed9e98a8 2017-11-29 stsp if (ds->anychange != 0) {
905 8ba9a219 2017-11-29 stsp if (args->diff_format == D_CONTEXT)
906 cb74ff21 2017-11-30 stsp dump_context_vec(outfile, ds, args, f1, f2, flags);
907 8ba9a219 2017-11-29 stsp else if (args->diff_format == D_UNIFIED)
908 cb74ff21 2017-11-30 stsp dump_unified_vec(outfile, ds, args, f1, f2, flags);
914 574ed2c3 2017-11-29 stsp static void
915 cb74ff21 2017-11-30 stsp range(FILE *outfile, int a, int b, char *separator)
917 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d", a > b ? b : a);
919 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s%d", separator, b);
922 574ed2c3 2017-11-29 stsp static void
923 cb74ff21 2017-11-30 stsp uni_range(FILE *outfile, int a, int b)
926 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d,%d", a, b - a + 1);
927 574ed2c3 2017-11-29 stsp else if (a == b)
928 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d", b);
930 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d,0", b);
933 574ed2c3 2017-11-29 stsp static char *
934 574ed2c3 2017-11-29 stsp preadline(int fd, size_t rlen, off_t off)
936 574ed2c3 2017-11-29 stsp char *line;
937 574ed2c3 2017-11-29 stsp ssize_t nr;
939 322260e1 2018-01-26 mpi line = malloc(rlen + 1);
940 322260e1 2018-01-26 mpi if (line == NULL)
941 322260e1 2018-01-26 mpi return NULL;
942 322260e1 2018-01-26 mpi if ((nr = pread(fd, line, rlen, off)) < 0) {
944 322260e1 2018-01-26 mpi return NULL;
946 574ed2c3 2017-11-29 stsp if (nr > 0 && line[nr-1] == '\n')
948 574ed2c3 2017-11-29 stsp line[nr] = '\0';
949 574ed2c3 2017-11-29 stsp return (line);
953 574ed2c3 2017-11-29 stsp ignoreline(char *line)
955 7d283eee 2017-11-29 stsp return 0; /* do not ignore any lines */
959 574ed2c3 2017-11-29 stsp * Indicate that there is a difference between lines a and b of the from file
960 574ed2c3 2017-11-29 stsp * to get to lines c to d of the to file. If a is greater then b then there
961 574ed2c3 2017-11-29 stsp * are no lines in the from file involved and this means that there were
962 574ed2c3 2017-11-29 stsp * lines appended (beginning at b). If c is greater than d then there are
963 574ed2c3 2017-11-29 stsp * lines missing from the to file.
966 cb74ff21 2017-11-30 stsp change(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
967 f9d67749 2017-11-30 stsp const char *file1, FILE *f1, const char *file2, FILE *f2,
968 ed9e98a8 2017-11-29 stsp int a, int b, int c, int d, int *pflags)
973 8ba9a219 2017-11-29 stsp if (args->diff_format != D_IFDEF && a > b && c > d)
975 8ba9a219 2017-11-29 stsp if (args->ignore_pats != NULL) {
976 574ed2c3 2017-11-29 stsp char *line;
978 574ed2c3 2017-11-29 stsp * All lines in the change, insert, or delete must
979 574ed2c3 2017-11-29 stsp * match an ignore pattern for the change to be
982 574ed2c3 2017-11-29 stsp if (a <= b) { /* Changes and deletes. */
983 574ed2c3 2017-11-29 stsp for (i = a; i <= b; i++) {
984 574ed2c3 2017-11-29 stsp line = preadline(fileno(f1),
985 322260e1 2018-01-26 mpi ds->ixold[i] - ds->ixold[i - 1],
986 322260e1 2018-01-26 mpi ds->ixold[i - 1]);
987 322260e1 2018-01-26 mpi if (line == NULL)
988 322260e1 2018-01-26 mpi return (-1);
989 574ed2c3 2017-11-29 stsp if (!ignoreline(line))
990 574ed2c3 2017-11-29 stsp goto proceed;
993 574ed2c3 2017-11-29 stsp if (a > b || c <= d) { /* Changes and inserts. */
994 574ed2c3 2017-11-29 stsp for (i = c; i <= d; i++) {
995 574ed2c3 2017-11-29 stsp line = preadline(fileno(f2),
996 322260e1 2018-01-26 mpi ds->ixnew[i] - ds->ixnew[i - 1],
997 322260e1 2018-01-26 mpi ds->ixnew[i - 1]);
998 322260e1 2018-01-26 mpi if (line == NULL)
999 322260e1 2018-01-26 mpi return (-1);
1000 574ed2c3 2017-11-29 stsp if (!ignoreline(line))
1001 574ed2c3 2017-11-29 stsp goto proceed;
1004 322260e1 2018-01-26 mpi return (0);
1007 574ed2c3 2017-11-29 stsp if (*pflags & D_HEADER) {
1008 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s %s\n", args->diffargs, file1, file2);
1009 574ed2c3 2017-11-29 stsp *pflags &= ~D_HEADER;
1011 8ba9a219 2017-11-29 stsp if (args->diff_format == D_CONTEXT || args->diff_format == D_UNIFIED) {
1013 574ed2c3 2017-11-29 stsp * Allocate change records as needed.
1015 ed9e98a8 2017-11-29 stsp if (ds->context_vec_ptr == ds->context_vec_end - 1) {
1016 76735683 2018-04-02 stsp ptrdiff_t offset;
1017 76735683 2018-04-02 stsp offset = ds->context_vec_ptr - ds->context_vec_start;
1018 76735683 2018-04-02 stsp ds->max_context <<= 1;
1019 322260e1 2018-01-26 mpi ds->context_vec_start =
1020 76735683 2018-04-02 stsp reallocarray(ds->context_vec_start, ds->max_context,
1021 322260e1 2018-01-26 mpi sizeof(*ds->context_vec_start));
1022 322260e1 2018-01-26 mpi if (ds->context_vec_start == NULL)
1023 322260e1 2018-01-26 mpi return (-1);
1024 76735683 2018-04-02 stsp ds->context_vec_end = ds->context_vec_start +
1025 76735683 2018-04-02 stsp ds->max_context;
1026 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start + offset;
1028 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0) {
1030 574ed2c3 2017-11-29 stsp * Print the context/unidiff header first time through.
1032 cb74ff21 2017-11-30 stsp print_header(outfile, ds, args, file1, file2);
1033 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
1034 8ba9a219 2017-11-29 stsp } else if (a > ds->context_vec_ptr->b + (2 * args->diff_context) + 1 &&
1035 8ba9a219 2017-11-29 stsp c > ds->context_vec_ptr->d + (2 * args->diff_context) + 1) {
1037 574ed2c3 2017-11-29 stsp * If this change is more than 'diff_context' lines from the
1038 574ed2c3 2017-11-29 stsp * previous change, dump the record and reset it.
1040 8ba9a219 2017-11-29 stsp if (args->diff_format == D_CONTEXT)
1041 cb74ff21 2017-11-30 stsp dump_context_vec(outfile, ds, args, f1, f2, *pflags);
1043 cb74ff21 2017-11-30 stsp dump_unified_vec(outfile, ds, args, f1, f2, *pflags);
1045 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr++;
1046 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->a = a;
1047 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->b = b;
1048 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->c = c;
1049 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->d = d;
1050 322260e1 2018-01-26 mpi return (0);
1052 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0)
1053 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
1054 8ba9a219 2017-11-29 stsp switch (args->diff_format) {
1055 574ed2c3 2017-11-29 stsp case D_BRIEF:
1056 322260e1 2018-01-26 mpi return (0);
1057 574ed2c3 2017-11-29 stsp case D_NORMAL:
1058 574ed2c3 2017-11-29 stsp case D_EDIT:
1059 cb74ff21 2017-11-30 stsp range(outfile, a, b, ",");
1060 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", a > b ? 'a' : c > d ? 'd' : 'c');
1061 8ba9a219 2017-11-29 stsp if (args->diff_format == D_NORMAL)
1062 cb74ff21 2017-11-30 stsp range(outfile, c, d, ",");
1063 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n");
1065 574ed2c3 2017-11-29 stsp case D_REVERSE:
1066 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", a > b ? 'a' : c > d ? 'd' : 'c');
1067 cb74ff21 2017-11-30 stsp range(outfile, a, b, " ");
1068 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n");
1070 574ed2c3 2017-11-29 stsp case D_NREVERSE:
1071 574ed2c3 2017-11-29 stsp if (a > b)
1072 cb74ff21 2017-11-30 stsp diff_output(outfile, "a%d %d\n", b, d - c + 1);
1074 cb74ff21 2017-11-30 stsp diff_output(outfile, "d%d %d\n", a, b - a + 1);
1075 574ed2c3 2017-11-29 stsp if (!(c > d))
1076 574ed2c3 2017-11-29 stsp /* add changed lines */
1077 cb74ff21 2017-11-30 stsp diff_output(outfile, "a%d %d\n", b, d - c + 1);
1081 8ba9a219 2017-11-29 stsp if (args->diff_format == D_NORMAL || args->diff_format == D_IFDEF) {
1082 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1, '<', 1, *pflags);
1083 8ba9a219 2017-11-29 stsp if (a <= b && c <= d && args->diff_format == D_NORMAL)
1084 cb74ff21 2017-11-30 stsp diff_output(outfile, "---\n");
1086 cb74ff21 2017-11-30 stsp i = fetch(outfile, ds, args, ds->ixnew, c, d, f2, args->diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
1087 8ba9a219 2017-11-29 stsp if (i != 0 && args->diff_format == D_EDIT) {
1089 574ed2c3 2017-11-29 stsp * A non-zero return value for D_EDIT indicates that the
1090 574ed2c3 2017-11-29 stsp * last line printed was a bare dot (".") that has been
1091 574ed2c3 2017-11-29 stsp * escaped as ".." to prevent ed(1) from misinterpreting
1092 574ed2c3 2017-11-29 stsp * it. We have to add a substitute command to change this
1093 574ed2c3 2017-11-29 stsp * back and restart where we left off.
1095 cb74ff21 2017-11-30 stsp diff_output(outfile, ".\n");
1096 cb74ff21 2017-11-30 stsp diff_output(outfile, "%ds/.//\n", a + i - 1);
1097 574ed2c3 2017-11-29 stsp b = a + i - 1;
1098 574ed2c3 2017-11-29 stsp a = b + 1;
1100 574ed2c3 2017-11-29 stsp goto restart;
1102 8ba9a219 2017-11-29 stsp if ((args->diff_format == D_EDIT || args->diff_format == D_REVERSE) && c <= d)
1103 cb74ff21 2017-11-30 stsp diff_output(outfile, ".\n");
1104 ed9e98a8 2017-11-29 stsp if (ds->inifdef) {
1105 cb74ff21 2017-11-30 stsp diff_output(outfile, "#endif /* %s */\n", args->ifdefname);
1106 ed9e98a8 2017-11-29 stsp ds->inifdef = 0;
1109 322260e1 2018-01-26 mpi return (0);
1112 574ed2c3 2017-11-29 stsp static int
1113 cb74ff21 2017-11-30 stsp fetch(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
1114 8ba9a219 2017-11-29 stsp long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags)
1116 574ed2c3 2017-11-29 stsp int i, j, c, lastc, col, nc;
1119 574ed2c3 2017-11-29 stsp * When doing #ifdef's, copy down to current line
1120 574ed2c3 2017-11-29 stsp * if this is the first file, so that stuff makes it to output.
1122 8ba9a219 2017-11-29 stsp if (args->diff_format == D_IFDEF && oldfile) {
1123 574ed2c3 2017-11-29 stsp long curpos = ftell(lb);
1124 574ed2c3 2017-11-29 stsp /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1125 574ed2c3 2017-11-29 stsp nc = f[a > b ? b : a - 1] - curpos;
1126 574ed2c3 2017-11-29 stsp for (i = 0; i < nc; i++)
1127 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", getc(lb));
1129 574ed2c3 2017-11-29 stsp if (a > b)
1130 574ed2c3 2017-11-29 stsp return (0);
1131 8ba9a219 2017-11-29 stsp if (args->diff_format == D_IFDEF) {
1132 ed9e98a8 2017-11-29 stsp if (ds->inifdef) {
1133 cb74ff21 2017-11-30 stsp diff_output(outfile, "#else /* %s%s */\n",
1134 8ba9a219 2017-11-29 stsp oldfile == 1 ? "!" : "", args->ifdefname);
1136 574ed2c3 2017-11-29 stsp if (oldfile)
1137 cb74ff21 2017-11-30 stsp diff_output(outfile, "#ifndef %s\n", args->ifdefname);
1139 cb74ff21 2017-11-30 stsp diff_output(outfile, "#ifdef %s\n", args->ifdefname);
1141 ed9e98a8 2017-11-29 stsp ds->inifdef = 1 + oldfile;
1143 574ed2c3 2017-11-29 stsp for (i = a; i <= b; i++) {
1144 574ed2c3 2017-11-29 stsp fseek(lb, f[i - 1], SEEK_SET);
1145 574ed2c3 2017-11-29 stsp nc = f[i] - f[i - 1];
1146 8ba9a219 2017-11-29 stsp if (args->diff_format != D_IFDEF && ch != '\0') {
1147 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", ch);
1148 8ba9a219 2017-11-29 stsp if (args->Tflag && (args->diff_format == D_NORMAL || args->diff_format == D_CONTEXT
1149 8ba9a219 2017-11-29 stsp || args->diff_format == D_UNIFIED))
1150 cb74ff21 2017-11-30 stsp diff_output(outfile, "\t");
1151 8ba9a219 2017-11-29 stsp else if (args->diff_format != D_UNIFIED)
1152 cb74ff21 2017-11-30 stsp diff_output(outfile, " ");
1155 574ed2c3 2017-11-29 stsp for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
1156 574ed2c3 2017-11-29 stsp if ((c = getc(lb)) == EOF) {
1157 8ba9a219 2017-11-29 stsp if (args->diff_format == D_EDIT || args->diff_format == D_REVERSE ||
1158 8ba9a219 2017-11-29 stsp args->diff_format == D_NREVERSE)
1159 574ed2c3 2017-11-29 stsp warnx("No newline at end of file");
1161 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n\\ No newline at end of "
1162 574ed2c3 2017-11-29 stsp "file\n");
1163 574ed2c3 2017-11-29 stsp return (0);
1165 574ed2c3 2017-11-29 stsp if (c == '\t' && (flags & D_EXPANDTABS)) {
1167 cb74ff21 2017-11-30 stsp diff_output(outfile, " ");
1168 574ed2c3 2017-11-29 stsp } while (++col & 7);
1170 8ba9a219 2017-11-29 stsp if (args->diff_format == D_EDIT && j == 1 && c == '\n'
1171 574ed2c3 2017-11-29 stsp && lastc == '.') {
1173 574ed2c3 2017-11-29 stsp * Don't print a bare "." line
1174 574ed2c3 2017-11-29 stsp * since that will confuse ed(1).
1175 574ed2c3 2017-11-29 stsp * Print ".." instead and return,
1176 574ed2c3 2017-11-29 stsp * giving the caller an offset
1177 574ed2c3 2017-11-29 stsp * from which to restart.
1179 cb74ff21 2017-11-30 stsp diff_output(outfile, ".\n");
1180 574ed2c3 2017-11-29 stsp return (i - a + 1);
1182 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", c);
1187 574ed2c3 2017-11-29 stsp return (0);
1191 574ed2c3 2017-11-29 stsp * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1193 574ed2c3 2017-11-29 stsp static int
1194 ed9e98a8 2017-11-29 stsp readhash(struct got_diff_state *ds, FILE *f, int flags)
1196 574ed2c3 2017-11-29 stsp int i, t, space;
1200 574ed2c3 2017-11-29 stsp space = 0;
1201 574ed2c3 2017-11-29 stsp if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) {
1202 574ed2c3 2017-11-29 stsp if (flags & D_IGNORECASE)
1203 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1204 574ed2c3 2017-11-29 stsp if (t == EOF) {
1205 574ed2c3 2017-11-29 stsp if (i == 0)
1206 574ed2c3 2017-11-29 stsp return (0);
1209 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1212 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1213 574ed2c3 2017-11-29 stsp if (t == EOF) {
1214 574ed2c3 2017-11-29 stsp if (i == 0)
1215 574ed2c3 2017-11-29 stsp return (0);
1218 574ed2c3 2017-11-29 stsp sum = sum * 127 + t;
1221 574ed2c3 2017-11-29 stsp for (i = 0;;) {
1222 574ed2c3 2017-11-29 stsp switch (t = getc(f)) {
1223 574ed2c3 2017-11-29 stsp case '\t':
1224 574ed2c3 2017-11-29 stsp case '\r':
1225 574ed2c3 2017-11-29 stsp case '\v':
1226 574ed2c3 2017-11-29 stsp case '\f':
1231 574ed2c3 2017-11-29 stsp if (space && (flags & D_IGNOREBLANKS) == 0) {
1233 574ed2c3 2017-11-29 stsp space = 0;
1235 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1239 574ed2c3 2017-11-29 stsp if (i == 0)
1240 574ed2c3 2017-11-29 stsp return (0);
1241 574ed2c3 2017-11-29 stsp /* FALLTHROUGH */
1242 574ed2c3 2017-11-29 stsp case '\n':
1249 574ed2c3 2017-11-29 stsp * There is a remote possibility that we end up with a zero sum.
1250 574ed2c3 2017-11-29 stsp * Zero is used as an EOF marker, so return 1 instead.
1252 574ed2c3 2017-11-29 stsp return (sum == 0 ? 1 : sum);
1255 574ed2c3 2017-11-29 stsp static int
1256 574ed2c3 2017-11-29 stsp asciifile(FILE *f)
1258 574ed2c3 2017-11-29 stsp unsigned char buf[BUFSIZ];
1259 574ed2c3 2017-11-29 stsp size_t cnt;
1261 574ed2c3 2017-11-29 stsp if (f == NULL)
1262 574ed2c3 2017-11-29 stsp return (1);
1264 574ed2c3 2017-11-29 stsp rewind(f);
1265 574ed2c3 2017-11-29 stsp cnt = fread(buf, 1, sizeof(buf), f);
1266 574ed2c3 2017-11-29 stsp return (memchr(buf, '\0', cnt) == NULL);
1269 574ed2c3 2017-11-29 stsp #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)
1271 574ed2c3 2017-11-29 stsp static char *
1272 ed9e98a8 2017-11-29 stsp match_function(struct got_diff_state *ds, const long *f, int pos, FILE *fp)
1274 574ed2c3 2017-11-29 stsp unsigned char buf[FUNCTION_CONTEXT_SIZE];
1275 574ed2c3 2017-11-29 stsp size_t nc;
1276 ed9e98a8 2017-11-29 stsp int last = ds->lastline;
1277 574ed2c3 2017-11-29 stsp char *state = NULL;
1279 ed9e98a8 2017-11-29 stsp ds->lastline = pos;
1280 574ed2c3 2017-11-29 stsp while (pos > last) {
1281 574ed2c3 2017-11-29 stsp fseek(fp, f[pos - 1], SEEK_SET);
1282 574ed2c3 2017-11-29 stsp nc = f[pos] - f[pos - 1];
1283 574ed2c3 2017-11-29 stsp if (nc >= sizeof(buf))
1284 574ed2c3 2017-11-29 stsp nc = sizeof(buf) - 1;
1285 574ed2c3 2017-11-29 stsp nc = fread(buf, 1, nc, fp);
1286 574ed2c3 2017-11-29 stsp if (nc > 0) {
1287 574ed2c3 2017-11-29 stsp buf[nc] = '\0';
1288 574ed2c3 2017-11-29 stsp buf[strcspn(buf, "\n")] = '\0';
1289 574ed2c3 2017-11-29 stsp if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1290 574ed2c3 2017-11-29 stsp if (begins_with(buf, "private:")) {
1291 574ed2c3 2017-11-29 stsp if (!state)
1292 574ed2c3 2017-11-29 stsp state = " (private)";
1293 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "protected:")) {
1294 574ed2c3 2017-11-29 stsp if (!state)
1295 574ed2c3 2017-11-29 stsp state = " (protected)";
1296 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "public:")) {
1297 574ed2c3 2017-11-29 stsp if (!state)
1298 574ed2c3 2017-11-29 stsp state = " (public)";
1300 ed9e98a8 2017-11-29 stsp strlcpy(ds->lastbuf, buf, sizeof ds->lastbuf);
1301 574ed2c3 2017-11-29 stsp if (state)
1302 ed9e98a8 2017-11-29 stsp strlcat(ds->lastbuf, state,
1303 ed9e98a8 2017-11-29 stsp sizeof ds->lastbuf);
1304 ed9e98a8 2017-11-29 stsp ds->lastmatchline = pos;
1305 ed9e98a8 2017-11-29 stsp return ds->lastbuf;
1311 ed9e98a8 2017-11-29 stsp return ds->lastmatchline > 0 ? ds->lastbuf : NULL;
1314 574ed2c3 2017-11-29 stsp /* dump accumulated "context" diff changes */
1315 574ed2c3 2017-11-29 stsp static void
1316 cb74ff21 2017-11-30 stsp dump_context_vec(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
1317 8ba9a219 2017-11-29 stsp FILE *f1, FILE *f2, int flags)
1319 ed9e98a8 2017-11-29 stsp struct context_vec *cvp = ds->context_vec_start;
1320 574ed2c3 2017-11-29 stsp int lowa, upb, lowc, upd, do_output;
1321 574ed2c3 2017-11-29 stsp int a, b, c, d;
1322 574ed2c3 2017-11-29 stsp char ch, *f;
1324 ed9e98a8 2017-11-29 stsp if (ds->context_vec_start > ds->context_vec_ptr)
1327 574ed2c3 2017-11-29 stsp b = d = 0; /* gcc */
1328 8ba9a219 2017-11-29 stsp lowa = MAXIMUM(1, cvp->a - args->diff_context);
1329 8ba9a219 2017-11-29 stsp upb = MINIMUM(ds->len[0], ds->context_vec_ptr->b + args->diff_context);
1330 8ba9a219 2017-11-29 stsp lowc = MAXIMUM(1, cvp->c - args->diff_context);
1331 8ba9a219 2017-11-29 stsp upd = MINIMUM(ds->len[1], ds->context_vec_ptr->d + args->diff_context);
1333 cb74ff21 2017-11-30 stsp diff_output(outfile, "***************");
1334 574ed2c3 2017-11-29 stsp if ((flags & D_PROTOTYPE)) {
1335 ed9e98a8 2017-11-29 stsp f = match_function(ds, ds->ixold, lowa-1, f1);
1336 574ed2c3 2017-11-29 stsp if (f != NULL)
1337 cb74ff21 2017-11-30 stsp diff_output(outfile, " %s", f);
1339 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n*** ");
1340 cb74ff21 2017-11-30 stsp range(outfile, lowa, upb, ",");
1341 cb74ff21 2017-11-30 stsp diff_output(outfile, " ****\n");
1344 574ed2c3 2017-11-29 stsp * Output changes to the "old" file. The first loop suppresses
1345 574ed2c3 2017-11-29 stsp * output if there were no changes to the "old" file (we'll see
1346 574ed2c3 2017-11-29 stsp * the "old" lines as context in the "new" list).
1348 574ed2c3 2017-11-29 stsp do_output = 0;
1349 ed9e98a8 2017-11-29 stsp for (; cvp <= ds->context_vec_ptr; cvp++)
1350 574ed2c3 2017-11-29 stsp if (cvp->a <= cvp->b) {
1351 ed9e98a8 2017-11-29 stsp cvp = ds->context_vec_start;
1352 574ed2c3 2017-11-29 stsp do_output++;
1355 574ed2c3 2017-11-29 stsp if (do_output) {
1356 ed9e98a8 2017-11-29 stsp while (cvp <= ds->context_vec_ptr) {
1357 574ed2c3 2017-11-29 stsp a = cvp->a;
1358 574ed2c3 2017-11-29 stsp b = cvp->b;
1359 574ed2c3 2017-11-29 stsp c = cvp->c;
1360 574ed2c3 2017-11-29 stsp d = cvp->d;
1362 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1365 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1367 574ed2c3 2017-11-29 stsp if (ch == 'a')
1368 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, b, f1, ' ', 0, flags);
1370 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1371 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1,
1372 574ed2c3 2017-11-29 stsp ch == 'c' ? '!' : '-', 0, flags);
1374 574ed2c3 2017-11-29 stsp lowa = b + 1;
1377 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, b + 1, upb, f1, ' ', 0, flags);
1379 574ed2c3 2017-11-29 stsp /* output changes to the "new" file */
1380 cb74ff21 2017-11-30 stsp diff_output(outfile, "--- ");
1381 cb74ff21 2017-11-30 stsp range(outfile, lowc, upd, ",");
1382 cb74ff21 2017-11-30 stsp diff_output(outfile, " ----\n");
1384 574ed2c3 2017-11-29 stsp do_output = 0;
1385 ed9e98a8 2017-11-29 stsp for (cvp = ds->context_vec_start; cvp <= ds->context_vec_ptr; cvp++)
1386 574ed2c3 2017-11-29 stsp if (cvp->c <= cvp->d) {
1387 ed9e98a8 2017-11-29 stsp cvp = ds->context_vec_start;
1388 574ed2c3 2017-11-29 stsp do_output++;
1391 574ed2c3 2017-11-29 stsp if (do_output) {
1392 ed9e98a8 2017-11-29 stsp while (cvp <= ds->context_vec_ptr) {
1393 574ed2c3 2017-11-29 stsp a = cvp->a;
1394 574ed2c3 2017-11-29 stsp b = cvp->b;
1395 574ed2c3 2017-11-29 stsp c = cvp->c;
1396 574ed2c3 2017-11-29 stsp d = cvp->d;
1398 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1401 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1403 574ed2c3 2017-11-29 stsp if (ch == 'd')
1404 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, lowc, d, f2, ' ', 0, flags);
1406 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, lowc, c - 1, f2, ' ', 0, flags);
1407 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, c, d, f2,
1408 574ed2c3 2017-11-29 stsp ch == 'c' ? '!' : '+', 0, flags);
1410 574ed2c3 2017-11-29 stsp lowc = d + 1;
1413 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, d + 1, upd, f2, ' ', 0, flags);
1415 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
1418 574ed2c3 2017-11-29 stsp /* dump accumulated "unified" diff changes */
1419 574ed2c3 2017-11-29 stsp static void
1420 cb74ff21 2017-11-30 stsp dump_unified_vec(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
1421 8ba9a219 2017-11-29 stsp FILE *f1, FILE *f2, int flags)
1423 ed9e98a8 2017-11-29 stsp struct context_vec *cvp = ds->context_vec_start;
1424 574ed2c3 2017-11-29 stsp int lowa, upb, lowc, upd;
1425 574ed2c3 2017-11-29 stsp int a, b, c, d;
1426 574ed2c3 2017-11-29 stsp char ch, *f;
1428 ed9e98a8 2017-11-29 stsp if (ds->context_vec_start > ds->context_vec_ptr)
1431 574ed2c3 2017-11-29 stsp b = d = 0; /* gcc */
1432 8ba9a219 2017-11-29 stsp lowa = MAXIMUM(1, cvp->a - args->diff_context);
1433 8ba9a219 2017-11-29 stsp upb = MINIMUM(ds->len[0], ds->context_vec_ptr->b + args->diff_context);
1434 8ba9a219 2017-11-29 stsp lowc = MAXIMUM(1, cvp->c - args->diff_context);
1435 8ba9a219 2017-11-29 stsp upd = MINIMUM(ds->len[1], ds->context_vec_ptr->d + args->diff_context);
1437 cb74ff21 2017-11-30 stsp diff_output(outfile, "@@ -");
1438 cb74ff21 2017-11-30 stsp uni_range(outfile, lowa, upb);
1439 cb74ff21 2017-11-30 stsp diff_output(outfile, " +");
1440 cb74ff21 2017-11-30 stsp uni_range(outfile, lowc, upd);
1441 cb74ff21 2017-11-30 stsp diff_output(outfile, " @@");
1442 574ed2c3 2017-11-29 stsp if ((flags & D_PROTOTYPE)) {
1443 ed9e98a8 2017-11-29 stsp f = match_function(ds, ds->ixold, lowa-1, f1);
1444 574ed2c3 2017-11-29 stsp if (f != NULL)
1445 cb74ff21 2017-11-30 stsp diff_output(outfile, " %s", f);
1447 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n");
1450 574ed2c3 2017-11-29 stsp * Output changes in "unified" diff format--the old and new lines
1451 574ed2c3 2017-11-29 stsp * are printed together.
1453 ed9e98a8 2017-11-29 stsp for (; cvp <= ds->context_vec_ptr; cvp++) {
1454 574ed2c3 2017-11-29 stsp a = cvp->a;
1455 574ed2c3 2017-11-29 stsp b = cvp->b;
1456 574ed2c3 2017-11-29 stsp c = cvp->c;
1457 574ed2c3 2017-11-29 stsp d = cvp->d;
1460 574ed2c3 2017-11-29 stsp * c: both new and old changes
1461 574ed2c3 2017-11-29 stsp * d: only changes in the old file
1462 574ed2c3 2017-11-29 stsp * a: only changes in the new file
1464 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1467 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1469 574ed2c3 2017-11-29 stsp switch (ch) {
1471 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1472 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1, '-', 0, flags);
1473 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, c, d, f2, '+', 0, flags);
1476 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1477 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1, '-', 0, flags);
1480 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, lowc, c - 1, f2, ' ', 0, flags);
1481 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, c, d, f2, '+', 0, flags);
1484 574ed2c3 2017-11-29 stsp lowa = b + 1;
1485 574ed2c3 2017-11-29 stsp lowc = d + 1;
1487 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, d + 1, upd, f2, ' ', 0, flags);
1489 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
1492 574ed2c3 2017-11-29 stsp static void
1493 cb74ff21 2017-11-30 stsp print_header(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
1494 8ba9a219 2017-11-29 stsp const char *file1, const char *file2)
1496 8ba9a219 2017-11-29 stsp if (args->label[0] != NULL)
1497 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s\n", args->diff_format == D_CONTEXT ? "***" : "---",
1498 8ba9a219 2017-11-29 stsp args->label[0]);
1500 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s\t%s", args->diff_format == D_CONTEXT ? "***" : "---",
1501 1c7f0520 2017-11-29 stsp file1, ctime(&ds->stb1.st_mtime));
1502 8ba9a219 2017-11-29 stsp if (args->label[1] != NULL)
1503 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s\n", args->diff_format == D_CONTEXT ? "---" : "+++",
1504 8ba9a219 2017-11-29 stsp args->label[1]);
1506 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s\t%s", args->diff_format == D_CONTEXT ? "---" : "+++",
1507 1c7f0520 2017-11-29 stsp file2, ctime(&ds->stb2.st_mtime));
