2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 * Davide Libenzi <davidel@xmailserver.org>
30 long xdl_bogosqrt(long n
) {
34 * Classical integer square root approximation using shifts.
36 for (i
= 1; n
> 0; n
>>= 2)
43 int xdl_emit_diffrec(char const *rec
, long size
, char const *pre
, long psize
,
48 mb
[0].ptr
= (char *) pre
;
50 mb
[1].ptr
= (char *) rec
;
52 if (size
> 0 && rec
[size
- 1] != '\n') {
53 mb
[2].ptr
= (char *) "\n\\ No newline at end of file\n";
54 mb
[2].size
= strlen(mb
[2].ptr
);
57 if (ecb
->outf(ecb
->priv
, mb
, i
) < 0) {
65 void *xdl_mmfile_first(mmfile_t
*mmf
, long *size
)
72 long xdl_mmfile_size(mmfile_t
*mmf
)
78 int xdl_cha_init(chastore_t
*cha
, long isize
, long icount
) {
80 cha
->head
= cha
->tail
= NULL
;
82 cha
->nsize
= icount
* isize
;
83 cha
->ancur
= cha
->sncur
= NULL
;
90 void xdl_cha_free(chastore_t
*cha
) {
93 for (cur
= cha
->head
; (tmp
= cur
) != NULL
;) {
100 void *xdl_cha_alloc(chastore_t
*cha
) {
104 if (!(ancur
= cha
->ancur
) || ancur
->icurr
== cha
->nsize
) {
105 if (!(ancur
= (chanode_t
*) xdl_malloc(sizeof(chanode_t
) + cha
->nsize
))) {
112 cha
->tail
->next
= ancur
;
119 data
= (char *) ancur
+ sizeof(chanode_t
) + ancur
->icurr
;
120 ancur
->icurr
+= cha
->isize
;
125 long xdl_guess_lines(mmfile_t
*mf
, long sample
) {
126 long nl
= 0, size
, tsize
= 0;
127 char const *data
, *cur
, *top
;
129 if ((cur
= data
= xdl_mmfile_first(mf
, &size
)) != NULL
) {
130 for (top
= data
+ size
; nl
< sample
&& cur
< top
; ) {
132 if (!(cur
= memchr(cur
, '\n', top
- cur
)))
137 tsize
+= (long) (cur
- data
);
141 nl
= xdl_mmfile_size(mf
) / (tsize
/ nl
);
146 int xdl_recmatch(const char *l1
, long s1
, const char *l2
, long s2
, long flags
)
150 if (s1
== s2
&& !memcmp(l1
, l2
, s1
))
152 if (!(flags
& XDF_WHITESPACE_FLAGS
))
159 * -w matches everything that matches with -b, and -b in turn
160 * matches everything that matches with --ignore-space-at-eol.
162 * Each flavor of ignoring needs different logic to skip whitespaces
163 * while we have both sides to compare.
165 if (flags
& XDF_IGNORE_WHITESPACE
) {
167 while (i1
< s1
&& i2
< s2
) {
168 if (l1
[i1
++] != l2
[i2
++])
171 while (i1
< s1
&& XDL_ISSPACE(l1
[i1
]))
173 while (i2
< s2
&& XDL_ISSPACE(l2
[i2
]))
176 } else if (flags
& XDF_IGNORE_WHITESPACE_CHANGE
) {
177 while (i1
< s1
&& i2
< s2
) {
178 if (XDL_ISSPACE(l1
[i1
]) && XDL_ISSPACE(l2
[i2
])) {
179 /* Skip matching spaces and try again */
180 while (i1
< s1
&& XDL_ISSPACE(l1
[i1
]))
182 while (i2
< s2
&& XDL_ISSPACE(l2
[i2
]))
186 if (l1
[i1
++] != l2
[i2
++])
189 } else if (flags
& XDF_IGNORE_WHITESPACE_AT_EOL
) {
190 while (i1
< s1
&& i2
< s2
&& l1
[i1
++] == l2
[i2
++])
195 * After running out of one side, the remaining side must have
196 * nothing but whitespace for the lines to match. Note that
197 * ignore-whitespace-at-eol case may break out of the loop
198 * while there still are characters remaining on both lines.
201 while (i1
< s1
&& XDL_ISSPACE(l1
[i1
]))
207 while (i2
< s2
&& XDL_ISSPACE(l2
[i2
]))
214 static unsigned long xdl_hash_record_with_whitespace(char const **data
,
215 char const *top
, long flags
) {
216 unsigned long ha
= 5381;
217 char const *ptr
= *data
;
219 for (; ptr
< top
&& *ptr
!= '\n'; ptr
++) {
220 if (XDL_ISSPACE(*ptr
)) {
221 const char *ptr2
= ptr
;
223 while (ptr
+ 1 < top
&& XDL_ISSPACE(ptr
[1])
226 at_eol
= (top
<= ptr
+ 1 || ptr
[1] == '\n');
227 if (flags
& XDF_IGNORE_WHITESPACE
)
228 ; /* already handled */
229 else if (flags
& XDF_IGNORE_WHITESPACE_CHANGE
232 ha
^= (unsigned long) ' ';
234 else if (flags
& XDF_IGNORE_WHITESPACE_AT_EOL
236 while (ptr2
!= ptr
+ 1) {
238 ha
^= (unsigned long) *ptr2
;
245 ha
^= (unsigned long) *ptr
;
247 *data
= ptr
< top
? ptr
+ 1: ptr
;
254 #define REPEAT_BYTE(x) ((~0ul / 0xff) * (x))
256 #define ONEBYTES REPEAT_BYTE(0x01)
257 #define NEWLINEBYTES REPEAT_BYTE(0x0a)
258 #define HIGHBITS REPEAT_BYTE(0x80)
260 /* Return the high bit set in the first byte that is a zero */
261 static inline unsigned long has_zero(unsigned long a
)
263 return ((a
- ONEBYTES
) & ~a
) & HIGHBITS
;
266 static inline long count_masked_bytes(unsigned long mask
)
268 if (sizeof(long) == 8) {
270 * Jan Achrenius on G+: microoptimized version of
271 * the simpler "(mask & ONEBYTES) * ONEBYTES >> 56"
272 * that works for the bytemasks without having to
276 * return mask * 0x0001020304050608 >> 56;
278 * Doing it like this avoids warnings on 32-bit machines.
280 long a
= (REPEAT_BYTE(0x01) / 0xff + 1);
281 return mask
* a
>> (sizeof(long) * 7);
283 /* Carl Chatfield / Jan Achrenius G+ version for 32-bit */
284 /* (000000 0000ff 00ffff ffffff) -> ( 1 1 2 3 ) */
285 long a
= (0x0ff0001 + mask
) >> 23;
286 /* Fix the 1 for 00 case */
291 unsigned long xdl_hash_record(char const **data
, char const *top
, long flags
)
293 unsigned long hash
= 5381;
294 unsigned long a
= 0, mask
= 0;
295 char const *ptr
= *data
;
296 char const *end
= top
- sizeof(unsigned long) + 1;
298 if (flags
& XDF_WHITESPACE_FLAGS
)
299 return xdl_hash_record_with_whitespace(data
, top
, flags
);
301 ptr
-= sizeof(unsigned long);
305 ptr
+= sizeof(unsigned long);
308 a
= *(unsigned long *)ptr
;
309 /* Do we have any '\n' bytes in this word? */
310 mask
= has_zero(a
^ NEWLINEBYTES
);
315 * There is only a partial word left at the end of the
316 * buffer. Because we may work with a memory mapping,
317 * we have to grab the rest byte by byte instead of
318 * blindly reading it.
320 * To avoid problems with masking in a signed value,
321 * we use an unsigned char here.
324 for (p
= top
- 1; p
>= ptr
; p
--)
325 a
= (a
<< 8) + *((const unsigned char *)p
);
326 mask
= has_zero(a
^ NEWLINEBYTES
);
329 * No '\n' found in the partial word. Make a
330 * mask that matches what we read.
332 mask
= 1UL << (8 * (top
- ptr
) + 7);
335 /* The mask *below* the first high bit set */
336 mask
= (mask
- 1) & ~mask
;
341 /* Advance past the last (possibly partial) word */
342 ptr
+= count_masked_bytes(mask
);
345 assert(*ptr
== '\n');
354 #else /* XDL_FAST_HASH */
356 unsigned long xdl_hash_record(char const **data
, char const *top
, long flags
) {
357 unsigned long ha
= 5381;
358 char const *ptr
= *data
;
360 if (flags
& XDF_WHITESPACE_FLAGS
)
361 return xdl_hash_record_with_whitespace(data
, top
, flags
);
363 for (; ptr
< top
&& *ptr
!= '\n'; ptr
++) {
365 ha
^= (unsigned long) *ptr
;
367 *data
= ptr
< top
? ptr
+ 1: ptr
;
372 #endif /* XDL_FAST_HASH */
374 unsigned int xdl_hashbits(unsigned int size
) {
375 unsigned int val
= 1, bits
= 0;
377 for (; val
< size
&& bits
< CHAR_BIT
* sizeof(unsigned int); val
<<= 1, bits
++);
378 return bits
? bits
: 1;
382 int xdl_num_out(char *out
, long val
) {
383 char *ptr
, *str
= out
;
386 ptr
= buf
+ sizeof(buf
) - 1;
392 for (; val
&& ptr
> buf
; val
/= 10)
393 *--ptr
= "0123456789"[val
% 10];
395 for (; *ptr
; ptr
++, str
++)
404 int xdl_emit_hunk_hdr(long s1
, long c1
, long s2
, long c2
,
405 const char *func
, long funclen
, xdemitcb_t
*ecb
) {
410 memcpy(buf
, "@@ -", 4);
413 nb
+= xdl_num_out(buf
+ nb
, c1
? s1
: s1
- 1);
416 memcpy(buf
+ nb
, ",", 1);
419 nb
+= xdl_num_out(buf
+ nb
, c1
);
422 memcpy(buf
+ nb
, " +", 2);
425 nb
+= xdl_num_out(buf
+ nb
, c2
? s2
: s2
- 1);
428 memcpy(buf
+ nb
, ",", 1);
431 nb
+= xdl_num_out(buf
+ nb
, c2
);
434 memcpy(buf
+ nb
, " @@", 3);
436 if (func
&& funclen
) {
438 if (funclen
> sizeof(buf
) - nb
- 1)
439 funclen
= sizeof(buf
) - nb
- 1;
440 memcpy(buf
+ nb
, func
, funclen
);
447 if (ecb
->outf(ecb
->priv
, &mb
, 1) < 0)
453 int xdl_fall_back_diff(xdfenv_t
*diff_env
, xpparam_t
const *xpp
,
454 int line1
, int count1
, int line2
, int count2
)
457 * This probably does not work outside Git, since
458 * we have a very simple mmfile structure.
460 * Note: ideally, we would reuse the prepared environment, but
461 * the libxdiff interface does not (yet) allow for diffing only
462 * ranges of lines instead of the whole files.
464 mmfile_t subfile1
, subfile2
;
467 subfile1
.ptr
= (char *)diff_env
->xdf1
.recs
[line1
- 1]->ptr
;
468 subfile1
.size
= diff_env
->xdf1
.recs
[line1
+ count1
- 2]->ptr
+
469 diff_env
->xdf1
.recs
[line1
+ count1
- 2]->size
- subfile1
.ptr
;
470 subfile2
.ptr
= (char *)diff_env
->xdf2
.recs
[line2
- 1]->ptr
;
471 subfile2
.size
= diff_env
->xdf2
.recs
[line2
+ count2
- 2]->ptr
+
472 diff_env
->xdf2
.recs
[line2
+ count2
- 2]->size
- subfile2
.ptr
;
473 if (xdl_do_diff(&subfile1
, &subfile2
, xpp
, &env
) < 0)
476 memcpy(diff_env
->xdf1
.rchg
+ line1
- 1, env
.xdf1
.rchg
, count1
);
477 memcpy(diff_env
->xdf2
.rchg
+ line2
- 1, env
.xdf2
.rchg
, count2
);