line |
stmt |
bran |
cond |
sub |
pod |
time |
code |
1
|
|
|
|
|
|
|
/* |
2
|
|
|
|
|
|
|
* LibXDiff by Davide Libenzi ( File Differential Library ) |
3
|
|
|
|
|
|
|
* Copyright (C) 2003 Davide Libenzi |
4
|
|
|
|
|
|
|
* |
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. |
9
|
|
|
|
|
|
|
* |
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. |
14
|
|
|
|
|
|
|
* |
15
|
|
|
|
|
|
|
* You should have received a copy of the GNU Lesser General Public |
16
|
|
|
|
|
|
|
* License along with this library; if not, see |
17
|
|
|
|
|
|
|
* . |
18
|
|
|
|
|
|
|
* |
19
|
|
|
|
|
|
|
* Davide Libenzi |
20
|
|
|
|
|
|
|
* |
21
|
|
|
|
|
|
|
*/ |
22
|
|
|
|
|
|
|
|
23
|
|
|
|
|
|
|
#include "xinclude.h" |
24
|
|
|
|
|
|
|
|
25
|
|
|
|
|
|
|
|
26
|
|
|
|
|
|
|
|
27
|
|
|
|
|
|
|
|
28
|
219
|
|
|
|
|
|
long xdl_bogosqrt(long n) { |
29
|
|
|
|
|
|
|
long i; |
30
|
|
|
|
|
|
|
|
31
|
|
|
|
|
|
|
/* |
32
|
|
|
|
|
|
|
* Classical integer square root approximation using shifts. |
33
|
|
|
|
|
|
|
*/ |
34
|
421
|
100
|
|
|
|
|
for (i = 1; n > 0; n >>= 2) |
35
|
202
|
|
|
|
|
|
i <<= 1; |
36
|
|
|
|
|
|
|
|
37
|
219
|
|
|
|
|
|
return i; |
38
|
|
|
|
|
|
|
} |
39
|
|
|
|
|
|
|
|
40
|
|
|
|
|
|
|
|
41
|
57
|
|
|
|
|
|
int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize, |
42
|
|
|
|
|
|
|
xdemitcb_t *ecb) { |
43
|
57
|
|
|
|
|
|
int i = 2; |
44
|
|
|
|
|
|
|
mmbuffer_t mb[3]; |
45
|
|
|
|
|
|
|
|
46
|
57
|
|
|
|
|
|
mb[0].ptr = (char *) pre; |
47
|
57
|
|
|
|
|
|
mb[0].size = psize; |
48
|
57
|
|
|
|
|
|
mb[1].ptr = (char *) rec; |
49
|
57
|
|
|
|
|
|
mb[1].size = size; |
50
|
57
|
50
|
|
|
|
|
if (size > 0 && rec[size - 1] != '\n') { |
|
|
100
|
|
|
|
|
|
51
|
24
|
|
|
|
|
|
mb[2].ptr = (char *) "\n\\ No newline at end of file\n"; |
52
|
24
|
|
|
|
|
|
mb[2].size = strlen(mb[2].ptr); |
53
|
24
|
|
|
|
|
|
i++; |
54
|
|
|
|
|
|
|
} |
55
|
57
|
50
|
|
|
|
|
if (ecb->outf(ecb->priv, mb, i) < 0) { |
56
|
|
|
|
|
|
|
|
57
|
0
|
|
|
|
|
|
return -1; |
58
|
|
|
|
|
|
|
} |
59
|
|
|
|
|
|
|
|
60
|
57
|
|
|
|
|
|
return 0; |
61
|
|
|
|
|
|
|
} |
62
|
|
|
|
|
|
|
|
63
|
292
|
|
|
|
|
|
void *xdl_mmfile_first(mmfile_t *mmf, long *size) |
64
|
|
|
|
|
|
|
{ |
65
|
292
|
|
|
|
|
|
*size = mmf->size; |
66
|
292
|
|
|
|
|
|
return mmf->ptr; |
67
|
|
|
|
|
|
|
} |
68
|
|
|
|
|
|
|
|
69
|
|
|
|
|
|
|
|
70
|
117
|
|
|
|
|
|
long xdl_mmfile_size(mmfile_t *mmf) |
71
|
|
|
|
|
|
|
{ |
72
|
117
|
|
|
|
|
|
return mmf->size; |
73
|
|
|
|
|
|
|
} |
74
|
|
|
|
|
|
|
|
75
|
|
|
|
|
|
|
|
76
|
219
|
|
|
|
|
|
int xdl_cha_init(chastore_t *cha, long isize, long icount) { |
77
|
|
|
|
|
|
|
|
78
|
219
|
|
|
|
|
|
cha->head = cha->tail = NULL; |
79
|
219
|
|
|
|
|
|
cha->isize = isize; |
80
|
219
|
|
|
|
|
|
cha->nsize = icount * isize; |
81
|
219
|
|
|
|
|
|
cha->ancur = cha->sncur = NULL; |
82
|
219
|
|
|
|
|
|
cha->scurr = 0; |
83
|
|
|
|
|
|
|
|
84
|
219
|
|
|
|
|
|
return 0; |
85
|
|
|
|
|
|
|
} |
86
|
|
|
|
|
|
|
|
87
|
|
|
|
|
|
|
|
88
|
219
|
|
|
|
|
|
void xdl_cha_free(chastore_t *cha) { |
89
|
|
|
|
|
|
|
chanode_t *cur, *tmp; |
90
|
|
|
|
|
|
|
|
91
|
434
|
100
|
|
|
|
|
for (cur = cha->head; (tmp = cur) != NULL;) { |
92
|
215
|
|
|
|
|
|
cur = cur->next; |
93
|
215
|
|
|
|
|
|
xdl_free(tmp); |
94
|
|
|
|
|
|
|
} |
95
|
219
|
|
|
|
|
|
} |
96
|
|
|
|
|
|
|
|
97
|
|
|
|
|
|
|
|
98
|
300
|
|
|
|
|
|
void *xdl_cha_alloc(chastore_t *cha) { |
99
|
|
|
|
|
|
|
chanode_t *ancur; |
100
|
|
|
|
|
|
|
void *data; |
101
|
|
|
|
|
|
|
|
102
|
300
|
100
|
|
|
|
|
if (!(ancur = cha->ancur) || ancur->icurr == cha->nsize) { |
|
|
100
|
|
|
|
|
|
103
|
215
|
50
|
|
|
|
|
if (!(ancur = (chanode_t *) xdl_malloc(sizeof(chanode_t) + cha->nsize))) { |
104
|
|
|
|
|
|
|
|
105
|
0
|
|
|
|
|
|
return NULL; |
106
|
|
|
|
|
|
|
} |
107
|
215
|
|
|
|
|
|
ancur->icurr = 0; |
108
|
215
|
|
|
|
|
|
ancur->next = NULL; |
109
|
215
|
100
|
|
|
|
|
if (cha->tail) |
110
|
25
|
|
|
|
|
|
cha->tail->next = ancur; |
111
|
215
|
100
|
|
|
|
|
if (!cha->head) |
112
|
190
|
|
|
|
|
|
cha->head = ancur; |
113
|
215
|
|
|
|
|
|
cha->tail = ancur; |
114
|
215
|
|
|
|
|
|
cha->ancur = ancur; |
115
|
|
|
|
|
|
|
} |
116
|
|
|
|
|
|
|
|
117
|
300
|
|
|
|
|
|
data = (char *) ancur + sizeof(chanode_t) + ancur->icurr; |
118
|
300
|
|
|
|
|
|
ancur->icurr += cha->isize; |
119
|
|
|
|
|
|
|
|
120
|
300
|
|
|
|
|
|
return data; |
121
|
|
|
|
|
|
|
} |
122
|
|
|
|
|
|
|
|
123
|
146
|
|
|
|
|
|
long xdl_guess_lines(mmfile_t *mf, long sample) { |
124
|
146
|
|
|
|
|
|
long nl = 0, size, tsize = 0; |
125
|
|
|
|
|
|
|
char const *data, *cur, *top; |
126
|
|
|
|
|
|
|
|
127
|
146
|
50
|
|
|
|
|
if ((cur = data = xdl_mmfile_first(mf, &size)) != NULL) { |
128
|
309
|
50
|
|
|
|
|
for (top = data + size; nl < sample && cur < top; ) { |
|
|
100
|
|
|
|
|
|
129
|
163
|
|
|
|
|
|
nl++; |
130
|
163
|
100
|
|
|
|
|
if (!(cur = memchr(cur, '\n', top - cur))) |
131
|
96
|
|
|
|
|
|
cur = top; |
132
|
|
|
|
|
|
|
else |
133
|
67
|
|
|
|
|
|
cur++; |
134
|
|
|
|
|
|
|
} |
135
|
146
|
|
|
|
|
|
tsize += (long) (cur - data); |
136
|
|
|
|
|
|
|
} |
137
|
|
|
|
|
|
|
|
138
|
146
|
100
|
|
|
|
|
if (nl && tsize) |
|
|
50
|
|
|
|
|
|
139
|
117
|
|
|
|
|
|
nl = xdl_mmfile_size(mf) / (tsize / nl); |
140
|
|
|
|
|
|
|
|
141
|
146
|
|
|
|
|
|
return nl + 1; |
142
|
|
|
|
|
|
|
} |
143
|
|
|
|
|
|
|
|
144
|
0
|
|
|
|
|
|
int xdl_blankline(const char *line, long size, long flags) |
145
|
|
|
|
|
|
|
{ |
146
|
|
|
|
|
|
|
long i; |
147
|
|
|
|
|
|
|
|
148
|
0
|
0
|
|
|
|
|
if (!(flags & XDF_WHITESPACE_FLAGS)) |
149
|
0
|
|
|
|
|
|
return (size <= 1); |
150
|
|
|
|
|
|
|
|
151
|
0
|
0
|
|
|
|
|
for (i = 0; i < size && XDL_ISSPACE(line[i]); i++) |
|
|
0
|
|
|
|
|
|
152
|
|
|
|
|
|
|
; |
153
|
|
|
|
|
|
|
|
154
|
0
|
|
|
|
|
|
return (i == size); |
155
|
|
|
|
|
|
|
} |
156
|
|
|
|
|
|
|
|
157
|
|
|
|
|
|
|
/* |
158
|
|
|
|
|
|
|
* Have we eaten everything on the line, except for an optional |
159
|
|
|
|
|
|
|
* CR at the very end? |
160
|
|
|
|
|
|
|
*/ |
161
|
0
|
|
|
|
|
|
static int ends_with_optional_cr(const char *l, long s, long i) |
162
|
|
|
|
|
|
|
{ |
163
|
0
|
0
|
|
|
|
|
int complete = s && l[s-1] == '\n'; |
|
|
0
|
|
|
|
|
|
164
|
|
|
|
|
|
|
|
165
|
0
|
0
|
|
|
|
|
if (complete) |
166
|
0
|
|
|
|
|
|
s--; |
167
|
0
|
0
|
|
|
|
|
if (s == i) |
168
|
0
|
|
|
|
|
|
return 1; |
169
|
|
|
|
|
|
|
/* do not ignore CR at the end of an incomplete line */ |
170
|
0
|
0
|
|
|
|
|
if (complete && s == i + 1 && l[i] == '\r') |
|
|
0
|
|
|
|
|
|
|
|
0
|
|
|
|
|
|
171
|
0
|
|
|
|
|
|
return 1; |
172
|
0
|
|
|
|
|
|
return 0; |
173
|
|
|
|
|
|
|
} |
174
|
|
|
|
|
|
|
|
175
|
51
|
|
|
|
|
|
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags) |
176
|
|
|
|
|
|
|
{ |
177
|
|
|
|
|
|
|
int i1, i2; |
178
|
|
|
|
|
|
|
|
179
|
51
|
100
|
|
|
|
|
if (s1 == s2 && !memcmp(l1, l2, s1)) |
|
|
100
|
|
|
|
|
|
180
|
38
|
|
|
|
|
|
return 1; |
181
|
13
|
50
|
|
|
|
|
if (!(flags & XDF_WHITESPACE_FLAGS)) |
182
|
13
|
|
|
|
|
|
return 0; |
183
|
|
|
|
|
|
|
|
184
|
0
|
|
|
|
|
|
i1 = 0; |
185
|
0
|
|
|
|
|
|
i2 = 0; |
186
|
|
|
|
|
|
|
|
187
|
|
|
|
|
|
|
/* |
188
|
|
|
|
|
|
|
* -w matches everything that matches with -b, and -b in turn |
189
|
|
|
|
|
|
|
* matches everything that matches with --ignore-space-at-eol, |
190
|
|
|
|
|
|
|
* which in turn matches everything that matches with --ignore-cr-at-eol. |
191
|
|
|
|
|
|
|
* |
192
|
|
|
|
|
|
|
* Each flavor of ignoring needs different logic to skip whitespaces |
193
|
|
|
|
|
|
|
* while we have both sides to compare. |
194
|
|
|
|
|
|
|
*/ |
195
|
0
|
0
|
|
|
|
|
if (flags & XDF_IGNORE_WHITESPACE) { |
196
|
0
|
|
|
|
|
|
goto skip_ws; |
197
|
0
|
0
|
|
|
|
|
while (i1 < s1 && i2 < s2) { |
|
|
0
|
|
|
|
|
|
198
|
0
|
0
|
|
|
|
|
if (l1[i1++] != l2[i2++]) |
199
|
0
|
|
|
|
|
|
return 0; |
200
|
|
|
|
|
|
|
skip_ws: |
201
|
0
|
0
|
|
|
|
|
while (i1 < s1 && XDL_ISSPACE(l1[i1])) |
|
|
0
|
|
|
|
|
|
202
|
0
|
|
|
|
|
|
i1++; |
203
|
0
|
0
|
|
|
|
|
while (i2 < s2 && XDL_ISSPACE(l2[i2])) |
|
|
0
|
|
|
|
|
|
204
|
0
|
|
|
|
|
|
i2++; |
205
|
|
|
|
|
|
|
} |
206
|
0
|
0
|
|
|
|
|
} else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) { |
207
|
0
|
0
|
|
|
|
|
while (i1 < s1 && i2 < s2) { |
|
|
0
|
|
|
|
|
|
208
|
0
|
0
|
|
|
|
|
if (XDL_ISSPACE(l1[i1]) && XDL_ISSPACE(l2[i2])) { |
|
|
0
|
|
|
|
|
|
209
|
|
|
|
|
|
|
/* Skip matching spaces and try again */ |
210
|
0
|
0
|
|
|
|
|
while (i1 < s1 && XDL_ISSPACE(l1[i1])) |
|
|
0
|
|
|
|
|
|
211
|
0
|
|
|
|
|
|
i1++; |
212
|
0
|
0
|
|
|
|
|
while (i2 < s2 && XDL_ISSPACE(l2[i2])) |
|
|
0
|
|
|
|
|
|
213
|
0
|
|
|
|
|
|
i2++; |
214
|
0
|
|
|
|
|
|
continue; |
215
|
|
|
|
|
|
|
} |
216
|
0
|
0
|
|
|
|
|
if (l1[i1++] != l2[i2++]) |
217
|
0
|
|
|
|
|
|
return 0; |
218
|
|
|
|
|
|
|
} |
219
|
0
|
0
|
|
|
|
|
} else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL) { |
220
|
0
|
0
|
|
|
|
|
while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) { |
|
|
0
|
|
|
|
|
|
|
|
0
|
|
|
|
|
|
221
|
0
|
|
|
|
|
|
i1++; |
222
|
0
|
|
|
|
|
|
i2++; |
223
|
|
|
|
|
|
|
} |
224
|
0
|
0
|
|
|
|
|
} else if (flags & XDF_IGNORE_CR_AT_EOL) { |
225
|
|
|
|
|
|
|
/* Find the first difference and see how the line ends */ |
226
|
0
|
0
|
|
|
|
|
while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) { |
|
|
0
|
|
|
|
|
|
|
|
0
|
|
|
|
|
|
227
|
0
|
|
|
|
|
|
i1++; |
228
|
0
|
|
|
|
|
|
i2++; |
229
|
|
|
|
|
|
|
} |
230
|
0
|
|
|
|
|
|
return (ends_with_optional_cr(l1, s1, i1) && |
231
|
0
|
|
|
|
|
|
ends_with_optional_cr(l2, s2, i2)); |
232
|
|
|
|
|
|
|
} |
233
|
|
|
|
|
|
|
|
234
|
|
|
|
|
|
|
/* |
235
|
|
|
|
|
|
|
* After running out of one side, the remaining side must have |
236
|
|
|
|
|
|
|
* nothing but whitespace for the lines to match. Note that |
237
|
|
|
|
|
|
|
* ignore-whitespace-at-eol case may break out of the loop |
238
|
|
|
|
|
|
|
* while there still are characters remaining on both lines. |
239
|
|
|
|
|
|
|
*/ |
240
|
0
|
0
|
|
|
|
|
if (i1 < s1) { |
241
|
0
|
0
|
|
|
|
|
while (i1 < s1 && XDL_ISSPACE(l1[i1])) |
|
|
0
|
|
|
|
|
|
242
|
0
|
|
|
|
|
|
i1++; |
243
|
0
|
0
|
|
|
|
|
if (s1 != i1) |
244
|
0
|
|
|
|
|
|
return 0; |
245
|
|
|
|
|
|
|
} |
246
|
0
|
0
|
|
|
|
|
if (i2 < s2) { |
247
|
0
|
0
|
|
|
|
|
while (i2 < s2 && XDL_ISSPACE(l2[i2])) |
|
|
0
|
|
|
|
|
|
248
|
0
|
|
|
|
|
|
i2++; |
249
|
0
|
|
|
|
|
|
return (s2 == i2); |
250
|
|
|
|
|
|
|
} |
251
|
0
|
|
|
|
|
|
return 1; |
252
|
|
|
|
|
|
|
} |
253
|
|
|
|
|
|
|
|
254
|
0
|
|
|
|
|
|
static unsigned long xdl_hash_record_with_whitespace(char const **data, |
255
|
|
|
|
|
|
|
char const *top, long flags) { |
256
|
0
|
|
|
|
|
|
unsigned long ha = 5381; |
257
|
0
|
|
|
|
|
|
char const *ptr = *data; |
258
|
0
|
|
|
|
|
|
int cr_at_eol_only = (flags & XDF_WHITESPACE_FLAGS) == XDF_IGNORE_CR_AT_EOL; |
259
|
|
|
|
|
|
|
|
260
|
0
|
0
|
|
|
|
|
for (; ptr < top && *ptr != '\n'; ptr++) { |
|
|
0
|
|
|
|
|
|
261
|
0
|
0
|
|
|
|
|
if (cr_at_eol_only) { |
262
|
|
|
|
|
|
|
/* do not ignore CR at the end of an incomplete line */ |
263
|
0
|
0
|
|
|
|
|
if (*ptr == '\r' && |
|
|
0
|
|
|
|
|
|
264
|
0
|
0
|
|
|
|
|
(ptr + 1 < top && ptr[1] == '\n')) |
265
|
0
|
|
|
|
|
|
continue; |
266
|
|
|
|
|
|
|
} |
267
|
0
|
0
|
|
|
|
|
else if (XDL_ISSPACE(*ptr)) { |
268
|
0
|
|
|
|
|
|
const char *ptr2 = ptr; |
269
|
|
|
|
|
|
|
int at_eol; |
270
|
0
|
0
|
|
|
|
|
while (ptr + 1 < top && XDL_ISSPACE(ptr[1]) |
|
|
0
|
|
|
|
|
|
271
|
0
|
0
|
|
|
|
|
&& ptr[1] != '\n') |
272
|
0
|
|
|
|
|
|
ptr++; |
273
|
0
|
0
|
|
|
|
|
at_eol = (top <= ptr + 1 || ptr[1] == '\n'); |
|
|
0
|
|
|
|
|
|
274
|
0
|
0
|
|
|
|
|
if (flags & XDF_IGNORE_WHITESPACE) |
275
|
|
|
|
|
|
|
; /* already handled */ |
276
|
0
|
0
|
|
|
|
|
else if (flags & XDF_IGNORE_WHITESPACE_CHANGE |
277
|
0
|
0
|
|
|
|
|
&& !at_eol) { |
278
|
0
|
|
|
|
|
|
ha += (ha << 5); |
279
|
0
|
|
|
|
|
|
ha ^= (unsigned long) ' '; |
280
|
|
|
|
|
|
|
} |
281
|
0
|
0
|
|
|
|
|
else if (flags & XDF_IGNORE_WHITESPACE_AT_EOL |
282
|
0
|
0
|
|
|
|
|
&& !at_eol) { |
283
|
0
|
0
|
|
|
|
|
while (ptr2 != ptr + 1) { |
284
|
0
|
|
|
|
|
|
ha += (ha << 5); |
285
|
0
|
|
|
|
|
|
ha ^= (unsigned long) *ptr2; |
286
|
0
|
|
|
|
|
|
ptr2++; |
287
|
|
|
|
|
|
|
} |
288
|
|
|
|
|
|
|
} |
289
|
0
|
|
|
|
|
|
continue; |
290
|
|
|
|
|
|
|
} |
291
|
0
|
|
|
|
|
|
ha += (ha << 5); |
292
|
0
|
|
|
|
|
|
ha ^= (unsigned long) *ptr; |
293
|
|
|
|
|
|
|
} |
294
|
0
|
0
|
|
|
|
|
*data = ptr < top ? ptr + 1: ptr; |
295
|
|
|
|
|
|
|
|
296
|
0
|
|
|
|
|
|
return ha; |
297
|
|
|
|
|
|
|
} |
298
|
|
|
|
|
|
|
|
299
|
163
|
|
|
|
|
|
unsigned long xdl_hash_record(char const **data, char const *top, long flags) { |
300
|
163
|
|
|
|
|
|
unsigned long ha = 5381; |
301
|
163
|
|
|
|
|
|
char const *ptr = *data; |
302
|
|
|
|
|
|
|
|
303
|
163
|
50
|
|
|
|
|
if (flags & XDF_WHITESPACE_FLAGS) |
304
|
0
|
|
|
|
|
|
return xdl_hash_record_with_whitespace(data, top, flags); |
305
|
|
|
|
|
|
|
|
306
|
2991
|
100
|
|
|
|
|
for (; ptr < top && *ptr != '\n'; ptr++) { |
|
|
100
|
|
|
|
|
|
307
|
2828
|
|
|
|
|
|
ha += (ha << 5); |
308
|
2828
|
|
|
|
|
|
ha ^= (unsigned long) *ptr; |
309
|
|
|
|
|
|
|
} |
310
|
163
|
100
|
|
|
|
|
*data = ptr < top ? ptr + 1: ptr; |
311
|
|
|
|
|
|
|
|
312
|
163
|
|
|
|
|
|
return ha; |
313
|
|
|
|
|
|
|
} |
314
|
|
|
|
|
|
|
|
315
|
219
|
|
|
|
|
|
unsigned int xdl_hashbits(unsigned int size) { |
316
|
219
|
|
|
|
|
|
unsigned int val = 1, bits = 0; |
317
|
|
|
|
|
|
|
|
318
|
724
|
100
|
|
|
|
|
for (; val < size && bits < CHAR_BIT * sizeof(unsigned int); val <<= 1, bits++); |
|
|
50
|
|
|
|
|
|
319
|
219
|
50
|
|
|
|
|
return bits ? bits: 1; |
320
|
|
|
|
|
|
|
} |
321
|
|
|
|
|
|
|
|
322
|
|
|
|
|
|
|
|
323
|
109
|
|
|
|
|
|
int xdl_num_out(char *out, long val) { |
324
|
109
|
|
|
|
|
|
char *ptr, *str = out; |
325
|
|
|
|
|
|
|
char buf[32]; |
326
|
|
|
|
|
|
|
|
327
|
109
|
|
|
|
|
|
ptr = buf + sizeof(buf) - 1; |
328
|
109
|
|
|
|
|
|
*ptr = '\0'; |
329
|
109
|
50
|
|
|
|
|
if (val < 0) { |
330
|
0
|
|
|
|
|
|
*--ptr = '-'; |
331
|
0
|
|
|
|
|
|
val = -val; |
332
|
|
|
|
|
|
|
} |
333
|
160
|
100
|
|
|
|
|
for (; val && ptr > buf; val /= 10) |
|
|
50
|
|
|
|
|
|
334
|
51
|
|
|
|
|
|
*--ptr = "0123456789"[val % 10]; |
335
|
109
|
100
|
|
|
|
|
if (*ptr) |
336
|
102
|
100
|
|
|
|
|
for (; *ptr; ptr++, str++) |
337
|
51
|
|
|
|
|
|
*str = *ptr; |
338
|
|
|
|
|
|
|
else |
339
|
58
|
|
|
|
|
|
*str++ = '0'; |
340
|
109
|
|
|
|
|
|
*str = '\0'; |
341
|
|
|
|
|
|
|
|
342
|
109
|
|
|
|
|
|
return str - out; |
343
|
|
|
|
|
|
|
} |
344
|
|
|
|
|
|
|
|
345
|
38
|
|
|
|
|
|
int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, |
346
|
|
|
|
|
|
|
const char *func, long funclen, xdemitcb_t *ecb) { |
347
|
38
|
|
|
|
|
|
int nb = 0; |
348
|
|
|
|
|
|
|
mmbuffer_t mb; |
349
|
|
|
|
|
|
|
char buf[128]; |
350
|
|
|
|
|
|
|
|
351
|
38
|
|
|
|
|
|
memcpy(buf, "@@ -", 4); |
352
|
38
|
|
|
|
|
|
nb += 4; |
353
|
|
|
|
|
|
|
|
354
|
38
|
100
|
|
|
|
|
nb += xdl_num_out(buf + nb, c1 ? s1: s1 - 1); |
355
|
|
|
|
|
|
|
|
356
|
38
|
100
|
|
|
|
|
if (c1 != 1) { |
357
|
28
|
|
|
|
|
|
memcpy(buf + nb, ",", 1); |
358
|
28
|
|
|
|
|
|
nb += 1; |
359
|
|
|
|
|
|
|
|
360
|
28
|
|
|
|
|
|
nb += xdl_num_out(buf + nb, c1); |
361
|
|
|
|
|
|
|
} |
362
|
|
|
|
|
|
|
|
363
|
38
|
|
|
|
|
|
memcpy(buf + nb, " +", 2); |
364
|
38
|
|
|
|
|
|
nb += 2; |
365
|
|
|
|
|
|
|
|
366
|
38
|
100
|
|
|
|
|
nb += xdl_num_out(buf + nb, c2 ? s2: s2 - 1); |
367
|
|
|
|
|
|
|
|
368
|
38
|
100
|
|
|
|
|
if (c2 != 1) { |
369
|
5
|
|
|
|
|
|
memcpy(buf + nb, ",", 1); |
370
|
5
|
|
|
|
|
|
nb += 1; |
371
|
|
|
|
|
|
|
|
372
|
5
|
|
|
|
|
|
nb += xdl_num_out(buf + nb, c2); |
373
|
|
|
|
|
|
|
} |
374
|
|
|
|
|
|
|
|
375
|
38
|
|
|
|
|
|
memcpy(buf + nb, " @@", 3); |
376
|
38
|
|
|
|
|
|
nb += 3; |
377
|
38
|
50
|
|
|
|
|
if (func && funclen) { |
|
|
50
|
|
|
|
|
|
378
|
0
|
|
|
|
|
|
buf[nb++] = ' '; |
379
|
0
|
0
|
|
|
|
|
if (funclen > (long)(sizeof(buf) - nb - 1)) |
380
|
0
|
|
|
|
|
|
funclen = sizeof(buf) - nb - 1; |
381
|
0
|
|
|
|
|
|
memcpy(buf + nb, func, funclen); |
382
|
0
|
|
|
|
|
|
nb += funclen; |
383
|
|
|
|
|
|
|
} |
384
|
38
|
|
|
|
|
|
buf[nb++] = '\n'; |
385
|
|
|
|
|
|
|
|
386
|
38
|
|
|
|
|
|
mb.ptr = buf; |
387
|
38
|
|
|
|
|
|
mb.size = nb; |
388
|
38
|
50
|
|
|
|
|
if (ecb->outf(ecb->priv, &mb, 1) < 0) |
389
|
0
|
|
|
|
|
|
return -1; |
390
|
|
|
|
|
|
|
|
391
|
38
|
|
|
|
|
|
return 0; |
392
|
|
|
|
|
|
|
} |
393
|
|
|
|
|
|
|
|
394
|
0
|
|
|
|
|
|
int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp, |
395
|
|
|
|
|
|
|
int line1, int count1, int line2, int count2) |
396
|
|
|
|
|
|
|
{ |
397
|
|
|
|
|
|
|
/* |
398
|
|
|
|
|
|
|
* This probably does not work outside Git, since |
399
|
|
|
|
|
|
|
* we have a very simple mmfile structure. |
400
|
|
|
|
|
|
|
* |
401
|
|
|
|
|
|
|
* Note: ideally, we would reuse the prepared environment, but |
402
|
|
|
|
|
|
|
* the libxdiff interface does not (yet) allow for diffing only |
403
|
|
|
|
|
|
|
* ranges of lines instead of the whole files. |
404
|
|
|
|
|
|
|
*/ |
405
|
|
|
|
|
|
|
mmfile_t subfile1, subfile2; |
406
|
|
|
|
|
|
|
xdfenv_t env; |
407
|
|
|
|
|
|
|
|
408
|
0
|
|
|
|
|
|
subfile1.ptr = (char *)diff_env->xdf1.recs[line1 - 1]->ptr; |
409
|
0
|
|
|
|
|
|
subfile1.size = diff_env->xdf1.recs[line1 + count1 - 2]->ptr + |
410
|
0
|
|
|
|
|
|
diff_env->xdf1.recs[line1 + count1 - 2]->size - subfile1.ptr; |
411
|
0
|
|
|
|
|
|
subfile2.ptr = (char *)diff_env->xdf2.recs[line2 - 1]->ptr; |
412
|
0
|
|
|
|
|
|
subfile2.size = diff_env->xdf2.recs[line2 + count2 - 2]->ptr + |
413
|
0
|
|
|
|
|
|
diff_env->xdf2.recs[line2 + count2 - 2]->size - subfile2.ptr; |
414
|
0
|
0
|
|
|
|
|
if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0) |
415
|
0
|
|
|
|
|
|
return -1; |
416
|
|
|
|
|
|
|
|
417
|
0
|
|
|
|
|
|
memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1); |
418
|
0
|
|
|
|
|
|
memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2); |
419
|
|
|
|
|
|
|
|
420
|
0
|
|
|
|
|
|
xdl_free_env(&env); |
421
|
|
|
|
|
|
|
|
422
|
0
|
|
|
|
|
|
return 0; |
423
|
|
|
|
|
|
|
} |