joachim99@52
|
1 /* File I/O for GNU DIFF.
|
joachim99@52
|
2
|
joachim99@52
|
3 Modified for KDiff3 by Joachim Eibl 2003.
|
joachim99@53
|
4 The original file was part of GNU DIFF.
|
joachim99@52
|
5
|
joachim99@52
|
6 Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1998, 2001, 2002
|
joachim99@52
|
7 Free Software Foundation, Inc.
|
joachim99@52
|
8
|
joachim99@52
|
9 GNU DIFF is free software; you can redistribute it and/or modify
|
joachim99@52
|
10 it under the terms of the GNU General Public License as published by
|
joachim99@52
|
11 the Free Software Foundation; either version 2, or (at your option)
|
joachim99@52
|
12 any later version.
|
joachim99@52
|
13
|
joachim99@52
|
14 GNU DIFF is distributed in the hope that it will be useful,
|
joachim99@52
|
15 but WITHOUT ANY WARRANTY; without even the implied warranty of
|
joachim99@52
|
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
joachim99@52
|
17 GNU General Public License for more details.
|
joachim99@52
|
18
|
joachim99@52
|
19 You should have received a copy of the GNU General Public License
|
joachim99@52
|
20 along with this program; see the file COPYING.
|
joachim99@52
|
21 If not, write to the Free Software Foundation,
|
joachim99@52
|
22 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
joachim99@52
|
23
|
joachim99@52
|
24 #include "gnudiff_diff.h"
|
joachim99@52
|
25 #include <stdlib.h>
|
joachim99@52
|
26
|
joachim99@52
|
27 /* Rotate an unsigned value to the left. */
|
joachim99@52
|
28 #define ROL(v, n) ((v) << (n) | (v) >> (sizeof (v) * CHAR_BIT - (n)))
|
joachim99@52
|
29
|
joachim99@52
|
30 /* Given a hash value and a new character, return a new hash value. */
|
joachim99@52
|
31 #define HASH(h, c) ((c) + ROL (h, 7))
|
joachim99@52
|
32
|
joachim99@52
|
33 /* The type of a hash value. */
|
joachim99@52
|
34 typedef size_t hash_value;
|
joachim99@52
|
35 verify (hash_value_is_unsigned, ! TYPE_SIGNED (hash_value));
|
joachim99@52
|
36
|
joachim99@52
|
37 /* Lines are put into equivalence classes of lines that match in lines_differ.
|
joachim99@52
|
38 Each equivalence class is represented by one of these structures,
|
joachim99@52
|
39 but only while the classes are being computed.
|
joachim99@52
|
40 Afterward, each class is represented by a number. */
|
joachim99@52
|
41 struct equivclass
|
joachim99@52
|
42 {
|
joachim99@52
|
43 lin next; /* Next item in this bucket. */
|
joachim99@52
|
44 hash_value hash; /* Hash of lines in this class. */
|
joachim99@52
|
45 char const *line; /* A line that fits this class. */
|
joachim99@52
|
46 size_t length; /* That line's length, not counting its newline. */
|
joachim99@52
|
47 };
|
joachim99@52
|
48
|
joachim99@52
|
49 /* Hash-table: array of buckets, each being a chain of equivalence classes.
|
joachim99@52
|
50 buckets[-1] is reserved for incomplete lines. */
|
joachim99@52
|
51 static lin *buckets;
|
joachim99@52
|
52
|
joachim99@52
|
53 /* Number of buckets in the hash table array, not counting buckets[-1]. */
|
joachim99@52
|
54 static size_t nbuckets;
|
joachim99@52
|
55
|
joachim99@52
|
56 /* Array in which the equivalence classes are allocated.
|
joachim99@52
|
57 The bucket-chains go through the elements in this array.
|
joachim99@52
|
58 The number of an equivalence class is its index in this array. */
|
joachim99@52
|
59 static struct equivclass *equivs;
|
joachim99@52
|
60
|
joachim99@52
|
61 /* Index of first free element in the array `equivs'. */
|
joachim99@52
|
62 static lin equivs_index;
|
joachim99@52
|
63
|
joachim99@52
|
64 /* Number of elements allocated in the array `equivs'. */
|
joachim99@52
|
65 static lin equivs_alloc;
|
joachim99@52
|
66
|
joachim99@52
|
67
|
joachim99@52
|
68 /* Check for binary files and compare them for exact identity. */
|
joachim99@52
|
69
|
joachim99@52
|
70 /* Return 1 if BUF contains a non text character.
|
joachim99@52
|
71 SIZE is the number of characters in BUF. */
|
joachim99@52
|
72
|
joachim99@52
|
73 #define binary_file_p(buf, size) (memchr (buf, 0, size) != 0)
|
joachim99@52
|
74
|
joachim99@52
|
75
|
joachim99@52
|
76 /* Split the file into lines, simultaneously computing the equivalence
|
joachim99@52
|
77 class for each line. */
|
joachim99@52
|
78
|
joachim99@53
|
79 void GnuDiff::find_and_hash_each_line (struct file_data *current)
|
joachim99@52
|
80 {
|
joachim99@52
|
81 hash_value h;
|
joachim99@52
|
82 unsigned char const *p = (unsigned char const *) current->prefix_end;
|
joachim99@52
|
83 unsigned char c;
|
joachim99@52
|
84 lin i, *bucket;
|
joachim99@52
|
85 size_t length;
|
joachim99@52
|
86
|
joachim99@52
|
87 /* Cache often-used quantities in local variables to help the compiler. */
|
joachim99@52
|
88 char const **linbuf = current->linbuf;
|
joachim99@52
|
89 lin alloc_lines = current->alloc_lines;
|
joachim99@52
|
90 lin line = 0;
|
joachim99@52
|
91 lin linbuf_base = current->linbuf_base;
|
joachim99@52
|
92 lin *cureqs = (lin*)xmalloc (alloc_lines * sizeof *cureqs);
|
joachim99@52
|
93 struct equivclass *eqs = equivs;
|
joachim99@52
|
94 lin eqs_index = equivs_index;
|
joachim99@52
|
95 lin eqs_alloc = equivs_alloc;
|
joachim99@52
|
96 char const *suffix_begin = current->suffix_begin;
|
joachim99@52
|
97 char const *bufend = FILE_BUFFER (current) + current->buffered;
|
joachim99@52
|
98 bool diff_length_compare_anyway =
|
joachim99@52
|
99 ignore_white_space != IGNORE_NO_WHITE_SPACE || bIgnoreNumbers;
|
joachim99@52
|
100 bool same_length_diff_contents_compare_anyway =
|
joachim99@52
|
101 diff_length_compare_anyway | ignore_case;
|
joachim99@52
|
102
|
joachim99@52
|
103 while ((char const *) p < suffix_begin)
|
joachim99@52
|
104 {
|
joachim99@52
|
105 char const *ip = (char const *) p;
|
joachim99@52
|
106
|
joachim99@52
|
107 h = 0;
|
joachim99@52
|
108
|
joachim99@52
|
109 /* Hash this line until we find a newline. */
|
joachim99@52
|
110 if (ignore_case)
|
joachim99@52
|
111 switch (ignore_white_space)
|
joachim99@52
|
112 {
|
joachim99@52
|
113 case IGNORE_ALL_SPACE:
|
joachim99@52
|
114 while ((c = *p++) != '\n')
|
joachim99@52
|
115 if (! (ISSPACE (c) || bIgnoreNumbers && (isdigit( c ) || c=='-' || c=='.' ) ))
|
joachim99@52
|
116 h = HASH (h, TOLOWER (c));
|
joachim99@52
|
117 break;
|
joachim99@52
|
118
|
joachim99@52
|
119 case IGNORE_SPACE_CHANGE:
|
joachim99@52
|
120 while ((c = *p++) != '\n')
|
joachim99@52
|
121 {
|
joachim99@52
|
122 if (ISSPACE (c))
|
joachim99@52
|
123 {
|
joachim99@52
|
124 do
|
joachim99@52
|
125 if ((c = *p++) == '\n')
|
joachim99@52
|
126 goto hashing_done;
|
joachim99@52
|
127 while (ISSPACE (c));
|
joachim99@52
|
128
|
joachim99@52
|
129 h = HASH (h, ' ');
|
joachim99@52
|
130 }
|
joachim99@52
|
131
|
joachim99@52
|
132 /* C is now the first non-space. */
|
joachim99@52
|
133 h = HASH (h, TOLOWER (c));
|
joachim99@52
|
134 }
|
joachim99@52
|
135 break;
|
joachim99@52
|
136
|
joachim99@52
|
137 case IGNORE_TAB_EXPANSION:
|
joachim99@52
|
138 {
|
joachim99@52
|
139 size_t column = 0;
|
joachim99@52
|
140 while ((c = *p++) != '\n')
|
joachim99@52
|
141 {
|
joachim99@52
|
142 int repetitions = 1;
|
joachim99@52
|
143
|
joachim99@52
|
144 switch (c)
|
joachim99@52
|
145 {
|
joachim99@52
|
146 case '\b':
|
joachim99@52
|
147 column -= 0 < column;
|
joachim99@52
|
148 break;
|
joachim99@52
|
149
|
joachim99@52
|
150 case '\t':
|
joachim99@52
|
151 c = ' ';
|
joachim99@52
|
152 repetitions = TAB_WIDTH - column % TAB_WIDTH;
|
joachim99@52
|
153 column += repetitions;
|
joachim99@52
|
154 break;
|
joachim99@52
|
155
|
joachim99@52
|
156 case '\r':
|
joachim99@52
|
157 column = 0;
|
joachim99@52
|
158 break;
|
joachim99@52
|
159
|
joachim99@52
|
160 default:
|
joachim99@52
|
161 c = TOLOWER (c);
|
joachim99@52
|
162 column++;
|
joachim99@52
|
163 break;
|
joachim99@52
|
164 }
|
joachim99@52
|
165
|
joachim99@52
|
166 do
|
joachim99@52
|
167 h = HASH (h, c);
|
joachim99@52
|
168 while (--repetitions != 0);
|
joachim99@52
|
169 }
|
joachim99@52
|
170 }
|
joachim99@52
|
171 break;
|
joachim99@52
|
172
|
joachim99@52
|
173 default:
|
joachim99@52
|
174 while ((c = *p++) != '\n')
|
joachim99@52
|
175 h = HASH (h, TOLOWER (c));
|
joachim99@52
|
176 break;
|
joachim99@52
|
177 }
|
joachim99@52
|
178 else
|
joachim99@52
|
179 switch (ignore_white_space)
|
joachim99@52
|
180 {
|
joachim99@52
|
181 case IGNORE_ALL_SPACE:
|
joachim99@52
|
182 while ((c = *p++) != '\n')
|
joachim99@52
|
183 if (! (ISSPACE (c)|| bIgnoreNumbers && (isdigit( c ) || c=='-' || c=='.' ) ))
|
joachim99@52
|
184 h = HASH (h, c);
|
joachim99@52
|
185 break;
|
joachim99@52
|
186
|
joachim99@52
|
187 case IGNORE_SPACE_CHANGE:
|
joachim99@52
|
188 while ((c = *p++) != '\n')
|
joachim99@52
|
189 {
|
joachim99@52
|
190 if (ISSPACE (c))
|
joachim99@52
|
191 {
|
joachim99@52
|
192 do
|
joachim99@52
|
193 if ((c = *p++) == '\n')
|
joachim99@52
|
194 goto hashing_done;
|
joachim99@52
|
195 while (ISSPACE (c));
|
joachim99@52
|
196
|
joachim99@52
|
197 h = HASH (h, ' ');
|
joachim99@52
|
198 }
|
joachim99@52
|
199
|
joachim99@52
|
200 /* C is now the first non-space. */
|
joachim99@52
|
201 h = HASH (h, c);
|
joachim99@52
|
202 }
|
joachim99@52
|
203 break;
|
joachim99@52
|
204
|
joachim99@52
|
205 case IGNORE_TAB_EXPANSION:
|
joachim99@52
|
206 {
|
joachim99@52
|
207 size_t column = 0;
|
joachim99@52
|
208 while ((c = *p++) != '\n')
|
joachim99@52
|
209 {
|
joachim99@52
|
210 int repetitions = 1;
|
joachim99@52
|
211
|
joachim99@52
|
212 switch (c)
|
joachim99@52
|
213 {
|
joachim99@52
|
214 case '\b':
|
joachim99@52
|
215 column -= 0 < column;
|
joachim99@52
|
216 break;
|
joachim99@52
|
217
|
joachim99@52
|
218 case '\t':
|
joachim99@52
|
219 c = ' ';
|
joachim99@52
|
220 repetitions = TAB_WIDTH - column % TAB_WIDTH;
|
joachim99@52
|
221 column += repetitions;
|
joachim99@52
|
222 break;
|
joachim99@52
|
223
|
joachim99@52
|
224 case '\r':
|
joachim99@52
|
225 column = 0;
|
joachim99@52
|
226 break;
|
joachim99@52
|
227
|
joachim99@52
|
228 default:
|
joachim99@52
|
229 column++;
|
joachim99@52
|
230 break;
|
joachim99@52
|
231 }
|
joachim99@52
|
232
|
joachim99@52
|
233 do
|
joachim99@52
|
234 h = HASH (h, c);
|
joachim99@52
|
235 while (--repetitions != 0);
|
joachim99@52
|
236 }
|
joachim99@52
|
237 }
|
joachim99@52
|
238 break;
|
joachim99@52
|
239
|
joachim99@52
|
240 default:
|
joachim99@52
|
241 while ((c = *p++) != '\n')
|
joachim99@52
|
242 h = HASH (h, c);
|
joachim99@52
|
243 break;
|
joachim99@52
|
244 }
|
joachim99@52
|
245
|
joachim99@52
|
246 hashing_done:;
|
joachim99@52
|
247
|
joachim99@52
|
248 bucket = &buckets[h % nbuckets];
|
joachim99@52
|
249 length = (char const *) p - ip - 1;
|
joachim99@52
|
250
|
joachim99@52
|
251 if ((char const *) p == bufend
|
joachim99@52
|
252 && current->missing_newline
|
joachim99@52
|
253 && ROBUST_OUTPUT_STYLE (output_style))
|
joachim99@52
|
254 {
|
joachim99@52
|
255 /* This line is incomplete. If this is significant,
|
joachim99@52
|
256 put the line into buckets[-1]. */
|
joachim99@52
|
257 if (ignore_white_space < IGNORE_SPACE_CHANGE)
|
joachim99@52
|
258 bucket = &buckets[-1];
|
joachim99@52
|
259
|
joachim99@52
|
260 /* Omit the inserted newline when computing linbuf later. */
|
joachim99@52
|
261 p--;
|
joachim99@52
|
262 bufend = suffix_begin = (char const *) p;
|
joachim99@52
|
263 }
|
joachim99@52
|
264
|
joachim99@52
|
265 for (i = *bucket; ; i = eqs[i].next)
|
joachim99@52
|
266 if (!i)
|
joachim99@52
|
267 {
|
joachim99@52
|
268 /* Create a new equivalence class in this bucket. */
|
joachim99@52
|
269 i = eqs_index++;
|
joachim99@52
|
270 if (i == eqs_alloc)
|
joachim99@52
|
271 {
|
joachim99@52
|
272 if ((int)(PTRDIFF_MAX / (2 * sizeof *eqs)) <= eqs_alloc)
|
joachim99@52
|
273 xalloc_die ();
|
joachim99@52
|
274 eqs_alloc *= 2;
|
joachim99@52
|
275 eqs = (equivclass*)xrealloc (eqs, eqs_alloc * sizeof *eqs);
|
joachim99@52
|
276 }
|
joachim99@52
|
277 eqs[i].next = *bucket;
|
joachim99@52
|
278 eqs[i].hash = h;
|
joachim99@52
|
279 eqs[i].line = ip;
|
joachim99@52
|
280 eqs[i].length = length;
|
joachim99@52
|
281 *bucket = i;
|
joachim99@52
|
282 break;
|
joachim99@52
|
283 }
|
joachim99@52
|
284 else if (eqs[i].hash == h)
|
joachim99@52
|
285 {
|
joachim99@52
|
286 char const *eqline = eqs[i].line;
|
joachim99@52
|
287
|
joachim99@52
|
288 /* Reuse existing class if lines_differ reports the lines
|
joachim99@52
|
289 equal. */
|
joachim99@52
|
290 if (eqs[i].length == length)
|
joachim99@52
|
291 {
|
joachim99@52
|
292 /* Reuse existing equivalence class if the lines are identical.
|
joachim99@52
|
293 This detects the common case of exact identity
|
joachim99@52
|
294 faster than lines_differ would. */
|
joachim99@52
|
295 if (memcmp (eqline, ip, length) == 0)
|
joachim99@52
|
296 break;
|
joachim99@52
|
297 if (!same_length_diff_contents_compare_anyway)
|
joachim99@52
|
298 continue;
|
joachim99@52
|
299 }
|
joachim99@52
|
300 else if (!diff_length_compare_anyway)
|
joachim99@52
|
301 continue;
|
joachim99@52
|
302
|
joachim99@52
|
303 if (! lines_differ (eqline, ip))
|
joachim99@52
|
304 break;
|
joachim99@52
|
305 }
|
joachim99@52
|
306
|
joachim99@52
|
307 /* Maybe increase the size of the line table. */
|
joachim99@52
|
308 if (line == alloc_lines)
|
joachim99@52
|
309 {
|
joachim99@52
|
310 /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. */
|
joachim99@52
|
311 if ((int)(PTRDIFF_MAX / 3) <= alloc_lines
|
joachim99@52
|
312 || (int)(PTRDIFF_MAX / sizeof *cureqs) <= 2 * alloc_lines - linbuf_base
|
joachim99@52
|
313 || (int)(PTRDIFF_MAX / sizeof *linbuf) <= alloc_lines - linbuf_base)
|
joachim99@52
|
314 xalloc_die ();
|
joachim99@52
|
315 alloc_lines = 2 * alloc_lines - linbuf_base;
|
joachim99@52
|
316 cureqs =(lin*) xrealloc (cureqs, alloc_lines * sizeof *cureqs);
|
joachim99@52
|
317 linbuf += linbuf_base;
|
joachim99@52
|
318 linbuf = (const char**) xrealloc (linbuf,
|
joachim99@52
|
319 (alloc_lines - linbuf_base) * sizeof *linbuf);
|
joachim99@52
|
320 linbuf -= linbuf_base;
|
joachim99@52
|
321 }
|
joachim99@52
|
322 linbuf[line] = ip;
|
joachim99@52
|
323 cureqs[line] = i;
|
joachim99@52
|
324 ++line;
|
joachim99@52
|
325 }
|
joachim99@52
|
326
|
joachim99@52
|
327 current->buffered_lines = line;
|
joachim99@52
|
328
|
joachim99@52
|
329 for (i = 0; ; i++)
|
joachim99@52
|
330 {
|
joachim99@52
|
331 /* Record the line start for lines in the suffix that we care about.
|
joachim99@52
|
332 Record one more line start than lines,
|
joachim99@52
|
333 so that we can compute the length of any buffered line. */
|
joachim99@52
|
334 if (line == alloc_lines)
|
joachim99@52
|
335 {
|
joachim99@52
|
336 /* Double (alloc_lines - linbuf_base) by adding to alloc_lines. */
|
joachim99@52
|
337 if ((int)(PTRDIFF_MAX / 3) <= alloc_lines
|
joachim99@52
|
338 || (int)(PTRDIFF_MAX / sizeof *cureqs) <= 2 * alloc_lines - linbuf_base
|
joachim99@52
|
339 || (int)(PTRDIFF_MAX / sizeof *linbuf) <= alloc_lines - linbuf_base)
|
joachim99@52
|
340 xalloc_die ();
|
joachim99@52
|
341 alloc_lines = 2 * alloc_lines - linbuf_base;
|
joachim99@52
|
342 linbuf += linbuf_base;
|
joachim99@52
|
343 linbuf = (const char**)xrealloc (linbuf,
|
joachim99@52
|
344 (alloc_lines - linbuf_base) * sizeof *linbuf);
|
joachim99@52
|
345 linbuf -= linbuf_base;
|
joachim99@52
|
346 }
|
joachim99@52
|
347 linbuf[line] = (char const *) p;
|
joachim99@52
|
348
|
joachim99@52
|
349 if ((char const *) p == bufend)
|
joachim99@52
|
350 break;
|
joachim99@52
|
351
|
joachim99@52
|
352 if (context <= i && no_diff_means_no_output)
|
joachim99@52
|
353 break;
|
joachim99@52
|
354
|
joachim99@52
|
355 line++;
|
joachim99@52
|
356
|
joachim99@52
|
357 while (*p++ != '\n')
|
joachim99@52
|
358 continue;
|
joachim99@52
|
359 }
|
joachim99@52
|
360
|
joachim99@52
|
361 /* Done with cache in local variables. */
|
joachim99@52
|
362 current->linbuf = linbuf;
|
joachim99@52
|
363 current->valid_lines = line;
|
joachim99@52
|
364 current->alloc_lines = alloc_lines;
|
joachim99@52
|
365 current->equivs = cureqs;
|
joachim99@52
|
366 equivs = eqs;
|
joachim99@52
|
367 equivs_alloc = eqs_alloc;
|
joachim99@52
|
368 equivs_index = eqs_index;
|
joachim99@52
|
369 }
|
joachim99@52
|
370
|
joachim99@52
|
371 /* Prepare the text. Make sure the text end is initialized.
|
joachim99@52
|
372 Make sure text ends in a newline,
|
joachim99@52
|
373 but remember that we had to add one.
|
joachim99@52
|
374 Strip trailing CRs, if that was requested. */
|
joachim99@52
|
375
|
joachim99@53
|
376 void GnuDiff::prepare_text (struct file_data *current)
|
joachim99@52
|
377 {
|
joachim99@52
|
378 size_t buffered = current->buffered;
|
joachim99@52
|
379 char *p = FILE_BUFFER (current);
|
joachim99@52
|
380 char *dst;
|
joachim99@52
|
381
|
joachim99@52
|
382 if (buffered == 0 || p[buffered - 1] == '\n')
|
joachim99@52
|
383 current->missing_newline = 0;
|
joachim99@52
|
384 else
|
joachim99@52
|
385 {
|
joachim99@52
|
386 p[buffered++] = '\n';
|
joachim99@52
|
387 current->missing_newline = 1;
|
joachim99@52
|
388 }
|
joachim99@52
|
389
|
joachim99@52
|
390 if (!p)
|
joachim99@52
|
391 return;
|
joachim99@52
|
392
|
joachim99@52
|
393 /* Don't use uninitialized storage when planting or using sentinels. */
|
joachim99@52
|
394 memset (p + buffered, 0, sizeof (word));
|
joachim99@52
|
395
|
joachim99@52
|
396 if (strip_trailing_cr && (dst = (char*)memchr (p, '\r', buffered)))
|
joachim99@52
|
397 {
|
joachim99@52
|
398 char const *src = dst;
|
joachim99@52
|
399 char const *srclim = p + buffered;
|
joachim99@52
|
400
|
joachim99@52
|
401 do
|
joachim99@52
|
402 dst += ! ((*dst = *src++) == '\r' && *src == '\n');
|
joachim99@52
|
403 while (src < srclim);
|
joachim99@52
|
404
|
joachim99@52
|
405 buffered -= src - dst;
|
joachim99@52
|
406 }
|
joachim99@52
|
407
|
joachim99@52
|
408 current->buffered = buffered;
|
joachim99@52
|
409 }
|
joachim99@52
|
410
|
joachim99@52
|
411 /* We have found N lines in a buffer of size S; guess the
|
joachim99@52
|
412 proportionate number of lines that will be found in a buffer of
|
joachim99@52
|
413 size T. However, do not guess a number of lines so large that the
|
joachim99@52
|
414 resulting line table might cause overflow in size calculations. */
|
joachim99@52
|
415 static lin
|
joachim99@52
|
416 guess_lines (lin n, size_t s, size_t t)
|
joachim99@52
|
417 {
|
joachim99@52
|
418 size_t guessed_bytes_per_line = n < 10 ? 32 : s / (n - 1);
|
joachim99@52
|
419 lin guessed_lines = MAX (1, t / guessed_bytes_per_line);
|
joachim99@52
|
420 return MIN (guessed_lines, (int)(PTRDIFF_MAX / (2 * sizeof (char *) + 1) - 5)) + 5;
|
joachim99@52
|
421 }
|
joachim99@52
|
422
|
joachim99@52
|
423 /* Given a vector of two file_data objects, find the identical
|
joachim99@52
|
424 prefixes and suffixes of each object. */
|
joachim99@52
|
425
|
joachim99@53
|
426 void GnuDiff::find_identical_ends (struct file_data filevec[])
|
joachim99@52
|
427 {
|
joachim99@52
|
428 word *w0, *w1;
|
joachim99@52
|
429 char *p0, *p1, *buffer0, *buffer1;
|
joachim99@52
|
430 char const *end0, *beg0;
|
joachim99@52
|
431 char const **linbuf0, **linbuf1;
|
joachim99@52
|
432 lin i, lines;
|
joachim99@52
|
433 size_t n0, n1;
|
joachim99@52
|
434 lin alloc_lines0, alloc_lines1;
|
joachim99@52
|
435 lin buffered_prefix, prefix_count, prefix_mask;
|
joachim99@52
|
436 lin middle_guess, suffix_guess;
|
joachim99@52
|
437
|
joachim99@52
|
438 prepare_text (&filevec[0]);
|
joachim99@52
|
439 prepare_text (&filevec[1]);
|
joachim99@52
|
440
|
joachim99@52
|
441 /* Find identical prefix. */
|
joachim99@52
|
442
|
joachim99@52
|
443 w0 = filevec[0].buffer;
|
joachim99@52
|
444 w1 = filevec[1].buffer;
|
joachim99@52
|
445 p0 = buffer0 = (char *) w0;
|
joachim99@52
|
446 p1 = buffer1 = (char *) w1;
|
joachim99@52
|
447 n0 = filevec[0].buffered;
|
joachim99@52
|
448 n1 = filevec[1].buffered;
|
joachim99@52
|
449
|
joachim99@52
|
450 if (p0 == p1)
|
joachim99@52
|
451 /* The buffers are the same; sentinels won't work. */
|
joachim99@52
|
452 p0 = p1 += n1;
|
joachim99@52
|
453 else
|
joachim99@52
|
454 {
|
joachim99@52
|
455 /* Insert end sentinels, in this case characters that are guaranteed
|
joachim99@52
|
456 to make the equality test false, and thus terminate the loop. */
|
joachim99@52
|
457
|
joachim99@52
|
458 if (n0 < n1)
|
joachim99@52
|
459 p0[n0] = ~p1[n0];
|
joachim99@52
|
460 else
|
joachim99@52
|
461 p1[n1] = ~p0[n1];
|
joachim99@52
|
462
|
joachim99@52
|
463 /* Loop until first mismatch, or to the sentinel characters. */
|
joachim99@52
|
464
|
joachim99@52
|
465 /* Compare a word at a time for speed. */
|
joachim99@52
|
466 while (*w0 == *w1)
|
joachim99@52
|
467 w0++, w1++;
|
joachim99@52
|
468
|
joachim99@52
|
469 /* Do the last few bytes of comparison a byte at a time. */
|
joachim99@52
|
470 p0 = (char *) w0;
|
joachim99@52
|
471 p1 = (char *) w1;
|
joachim99@52
|
472 while (*p0 == *p1)
|
joachim99@52
|
473 p0++, p1++;
|
joachim99@52
|
474
|
joachim99@52
|
475 /* Don't mistakenly count missing newline as part of prefix. */
|
joachim99@52
|
476 if (ROBUST_OUTPUT_STYLE (output_style)
|
joachim99@52
|
477 && ((buffer0 + n0 - filevec[0].missing_newline < p0)
|
joachim99@52
|
478 !=
|
joachim99@52
|
479 (buffer1 + n1 - filevec[1].missing_newline < p1)))
|
joachim99@52
|
480 p0--, p1--;
|
joachim99@52
|
481 }
|
joachim99@52
|
482
|
joachim99@52
|
483 /* Now P0 and P1 point at the first nonmatching characters. */
|
joachim99@52
|
484
|
joachim99@52
|
485 /* Skip back to last line-beginning in the prefix,
|
joachim99@52
|
486 and then discard up to HORIZON_LINES lines from the prefix. */
|
joachim99@52
|
487 i = horizon_lines;
|
joachim99@52
|
488 while (p0 != buffer0 && (p0[-1] != '\n' || i--))
|
joachim99@52
|
489 p0--, p1--;
|
joachim99@52
|
490
|
joachim99@52
|
491 /* Record the prefix. */
|
joachim99@52
|
492 filevec[0].prefix_end = p0;
|
joachim99@52
|
493 filevec[1].prefix_end = p1;
|
joachim99@52
|
494
|
joachim99@52
|
495 /* Find identical suffix. */
|
joachim99@52
|
496
|
joachim99@52
|
497 /* P0 and P1 point beyond the last chars not yet compared. */
|
joachim99@52
|
498 p0 = buffer0 + n0;
|
joachim99@52
|
499 p1 = buffer1 + n1;
|
joachim99@52
|
500
|
joachim99@52
|
501 if (! ROBUST_OUTPUT_STYLE (output_style)
|
joachim99@52
|
502 || filevec[0].missing_newline == filevec[1].missing_newline)
|
joachim99@52
|
503 {
|
joachim99@52
|
504 end0 = p0; /* Addr of last char in file 0. */
|
joachim99@52
|
505
|
joachim99@52
|
506 /* Get value of P0 at which we should stop scanning backward:
|
joachim99@52
|
507 this is when either P0 or P1 points just past the last char
|
joachim99@52
|
508 of the identical prefix. */
|
joachim99@52
|
509 beg0 = filevec[0].prefix_end + (n0 < n1 ? 0 : n0 - n1);
|
joachim99@52
|
510
|
joachim99@52
|
511 /* Scan back until chars don't match or we reach that point. */
|
joachim99@52
|
512 for (; p0 != beg0; p0--, p1--)
|
joachim99@52
|
513 if (*p0 != *p1)
|
joachim99@52
|
514 {
|
joachim99@52
|
515 /* Point at the first char of the matching suffix. */
|
joachim99@52
|
516 beg0 = p0;
|
joachim99@52
|
517 break;
|
joachim99@52
|
518 }
|
joachim99@52
|
519
|
joachim99@52
|
520 /* Are we at a line-beginning in both files? If not, add the rest of
|
joachim99@52
|
521 this line to the main body. Discard up to HORIZON_LINES lines from
|
joachim99@52
|
522 the identical suffix. Also, discard one extra line,
|
joachim99@52
|
523 because shift_boundaries may need it. */
|
joachim99@52
|
524 i = horizon_lines + !((buffer0 == p0 || p0[-1] == '\n')
|
joachim99@52
|
525 &&
|
joachim99@52
|
526 (buffer1 == p1 || p1[-1] == '\n'));
|
joachim99@52
|
527 while (i-- && p0 != end0)
|
joachim99@52
|
528 while (*p0++ != '\n')
|
joachim99@52
|
529 continue;
|
joachim99@52
|
530
|
joachim99@52
|
531 p1 += p0 - beg0;
|
joachim99@52
|
532 }
|
joachim99@52
|
533
|
joachim99@52
|
534 /* Record the suffix. */
|
joachim99@52
|
535 filevec[0].suffix_begin = p0;
|
joachim99@52
|
536 filevec[1].suffix_begin = p1;
|
joachim99@52
|
537
|
joachim99@52
|
538 /* Calculate number of lines of prefix to save.
|
joachim99@52
|
539
|
joachim99@52
|
540 prefix_count == 0 means save the whole prefix;
|
joachim99@52
|
541 we need this for options like -D that output the whole file,
|
joachim99@52
|
542 or for enormous contexts (to avoid worrying about arithmetic overflow).
|
joachim99@52
|
543 We also need it for options like -F that output some preceding line;
|
joachim99@52
|
544 at least we will need to find the last few lines,
|
joachim99@52
|
545 but since we don't know how many, it's easiest to find them all.
|
joachim99@52
|
546
|
joachim99@52
|
547 Otherwise, prefix_count != 0. Save just prefix_count lines at start
|
joachim99@52
|
548 of the line buffer; they'll be moved to the proper location later.
|
joachim99@52
|
549 Handle 1 more line than the context says (because we count 1 too many),
|
joachim99@52
|
550 rounded up to the next power of 2 to speed index computation. */
|
joachim99@52
|
551
|
joachim99@52
|
552 if (no_diff_means_no_output
|
joachim99@52
|
553 && context < int(LIN_MAX / 4) && context < int(n0))
|
joachim99@52
|
554 {
|
joachim99@52
|
555 middle_guess = guess_lines (0, 0, p0 - filevec[0].prefix_end);
|
joachim99@52
|
556 suffix_guess = guess_lines (0, 0, buffer0 + n0 - p0);
|
joachim99@52
|
557 for (prefix_count = 1; prefix_count <= context; prefix_count *= 2)
|
joachim99@52
|
558 continue;
|
joachim99@52
|
559 alloc_lines0 = (prefix_count + middle_guess
|
joachim99@52
|
560 + MIN (context, suffix_guess));
|
joachim99@52
|
561 }
|
joachim99@52
|
562 else
|
joachim99@52
|
563 {
|
joachim99@52
|
564 prefix_count = 0;
|
joachim99@52
|
565 alloc_lines0 = guess_lines (0, 0, n0);
|
joachim99@52
|
566 }
|
joachim99@52
|
567
|
joachim99@52
|
568 prefix_mask = prefix_count - 1;
|
joachim99@52
|
569 lines = 0;
|
joachim99@52
|
570 linbuf0 = (const char**) xmalloc (alloc_lines0 * sizeof *linbuf0);
|
joachim99@52
|
571 p0 = buffer0;
|
joachim99@52
|
572
|
joachim99@52
|
573 /* If the prefix is needed, find the prefix lines. */
|
joachim99@52
|
574 if (! (no_diff_means_no_output
|
joachim99@52
|
575 && filevec[0].prefix_end == p0
|
joachim99@52
|
576 && filevec[1].prefix_end == p1))
|
joachim99@52
|
577 {
|
joachim99@52
|
578 end0 = filevec[0].prefix_end;
|
joachim99@52
|
579 while (p0 != end0)
|
joachim99@52
|
580 {
|
joachim99@52
|
581 lin l = lines++ & prefix_mask;
|
joachim99@52
|
582 if (l == alloc_lines0)
|
joachim99@52
|
583 {
|
joachim99@52
|
584 if (int(PTRDIFF_MAX / (2 * sizeof *linbuf0)) <= alloc_lines0)
|
joachim99@52
|
585 xalloc_die ();
|
joachim99@52
|
586 alloc_lines0 *= 2;
|
joachim99@52
|
587 linbuf0 = (const char**) xrealloc (linbuf0, alloc_lines0 * sizeof *linbuf0);
|
joachim99@52
|
588 }
|
joachim99@52
|
589 linbuf0[l] = p0;
|
joachim99@52
|
590 while (*p0++ != '\n')
|
joachim99@52
|
591 continue;
|
joachim99@52
|
592 }
|
joachim99@52
|
593 }
|
joachim99@52
|
594 buffered_prefix = prefix_count && context < lines ? context : lines;
|
joachim99@52
|
595
|
joachim99@52
|
596 /* Allocate line buffer 1. */
|
joachim99@52
|
597
|
joachim99@52
|
598 middle_guess = guess_lines (lines, p0 - buffer0, p1 - filevec[1].prefix_end);
|
joachim99@52
|
599 suffix_guess = guess_lines (lines, p0 - buffer0, buffer1 + n1 - p1);
|
joachim99@52
|
600 alloc_lines1 = buffered_prefix + middle_guess + MIN (context, suffix_guess);
|
joachim99@52
|
601 if (alloc_lines1 < buffered_prefix
|
joachim99@52
|
602 || int(PTRDIFF_MAX / sizeof *linbuf1) <= alloc_lines1)
|
joachim99@52
|
603 xalloc_die ();
|
joachim99@52
|
604 linbuf1 = (const char**)xmalloc (alloc_lines1 * sizeof *linbuf1);
|
joachim99@52
|
605
|
joachim99@52
|
606 if (buffered_prefix != lines)
|
joachim99@52
|
607 {
|
joachim99@52
|
608 /* Rotate prefix lines to proper location. */
|
joachim99@52
|
609 for (i = 0; i < buffered_prefix; i++)
|
joachim99@52
|
610 linbuf1[i] = linbuf0[(lines - context + i) & prefix_mask];
|
joachim99@52
|
611 for (i = 0; i < buffered_prefix; i++)
|
joachim99@52
|
612 linbuf0[i] = linbuf1[i];
|
joachim99@52
|
613 }
|
joachim99@52
|
614
|
joachim99@52
|
615 /* Initialize line buffer 1 from line buffer 0. */
|
joachim99@52
|
616 for (i = 0; i < buffered_prefix; i++)
|
joachim99@52
|
617 linbuf1[i] = linbuf0[i] - buffer0 + buffer1;
|
joachim99@52
|
618
|
joachim99@52
|
619 /* Record the line buffer, adjusted so that
|
joachim99@52
|
620 linbuf[0] points at the first differing line. */
|
joachim99@52
|
621 filevec[0].linbuf = linbuf0 + buffered_prefix;
|
joachim99@52
|
622 filevec[1].linbuf = linbuf1 + buffered_prefix;
|
joachim99@52
|
623 filevec[0].linbuf_base = filevec[1].linbuf_base = - buffered_prefix;
|
joachim99@52
|
624 filevec[0].alloc_lines = alloc_lines0 - buffered_prefix;
|
joachim99@52
|
625 filevec[1].alloc_lines = alloc_lines1 - buffered_prefix;
|
joachim99@52
|
626 filevec[0].prefix_lines = filevec[1].prefix_lines = lines;
|
joachim99@52
|
627 }
|
joachim99@52
|
628
|
joachim99@52
|
629 /* If 1 < k, then (2**k - prime_offset[k]) is the largest prime less
|
joachim99@52
|
630 than 2**k. This table is derived from Chris K. Caldwell's list
|
joachim99@52
|
631 <http://www.utm.edu/research/primes/lists/2small/>. */
|
joachim99@52
|
632
|
joachim99@52
|
633 static unsigned char const prime_offset[] =
|
joachim99@52
|
634 {
|
joachim99@52
|
635 0, 0, 1, 1, 3, 1, 3, 1, 5, 3, 3, 9, 3, 1, 3, 19, 15, 1, 5, 1, 3, 9, 3,
|
joachim99@52
|
636 15, 3, 39, 5, 39, 57, 3, 35, 1, 5, 9, 41, 31, 5, 25, 45, 7, 87, 21,
|
joachim99@52
|
637 11, 57, 17, 55, 21, 115, 59, 81, 27, 129, 47, 111, 33, 55, 5, 13, 27,
|
joachim99@52
|
638 55, 93, 1, 57, 25
|
joachim99@52
|
639 };
|
joachim99@52
|
640
|
joachim99@52
|
641 /* Verify that this host's size_t is not too wide for the above table. */
|
joachim99@52
|
642
|
joachim99@52
|
643 verify (enough_prime_offsets,
|
joachim99@52
|
644 sizeof (size_t) * CHAR_BIT <= sizeof prime_offset);
|
joachim99@52
|
645
|
joachim99@52
|
646 /* Given a vector of two file_data objects, read the file associated
|
joachim99@52
|
647 with each one, and build the table of equivalence classes.
|
joachim99@52
|
648 Return nonzero if either file appears to be a binary file.
|
joachim99@52
|
649 If PRETEND_BINARY is nonzero, pretend they are binary regardless. */
|
joachim99@52
|
650
|
joachim99@52
|
651 bool
|
joachim99@53
|
652 GnuDiff::read_files (struct file_data filevec[], bool /*pretend_binary*/)
|
joachim99@52
|
653 {
|
joachim99@52
|
654 int i;
|
joachim99@52
|
655
|
joachim99@52
|
656 find_identical_ends (filevec);
|
joachim99@52
|
657
|
joachim99@52
|
658 equivs_alloc = filevec[0].alloc_lines + filevec[1].alloc_lines + 1;
|
joachim99@52
|
659 if (int(PTRDIFF_MAX / sizeof *equivs) <= equivs_alloc)
|
joachim99@52
|
660 xalloc_die ();
|
joachim99@52
|
661 equivs = (equivclass*)xmalloc (equivs_alloc * sizeof *equivs);
|
joachim99@52
|
662 /* Equivalence class 0 is permanently safe for lines that were not
|
joachim99@52
|
663 hashed. Real equivalence classes start at 1. */
|
joachim99@52
|
664 equivs_index = 1;
|
joachim99@52
|
665
|
joachim99@52
|
666 /* Allocate (one plus) a prime number of hash buckets. Use a prime
|
joachim99@52
|
667 number between 1/3 and 2/3 of the value of equiv_allocs,
|
joachim99@52
|
668 approximately. */
|
joachim99@52
|
669 for (i = 9; 1 << i < equivs_alloc / 3; i++)
|
joachim99@52
|
670 continue;
|
joachim99@52
|
671 nbuckets = ((size_t) 1 << i) - prime_offset[i];
|
joachim99@52
|
672 if (PTRDIFF_MAX / sizeof *buckets <= nbuckets)
|
joachim99@52
|
673 xalloc_die ();
|
joachim99@52
|
674 buckets = (lin*)zalloc ((nbuckets + 1) * sizeof *buckets);
|
joachim99@52
|
675 buckets++;
|
joachim99@52
|
676
|
joachim99@52
|
677 for (i = 0; i < 2; i++)
|
joachim99@52
|
678 find_and_hash_each_line (&filevec[i]);
|
joachim99@52
|
679
|
joachim99@52
|
680 filevec[0].equiv_max = filevec[1].equiv_max = equivs_index;
|
joachim99@52
|
681
|
joachim99@52
|
682 free (equivs);
|
joachim99@52
|
683 free (buckets - 1);
|
joachim99@52
|
684
|
joachim99@52
|
685 return 0;
|
joachim99@52
|
686 }
|