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