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;
174 cb74ff21 2017-11-30 stsp static void diff_output(FILE *, const char *, ...);
175 404c43c4 2018-06-21 stsp static int output(FILE *, struct got_diff_changes *, struct got_diff_state *, struct got_diff_args *, const char *, FILE *, const char *, FILE *, int);
176 ed9e98a8 2017-11-29 stsp static void check(struct got_diff_state *, FILE *, FILE *, int);
177 cb74ff21 2017-11-30 stsp static void uni_range(FILE *, int, int);
178 404c43c4 2018-06-21 stsp static void dump_unified_vec(FILE *, struct got_diff_changes *, struct got_diff_state *, struct got_diff_args *, FILE *, FILE *, int);
179 322260e1 2018-01-26 mpi static int prepare(struct got_diff_state *, int, FILE *, off_t, int);
180 ed9e98a8 2017-11-29 stsp static void prune(struct got_diff_state *);
181 574ed2c3 2017-11-29 stsp static void equiv(struct line *, int, struct line *, int, int *);
182 ed9e98a8 2017-11-29 stsp static void unravel(struct got_diff_state *, int);
183 322260e1 2018-01-26 mpi static int unsort(struct line *, int, int *);
184 404c43c4 2018-06-21 stsp static int change(FILE *, struct got_diff_changes *, struct got_diff_state *, struct got_diff_args *, const char *, FILE *, const char *, FILE *, int, int, int, int, int *);
185 574ed2c3 2017-11-29 stsp static void sort(struct line *, int);
186 cb74ff21 2017-11-30 stsp static void print_header(FILE *, struct got_diff_state *, struct got_diff_args *, const char *, const char *);
187 574ed2c3 2017-11-29 stsp static int asciifile(FILE *);
188 cb74ff21 2017-11-30 stsp static int fetch(FILE *, struct got_diff_state *, struct got_diff_args *, long *, int, int, FILE *, int, int, int);
189 322260e1 2018-01-26 mpi static int newcand(struct got_diff_state *, int, int, int, int *);
190 ed9e98a8 2017-11-29 stsp static int search(struct got_diff_state *, int *, int, int);
191 574ed2c3 2017-11-29 stsp static int skipline(FILE *);
192 574ed2c3 2017-11-29 stsp static int isqrt(int);
193 ed9e98a8 2017-11-29 stsp static int stone(struct got_diff_state *, int *, int, int *, int *, int);
194 ed9e98a8 2017-11-29 stsp static int readhash(struct got_diff_state *, FILE *, int);
195 1c7f0520 2017-11-29 stsp static int files_differ(struct got_diff_state *, FILE *, FILE *, int);
196 ed9e98a8 2017-11-29 stsp static char *match_function(struct got_diff_state *, const long *, int, FILE *);
199 574ed2c3 2017-11-29 stsp * chrtran points to one of 2 translation tables: cup2low if folding upper to
200 574ed2c3 2017-11-29 stsp * lower case clow2low if not folding case
202 574ed2c3 2017-11-29 stsp u_char clow2low[256] = {
203 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
204 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
205 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
206 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
207 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
208 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
209 574ed2c3 2017-11-29 stsp 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
210 574ed2c3 2017-11-29 stsp 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
211 574ed2c3 2017-11-29 stsp 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
212 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
213 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
214 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
215 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
216 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
217 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
218 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
219 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
220 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
221 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
222 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
223 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
224 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
225 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
226 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
229 574ed2c3 2017-11-29 stsp u_char cup2low[256] = {
230 574ed2c3 2017-11-29 stsp 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
231 574ed2c3 2017-11-29 stsp 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
232 574ed2c3 2017-11-29 stsp 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
233 574ed2c3 2017-11-29 stsp 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
234 574ed2c3 2017-11-29 stsp 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
235 574ed2c3 2017-11-29 stsp 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61,
236 574ed2c3 2017-11-29 stsp 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
237 574ed2c3 2017-11-29 stsp 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
238 574ed2c3 2017-11-29 stsp 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62,
239 574ed2c3 2017-11-29 stsp 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
240 574ed2c3 2017-11-29 stsp 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
241 574ed2c3 2017-11-29 stsp 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
242 574ed2c3 2017-11-29 stsp 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
243 574ed2c3 2017-11-29 stsp 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
244 574ed2c3 2017-11-29 stsp 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
245 574ed2c3 2017-11-29 stsp 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
246 574ed2c3 2017-11-29 stsp 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
247 574ed2c3 2017-11-29 stsp 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
248 574ed2c3 2017-11-29 stsp 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
249 574ed2c3 2017-11-29 stsp 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
250 574ed2c3 2017-11-29 stsp 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
251 574ed2c3 2017-11-29 stsp 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
252 574ed2c3 2017-11-29 stsp 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
253 574ed2c3 2017-11-29 stsp 0xfd, 0xfe, 0xff
256 cb74ff21 2017-11-30 stsp static void
257 cb74ff21 2017-11-30 stsp diff_output(FILE *outfile, const char *fmt, ...)
259 cb74ff21 2017-11-30 stsp va_list ap;
261 404c43c4 2018-06-21 stsp if (outfile == NULL)
264 cb74ff21 2017-11-30 stsp va_start(ap, fmt);
265 cb74ff21 2017-11-30 stsp vfprintf(outfile, fmt, ap);
266 cb74ff21 2017-11-30 stsp va_end(ap);
269 7d283eee 2017-11-29 stsp const struct got_error *
270 f9d67749 2017-11-30 stsp got_diffreg(int *rval, FILE *f1, FILE *f2, int flags,
271 404c43c4 2018-06-21 stsp struct got_diff_args *args, struct got_diff_state *ds, FILE *outfile,
272 404c43c4 2018-06-21 stsp struct got_diff_changes *changes)
274 7d283eee 2017-11-29 stsp const struct got_error *err = NULL;
278 7d283eee 2017-11-29 stsp *rval = D_SAME;
279 ed9e98a8 2017-11-29 stsp ds->anychange = 0;
280 ed9e98a8 2017-11-29 stsp ds->lastline = 0;
281 ed9e98a8 2017-11-29 stsp ds->lastmatchline = 0;
282 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
283 4a8520aa 2018-10-18 stsp ds->max_context = GOT_DIFF_MAX_CONTEXT;
284 ed9e98a8 2017-11-29 stsp if (flags & D_IGNORECASE)
285 ed9e98a8 2017-11-29 stsp ds->chrtran = cup2low;
287 ed9e98a8 2017-11-29 stsp ds->chrtran = clow2low;
288 1c7f0520 2017-11-29 stsp if (S_ISDIR(ds->stb1.st_mode) != S_ISDIR(ds->stb2.st_mode)) {
289 1c7f0520 2017-11-29 stsp *rval = (S_ISDIR(ds->stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
290 7d283eee 2017-11-29 stsp return NULL;
292 ecf6e46e 2018-04-01 stsp if (flags & D_EMPTY1) {
293 574ed2c3 2017-11-29 stsp f1 = fopen(_PATH_DEVNULL, "r");
294 bb5dcc10 2018-04-01 stsp if (f1 == NULL) {
295 bb5dcc10 2018-04-01 stsp err = got_error_from_errno();
296 bb5dcc10 2018-04-01 stsp goto closem;
299 f9d67749 2017-11-30 stsp else if (f1 == NULL) {
300 8ba9a219 2017-11-29 stsp args->status |= 2;
301 574ed2c3 2017-11-29 stsp goto closem;
304 ecf6e46e 2018-04-01 stsp if (flags & D_EMPTY2) {
305 574ed2c3 2017-11-29 stsp f2 = fopen(_PATH_DEVNULL, "r");
306 bb5dcc10 2018-04-01 stsp if (f2 == NULL) {
307 bb5dcc10 2018-04-01 stsp err = got_error_from_errno();
308 bb5dcc10 2018-04-01 stsp goto closem;
310 ecf6e46e 2018-04-01 stsp } else if (f2 == NULL) {
311 8ba9a219 2017-11-29 stsp args->status |= 2;
312 574ed2c3 2017-11-29 stsp goto closem;
315 1c7f0520 2017-11-29 stsp switch (files_differ(ds, f1, f2, flags)) {
317 574ed2c3 2017-11-29 stsp goto closem;
321 574ed2c3 2017-11-29 stsp /* error */
322 8ba9a219 2017-11-29 stsp args->status |= 2;
323 574ed2c3 2017-11-29 stsp goto closem;
326 574ed2c3 2017-11-29 stsp if ((flags & D_FORCEASCII) == 0 &&
327 574ed2c3 2017-11-29 stsp (!asciifile(f1) || !asciifile(f2))) {
328 7d283eee 2017-11-29 stsp *rval = D_BINARY;
329 8ba9a219 2017-11-29 stsp args->status |= 1;
330 574ed2c3 2017-11-29 stsp goto closem;
332 322260e1 2018-01-26 mpi if (prepare(ds, 0, f1, ds->stb1.st_size, flags)) {
333 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
334 322260e1 2018-01-26 mpi goto closem;
336 322260e1 2018-01-26 mpi if (prepare(ds, 1, f2, ds->stb2.st_size, flags)) {
337 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
338 322260e1 2018-01-26 mpi goto closem;
342 ed9e98a8 2017-11-29 stsp sort(ds->sfile[0], ds->slen[0]);
343 ed9e98a8 2017-11-29 stsp sort(ds->sfile[1], ds->slen[1]);
345 ed9e98a8 2017-11-29 stsp ds->member = (int *)ds->file[1];
346 ed9e98a8 2017-11-29 stsp equiv(ds->sfile[0], ds->slen[0], ds->sfile[1], ds->slen[1], ds->member);
347 df51fc4e 2018-04-02 stsp p = reallocarray(ds->member, ds->slen[1] + 2, sizeof(*ds->member));
348 df51fc4e 2018-04-02 stsp if (p == NULL) {
349 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
350 7d283eee 2017-11-29 stsp goto closem;
352 df51fc4e 2018-04-02 stsp ds->member = p;
354 ed9e98a8 2017-11-29 stsp ds->class = (int *)ds->file[0];
355 322260e1 2018-01-26 mpi if (unsort(ds->sfile[0], ds->slen[0], ds->class)) {
356 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
357 322260e1 2018-01-26 mpi goto closem;
359 df51fc4e 2018-04-02 stsp p = reallocarray(ds->class, ds->slen[0] + 2, sizeof(*ds->class));
360 df51fc4e 2018-04-02 stsp if (p == NULL) {
361 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
362 7d283eee 2017-11-29 stsp goto closem;
364 df51fc4e 2018-04-02 stsp ds->class = p;
366 ed9e98a8 2017-11-29 stsp ds->klist = calloc(ds->slen[0] + 2, sizeof(*ds->klist));
367 ed9e98a8 2017-11-29 stsp if (ds->klist == NULL) {
368 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
369 7d283eee 2017-11-29 stsp goto closem;
371 ed9e98a8 2017-11-29 stsp ds->clen = 0;
372 ed9e98a8 2017-11-29 stsp ds->clistlen = 100;
373 ed9e98a8 2017-11-29 stsp ds->clist = calloc(ds->clistlen, sizeof(*ds->clist));
374 ed9e98a8 2017-11-29 stsp if (ds->clist == NULL) {
375 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
376 7d283eee 2017-11-29 stsp goto closem;
378 ed9e98a8 2017-11-29 stsp i = stone(ds, ds->class, ds->slen[0], ds->member, ds->klist, flags);
379 0a585a0d 2018-03-17 stsp if (i < 0) {
380 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
381 322260e1 2018-01-26 mpi goto closem;
384 df51fc4e 2018-04-02 stsp p = reallocarray(ds->J, ds->len[0] + 2, sizeof(*ds->J));
385 df51fc4e 2018-04-02 stsp if (p == NULL) {
386 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
387 7d283eee 2017-11-29 stsp goto closem;
390 ed9e98a8 2017-11-29 stsp unravel(ds, ds->klist[i]);
392 df51fc4e 2018-04-02 stsp lp = reallocarray(ds->ixold, ds->len[0] + 2, sizeof(*ds->ixold));
393 df51fc4e 2018-04-02 stsp if (lp == NULL) {
394 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
395 7d283eee 2017-11-29 stsp goto closem;
397 df51fc4e 2018-04-02 stsp ds->ixold = lp;
398 df51fc4e 2018-04-02 stsp lp = reallocarray(ds->ixnew, ds->len[1] + 2, sizeof(*ds->ixnew));
399 df51fc4e 2018-04-02 stsp if (lp == NULL) {
400 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
401 7d283eee 2017-11-29 stsp goto closem;
403 df51fc4e 2018-04-02 stsp ds->ixnew = lp;
404 ed9e98a8 2017-11-29 stsp check(ds, f1, f2, flags);
405 404c43c4 2018-06-21 stsp if (output(outfile, changes, ds, args, args->label[0], f1,
406 404c43c4 2018-06-21 stsp args->label[1], f2, flags))
407 0a585a0d 2018-03-17 stsp err = got_error_from_errno();
409 7b366981 2018-04-02 stsp free(ds->J);
410 9b98f34b 2018-04-02 stsp free(ds->member);
411 9b98f34b 2018-04-02 stsp free(ds->class);
412 6b59e13c 2018-04-02 stsp free(ds->clist);
413 6b59e13c 2018-04-02 stsp free(ds->klist);
414 5a7ffad5 2018-04-02 stsp free(ds->ixold);
415 5a7ffad5 2018-04-02 stsp free(ds->ixnew);
416 ed9e98a8 2017-11-29 stsp if (ds->anychange) {
417 8ba9a219 2017-11-29 stsp args->status |= 1;
418 7d283eee 2017-11-29 stsp if (*rval == D_SAME)
419 7d283eee 2017-11-29 stsp *rval = D_DIFFER;
421 574ed2c3 2017-11-29 stsp if (f1 != NULL)
422 574ed2c3 2017-11-29 stsp fclose(f1);
423 574ed2c3 2017-11-29 stsp if (f2 != NULL)
424 574ed2c3 2017-11-29 stsp fclose(f2);
426 7d283eee 2017-11-29 stsp return (err);
430 574ed2c3 2017-11-29 stsp * Check to see if the given files differ.
431 574ed2c3 2017-11-29 stsp * Returns 0 if they are the same, 1 if different, and -1 on error.
432 574ed2c3 2017-11-29 stsp * XXX - could use code from cmp(1) [faster]
435 1c7f0520 2017-11-29 stsp files_differ(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
437 574ed2c3 2017-11-29 stsp char buf1[BUFSIZ], buf2[BUFSIZ];
438 574ed2c3 2017-11-29 stsp size_t i, j;
440 1c7f0520 2017-11-29 stsp if ((flags & (D_EMPTY1|D_EMPTY2)) || ds->stb1.st_size != ds->stb2.st_size ||
441 1c7f0520 2017-11-29 stsp (ds->stb1.st_mode & S_IFMT) != (ds->stb2.st_mode & S_IFMT))
442 574ed2c3 2017-11-29 stsp return (1);
444 574ed2c3 2017-11-29 stsp i = fread(buf1, 1, sizeof(buf1), f1);
445 574ed2c3 2017-11-29 stsp j = fread(buf2, 1, sizeof(buf2), f2);
446 574ed2c3 2017-11-29 stsp if ((!i && ferror(f1)) || (!j && ferror(f2)))
447 574ed2c3 2017-11-29 stsp return (-1);
448 574ed2c3 2017-11-29 stsp if (i != j)
449 574ed2c3 2017-11-29 stsp return (1);
450 574ed2c3 2017-11-29 stsp if (i == 0)
451 574ed2c3 2017-11-29 stsp return (0);
452 574ed2c3 2017-11-29 stsp if (memcmp(buf1, buf2, i) != 0)
453 574ed2c3 2017-11-29 stsp return (1);
458 ed9e98a8 2017-11-29 stsp prepare(struct got_diff_state *ds, int i, FILE *fd, off_t filesize, int flags)
460 df51fc4e 2018-04-02 stsp struct line *p, *q;
464 574ed2c3 2017-11-29 stsp rewind(fd);
466 574ed2c3 2017-11-29 stsp sz = (filesize <= SIZE_MAX ? filesize : SIZE_MAX) / 25;
467 574ed2c3 2017-11-29 stsp if (sz < 100)
470 322260e1 2018-01-26 mpi p = calloc(sz + 3, sizeof(*p));
471 322260e1 2018-01-26 mpi if (p == NULL)
472 322260e1 2018-01-26 mpi return (-1);
473 ed9e98a8 2017-11-29 stsp for (j = 0; (h = readhash(ds, fd, flags));) {
474 574ed2c3 2017-11-29 stsp if (j == sz) {
475 574ed2c3 2017-11-29 stsp sz = sz * 3 / 2;
476 df51fc4e 2018-04-02 stsp q = reallocarray(p, sz + 3, sizeof(*p));
477 df51fc4e 2018-04-02 stsp if (q == NULL) {
479 322260e1 2018-01-26 mpi return (-1);
483 574ed2c3 2017-11-29 stsp p[++j].value = h;
485 ed9e98a8 2017-11-29 stsp ds->len[i] = j;
486 ed9e98a8 2017-11-29 stsp ds->file[i] = p;
491 574ed2c3 2017-11-29 stsp static void
492 ed9e98a8 2017-11-29 stsp prune(struct got_diff_state *ds)
496 ed9e98a8 2017-11-29 stsp for (ds->pref = 0; ds->pref < ds->len[0] && ds->pref < ds->len[1] &&
497 ed9e98a8 2017-11-29 stsp ds->file[0][ds->pref + 1].value == ds->file[1][ds->pref + 1].value;
498 ed9e98a8 2017-11-29 stsp ds->pref++)
500 ed9e98a8 2017-11-29 stsp for (ds->suff = 0; ds->suff < ds->len[0] - ds->pref && ds->suff < ds->len[1] - ds->pref &&
501 ed9e98a8 2017-11-29 stsp ds->file[0][ds->len[0] - ds->suff].value == ds->file[1][ds->len[1] - ds->suff].value;
502 ed9e98a8 2017-11-29 stsp ds->suff++)
504 574ed2c3 2017-11-29 stsp for (j = 0; j < 2; j++) {
505 ed9e98a8 2017-11-29 stsp ds->sfile[j] = ds->file[j] + ds->pref;
506 ed9e98a8 2017-11-29 stsp ds->slen[j] = ds->len[j] - ds->pref - ds->suff;
507 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->slen[j]; i++)
508 ed9e98a8 2017-11-29 stsp ds->sfile[j][i].serial = i;
512 574ed2c3 2017-11-29 stsp static void
513 574ed2c3 2017-11-29 stsp equiv(struct line *a, int n, struct line *b, int m, int *c)
518 574ed2c3 2017-11-29 stsp while (i <= n && j <= m) {
519 574ed2c3 2017-11-29 stsp if (a[i].value < b[j].value)
520 574ed2c3 2017-11-29 stsp a[i++].value = 0;
521 574ed2c3 2017-11-29 stsp else if (a[i].value == b[j].value)
522 574ed2c3 2017-11-29 stsp a[i++].value = j;
526 574ed2c3 2017-11-29 stsp while (i <= n)
527 574ed2c3 2017-11-29 stsp a[i++].value = 0;
528 574ed2c3 2017-11-29 stsp b[m + 1].value = 0;
530 574ed2c3 2017-11-29 stsp while (++j <= m) {
531 574ed2c3 2017-11-29 stsp c[j] = -b[j].serial;
532 574ed2c3 2017-11-29 stsp while (b[j + 1].value == b[j].value) {
534 574ed2c3 2017-11-29 stsp c[j] = b[j].serial;
540 574ed2c3 2017-11-29 stsp /* Code taken from ping.c */
542 574ed2c3 2017-11-29 stsp isqrt(int n)
544 574ed2c3 2017-11-29 stsp int y, x = 1;
546 574ed2c3 2017-11-29 stsp if (n == 0)
547 574ed2c3 2017-11-29 stsp return (0);
549 574ed2c3 2017-11-29 stsp do { /* newton was a stinker */
554 574ed2c3 2017-11-29 stsp } while ((x - y) > 1 || (x - y) < -1);
556 574ed2c3 2017-11-29 stsp return (x);
560 ed9e98a8 2017-11-29 stsp stone(struct got_diff_state *ds, int *a, int n, int *b, int *c, int flags)
562 574ed2c3 2017-11-29 stsp int i, k, y, j, l;
563 574ed2c3 2017-11-29 stsp int oldc, tc, oldl, sq;
564 574ed2c3 2017-11-29 stsp u_int numtries, bound;
567 574ed2c3 2017-11-29 stsp if (flags & D_MINIMAL)
568 574ed2c3 2017-11-29 stsp bound = UINT_MAX;
570 574ed2c3 2017-11-29 stsp sq = isqrt(n);
571 574ed2c3 2017-11-29 stsp bound = MAXIMUM(256, sq);
575 322260e1 2018-01-26 mpi c[0] = newcand(ds, 0, 0, 0, &error);
578 574ed2c3 2017-11-29 stsp for (i = 1; i <= n; i++) {
580 574ed2c3 2017-11-29 stsp if (j == 0)
584 574ed2c3 2017-11-29 stsp oldc = c[0];
585 574ed2c3 2017-11-29 stsp numtries = 0;
587 ed9e98a8 2017-11-29 stsp if (y <= ds->clist[oldc].y)
589 ed9e98a8 2017-11-29 stsp l = search(ds, c, k, y);
590 574ed2c3 2017-11-29 stsp if (l != oldl + 1)
591 574ed2c3 2017-11-29 stsp oldc = c[l - 1];
592 574ed2c3 2017-11-29 stsp if (l <= k) {
593 ed9e98a8 2017-11-29 stsp if (ds->clist[c[l]].y <= y)
596 322260e1 2018-01-26 mpi c[l] = newcand(ds, i, y, oldc, &error);
601 574ed2c3 2017-11-29 stsp numtries++;
603 322260e1 2018-01-26 mpi c[l] = newcand(ds, i, y, oldc, &error);
609 574ed2c3 2017-11-29 stsp } while ((y = b[++j]) > 0 && numtries < bound);
611 574ed2c3 2017-11-29 stsp return (k);
615 322260e1 2018-01-26 mpi newcand(struct got_diff_state *ds, int x, int y, int pred, int *errorp)
617 574ed2c3 2017-11-29 stsp struct cand *q;
619 ed9e98a8 2017-11-29 stsp if (ds->clen == ds->clistlen) {
620 ed9e98a8 2017-11-29 stsp ds->clistlen = ds->clistlen * 11 / 10;
621 df51fc4e 2018-04-02 stsp q = reallocarray(ds->clist, ds->clistlen, sizeof(*ds->clist));
622 df51fc4e 2018-04-02 stsp if (q == NULL) {
623 322260e1 2018-01-26 mpi *errorp = -1;
624 df51fc4e 2018-04-02 stsp free(ds->clist);
625 df51fc4e 2018-04-02 stsp ds->clist = NULL;
628 df51fc4e 2018-04-02 stsp ds->clist = q;
630 ed9e98a8 2017-11-29 stsp q = ds->clist + ds->clen;
633 574ed2c3 2017-11-29 stsp q->pred = pred;
634 322260e1 2018-01-26 mpi *errorp = 0;
635 ed9e98a8 2017-11-29 stsp return (ds->clen++);
639 ed9e98a8 2017-11-29 stsp search(struct got_diff_state *ds, int *c, int k, int y)
641 574ed2c3 2017-11-29 stsp int i, j, l, t;
643 ed9e98a8 2017-11-29 stsp if (ds->clist[c[k]].y < y) /* quick look for typical case */
644 574ed2c3 2017-11-29 stsp return (k + 1);
648 574ed2c3 2017-11-29 stsp l = (i + j) / 2;
649 574ed2c3 2017-11-29 stsp if (l <= i)
651 ed9e98a8 2017-11-29 stsp t = ds->clist[c[l]].y;
654 574ed2c3 2017-11-29 stsp else if (t < y)
657 574ed2c3 2017-11-29 stsp return (l);
659 574ed2c3 2017-11-29 stsp return (l + 1);
662 574ed2c3 2017-11-29 stsp static void
663 ed9e98a8 2017-11-29 stsp unravel(struct got_diff_state *ds, int p)
665 574ed2c3 2017-11-29 stsp struct cand *q;
668 ed9e98a8 2017-11-29 stsp for (i = 0; i <= ds->len[0]; i++)
669 ed9e98a8 2017-11-29 stsp ds->J[i] = i <= ds->pref ? i :
670 ed9e98a8 2017-11-29 stsp i > ds->len[0] - ds->suff ? i + ds->len[1] - ds->len[0] : 0;
671 ed9e98a8 2017-11-29 stsp for (q = ds->clist + p; q->y != 0; q = ds->clist + q->pred)
672 ed9e98a8 2017-11-29 stsp ds->J[q->x + ds->pref] = q->y + ds->pref;
676 574ed2c3 2017-11-29 stsp * Check does double duty:
677 574ed2c3 2017-11-29 stsp * 1. ferret out any fortuitous correspondences due
678 574ed2c3 2017-11-29 stsp * to confounding by hashing (which result in "jackpot")
679 574ed2c3 2017-11-29 stsp * 2. collect random access indexes to the two files
681 574ed2c3 2017-11-29 stsp static void
682 ed9e98a8 2017-11-29 stsp check(struct got_diff_state *ds, FILE *f1, FILE *f2, int flags)
684 574ed2c3 2017-11-29 stsp int i, j, jackpot, c, d;
685 574ed2c3 2017-11-29 stsp long ctold, ctnew;
687 574ed2c3 2017-11-29 stsp rewind(f1);
688 574ed2c3 2017-11-29 stsp rewind(f2);
690 ed9e98a8 2017-11-29 stsp ds->ixold[0] = ds->ixnew[0] = 0;
691 574ed2c3 2017-11-29 stsp jackpot = 0;
692 574ed2c3 2017-11-29 stsp ctold = ctnew = 0;
693 ed9e98a8 2017-11-29 stsp for (i = 1; i <= ds->len[0]; i++) {
694 ed9e98a8 2017-11-29 stsp if (ds->J[i] == 0) {
695 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold += skipline(f1);
698 ed9e98a8 2017-11-29 stsp while (j < ds->J[i]) {
699 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
702 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE)) {
704 574ed2c3 2017-11-29 stsp c = getc(f1);
705 574ed2c3 2017-11-29 stsp d = getc(f2);
707 574ed2c3 2017-11-29 stsp * GNU diff ignores a missing newline
708 574ed2c3 2017-11-29 stsp * in one file for -b or -w.
710 574ed2c3 2017-11-29 stsp if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) {
711 574ed2c3 2017-11-29 stsp if (c == EOF && d == '\n') {
714 574ed2c3 2017-11-29 stsp } else if (c == '\n' && d == EOF) {
721 574ed2c3 2017-11-29 stsp if ((flags & D_FOLDBLANKS) && isspace(c) &&
722 574ed2c3 2017-11-29 stsp isspace(d)) {
724 574ed2c3 2017-11-29 stsp if (c == '\n')
727 574ed2c3 2017-11-29 stsp } while (isspace(c = getc(f1)));
729 574ed2c3 2017-11-29 stsp if (d == '\n')
732 574ed2c3 2017-11-29 stsp } while (isspace(d = getc(f2)));
733 574ed2c3 2017-11-29 stsp } else if ((flags & D_IGNOREBLANKS)) {
734 574ed2c3 2017-11-29 stsp while (isspace(c) && c != '\n') {
735 574ed2c3 2017-11-29 stsp c = getc(f1);
738 574ed2c3 2017-11-29 stsp while (isspace(d) && d != '\n') {
739 574ed2c3 2017-11-29 stsp d = getc(f2);
743 ed9e98a8 2017-11-29 stsp if (ds->chrtran[c] != ds->chrtran[d]) {
745 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
746 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
747 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
748 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
749 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
752 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
759 574ed2c3 2017-11-29 stsp if ((c = getc(f1)) != (d = getc(f2))) {
760 574ed2c3 2017-11-29 stsp /* jackpot++; */
761 ed9e98a8 2017-11-29 stsp ds->J[i] = 0;
762 574ed2c3 2017-11-29 stsp if (c != '\n' && c != EOF)
763 574ed2c3 2017-11-29 stsp ctold += skipline(f1);
764 574ed2c3 2017-11-29 stsp if (d != '\n' && c != EOF)
765 574ed2c3 2017-11-29 stsp ctnew += skipline(f2);
768 574ed2c3 2017-11-29 stsp if (c == '\n' || c == EOF)
772 ed9e98a8 2017-11-29 stsp ds->ixold[i] = ctold;
773 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew;
776 ed9e98a8 2017-11-29 stsp for (; j <= ds->len[1]; j++)
777 ed9e98a8 2017-11-29 stsp ds->ixnew[j] = ctnew += skipline(f2);
779 574ed2c3 2017-11-29 stsp * if (jackpot)
780 574ed2c3 2017-11-29 stsp * fprintf(stderr, "jackpot\n");
784 574ed2c3 2017-11-29 stsp /* shellsort CACM #201 */
785 574ed2c3 2017-11-29 stsp static void
786 574ed2c3 2017-11-29 stsp sort(struct line *a, int n)
788 574ed2c3 2017-11-29 stsp struct line *ai, *aim, w;
789 574ed2c3 2017-11-29 stsp int j, m = 0, k;
791 574ed2c3 2017-11-29 stsp if (n == 0)
793 574ed2c3 2017-11-29 stsp for (j = 1; j <= n; j *= 2)
794 574ed2c3 2017-11-29 stsp m = 2 * j - 1;
795 574ed2c3 2017-11-29 stsp for (m /= 2; m != 0; m /= 2) {
797 574ed2c3 2017-11-29 stsp for (j = 1; j <= k; j++) {
798 574ed2c3 2017-11-29 stsp for (ai = &a[j]; ai > a; ai -= m) {
799 574ed2c3 2017-11-29 stsp aim = &ai[m];
800 574ed2c3 2017-11-29 stsp if (aim < ai)
801 574ed2c3 2017-11-29 stsp break; /* wraparound */
802 574ed2c3 2017-11-29 stsp if (aim->value > ai[0].value ||
803 574ed2c3 2017-11-29 stsp (aim->value == ai[0].value &&
804 574ed2c3 2017-11-29 stsp aim->serial > ai[0].serial))
806 574ed2c3 2017-11-29 stsp w.value = ai[0].value;
807 574ed2c3 2017-11-29 stsp ai[0].value = aim->value;
808 574ed2c3 2017-11-29 stsp aim->value = w.value;
809 574ed2c3 2017-11-29 stsp w.serial = ai[0].serial;
810 574ed2c3 2017-11-29 stsp ai[0].serial = aim->serial;
811 574ed2c3 2017-11-29 stsp aim->serial = w.serial;
818 574ed2c3 2017-11-29 stsp unsort(struct line *f, int l, int *b)
822 322260e1 2018-01-26 mpi a = calloc(l + 1, sizeof(*a));
823 322260e1 2018-01-26 mpi if (a == NULL)
824 322260e1 2018-01-26 mpi return (-1);
825 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
826 574ed2c3 2017-11-29 stsp a[f[i].serial] = f[i].value;
827 574ed2c3 2017-11-29 stsp for (i = 1; i <= l; i++)
828 574ed2c3 2017-11-29 stsp b[i] = a[i];
835 574ed2c3 2017-11-29 stsp skipline(FILE *f)
839 574ed2c3 2017-11-29 stsp for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
841 574ed2c3 2017-11-29 stsp return (i);
845 404c43c4 2018-06-21 stsp output(FILE *outfile, struct got_diff_changes *changes,
846 404c43c4 2018-06-21 stsp struct got_diff_state *ds, struct got_diff_args *args,
847 f9d67749 2017-11-30 stsp const char *file1, FILE *f1, const char *file2, FILE *f2, int flags)
849 574ed2c3 2017-11-29 stsp int m, i0, i1, j0, j1;
850 322260e1 2018-01-26 mpi int error = 0;
852 574ed2c3 2017-11-29 stsp rewind(f1);
853 574ed2c3 2017-11-29 stsp rewind(f2);
854 ed9e98a8 2017-11-29 stsp m = ds->len[0];
855 ed9e98a8 2017-11-29 stsp ds->J[0] = 0;
856 ed9e98a8 2017-11-29 stsp ds->J[m + 1] = ds->len[1] + 1;
857 0165cdf0 2018-04-02 stsp for (i0 = 1; i0 <= m; i0 = i1 + 1) {
858 0165cdf0 2018-04-02 stsp while (i0 <= m && ds->J[i0] == ds->J[i0 - 1] + 1)
860 0165cdf0 2018-04-02 stsp j0 = ds->J[i0 - 1] + 1;
861 0165cdf0 2018-04-02 stsp i1 = i0 - 1;
862 0165cdf0 2018-04-02 stsp while (i1 < m && ds->J[i1 + 1] == 0)
864 0165cdf0 2018-04-02 stsp j1 = ds->J[i1 + 1] - 1;
865 0165cdf0 2018-04-02 stsp ds->J[i1] = j1;
866 404c43c4 2018-06-21 stsp error = change(outfile, changes, ds, args, file1, f1, file2, f2,
867 0165cdf0 2018-04-02 stsp i0, i1, j0, j1, &flags);
869 0165cdf0 2018-04-02 stsp return (error);
871 322260e1 2018-01-26 mpi if (m == 0) {
872 404c43c4 2018-06-21 stsp error = change(outfile, changes, ds, args, file1, f1, file2, f2,
873 404c43c4 2018-06-21 stsp 1, 0, 1, ds->len[1], &flags);
875 322260e1 2018-01-26 mpi return (error);
877 84e11851 2018-04-02 stsp if (ds->anychange != 0)
878 404c43c4 2018-06-21 stsp dump_unified_vec(outfile, changes, ds, args, f1, f2, flags);
883 574ed2c3 2017-11-29 stsp static void
884 cb74ff21 2017-11-30 stsp uni_range(FILE *outfile, int a, int b)
887 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d,%d", a, b - a + 1);
888 574ed2c3 2017-11-29 stsp else if (a == b)
889 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d", b);
891 cb74ff21 2017-11-30 stsp diff_output(outfile, "%d,0", b);
895 574ed2c3 2017-11-29 stsp * Indicate that there is a difference between lines a and b of the from file
896 574ed2c3 2017-11-29 stsp * to get to lines c to d of the to file. If a is greater then b then there
897 574ed2c3 2017-11-29 stsp * are no lines in the from file involved and this means that there were
898 574ed2c3 2017-11-29 stsp * lines appended (beginning at b). If c is greater than d then there are
899 574ed2c3 2017-11-29 stsp * lines missing from the to file.
902 404c43c4 2018-06-21 stsp change(FILE *outfile, struct got_diff_changes *changes,
903 404c43c4 2018-06-21 stsp struct got_diff_state *ds, struct got_diff_args *args,
904 f9d67749 2017-11-30 stsp const char *file1, FILE *f1, const char *file2, FILE *f2,
905 ed9e98a8 2017-11-29 stsp int a, int b, int c, int d, int *pflags)
909 c48ceb4c 2018-04-02 stsp if (a > b && c > d)
912 574ed2c3 2017-11-29 stsp if (*pflags & D_HEADER) {
913 cb74ff21 2017-11-30 stsp diff_output(outfile, "%s %s %s\n", args->diffargs, file1, file2);
914 574ed2c3 2017-11-29 stsp *pflags &= ~D_HEADER;
916 84e11851 2018-04-02 stsp if (args->diff_format == D_UNIFIED) {
918 574ed2c3 2017-11-29 stsp * Allocate change records as needed.
920 ed9e98a8 2017-11-29 stsp if (ds->context_vec_ptr == ds->context_vec_end - 1) {
921 df51fc4e 2018-04-02 stsp struct context_vec *cvp;
922 76735683 2018-04-02 stsp ptrdiff_t offset;
923 76735683 2018-04-02 stsp offset = ds->context_vec_ptr - ds->context_vec_start;
924 76735683 2018-04-02 stsp ds->max_context <<= 1;
925 322260e1 2018-01-26 mpi ds->context_vec_start =
926 df51fc4e 2018-04-02 stsp cvp = reallocarray(ds->context_vec_start,
927 df51fc4e 2018-04-02 stsp ds->max_context, sizeof(*ds->context_vec_start));
928 df51fc4e 2018-04-02 stsp if (cvp == NULL) {
929 df51fc4e 2018-04-02 stsp free(ds->context_vec_start);
930 322260e1 2018-01-26 mpi return (-1);
932 df51fc4e 2018-04-02 stsp ds->context_vec_start = cvp;
933 76735683 2018-04-02 stsp ds->context_vec_end = ds->context_vec_start +
934 76735683 2018-04-02 stsp ds->max_context;
935 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start + offset;
937 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0) {
939 574ed2c3 2017-11-29 stsp * Print the context/unidiff header first time through.
941 cb74ff21 2017-11-30 stsp print_header(outfile, ds, args, file1, file2);
942 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
943 8ba9a219 2017-11-29 stsp } else if (a > ds->context_vec_ptr->b + (2 * args->diff_context) + 1 &&
944 8ba9a219 2017-11-29 stsp c > ds->context_vec_ptr->d + (2 * args->diff_context) + 1) {
946 574ed2c3 2017-11-29 stsp * If this change is more than 'diff_context' lines from the
947 574ed2c3 2017-11-29 stsp * previous change, dump the record and reset it.
949 404c43c4 2018-06-21 stsp dump_unified_vec(outfile, changes, ds, args, f1, f2,
952 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr++;
953 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->a = a;
954 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->b = b;
955 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->c = c;
956 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr->d = d;
959 ed9e98a8 2017-11-29 stsp if (ds->anychange == 0)
960 ed9e98a8 2017-11-29 stsp ds->anychange = 1;
961 1afa8e43 2018-04-02 stsp if (args->diff_format == D_BRIEF)
963 119f8600 2018-04-02 stsp i = fetch(outfile, ds, args, ds->ixnew, c, d, f2, '\0', 0, *pflags);
968 cb74ff21 2017-11-30 stsp fetch(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
969 8ba9a219 2017-11-29 stsp long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags)
971 574ed2c3 2017-11-29 stsp int i, j, c, lastc, col, nc;
974 574ed2c3 2017-11-29 stsp return (0);
975 574ed2c3 2017-11-29 stsp for (i = a; i <= b; i++) {
976 574ed2c3 2017-11-29 stsp fseek(lb, f[i - 1], SEEK_SET);
977 574ed2c3 2017-11-29 stsp nc = f[i] - f[i - 1];
978 c48ceb4c 2018-04-02 stsp if (ch != '\0') {
979 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", ch);
980 119f8600 2018-04-02 stsp if (args->Tflag && args->diff_format == D_UNIFIED)
981 cb74ff21 2017-11-30 stsp diff_output(outfile, "\t");
982 8ba9a219 2017-11-29 stsp else if (args->diff_format != D_UNIFIED)
983 cb74ff21 2017-11-30 stsp diff_output(outfile, " ");
986 574ed2c3 2017-11-29 stsp for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
987 574ed2c3 2017-11-29 stsp if ((c = getc(lb)) == EOF) {
988 1afa8e43 2018-04-02 stsp diff_output(outfile, "\n\\ No newline at end of "
990 574ed2c3 2017-11-29 stsp return (0);
992 574ed2c3 2017-11-29 stsp if (c == '\t' && (flags & D_EXPANDTABS)) {
994 cb74ff21 2017-11-30 stsp diff_output(outfile, " ");
995 574ed2c3 2017-11-29 stsp } while (++col & 7);
997 cb74ff21 2017-11-30 stsp diff_output(outfile, "%c", c);
1002 574ed2c3 2017-11-29 stsp return (0);
1006 574ed2c3 2017-11-29 stsp * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1008 574ed2c3 2017-11-29 stsp static int
1009 ed9e98a8 2017-11-29 stsp readhash(struct got_diff_state *ds, FILE *f, int flags)
1011 574ed2c3 2017-11-29 stsp int i, t, space;
1015 574ed2c3 2017-11-29 stsp space = 0;
1016 574ed2c3 2017-11-29 stsp if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) {
1017 574ed2c3 2017-11-29 stsp if (flags & D_IGNORECASE)
1018 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1019 574ed2c3 2017-11-29 stsp if (t == EOF) {
1020 574ed2c3 2017-11-29 stsp if (i == 0)
1021 574ed2c3 2017-11-29 stsp return (0);
1024 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1027 574ed2c3 2017-11-29 stsp for (i = 0; (t = getc(f)) != '\n'; i++) {
1028 574ed2c3 2017-11-29 stsp if (t == EOF) {
1029 574ed2c3 2017-11-29 stsp if (i == 0)
1030 574ed2c3 2017-11-29 stsp return (0);
1033 574ed2c3 2017-11-29 stsp sum = sum * 127 + t;
1036 574ed2c3 2017-11-29 stsp for (i = 0;;) {
1037 574ed2c3 2017-11-29 stsp switch (t = getc(f)) {
1038 574ed2c3 2017-11-29 stsp case '\t':
1039 574ed2c3 2017-11-29 stsp case '\r':
1040 574ed2c3 2017-11-29 stsp case '\v':
1041 574ed2c3 2017-11-29 stsp case '\f':
1046 574ed2c3 2017-11-29 stsp if (space && (flags & D_IGNOREBLANKS) == 0) {
1048 574ed2c3 2017-11-29 stsp space = 0;
1050 ed9e98a8 2017-11-29 stsp sum = sum * 127 + ds->chrtran[t];
1054 574ed2c3 2017-11-29 stsp if (i == 0)
1055 574ed2c3 2017-11-29 stsp return (0);
1056 574ed2c3 2017-11-29 stsp /* FALLTHROUGH */
1057 574ed2c3 2017-11-29 stsp case '\n':
1064 574ed2c3 2017-11-29 stsp * There is a remote possibility that we end up with a zero sum.
1065 574ed2c3 2017-11-29 stsp * Zero is used as an EOF marker, so return 1 instead.
1067 574ed2c3 2017-11-29 stsp return (sum == 0 ? 1 : sum);
1070 574ed2c3 2017-11-29 stsp static int
1071 574ed2c3 2017-11-29 stsp asciifile(FILE *f)
1073 574ed2c3 2017-11-29 stsp unsigned char buf[BUFSIZ];
1074 574ed2c3 2017-11-29 stsp size_t cnt;
1076 574ed2c3 2017-11-29 stsp if (f == NULL)
1077 574ed2c3 2017-11-29 stsp return (1);
1079 574ed2c3 2017-11-29 stsp rewind(f);
1080 574ed2c3 2017-11-29 stsp cnt = fread(buf, 1, sizeof(buf), f);
1081 574ed2c3 2017-11-29 stsp return (memchr(buf, '\0', cnt) == NULL);
1084 574ed2c3 2017-11-29 stsp #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)
1086 574ed2c3 2017-11-29 stsp static char *
1087 ed9e98a8 2017-11-29 stsp match_function(struct got_diff_state *ds, const long *f, int pos, FILE *fp)
1089 574ed2c3 2017-11-29 stsp unsigned char buf[FUNCTION_CONTEXT_SIZE];
1090 574ed2c3 2017-11-29 stsp size_t nc;
1091 ed9e98a8 2017-11-29 stsp int last = ds->lastline;
1092 574ed2c3 2017-11-29 stsp char *state = NULL;
1094 ed9e98a8 2017-11-29 stsp ds->lastline = pos;
1095 574ed2c3 2017-11-29 stsp while (pos > last) {
1096 574ed2c3 2017-11-29 stsp fseek(fp, f[pos - 1], SEEK_SET);
1097 574ed2c3 2017-11-29 stsp nc = f[pos] - f[pos - 1];
1098 574ed2c3 2017-11-29 stsp if (nc >= sizeof(buf))
1099 574ed2c3 2017-11-29 stsp nc = sizeof(buf) - 1;
1100 574ed2c3 2017-11-29 stsp nc = fread(buf, 1, nc, fp);
1101 574ed2c3 2017-11-29 stsp if (nc > 0) {
1102 574ed2c3 2017-11-29 stsp buf[nc] = '\0';
1103 574ed2c3 2017-11-29 stsp buf[strcspn(buf, "\n")] = '\0';
1104 574ed2c3 2017-11-29 stsp if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1105 574ed2c3 2017-11-29 stsp if (begins_with(buf, "private:")) {
1106 574ed2c3 2017-11-29 stsp if (!state)
1107 574ed2c3 2017-11-29 stsp state = " (private)";
1108 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "protected:")) {
1109 574ed2c3 2017-11-29 stsp if (!state)
1110 574ed2c3 2017-11-29 stsp state = " (protected)";
1111 574ed2c3 2017-11-29 stsp } else if (begins_with(buf, "public:")) {
1112 574ed2c3 2017-11-29 stsp if (!state)
1113 574ed2c3 2017-11-29 stsp state = " (public)";
1115 ed9e98a8 2017-11-29 stsp strlcpy(ds->lastbuf, buf, sizeof ds->lastbuf);
1116 574ed2c3 2017-11-29 stsp if (state)
1117 ed9e98a8 2017-11-29 stsp strlcat(ds->lastbuf, state,
1118 ed9e98a8 2017-11-29 stsp sizeof ds->lastbuf);
1119 ed9e98a8 2017-11-29 stsp ds->lastmatchline = pos;
1120 ed9e98a8 2017-11-29 stsp return ds->lastbuf;
1126 ed9e98a8 2017-11-29 stsp return ds->lastmatchline > 0 ? ds->lastbuf : NULL;
1129 574ed2c3 2017-11-29 stsp /* dump accumulated "unified" diff changes */
1130 574ed2c3 2017-11-29 stsp static void
1131 404c43c4 2018-06-21 stsp dump_unified_vec(FILE *outfile, struct got_diff_changes *changes,
1132 404c43c4 2018-06-21 stsp struct got_diff_state *ds, struct got_diff_args *args,
1133 8ba9a219 2017-11-29 stsp FILE *f1, FILE *f2, int flags)
1135 ed9e98a8 2017-11-29 stsp struct context_vec *cvp = ds->context_vec_start;
1136 574ed2c3 2017-11-29 stsp int lowa, upb, lowc, upd;
1137 574ed2c3 2017-11-29 stsp int a, b, c, d;
1138 574ed2c3 2017-11-29 stsp char ch, *f;
1140 ed9e98a8 2017-11-29 stsp if (ds->context_vec_start > ds->context_vec_ptr)
1143 574ed2c3 2017-11-29 stsp b = d = 0; /* gcc */
1144 8ba9a219 2017-11-29 stsp lowa = MAXIMUM(1, cvp->a - args->diff_context);
1145 8ba9a219 2017-11-29 stsp upb = MINIMUM(ds->len[0], ds->context_vec_ptr->b + args->diff_context);
1146 8ba9a219 2017-11-29 stsp lowc = MAXIMUM(1, cvp->c - args->diff_context);
1147 8ba9a219 2017-11-29 stsp upd = MINIMUM(ds->len[1], ds->context_vec_ptr->d + args->diff_context);
1149 cb74ff21 2017-11-30 stsp diff_output(outfile, "@@ -");
1150 cb74ff21 2017-11-30 stsp uni_range(outfile, lowa, upb);
1151 cb74ff21 2017-11-30 stsp diff_output(outfile, " +");
1152 cb74ff21 2017-11-30 stsp uni_range(outfile, lowc, upd);
1153 cb74ff21 2017-11-30 stsp diff_output(outfile, " @@");
1154 574ed2c3 2017-11-29 stsp if ((flags & D_PROTOTYPE)) {
1155 ed9e98a8 2017-11-29 stsp f = match_function(ds, ds->ixold, lowa-1, f1);
1156 574ed2c3 2017-11-29 stsp if (f != NULL)
1157 cb74ff21 2017-11-30 stsp diff_output(outfile, " %s", f);
1159 cb74ff21 2017-11-30 stsp diff_output(outfile, "\n");
1162 574ed2c3 2017-11-29 stsp * Output changes in "unified" diff format--the old and new lines
1163 574ed2c3 2017-11-29 stsp * are printed together.
1165 ed9e98a8 2017-11-29 stsp for (; cvp <= ds->context_vec_ptr; cvp++) {
1166 404c43c4 2018-06-21 stsp if (changes) {
1167 404c43c4 2018-06-21 stsp struct got_diff_change *change;
1168 404c43c4 2018-06-21 stsp change = calloc(1, sizeof(*change));
1169 404c43c4 2018-06-21 stsp if (change) {
1170 404c43c4 2018-06-21 stsp memcpy(&change->cv, cvp, sizeof(change->cv));
1171 404c43c4 2018-06-21 stsp SIMPLEQ_INSERT_TAIL(&changes->entries, change,
1173 404c43c4 2018-06-21 stsp changes->nchanges++;
1177 574ed2c3 2017-11-29 stsp a = cvp->a;
1178 574ed2c3 2017-11-29 stsp b = cvp->b;
1179 574ed2c3 2017-11-29 stsp c = cvp->c;
1180 574ed2c3 2017-11-29 stsp d = cvp->d;
1183 574ed2c3 2017-11-29 stsp * c: both new and old changes
1184 574ed2c3 2017-11-29 stsp * d: only changes in the old file
1185 574ed2c3 2017-11-29 stsp * a: only changes in the new file
1187 574ed2c3 2017-11-29 stsp if (a <= b && c <= d)
1190 574ed2c3 2017-11-29 stsp ch = (a <= b) ? 'd' : 'a';
1192 574ed2c3 2017-11-29 stsp switch (ch) {
1194 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1195 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1, '-', 0, flags);
1196 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, c, d, f2, '+', 0, flags);
1199 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, lowa, a - 1, f1, ' ', 0, flags);
1200 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixold, a, b, f1, '-', 0, flags);
1203 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, lowc, c - 1, f2, ' ', 0, flags);
1204 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, c, d, f2, '+', 0, flags);
1207 574ed2c3 2017-11-29 stsp lowa = b + 1;
1208 574ed2c3 2017-11-29 stsp lowc = d + 1;
1210 cb74ff21 2017-11-30 stsp fetch(outfile, ds, args, ds->ixnew, d + 1, upd, f2, ' ', 0, flags);
1212 ed9e98a8 2017-11-29 stsp ds->context_vec_ptr = ds->context_vec_start - 1;
1215 574ed2c3 2017-11-29 stsp static void
1216 cb74ff21 2017-11-30 stsp print_header(FILE *outfile, struct got_diff_state *ds, struct got_diff_args *args,
1217 8ba9a219 2017-11-29 stsp const char *file1, const char *file2)
1219 8ba9a219 2017-11-29 stsp if (args->label[0] != NULL)
1220 84e11851 2018-04-02 stsp diff_output(outfile, "--- %s\n", args->label[0]);
1222 84e11851 2018-04-02 stsp diff_output(outfile, "--- %s\t%s", file1,
1223 84e11851 2018-04-02 stsp ctime(&ds->stb1.st_mtime));
1224 8ba9a219 2017-11-29 stsp if (args->label[1] != NULL)
1225 84e11851 2018-04-02 stsp diff_output(outfile, "+++ %s\n", args->label[1]);
1227 84e11851 2018-04-02 stsp diff_output(outfile, "+++ %s\t%s", file2,
1228 84e11851 2018-04-02 stsp ctime(&ds->stb2.st_mtime));
