Line | Count | Source (jump to first uncovered line) |
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 | | * <http://www.gnu.org/licenses/>. |
18 | | * |
19 | | * Davide Libenzi <davidel@xmailserver.org> |
20 | | * |
21 | | */ |
22 | | |
23 | | #include "xinclude.h" |
24 | | |
25 | 0 | static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) { |
26 | |
|
27 | 0 | *rec = xdf->recs[ri]->ptr; |
28 | |
|
29 | 0 | return xdf->recs[ri]->size; |
30 | 0 | } |
31 | | |
32 | | |
33 | 0 | static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) { |
34 | 0 | long size, psize = strlen(pre); |
35 | 0 | char const *rec; |
36 | |
|
37 | 0 | size = xdl_get_rec(xdf, ri, &rec); |
38 | 0 | if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0) { |
39 | |
|
40 | 0 | return -1; |
41 | 0 | } |
42 | | |
43 | 0 | return 0; |
44 | 0 | } |
45 | | |
46 | | |
47 | | /* |
48 | | * Starting at the passed change atom, find the latest change atom to be included |
49 | | * inside the differential hunk according to the specified configuration. |
50 | | * Also advance xscr if the first changes must be discarded. |
51 | | */ |
52 | | xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) |
53 | 0 | { |
54 | 0 | xdchange_t *xch, *xchp, *lxch; |
55 | 0 | long max_common = 2 * xecfg->ctxlen + xecfg->interhunkctxlen; |
56 | 0 | long max_ignorable = xecfg->ctxlen; |
57 | 0 | unsigned long ignored = 0; /* number of ignored blank lines */ |
58 | | |
59 | | /* remove ignorable changes that are too far before other changes */ |
60 | 0 | for (xchp = *xscr; xchp && xchp->ignore; xchp = xchp->next) { |
61 | 0 | xch = xchp->next; |
62 | |
|
63 | 0 | if (xch == NULL || |
64 | 0 | xch->i1 - (xchp->i1 + xchp->chg1) >= max_ignorable) |
65 | 0 | *xscr = xch; |
66 | 0 | } |
67 | |
|
68 | 0 | if (!*xscr) |
69 | 0 | return NULL; |
70 | | |
71 | 0 | lxch = *xscr; |
72 | |
|
73 | 0 | for (xchp = *xscr, xch = xchp->next; xch; xchp = xch, xch = xch->next) { |
74 | 0 | long distance = xch->i1 - (xchp->i1 + xchp->chg1); |
75 | 0 | if (distance > max_common) |
76 | 0 | break; |
77 | | |
78 | 0 | if (distance < max_ignorable && (!xch->ignore || lxch == xchp)) { |
79 | 0 | lxch = xch; |
80 | 0 | ignored = 0; |
81 | 0 | } else if (distance < max_ignorable && xch->ignore) { |
82 | 0 | ignored += xch->chg2; |
83 | 0 | } else if (lxch != xchp && |
84 | 0 | xch->i1 + ignored - (lxch->i1 + lxch->chg1) > max_common) { |
85 | 0 | break; |
86 | 0 | } else if (!xch->ignore) { |
87 | 0 | lxch = xch; |
88 | 0 | ignored = 0; |
89 | 0 | } else { |
90 | 0 | ignored += xch->chg2; |
91 | 0 | } |
92 | 0 | } |
93 | |
|
94 | 0 | return lxch; |
95 | 0 | } |
96 | | |
97 | | |
98 | | static long def_ff(const char *rec, long len, char *buf, long sz) |
99 | 0 | { |
100 | 0 | if (len > 0 && |
101 | 0 | (isalpha((unsigned char)*rec) || /* identifier? */ |
102 | 0 | *rec == '_' || /* also identifier? */ |
103 | 0 | *rec == '$')) { /* identifiers from VMS and other esoterico */ |
104 | 0 | if (len > sz) |
105 | 0 | len = sz; |
106 | 0 | while (0 < len && isspace((unsigned char)rec[len - 1])) |
107 | 0 | len--; |
108 | 0 | memcpy(buf, rec, len); |
109 | 0 | return len; |
110 | 0 | } |
111 | 0 | return -1; |
112 | 0 | } |
113 | | |
114 | | static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri, |
115 | | char *buf, long sz) |
116 | 0 | { |
117 | 0 | const char *rec; |
118 | 0 | long len = xdl_get_rec(xdf, ri, &rec); |
119 | 0 | if (!xecfg->find_func) |
120 | 0 | return def_ff(rec, len, buf, sz); |
121 | 0 | return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv); |
122 | 0 | } |
123 | | |
124 | | static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri) |
125 | 0 | { |
126 | 0 | char dummy[1]; |
127 | 0 | return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0; |
128 | 0 | } |
129 | | |
130 | | struct func_line { |
131 | | long len; |
132 | | char buf[80]; |
133 | | }; |
134 | | |
135 | | static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg, |
136 | | struct func_line *func_line, long start, long limit) |
137 | 0 | { |
138 | 0 | long l, size, step = (start > limit) ? -1 : 1; |
139 | 0 | char *buf, dummy[1]; |
140 | |
|
141 | 0 | buf = func_line ? func_line->buf : dummy; |
142 | 0 | size = func_line ? sizeof(func_line->buf) : sizeof(dummy); |
143 | |
|
144 | 0 | for (l = start; l != limit && 0 <= l && l < xe->xdf1.nrec; l += step) { |
145 | 0 | long len = match_func_rec(&xe->xdf1, xecfg, l, buf, size); |
146 | 0 | if (len >= 0) { |
147 | 0 | if (func_line) |
148 | 0 | func_line->len = len; |
149 | 0 | return l; |
150 | 0 | } |
151 | 0 | } |
152 | 0 | return -1; |
153 | 0 | } |
154 | | |
155 | | static int is_empty_rec(xdfile_t *xdf, long ri) |
156 | 0 | { |
157 | 0 | const char *rec; |
158 | 0 | long len = xdl_get_rec(xdf, ri, &rec); |
159 | |
|
160 | 0 | while (len > 0 && XDL_ISSPACE(*rec)) { |
161 | 0 | rec++; |
162 | 0 | len--; |
163 | 0 | } |
164 | 0 | return !len; |
165 | 0 | } |
166 | | |
167 | | int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, |
168 | 0 | xdemitconf_t const *xecfg) { |
169 | 0 | long s1, s2, e1, e2, lctx; |
170 | 0 | xdchange_t *xch, *xche; |
171 | 0 | long funclineprev = -1; |
172 | 0 | struct func_line func_line = { 0 }; |
173 | |
|
174 | 0 | for (xch = xscr; xch; xch = xche->next) { |
175 | 0 | xdchange_t *xchp = xch; |
176 | 0 | xche = xdl_get_hunk(&xch, xecfg); |
177 | 0 | if (!xch) |
178 | 0 | break; |
179 | | |
180 | 0 | pre_context_calculation: |
181 | 0 | s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0); |
182 | 0 | s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0); |
183 | |
|
184 | 0 | if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { |
185 | 0 | long fs1, i1 = xch->i1; |
186 | | |
187 | | /* Appended chunk? */ |
188 | 0 | if (i1 >= xe->xdf1.nrec) { |
189 | 0 | long i2 = xch->i2; |
190 | | |
191 | | /* |
192 | | * We don't need additional context if |
193 | | * a whole function was added. |
194 | | */ |
195 | 0 | while (i2 < xe->xdf2.nrec) { |
196 | 0 | if (is_func_rec(&xe->xdf2, xecfg, i2)) |
197 | 0 | goto post_context_calculation; |
198 | 0 | i2++; |
199 | 0 | } |
200 | | |
201 | | /* |
202 | | * Otherwise get more context from the |
203 | | * pre-image. |
204 | | */ |
205 | 0 | i1 = xe->xdf1.nrec - 1; |
206 | 0 | } |
207 | | |
208 | 0 | fs1 = get_func_line(xe, xecfg, NULL, i1, -1); |
209 | 0 | while (fs1 > 0 && !is_empty_rec(&xe->xdf1, fs1 - 1) && |
210 | 0 | !is_func_rec(&xe->xdf1, xecfg, fs1 - 1)) |
211 | 0 | fs1--; |
212 | 0 | if (fs1 < 0) |
213 | 0 | fs1 = 0; |
214 | 0 | if (fs1 < s1) { |
215 | 0 | s2 = XDL_MAX(s2 - (s1 - fs1), 0); |
216 | 0 | s1 = fs1; |
217 | | |
218 | | /* |
219 | | * Did we extend context upwards into an |
220 | | * ignored change? |
221 | | */ |
222 | 0 | while (xchp != xch && |
223 | 0 | xchp->i1 + xchp->chg1 <= s1 && |
224 | 0 | xchp->i2 + xchp->chg2 <= s2) |
225 | 0 | xchp = xchp->next; |
226 | | |
227 | | /* If so, show it after all. */ |
228 | 0 | if (xchp != xch) { |
229 | 0 | xch = xchp; |
230 | 0 | goto pre_context_calculation; |
231 | 0 | } |
232 | 0 | } |
233 | 0 | } |
234 | | |
235 | 0 | post_context_calculation: |
236 | 0 | lctx = xecfg->ctxlen; |
237 | 0 | lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1)); |
238 | 0 | lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2)); |
239 | |
|
240 | 0 | e1 = xche->i1 + xche->chg1 + lctx; |
241 | 0 | e2 = xche->i2 + xche->chg2 + lctx; |
242 | |
|
243 | 0 | if (xecfg->flags & XDL_EMIT_FUNCCONTEXT) { |
244 | 0 | long fe1 = get_func_line(xe, xecfg, NULL, |
245 | 0 | xche->i1 + xche->chg1, |
246 | 0 | xe->xdf1.nrec); |
247 | 0 | while (fe1 > 0 && is_empty_rec(&xe->xdf1, fe1 - 1)) |
248 | 0 | fe1--; |
249 | 0 | if (fe1 < 0) |
250 | 0 | fe1 = xe->xdf1.nrec; |
251 | 0 | if (fe1 > e1) { |
252 | 0 | e2 = XDL_MIN(e2 + (fe1 - e1), xe->xdf2.nrec); |
253 | 0 | e1 = fe1; |
254 | 0 | } |
255 | | |
256 | | /* |
257 | | * Overlap with next change? Then include it |
258 | | * in the current hunk and start over to find |
259 | | * its new end. |
260 | | */ |
261 | 0 | if (xche->next) { |
262 | 0 | long l = XDL_MIN(xche->next->i1, |
263 | 0 | xe->xdf1.nrec - 1); |
264 | 0 | if (l - xecfg->ctxlen <= e1 || |
265 | 0 | get_func_line(xe, xecfg, NULL, l, e1) < 0) { |
266 | 0 | xche = xche->next; |
267 | 0 | goto post_context_calculation; |
268 | 0 | } |
269 | 0 | } |
270 | 0 | } |
271 | | |
272 | | /* |
273 | | * Emit current hunk header. |
274 | | */ |
275 | | |
276 | 0 | if (xecfg->flags & XDL_EMIT_FUNCNAMES) { |
277 | 0 | get_func_line(xe, xecfg, &func_line, |
278 | 0 | s1 - 1, funclineprev); |
279 | 0 | funclineprev = s1 - 1; |
280 | 0 | } |
281 | 0 | if (!(xecfg->flags & XDL_EMIT_NO_HUNK_HDR) && |
282 | 0 | xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2, |
283 | 0 | func_line.buf, func_line.len, ecb) < 0) |
284 | 0 | return -1; |
285 | | |
286 | | /* |
287 | | * Emit pre-context. |
288 | | */ |
289 | 0 | for (; s2 < xch->i2; s2++) |
290 | 0 | if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) |
291 | 0 | return -1; |
292 | | |
293 | 0 | for (s1 = xch->i1, s2 = xch->i2;; xch = xch->next) { |
294 | | /* |
295 | | * Merge previous with current change atom. |
296 | | */ |
297 | 0 | for (; s1 < xch->i1 && s2 < xch->i2; s1++, s2++) |
298 | 0 | if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) |
299 | 0 | return -1; |
300 | | |
301 | | /* |
302 | | * Removes lines from the first file. |
303 | | */ |
304 | 0 | for (s1 = xch->i1; s1 < xch->i1 + xch->chg1; s1++) |
305 | 0 | if (xdl_emit_record(&xe->xdf1, s1, "-", ecb) < 0) |
306 | 0 | return -1; |
307 | | |
308 | | /* |
309 | | * Adds lines from the second file. |
310 | | */ |
311 | 0 | for (s2 = xch->i2; s2 < xch->i2 + xch->chg2; s2++) |
312 | 0 | if (xdl_emit_record(&xe->xdf2, s2, "+", ecb) < 0) |
313 | 0 | return -1; |
314 | | |
315 | 0 | if (xch == xche) |
316 | 0 | break; |
317 | 0 | s1 = xch->i1 + xch->chg1; |
318 | 0 | s2 = xch->i2 + xch->chg2; |
319 | 0 | } |
320 | | |
321 | | /* |
322 | | * Emit post-context. |
323 | | */ |
324 | 0 | for (s2 = xche->i2 + xche->chg2; s2 < e2; s2++) |
325 | 0 | if (xdl_emit_record(&xe->xdf2, s2, " ", ecb) < 0) |
326 | 0 | return -1; |
327 | 0 | } |
328 | | |
329 | 0 | return 0; |
330 | 0 | } |