1 fe621944 2020-11-10 stsp /* Generic infrastructure to implement various diff algorithms (implementation). */
3 fe621944 2020-11-10 stsp * Copyright (c) 2020 Neels Hofmeyr <neels@hofmeyr.de>
5 fe621944 2020-11-10 stsp * Permission to use, copy, modify, and distribute this software for any
6 fe621944 2020-11-10 stsp * purpose with or without fee is hereby granted, provided that the above
7 fe621944 2020-11-10 stsp * copyright notice and this permission notice appear in all copies.
9 fe621944 2020-11-10 stsp * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 fe621944 2020-11-10 stsp * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 fe621944 2020-11-10 stsp * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 fe621944 2020-11-10 stsp * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 fe621944 2020-11-10 stsp * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 fe621944 2020-11-10 stsp * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 fe621944 2020-11-10 stsp * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
19 fe621944 2020-11-10 stsp #include <ctype.h>
20 fe621944 2020-11-10 stsp #include <errno.h>
21 fe621944 2020-11-10 stsp #include <stdint.h>
22 fe621944 2020-11-10 stsp #include <stdlib.h>
23 fe621944 2020-11-10 stsp #include <stdbool.h>
24 fe621944 2020-11-10 stsp #include <stdio.h>
25 fe621944 2020-11-10 stsp #include <string.h>
26 fe621944 2020-11-10 stsp #include <limits.h>
27 fe621944 2020-11-10 stsp #include <unistd.h>
29 fe621944 2020-11-10 stsp #include <assert.h>
31 fe621944 2020-11-10 stsp #include <arraylist.h>
32 fe621944 2020-11-10 stsp #include <diff_main.h>
34 dd038bc6 2021-09-21 thomas.ad #include "got_compat.h"
36 fe621944 2020-11-10 stsp #include "diff_internal.h"
37 fe621944 2020-11-10 stsp #include "diff_debug.h"
40 fe621944 2020-11-10 stsp read_at(FILE *f, off_t at_pos, unsigned char *buf, size_t len)
43 fe621944 2020-11-10 stsp if (fseeko(f, at_pos, SEEK_SET) == -1)
44 fe621944 2020-11-10 stsp return errno;
45 fe621944 2020-11-10 stsp r = fread(buf, sizeof(char), len, f);
46 fe621944 2020-11-10 stsp if ((r == 0 || r < len) && ferror(f))
47 fe621944 2020-11-10 stsp return errno;
48 fe621944 2020-11-10 stsp if (r != len)
54 fe621944 2020-11-10 stsp buf_cmp(const unsigned char *left, size_t left_len,
55 fe621944 2020-11-10 stsp const unsigned char *right, size_t right_len,
56 fe621944 2020-11-10 stsp bool ignore_whitespace)
60 fe621944 2020-11-10 stsp if (ignore_whitespace) {
61 fe621944 2020-11-10 stsp int il = 0, ir = 0;
62 fe621944 2020-11-10 stsp while (il < left_len && ir < right_len) {
63 fe621944 2020-11-10 stsp unsigned char cl = left[il];
64 fe621944 2020-11-10 stsp unsigned char cr = right[ir];
66 fe621944 2020-11-10 stsp if (isspace(cl) && il < left_len) {
70 fe621944 2020-11-10 stsp if (isspace(cr) && ir < right_len) {
75 fe621944 2020-11-10 stsp if (cl > cr)
77 fe621944 2020-11-10 stsp if (cr > cl)
82 fe621944 2020-11-10 stsp while (il < left_len) {
83 fe621944 2020-11-10 stsp unsigned char cl = left[il++];
84 fe621944 2020-11-10 stsp if (!isspace(cl))
87 fe621944 2020-11-10 stsp while (ir < right_len) {
88 fe621944 2020-11-10 stsp unsigned char cr = right[ir++];
89 fe621944 2020-11-10 stsp if (!isspace(cr))
96 fe621944 2020-11-10 stsp cmp = memcmp(left, right, MIN(left_len, right_len));
99 fe621944 2020-11-10 stsp if (left_len == right_len)
101 fe621944 2020-11-10 stsp return (left_len > right_len) ? 1 : -1;
105 fe621944 2020-11-10 stsp diff_atom_cmp(int *cmp,
106 fe621944 2020-11-10 stsp const struct diff_atom *left,
107 fe621944 2020-11-10 stsp const struct diff_atom *right)
109 fe621944 2020-11-10 stsp off_t remain_left, remain_right;
110 fe621944 2020-11-10 stsp int flags = (left->root->diff_flags | right->root->diff_flags);
111 fe621944 2020-11-10 stsp bool ignore_whitespace = (flags & DIFF_FLAG_IGNORE_WHITESPACE);
113 fe621944 2020-11-10 stsp if (!left->len && !right->len) {
117 fe621944 2020-11-10 stsp if (!ignore_whitespace) {
118 fe621944 2020-11-10 stsp if (!right->len) {
122 fe621944 2020-11-10 stsp if (!left->len) {
128 fe621944 2020-11-10 stsp if (left->at != NULL && right->at != NULL) {
129 fe621944 2020-11-10 stsp *cmp = buf_cmp(left->at, left->len, right->at, right->len,
130 fe621944 2020-11-10 stsp ignore_whitespace);
134 fe621944 2020-11-10 stsp remain_left = left->len;
135 fe621944 2020-11-10 stsp remain_right = right->len;
136 fe621944 2020-11-10 stsp while (remain_left > 0 || remain_right > 0) {
137 fe621944 2020-11-10 stsp const size_t chunksz = 8192;
138 fe621944 2020-11-10 stsp unsigned char buf_left[chunksz], buf_right[chunksz];
139 fe621944 2020-11-10 stsp const uint8_t *p_left, *p_right;
140 fe621944 2020-11-10 stsp off_t n_left, n_right;
143 fe621944 2020-11-10 stsp if (!remain_right) {
147 fe621944 2020-11-10 stsp if (!remain_left) {
152 fe621944 2020-11-10 stsp n_left = MIN(chunksz, remain_left);
153 fe621944 2020-11-10 stsp n_right = MIN(chunksz, remain_right);
155 fe621944 2020-11-10 stsp if (left->at == NULL) {
156 fe621944 2020-11-10 stsp r = read_at(left->root->f,
157 fe621944 2020-11-10 stsp left->pos + (left->len - remain_left),
158 fe621944 2020-11-10 stsp buf_left, n_left);
163 fe621944 2020-11-10 stsp p_left = buf_left;
165 fe621944 2020-11-10 stsp p_left = left->at + (left->len - remain_left);
168 fe621944 2020-11-10 stsp if (right->at == NULL) {
169 fe621944 2020-11-10 stsp r = read_at(right->root->f,
170 fe621944 2020-11-10 stsp right->pos + (right->len - remain_right),
171 fe621944 2020-11-10 stsp buf_right, n_right);
176 fe621944 2020-11-10 stsp p_right = buf_right;
178 fe621944 2020-11-10 stsp p_right = right->at + (right->len - remain_right);
181 fe621944 2020-11-10 stsp r = buf_cmp(p_left, n_left, p_right, n_right,
182 fe621944 2020-11-10 stsp ignore_whitespace);
188 fe621944 2020-11-10 stsp remain_left -= n_left;
189 fe621944 2020-11-10 stsp remain_right -= n_right;
197 fe621944 2020-11-10 stsp diff_atom_same(bool *same,
198 fe621944 2020-11-10 stsp const struct diff_atom *left,
199 fe621944 2020-11-10 stsp const struct diff_atom *right)
203 fe621944 2020-11-10 stsp if (left->hash != right->hash) {
204 fe621944 2020-11-10 stsp *same = false;
207 fe621944 2020-11-10 stsp r = diff_atom_cmp(&cmp, left, right);
209 fe621944 2020-11-10 stsp *same = true;
212 fe621944 2020-11-10 stsp *same = (cmp == 0);
216 fe621944 2020-11-10 stsp static struct diff_chunk *
217 fe621944 2020-11-10 stsp diff_state_add_solved_chunk(struct diff_state *state,
218 fe621944 2020-11-10 stsp const struct diff_chunk *chunk)
220 fe621944 2020-11-10 stsp diff_chunk_arraylist_t *result;
221 fe621944 2020-11-10 stsp struct diff_chunk *new_chunk;
222 fe621944 2020-11-10 stsp enum diff_chunk_type last_t;
223 fe621944 2020-11-10 stsp enum diff_chunk_type new_t;
224 fe621944 2020-11-10 stsp struct diff_chunk *last;
226 fe621944 2020-11-10 stsp /* Append to solved chunks; make sure that adjacent chunks of same type are combined, and that a minus chunk
227 fe621944 2020-11-10 stsp * never directly follows a plus chunk. */
228 fe621944 2020-11-10 stsp result = &state->result->chunks;
230 fe621944 2020-11-10 stsp last_t = result->len ? diff_chunk_type(&result->head[result->len - 1])
231 fe621944 2020-11-10 stsp : CHUNK_EMPTY;
232 fe621944 2020-11-10 stsp new_t = diff_chunk_type(chunk);
234 fe621944 2020-11-10 stsp debug("ADD %s chunk #%u:\n", chunk->solved ? "solved" : "UNSOLVED",
235 fe621944 2020-11-10 stsp result->len);
236 fe621944 2020-11-10 stsp debug("L\n");
237 fe621944 2020-11-10 stsp debug_dump_atoms(&state->left, chunk->left_start, chunk->left_count);
238 fe621944 2020-11-10 stsp debug("R\n");
239 fe621944 2020-11-10 stsp debug_dump_atoms(&state->right, chunk->right_start, chunk->right_count);
241 fe621944 2020-11-10 stsp if (result->len) {
242 fe621944 2020-11-10 stsp last = &result->head[result->len - 1];
243 fe621944 2020-11-10 stsp assert(chunk->left_start
244 fe621944 2020-11-10 stsp == last->left_start + last->left_count);
245 fe621944 2020-11-10 stsp assert(chunk->right_start
246 fe621944 2020-11-10 stsp == last->right_start + last->right_count);
249 fe621944 2020-11-10 stsp if (new_t == last_t) {
250 fe621944 2020-11-10 stsp new_chunk = &result->head[result->len - 1];
251 fe621944 2020-11-10 stsp new_chunk->left_count += chunk->left_count;
252 fe621944 2020-11-10 stsp new_chunk->right_count += chunk->right_count;
253 fe621944 2020-11-10 stsp debug(" - added chunk touches previous one of same type, joined:\n");
254 fe621944 2020-11-10 stsp debug("L\n");
255 fe621944 2020-11-10 stsp debug_dump_atoms(&state->left, new_chunk->left_start, new_chunk->left_count);
256 fe621944 2020-11-10 stsp debug("R\n");
257 fe621944 2020-11-10 stsp debug_dump_atoms(&state->right, new_chunk->right_start, new_chunk->right_count);
258 fe621944 2020-11-10 stsp } else if (last_t == CHUNK_PLUS && new_t == CHUNK_MINUS) {
259 fe621944 2020-11-10 stsp enum diff_chunk_type prev_last_t =
260 fe621944 2020-11-10 stsp result->len > 1 ?
261 fe621944 2020-11-10 stsp diff_chunk_type(&result->head[result->len - 2])
262 fe621944 2020-11-10 stsp : CHUNK_EMPTY;
263 fe621944 2020-11-10 stsp /* If a minus-chunk follows a plus-chunk, place it above the plus-chunk->
264 fe621944 2020-11-10 stsp * Is the one before that also a minus? combine. */
265 fe621944 2020-11-10 stsp if (prev_last_t == CHUNK_MINUS) {
266 fe621944 2020-11-10 stsp new_chunk = &result->head[result->len - 2];
267 fe621944 2020-11-10 stsp new_chunk->left_count += chunk->left_count;
268 fe621944 2020-11-10 stsp new_chunk->right_count += chunk->right_count;
270 fe621944 2020-11-10 stsp debug(" - added minus-chunk follows plus-chunk,"
271 fe621944 2020-11-10 stsp " put before that plus-chunk and joined"
272 fe621944 2020-11-10 stsp " with preceding minus-chunk:\n");
273 fe621944 2020-11-10 stsp debug("L\n");
274 fe621944 2020-11-10 stsp debug_dump_atoms(&state->left, new_chunk->left_start, new_chunk->left_count);
275 fe621944 2020-11-10 stsp debug("R\n");
276 fe621944 2020-11-10 stsp debug_dump_atoms(&state->right, new_chunk->right_start, new_chunk->right_count);
278 fe621944 2020-11-10 stsp ARRAYLIST_INSERT(new_chunk, *result, result->len - 1);
279 fe621944 2020-11-10 stsp if (!new_chunk)
280 fe621944 2020-11-10 stsp return NULL;
281 fe621944 2020-11-10 stsp *new_chunk = *chunk;
283 fe621944 2020-11-10 stsp /* The new minus chunk indicates to which position on
284 fe621944 2020-11-10 stsp * the right it corresponds, even though it doesn't add
285 fe621944 2020-11-10 stsp * any lines on the right. By moving above a plus chunk,
286 fe621944 2020-11-10 stsp * that position on the right has shifted. */
287 fe621944 2020-11-10 stsp last = &result->head[result->len - 1];
288 fe621944 2020-11-10 stsp new_chunk->right_start = last->right_start;
290 fe621944 2020-11-10 stsp debug(" - added minus-chunk follows plus-chunk,"
291 fe621944 2020-11-10 stsp " put before that plus-chunk\n");
294 fe621944 2020-11-10 stsp /* That last_t == CHUNK_PLUS indicates to which position on the
295 fe621944 2020-11-10 stsp * left it corresponds, even though it doesn't add any lines on
296 fe621944 2020-11-10 stsp * the left. By inserting/extending the prev_last_t ==
297 fe621944 2020-11-10 stsp * CHUNK_MINUS, that position on the left has shifted. */
298 fe621944 2020-11-10 stsp last = &result->head[result->len - 1];
299 fe621944 2020-11-10 stsp last->left_start = new_chunk->left_start
300 fe621944 2020-11-10 stsp + new_chunk->left_count;
303 fe621944 2020-11-10 stsp ARRAYLIST_ADD(new_chunk, *result);
304 fe621944 2020-11-10 stsp if (!new_chunk)
305 fe621944 2020-11-10 stsp return NULL;
306 fe621944 2020-11-10 stsp *new_chunk = *chunk;
308 fe621944 2020-11-10 stsp return new_chunk;
311 fe621944 2020-11-10 stsp /* Even if a left or right side is empty, diff output may need to know the
312 fe621944 2020-11-10 stsp * position in that file.
313 fe621944 2020-11-10 stsp * So left_start or right_start must never be NULL -- pass left_count or
314 fe621944 2020-11-10 stsp * right_count as zero to indicate staying at that position without consuming
315 fe621944 2020-11-10 stsp * any lines. */
316 fe621944 2020-11-10 stsp struct diff_chunk *
317 fe621944 2020-11-10 stsp diff_state_add_chunk(struct diff_state *state, bool solved,
318 fe621944 2020-11-10 stsp struct diff_atom *left_start, unsigned int left_count,
319 fe621944 2020-11-10 stsp struct diff_atom *right_start, unsigned int right_count)
321 fe621944 2020-11-10 stsp struct diff_chunk *new_chunk;
322 fe621944 2020-11-10 stsp struct diff_chunk chunk = {
323 fe621944 2020-11-10 stsp .solved = solved,
324 fe621944 2020-11-10 stsp .left_start = left_start,
325 fe621944 2020-11-10 stsp .left_count = left_count,
326 fe621944 2020-11-10 stsp .right_start = right_start,
327 fe621944 2020-11-10 stsp .right_count = right_count,
330 fe621944 2020-11-10 stsp /* An unsolved chunk means store as intermediate result for later
331 fe621944 2020-11-10 stsp * re-iteration.
332 fe621944 2020-11-10 stsp * If there already are intermediate results, that means even a
333 fe621944 2020-11-10 stsp * following solved chunk needs to go to intermediate results, so that
334 fe621944 2020-11-10 stsp * it is later put in the final correct position in solved chunks.
336 fe621944 2020-11-10 stsp if (!solved || state->temp_result.len) {
337 fe621944 2020-11-10 stsp /* Append to temp_result */
338 fe621944 2020-11-10 stsp debug("ADD %s chunk to temp result:\n",
339 fe621944 2020-11-10 stsp chunk.solved ? "solved" : "UNSOLVED");
340 fe621944 2020-11-10 stsp debug("L\n");
341 fe621944 2020-11-10 stsp debug_dump_atoms(&state->left, left_start, left_count);
342 fe621944 2020-11-10 stsp debug("R\n");
343 fe621944 2020-11-10 stsp debug_dump_atoms(&state->right, right_start, right_count);
344 fe621944 2020-11-10 stsp ARRAYLIST_ADD(new_chunk, state->temp_result);
345 fe621944 2020-11-10 stsp if (!new_chunk)
346 fe621944 2020-11-10 stsp return NULL;
347 fe621944 2020-11-10 stsp *new_chunk = chunk;
348 fe621944 2020-11-10 stsp return new_chunk;
351 fe621944 2020-11-10 stsp return diff_state_add_solved_chunk(state, &chunk);
355 fe621944 2020-11-10 stsp diff_data_init_root(struct diff_data *d, FILE *f, const uint8_t *data,
356 fe621944 2020-11-10 stsp unsigned long long len, int diff_flags)
358 fe621944 2020-11-10 stsp *d = (struct diff_data){
361 fe621944 2020-11-10 stsp .data = data,
362 fe621944 2020-11-10 stsp .len = len,
364 fe621944 2020-11-10 stsp .diff_flags = diff_flags,
369 fe621944 2020-11-10 stsp diff_data_init_subsection(struct diff_data *d, struct diff_data *parent,
370 fe621944 2020-11-10 stsp struct diff_atom *from_atom, unsigned int atoms_count)
372 fe621944 2020-11-10 stsp struct diff_atom *last_atom;
374 fe621944 2020-11-10 stsp debug("diff_data %p parent %p from_atom %p atoms_count %u\n",
375 fe621944 2020-11-10 stsp d, parent, from_atom, atoms_count);
376 fe621944 2020-11-10 stsp debug(" from_atom ");
377 fe621944 2020-11-10 stsp debug_dump_atom(parent, NULL, from_atom);
379 fe621944 2020-11-10 stsp if (atoms_count == 0) {
380 fe621944 2020-11-10 stsp *d = (struct diff_data){
383 fe621944 2020-11-10 stsp .data = NULL,
385 fe621944 2020-11-10 stsp .root = parent->root,
386 fe621944 2020-11-10 stsp .atoms.head = NULL,
387 fe621944 2020-11-10 stsp .atoms.len = atoms_count,
393 fe621944 2020-11-10 stsp last_atom = from_atom + atoms_count - 1;
394 fe621944 2020-11-10 stsp *d = (struct diff_data){
396 fe621944 2020-11-10 stsp .pos = from_atom->pos,
397 fe621944 2020-11-10 stsp .data = from_atom->at,
398 fe621944 2020-11-10 stsp .len = (last_atom->pos + last_atom->len) - from_atom->pos,
399 fe621944 2020-11-10 stsp .root = parent->root,
400 fe621944 2020-11-10 stsp .atoms.head = from_atom,
401 fe621944 2020-11-10 stsp .atoms.len = atoms_count,
404 fe621944 2020-11-10 stsp debug("subsection:\n");
405 fe621944 2020-11-10 stsp debug_dump(d);
409 fe621944 2020-11-10 stsp diff_data_free(struct diff_data *diff_data)
411 fe621944 2020-11-10 stsp if (!diff_data)
413 fe621944 2020-11-10 stsp if (diff_data->atoms.allocated)
414 fe621944 2020-11-10 stsp ARRAYLIST_FREE(diff_data->atoms);
418 fe621944 2020-11-10 stsp diff_algo_none(const struct diff_algo_config *algo_config,
419 fe621944 2020-11-10 stsp struct diff_state *state)
421 fe621944 2020-11-10 stsp debug("\n** %s\n", __func__);
422 fe621944 2020-11-10 stsp debug("left:\n");
423 fe621944 2020-11-10 stsp debug_dump(&state->left);
424 fe621944 2020-11-10 stsp debug("right:\n");
425 fe621944 2020-11-10 stsp debug_dump(&state->right);
426 fe621944 2020-11-10 stsp debug_dump_myers_graph(&state->left, &state->right, NULL, NULL, 0, NULL,
429 fe621944 2020-11-10 stsp /* Add a chunk of equal lines, if any */
430 fe621944 2020-11-10 stsp struct diff_atom *l = state->left.atoms.head;
431 fe621944 2020-11-10 stsp unsigned int l_len = state->left.atoms.len;
432 fe621944 2020-11-10 stsp struct diff_atom *r = state->right.atoms.head;
433 fe621944 2020-11-10 stsp unsigned int r_len = state->right.atoms.len;
434 fe621944 2020-11-10 stsp unsigned int equal_atoms_start = 0;
435 fe621944 2020-11-10 stsp unsigned int equal_atoms_end = 0;
436 fe621944 2020-11-10 stsp unsigned int l_idx = 0;
437 fe621944 2020-11-10 stsp unsigned int r_idx = 0;
439 fe621944 2020-11-10 stsp while (equal_atoms_start < l_len
440 fe621944 2020-11-10 stsp && equal_atoms_start < r_len) {
443 fe621944 2020-11-10 stsp err = diff_atom_same(&same, &l[equal_atoms_start],
444 fe621944 2020-11-10 stsp &r[equal_atoms_start]);
446 fe621944 2020-11-10 stsp return err;
449 fe621944 2020-11-10 stsp equal_atoms_start++;
451 fe621944 2020-11-10 stsp while (equal_atoms_end < (l_len - equal_atoms_start)
452 fe621944 2020-11-10 stsp && equal_atoms_end < (r_len - equal_atoms_start)) {
455 fe621944 2020-11-10 stsp err = diff_atom_same(&same, &l[l_len - 1 - equal_atoms_end],
456 fe621944 2020-11-10 stsp &r[r_len - 1 - equal_atoms_end]);
458 fe621944 2020-11-10 stsp return err;
461 fe621944 2020-11-10 stsp equal_atoms_end++;
464 fe621944 2020-11-10 stsp /* Add a chunk of equal lines at the start */
465 fe621944 2020-11-10 stsp if (equal_atoms_start) {
466 fe621944 2020-11-10 stsp if (!diff_state_add_chunk(state, true,
467 fe621944 2020-11-10 stsp l, equal_atoms_start,
468 fe621944 2020-11-10 stsp r, equal_atoms_start))
469 fe621944 2020-11-10 stsp return ENOMEM;
470 fe621944 2020-11-10 stsp l_idx += equal_atoms_start;
471 fe621944 2020-11-10 stsp r_idx += equal_atoms_start;
474 fe621944 2020-11-10 stsp /* Add a "minus" chunk with all lines from the left. */
475 fe621944 2020-11-10 stsp if (equal_atoms_start + equal_atoms_end < l_len) {
476 fe621944 2020-11-10 stsp unsigned int add_len = l_len - equal_atoms_start - equal_atoms_end;
477 fe621944 2020-11-10 stsp if (!diff_state_add_chunk(state, true,
478 fe621944 2020-11-10 stsp &l[l_idx], add_len,
479 fe621944 2020-11-10 stsp &r[r_idx], 0))
480 fe621944 2020-11-10 stsp return ENOMEM;
481 fe621944 2020-11-10 stsp l_idx += add_len;
484 fe621944 2020-11-10 stsp /* Add a "plus" chunk with all lines from the right. */
485 fe621944 2020-11-10 stsp if (equal_atoms_start + equal_atoms_end < r_len) {
486 fe621944 2020-11-10 stsp unsigned int add_len = r_len - equal_atoms_start - equal_atoms_end;
487 fe621944 2020-11-10 stsp if (!diff_state_add_chunk(state, true,
488 fe621944 2020-11-10 stsp &l[l_idx], 0,
489 fe621944 2020-11-10 stsp &r[r_idx], add_len))
490 fe621944 2020-11-10 stsp return ENOMEM;
491 fe621944 2020-11-10 stsp r_idx += add_len;
494 fe621944 2020-11-10 stsp /* Add a chunk of equal lines at the end */
495 fe621944 2020-11-10 stsp if (equal_atoms_end) {
496 fe621944 2020-11-10 stsp if (!diff_state_add_chunk(state, true,
497 fe621944 2020-11-10 stsp &l[l_idx], equal_atoms_end,
498 fe621944 2020-11-10 stsp &r[r_idx], equal_atoms_end))
499 fe621944 2020-11-10 stsp return ENOMEM;
502 fe621944 2020-11-10 stsp return DIFF_RC_OK;
506 fe621944 2020-11-10 stsp diff_run_algo(const struct diff_algo_config *algo_config,
507 fe621944 2020-11-10 stsp struct diff_state *state)
511 fe621944 2020-11-10 stsp if (!algo_config || !algo_config->impl
512 fe621944 2020-11-10 stsp || !state->recursion_depth_left
513 fe621944 2020-11-10 stsp || !state->left.atoms.len || !state->right.atoms.len) {
514 fe621944 2020-11-10 stsp debug("Fall back to diff_algo_none():%s%s%s\n",
515 fe621944 2020-11-10 stsp (!algo_config || !algo_config->impl) ? " no-cfg" : "",
516 fe621944 2020-11-10 stsp (!state->recursion_depth_left) ? " max-depth" : "",
517 fe621944 2020-11-10 stsp (!state->left.atoms.len || !state->right.atoms.len)?
518 fe621944 2020-11-10 stsp " trivial" : "");
519 fe621944 2020-11-10 stsp return diff_algo_none(algo_config, state);
522 fe621944 2020-11-10 stsp ARRAYLIST_FREE(state->temp_result);
523 fe621944 2020-11-10 stsp ARRAYLIST_INIT(state->temp_result, DIFF_RESULT_ALLOC_BLOCKSIZE);
524 fe621944 2020-11-10 stsp rc = algo_config->impl(algo_config, state);
525 fe621944 2020-11-10 stsp switch (rc) {
526 fe621944 2020-11-10 stsp case DIFF_RC_USE_DIFF_ALGO_FALLBACK:
527 fe621944 2020-11-10 stsp debug("Got DIFF_RC_USE_DIFF_ALGO_FALLBACK (%p)\n",
528 fe621944 2020-11-10 stsp algo_config->fallback_algo);
529 fe621944 2020-11-10 stsp rc = diff_run_algo(algo_config->fallback_algo, state);
530 fe621944 2020-11-10 stsp goto return_rc;
532 fe621944 2020-11-10 stsp case DIFF_RC_OK:
533 fe621944 2020-11-10 stsp /* continue below */
537 fe621944 2020-11-10 stsp /* some error happened */
538 fe621944 2020-11-10 stsp goto return_rc;
541 fe621944 2020-11-10 stsp /* Pick up any diff chunks that are still unsolved and feed to
542 fe621944 2020-11-10 stsp * inner_algo. inner_algo will solve unsolved chunks and append to
543 fe621944 2020-11-10 stsp * result, and subsequent solved chunks on this level are then appended
544 fe621944 2020-11-10 stsp * to result afterwards. */
546 fe621944 2020-11-10 stsp for (i = 0; i < state->temp_result.len; i++) {
547 fe621944 2020-11-10 stsp struct diff_chunk *c = &state->temp_result.head[i];
548 fe621944 2020-11-10 stsp if (c->solved) {
549 fe621944 2020-11-10 stsp diff_state_add_solved_chunk(state, c);
553 fe621944 2020-11-10 stsp /* c is an unsolved chunk, feed to inner_algo */
554 fe621944 2020-11-10 stsp struct diff_state inner_state = {
555 fe621944 2020-11-10 stsp .result = state->result,
556 fe621944 2020-11-10 stsp .recursion_depth_left = state->recursion_depth_left - 1,
557 fe621944 2020-11-10 stsp .kd_buf = state->kd_buf,
558 fe621944 2020-11-10 stsp .kd_buf_size = state->kd_buf_size,
560 fe621944 2020-11-10 stsp diff_data_init_subsection(&inner_state.left, &state->left,
561 fe621944 2020-11-10 stsp c->left_start, c->left_count);
562 fe621944 2020-11-10 stsp diff_data_init_subsection(&inner_state.right, &state->right,
563 fe621944 2020-11-10 stsp c->right_start, c->right_count);
565 fe621944 2020-11-10 stsp rc = diff_run_algo(algo_config->inner_algo, &inner_state);
566 fe621944 2020-11-10 stsp state->kd_buf = inner_state.kd_buf;
567 fe621944 2020-11-10 stsp state->kd_buf_size = inner_state.kd_buf_size;
568 fe621944 2020-11-10 stsp if (rc != DIFF_RC_OK)
569 fe621944 2020-11-10 stsp goto return_rc;
572 fe621944 2020-11-10 stsp rc = DIFF_RC_OK;
574 fe621944 2020-11-10 stsp ARRAYLIST_FREE(state->temp_result);
579 fe621944 2020-11-10 stsp diff_atomize_file(struct diff_data *d,
580 fe621944 2020-11-10 stsp const struct diff_config *config,
581 fe621944 2020-11-10 stsp FILE *f, const uint8_t *data, off_t len, int diff_flags)
583 fe621944 2020-11-10 stsp if (!config->atomize_func)
584 fe621944 2020-11-10 stsp return EINVAL;
586 fe621944 2020-11-10 stsp diff_data_init_root(d, f, data, len, diff_flags);
588 fe621944 2020-11-10 stsp return config->atomize_func(config->atomize_func_data, d);
592 fe621944 2020-11-10 stsp struct diff_result *
593 fe621944 2020-11-10 stsp diff_main(const struct diff_config *config, struct diff_data *left,
594 fe621944 2020-11-10 stsp struct diff_data *right)
596 fe621944 2020-11-10 stsp struct diff_result *result = malloc(sizeof(struct diff_result));
597 fe621944 2020-11-10 stsp if (!result)
598 fe621944 2020-11-10 stsp return NULL;
600 fe621944 2020-11-10 stsp *result = (struct diff_result){};
601 fe621944 2020-11-10 stsp result->left = left;
602 fe621944 2020-11-10 stsp result->right = right;
604 fe621944 2020-11-10 stsp struct diff_state state = {
605 fe621944 2020-11-10 stsp .result = result,
606 751e0afb 2020-11-22 stsp .recursion_depth_left = config->max_recursion_depth ? : UINT_MAX,
607 fe621944 2020-11-10 stsp .kd_buf = NULL,
608 fe621944 2020-11-10 stsp .kd_buf_size = 0,
610 fe621944 2020-11-10 stsp diff_data_init_subsection(&state.left, left,
611 fe621944 2020-11-10 stsp left->atoms.head,
612 fe621944 2020-11-10 stsp left->atoms.len);
613 fe621944 2020-11-10 stsp diff_data_init_subsection(&state.right, right,
614 fe621944 2020-11-10 stsp right->atoms.head,
615 fe621944 2020-11-10 stsp right->atoms.len);
617 fe621944 2020-11-10 stsp result->rc = diff_run_algo(config->algo, &state);
618 fe621944 2020-11-10 stsp free(state.kd_buf);
620 fe621944 2020-11-10 stsp return result;
624 fe621944 2020-11-10 stsp diff_result_free(struct diff_result *result)
626 fe621944 2020-11-10 stsp if (!result)
628 fe621944 2020-11-10 stsp ARRAYLIST_FREE(result->chunks);
629 fe621944 2020-11-10 stsp free(result);
