Coverage Report

Created: 2026-11-12 06:03

next uncovered line (L), next uncovered region (R), next uncovered branch (B)
/src/git/xdiff/xmerge.c
Line
Count
Source
1
/*
2
 *  LibXDiff by Davide Libenzi ( File Differential Library )
3
 *  Copyright (C) 2003-2006 Davide Libenzi, Johannes E. Schindelin
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
typedef struct s_xdmerge {
26
  struct s_xdmerge *next;
27
  /*
28
   * 0 = conflict,
29
   * 1 = no conflict, take first,
30
   * 2 = no conflict, take second.
31
   * 3 = no conflict, take both.
32
   */
33
  int mode;
34
  /*
35
   * These point at the respective postimages.  E.g. <i1,chg1> is
36
   * how side #1 wants to change the common ancestor; if there is no
37
   * overlap, lines before i1 in the postimage of side #1 appear
38
   * in the merge result as a region touched by neither side.
39
   */
40
  long i1, i2;
41
  long chg1, chg2;
42
  /*
43
   * These point at the preimage; of course there is just one
44
   * preimage, that is from the shared common ancestor.
45
   */
46
  long i0;
47
  long chg0;
48
} xdmerge_t;
49
50
static int xdl_append_merge(xdmerge_t **merge, int mode,
51
          long i0, long chg0,
52
          long i1, long chg1,
53
          long i2, long chg2)
54
0
{
55
0
  xdmerge_t *m = *merge;
56
0
  if (m && (i1 <= m->i1 + m->chg1 || i2 <= m->i2 + m->chg2)) {
57
0
    if (mode != m->mode)
58
0
      m->mode = 0;
59
0
    m->chg0 = i0 + chg0 - m->i0;
60
0
    m->chg1 = i1 + chg1 - m->i1;
61
0
    m->chg2 = i2 + chg2 - m->i2;
62
0
  } else {
63
0
    m = xdl_malloc(sizeof(xdmerge_t));
64
0
    if (!m)
65
0
      return -1;
66
0
    m->next = NULL;
67
0
    m->mode = mode;
68
0
    m->i0 = i0;
69
0
    m->chg0 = chg0;
70
0
    m->i1 = i1;
71
0
    m->chg1 = chg1;
72
0
    m->i2 = i2;
73
0
    m->chg2 = chg2;
74
0
    if (*merge)
75
0
      (*merge)->next = m;
76
0
    *merge = m;
77
0
  }
78
0
  return 0;
79
0
}
80
81
static int xdl_cleanup_merge(xdmerge_t *c)
82
0
{
83
0
  int count = 0;
84
0
  xdmerge_t *next_c;
85
86
  /* were there conflicts? */
87
0
  for (; c; c = next_c) {
88
0
    if (c->mode == 0)
89
0
      count++;
90
0
    next_c = c->next;
91
0
    free(c);
92
0
  }
93
0
  return count;
94
0
}
95
96
static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2,
97
    int line_count, long flags)
98
0
{
99
0
  int i;
100
0
  xrecord_t *rec1 = xe1->xdf2.recs + i1;
101
0
  xrecord_t *rec2 = xe2->xdf2.recs + i2;
102
103
0
  for (i = 0; i < line_count; i++) {
104
0
    int result = xdl_recmatch((const char *)rec1[i].ptr, (long)rec1[i].size,
105
0
      (const char *)rec2[i].ptr, (long)rec2[i].size, flags);
106
0
    if (!result)
107
0
      return -1;
108
0
  }
109
0
  return 0;
110
0
}
111
112
static size_t xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
113
0
{
114
0
  xrecord_t *recs;
115
0
  size_t size = 0;
116
117
0
  recs = (use_orig ? xe->xdf1.recs : xe->xdf2.recs) + i;
118
119
0
  if (count < 1)
120
0
    return 0;
121
122
0
  for (i = 0; i < count; size = st_add(size, recs[i++].size))
123
0
    if (dest)
124
0
      memcpy(dest + size, recs[i].ptr, recs[i].size);
125
0
  if (add_nl) {
126
0
    i = (int)recs[count - 1].size;
127
0
    if (i == 0 || recs[count - 1].ptr[i - 1] != '\n') {
128
0
      if (needs_cr) {
129
0
        if (dest)
130
0
          dest[size] = '\r';
131
0
        size = st_add(size, 1);
132
0
      }
133
134
0
      if (dest)
135
0
        dest[size] = '\n';
136
0
      size = st_add(size, 1);
137
0
    }
138
0
  }
139
0
  return size;
140
0
}
141
142
static size_t xdl_recs_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
143
0
{
144
0
  return xdl_recs_copy_0(0, xe, i, count, needs_cr, add_nl, dest);
145
0
}
146
147
static size_t xdl_orig_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest)
148
0
{
149
0
  return xdl_recs_copy_0(1, xe, i, count, needs_cr, add_nl, dest);
150
0
}
151
152
/*
153
 * Returns 1 if the i'th line ends in CR/LF (if it is the last line and
154
 * has no eol, the preceding line, if any), 0 if it ends in LF-only, and
155
 * -1 if the line ending cannot be determined.
156
 */
157
static int is_eol_crlf(xdfile_t *file, int i)
158
0
{
159
0
  size_t size;
160
161
0
  if (i < (long)file->nrec - 1)
162
    /* All lines before the last *must* end in LF */
163
0
    return (size = file->recs[i].size) > 1 &&
164
0
      file->recs[i].ptr[size - 2] == '\r';
165
0
  if (!file->nrec)
166
    /* Cannot determine eol style from empty file */
167
0
    return -1;
168
0
  if ((size = file->recs[i].size) &&
169
0
      file->recs[i].ptr[size - 1] == '\n')
170
    /* Last line; ends in LF; Is it CR/LF? */
171
0
    return size > 1 &&
172
0
      file->recs[i].ptr[size - 2] == '\r';
173
0
  if (!i)
174
    /* The only line has no eol */
175
0
    return -1;
176
  /* Determine eol from second-to-last line */
177
0
  return (size = file->recs[i - 1].size) > 1 &&
178
0
    file->recs[i - 1].ptr[size - 2] == '\r';
179
0
}
180
181
static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m)
182
0
{
183
0
  int needs_cr;
184
185
  /* Match post-images' preceding, or first, lines' end-of-line style */
186
0
  needs_cr = is_eol_crlf(&xe1->xdf2, m->i1 ? m->i1 - 1 : 0);
187
0
  if (needs_cr)
188
0
    needs_cr = is_eol_crlf(&xe2->xdf2, m->i2 ? m->i2 - 1 : 0);
189
  /* Look at pre-image's first line, unless we already settled on LF */
190
0
  if (needs_cr)
191
0
    needs_cr = is_eol_crlf(&xe1->xdf1, 0);
192
  /* If still undecided, use LF-only */
193
0
  return needs_cr < 0 ? 0 : needs_cr;
194
0
}
195
196
static size_t fill_conflict_hunk(xdfenv_t *xe1, const char *name1,
197
         xdfenv_t *xe2, const char *name2,
198
         const char *name3,
199
         size_t size, int i, int style,
200
         xdmerge_t *m, char *dest, int marker_size)
201
0
{
202
0
  int marker1_size = (name1 && *name1 ? strlen(name1) + 1 : 0);
203
0
  int marker2_size = (name2 && *name2 ? strlen(name2) + 1 : 0);
204
0
  int marker3_size = (name3 && *name3 ? strlen(name3) + 1 : 0);
205
0
  int needs_cr = is_cr_needed(xe1, xe2, m);
206
207
0
  if (marker_size <= 0)
208
0
    marker_size = DEFAULT_CONFLICT_MARKER_SIZE;
209
210
  /* Before conflicting part */
211
0
  size = st_add(size, xdl_recs_copy(xe1, i, m->i1 - i, 0, 0,
212
0
            dest ? dest + size : NULL));
213
214
0
  if (!dest) {
215
0
    size = st_add5(size, marker_size, 1, needs_cr, marker1_size);
216
0
  } else {
217
0
    memset(dest + size, '<', marker_size);
218
0
    size += marker_size;
219
0
    if (marker1_size) {
220
0
      dest[size] = ' ';
221
0
      memcpy(dest + size + 1, name1, marker1_size - 1);
222
0
      size += marker1_size;
223
0
    }
224
0
    if (needs_cr)
225
0
      dest[size++] = '\r';
226
0
    dest[size++] = '\n';
227
0
  }
228
229
  /* Postimage from side #1 */
230
0
  size = st_add(size, xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, 1,
231
0
            dest ? dest + size : NULL));
232
233
0
  if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
234
    /* Shared preimage */
235
0
    if (!dest) {
236
0
      size = st_add5(size, marker_size, 1, needs_cr, marker3_size);
237
0
    } else {
238
0
      memset(dest + size, '|', marker_size);
239
0
      size += marker_size;
240
0
      if (marker3_size) {
241
0
        dest[size] = ' ';
242
0
        memcpy(dest + size + 1, name3, marker3_size - 1);
243
0
        size += marker3_size;
244
0
      }
245
0
      if (needs_cr)
246
0
        dest[size++] = '\r';
247
0
      dest[size++] = '\n';
248
0
    }
249
0
    size = st_add(size, xdl_orig_copy(xe1, m->i0, m->chg0, needs_cr, 1,
250
0
              dest ? dest + size : NULL));
251
0
  }
252
253
0
  if (!dest) {
254
0
    size = st_add4(size, marker_size, 1, needs_cr);
255
0
  } else {
256
0
    memset(dest + size, '=', marker_size);
257
0
    size += marker_size;
258
0
    if (needs_cr)
259
0
      dest[size++] = '\r';
260
0
    dest[size++] = '\n';
261
0
  }
262
263
  /* Postimage from side #2 */
264
0
  size = st_add(size, xdl_recs_copy(xe2, m->i2, m->chg2, needs_cr, 1,
265
0
            dest ? dest + size : NULL));
266
0
  if (!dest) {
267
0
    size = st_add5(size, marker_size, 1, needs_cr, marker2_size);
268
0
  } else {
269
0
    memset(dest + size, '>', marker_size);
270
0
    size += marker_size;
271
0
    if (marker2_size) {
272
0
      dest[size] = ' ';
273
0
      memcpy(dest + size + 1, name2, marker2_size - 1);
274
0
      size += marker2_size;
275
0
    }
276
0
    if (needs_cr)
277
0
      dest[size++] = '\r';
278
0
    dest[size++] = '\n';
279
0
  }
280
0
  return size;
281
0
}
282
283
static size_t xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
284
            xdfenv_t *xe2, const char *name2,
285
            const char *ancestor_name,
286
            int favor,
287
            xdmerge_t *m, char *dest, int style,
288
            int marker_size)
289
0
{
290
0
  size_t size;
291
0
  int i;
292
293
0
  for (size = i = 0; m; m = m->next) {
294
0
    if (favor && !m->mode)
295
0
      m->mode = favor;
296
297
0
    if (m->mode == 0)
298
0
      size = fill_conflict_hunk(xe1, name1, xe2, name2,
299
0
              ancestor_name,
300
0
              size, i, style, m, dest,
301
0
              marker_size);
302
0
    else if (m->mode & 3) {
303
      /* Before conflicting part */
304
0
      size = st_add(size, xdl_recs_copy(xe1, i, m->i1 - i, 0, 0,
305
0
                dest ? dest + size : NULL));
306
      /* Postimage from side #1 */
307
0
      if (m->mode & 1) {
308
0
        int needs_cr = is_cr_needed(xe1, xe2, m);
309
310
0
        size = st_add(size, xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, (m->mode & 2),
311
0
                  dest ? dest + size : NULL));
312
0
      }
313
      /* Postimage from side #2 */
314
0
      if (m->mode & 2)
315
0
        size = st_add(size, xdl_recs_copy(xe2, m->i2, m->chg2, 0, 0,
316
0
                  dest ? dest + size : NULL));
317
0
    } else
318
0
      continue;
319
0
    i = m->i1 + m->chg1;
320
0
  }
321
0
  size = st_add(size, xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0, 0,
322
0
            dest ? dest + size : NULL));
323
0
  return size;
324
0
}
325
326
static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags)
327
0
{
328
0
  return xdl_recmatch((const char *)rec1->ptr, (long)rec1->size,
329
0
          (const char *)rec2->ptr, (long)rec2->size, flags);
330
0
}
331
332
/*
333
 * Remove any common lines from the beginning and end of the conflicted region.
334
 */
335
static void xdl_refine_zdiff3_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
336
    xpparam_t const *xpp)
337
0
{
338
0
  xrecord_t *rec1 = xe1->xdf2.recs, *rec2 = xe2->xdf2.recs;
339
0
  for (; m; m = m->next) {
340
    /* let's handle just the conflicts */
341
0
    if (m->mode)
342
0
      continue;
343
344
0
    while(m->chg1 && m->chg2 &&
345
0
          recmatch(&rec1[m->i1], &rec2[m->i2], xpp->flags)) {
346
0
      m->chg1--;
347
0
      m->chg2--;
348
0
      m->i1++;
349
0
      m->i2++;
350
0
    }
351
0
    while (m->chg1 && m->chg2 &&
352
0
           recmatch(&rec1[m->i1 + m->chg1 - 1],
353
0
        &rec2[m->i2 + m->chg2 - 1], xpp->flags)) {
354
0
      m->chg1--;
355
0
      m->chg2--;
356
0
    }
357
0
  }
358
0
}
359
360
/*
361
 * Sometimes, changes are not quite identical, but differ in only a few
362
 * lines. Try hard to show only these few lines as conflicting.
363
 */
364
static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m,
365
    xpparam_t const *xpp)
366
0
{
367
0
  for (; m; m = m->next) {
368
0
    mmfile_t t1, t2;
369
0
    xdfenv_t xe;
370
0
    xdchange_t *xscr, *x;
371
0
    int i1 = m->i1, i2 = m->i2;
372
373
    /* let's handle just the conflicts */
374
0
    if (m->mode)
375
0
      continue;
376
377
    /* no sense refining a conflict when one side is empty */
378
0
    if (m->chg1 == 0 || m->chg2 == 0)
379
0
      continue;
380
381
    /*
382
     * This probably does not work outside git, since
383
     * we have a very simple mmfile structure.
384
     */
385
0
    t1.ptr = (char *)xe1->xdf2.recs[m->i1].ptr;
386
0
    t1.size = (char *)xe1->xdf2.recs[m->i1 + m->chg1 - 1].ptr
387
0
      + xe1->xdf2.recs[m->i1 + m->chg1 - 1].size - t1.ptr;
388
0
    t2.ptr = (char *)xe2->xdf2.recs[m->i2].ptr;
389
0
    t2.size = (char *)xe2->xdf2.recs[m->i2 + m->chg2 - 1].ptr
390
0
      + xe2->xdf2.recs[m->i2 + m->chg2 - 1].size - t2.ptr;
391
0
    if (xdl_do_diff(&t1, &t2, xpp, &xe) < 0)
392
0
      return -1;
393
0
    if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 ||
394
0
        xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 ||
395
0
        xdl_build_script(&xe, &xscr) < 0) {
396
0
      xdl_free_env(&xe);
397
0
      return -1;
398
0
    }
399
0
    if (!xscr) {
400
      /* If this happens, the changes are identical. */
401
0
      xdl_free_env(&xe);
402
0
      m->mode = 4;
403
0
      continue;
404
0
    }
405
0
    x = xscr;
406
0
    m->i1 = xscr->i1 + i1;
407
0
    m->chg1 = xscr->chg1;
408
0
    m->i2 = xscr->i2 + i2;
409
0
    m->chg2 = xscr->chg2;
410
0
    while (xscr->next) {
411
0
      xdmerge_t *m2 = xdl_malloc(sizeof(xdmerge_t));
412
0
      if (!m2) {
413
0
        xdl_free_env(&xe);
414
0
        xdl_free_script(x);
415
0
        return -1;
416
0
      }
417
0
      xscr = xscr->next;
418
0
      m2->next = m->next;
419
0
      m->next = m2;
420
0
      m = m2;
421
0
      m->mode = 0;
422
0
      m->i1 = xscr->i1 + i1;
423
0
      m->chg1 = xscr->chg1;
424
0
      m->i2 = xscr->i2 + i2;
425
0
      m->chg2 = xscr->chg2;
426
0
    }
427
0
    xdl_free_env(&xe);
428
0
    xdl_free_script(x);
429
0
  }
430
0
  return 0;
431
0
}
432
433
static int line_contains_alnum(const char *ptr, long size)
434
0
{
435
0
  while (size--)
436
0
    if (isalnum((unsigned char)*(ptr++)))
437
0
      return 1;
438
0
  return 0;
439
0
}
440
441
static int lines_contain_alnum(xdfenv_t *xe, int i, int chg)
442
0
{
443
0
  for (; chg; chg--, i++)
444
0
    if (line_contains_alnum((const char *)xe->xdf2.recs[i].ptr,
445
0
        (long)xe->xdf2.recs[i].size))
446
0
      return 1;
447
0
  return 0;
448
0
}
449
450
/*
451
 * This function merges m and m->next, marking everything between those hunks
452
 * as conflicting, too.
453
 */
454
static void xdl_merge_two_conflicts(xdmerge_t *m)
455
0
{
456
0
  xdmerge_t *next_m = m->next;
457
0
  m->chg1 = next_m->i1 + next_m->chg1 - m->i1;
458
0
  m->chg2 = next_m->i2 + next_m->chg2 - m->i2;
459
0
  m->next = next_m->next;
460
0
  free(next_m);
461
0
}
462
463
/*
464
 * If there are less than 3 non-conflicting lines between conflicts,
465
 * it appears simpler -- because it takes up less (or as many) lines --
466
 * if the lines are moved into the conflicts.
467
 */
468
static int xdl_simplify_non_conflicts(xdfenv_t *xe1, xdmerge_t *m,
469
              int simplify_if_no_alnum)
470
0
{
471
0
  int result = 0;
472
473
0
  if (!m)
474
0
    return result;
475
0
  for (;;) {
476
0
    xdmerge_t *next_m = m->next;
477
0
    int begin, end;
478
479
0
    if (!next_m)
480
0
      return result;
481
482
0
    begin = m->i1 + m->chg1;
483
0
    end = next_m->i1;
484
485
0
    if (m->mode != 0 || next_m->mode != 0 ||
486
0
        (end - begin > 3 &&
487
0
         (!simplify_if_no_alnum ||
488
0
          lines_contain_alnum(xe1, begin, end - begin)))) {
489
0
      m = next_m;
490
0
    } else {
491
0
      result++;
492
0
      xdl_merge_two_conflicts(m);
493
0
    }
494
0
  }
495
0
}
496
497
/*
498
 * level == 0: mark all overlapping changes as conflict
499
 * level == 1: mark overlapping changes as conflict only if not identical
500
 * level == 2: analyze non-identical changes for minimal conflict set
501
 * level == 3: analyze non-identical changes for minimal conflict set, but
502
 *             treat hunks not containing any letter or number as conflicting
503
 *
504
 * returns < 0 on error, == 0 for no conflicts, else number of conflicts
505
 */
506
static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1,
507
    xdfenv_t *xe2, xdchange_t *xscr2,
508
    xmparam_t const *xmp, mmfile_t *result)
509
0
{
510
0
  xdmerge_t *changes, *c;
511
0
  xpparam_t const *xpp = &xmp->xpp;
512
0
  const char *const ancestor_name = xmp->ancestor;
513
0
  const char *const name1 = xmp->file1;
514
0
  const char *const name2 = xmp->file2;
515
0
  int i0, i1, i2, chg0, chg1, chg2;
516
0
  int level = xmp->level;
517
0
  int style = xmp->style;
518
0
  int favor = xmp->favor;
519
520
  /*
521
   * XDL_MERGE_DIFF3 does not attempt to refine conflicts by looking
522
   * at common areas of sides 1 & 2, because the base (side 0) does
523
   * not match and is being shown.  Similarly, simplification of
524
   * non-conflicts is also skipped due to the skipping of conflict
525
   * refinement.
526
   *
527
   * XDL_MERGE_ZEALOUS_DIFF3, on the other hand, will attempt to
528
   * refine conflicts looking for common areas of sides 1 & 2.
529
   * However, since the base is being shown and does not match,
530
   * it will only look for common areas at the beginning or end
531
   * of the conflict block.  Since XDL_MERGE_ZEALOUS_DIFF3's
532
   * conflict refinement is much more limited in this fashion, the
533
   * conflict simplification will be skipped.
534
   */
535
0
  if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) {
536
    /*
537
     * "diff3 -m" output does not make sense for anything
538
     * more aggressive than XDL_MERGE_EAGER.
539
     */
540
0
    if (XDL_MERGE_EAGER < level)
541
0
      level = XDL_MERGE_EAGER;
542
0
  }
543
544
0
  c = changes = NULL;
545
546
0
  while (xscr1 && xscr2) {
547
0
    if (!changes)
548
0
      changes = c;
549
0
    if (xscr1->i1 + xscr1->chg1 < xscr2->i1) {
550
0
      i0 = xscr1->i1;
551
0
      i1 = xscr1->i2;
552
0
      i2 = xscr2->i2 - xscr2->i1 + xscr1->i1;
553
0
      chg0 = xscr1->chg1;
554
0
      chg1 = xscr1->chg2;
555
0
      chg2 = xscr1->chg1;
556
0
      if (xdl_append_merge(&c, 1,
557
0
               i0, chg0, i1, chg1, i2, chg2)) {
558
0
        xdl_cleanup_merge(changes);
559
0
        return -1;
560
0
      }
561
0
      xscr1 = xscr1->next;
562
0
      continue;
563
0
    }
564
0
    if (xscr2->i1 + xscr2->chg1 < xscr1->i1) {
565
0
      i0 = xscr2->i1;
566
0
      i1 = xscr1->i2 - xscr1->i1 + xscr2->i1;
567
0
      i2 = xscr2->i2;
568
0
      chg0 = xscr2->chg1;
569
0
      chg1 = xscr2->chg1;
570
0
      chg2 = xscr2->chg2;
571
0
      if (xdl_append_merge(&c, 2,
572
0
               i0, chg0, i1, chg1, i2, chg2)) {
573
0
        xdl_cleanup_merge(changes);
574
0
        return -1;
575
0
      }
576
0
      xscr2 = xscr2->next;
577
0
      continue;
578
0
    }
579
0
    if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 ||
580
0
        xscr1->chg1 != xscr2->chg1 ||
581
0
        xscr1->chg2 != xscr2->chg2 ||
582
0
        xdl_merge_cmp_lines(xe1, xscr1->i2,
583
0
          xe2, xscr2->i2,
584
0
          xscr1->chg2, xpp->flags)) {
585
      /* conflict */
586
0
      int off = xscr1->i1 - xscr2->i1;
587
0
      int ffo = off + xscr1->chg1 - xscr2->chg1;
588
589
0
      i0 = xscr1->i1;
590
0
      i1 = xscr1->i2;
591
0
      i2 = xscr2->i2;
592
0
      if (off > 0) {
593
0
        i0 -= off;
594
0
        i1 -= off;
595
0
      }
596
0
      else
597
0
        i2 += off;
598
0
      chg0 = xscr1->i1 + xscr1->chg1 - i0;
599
0
      chg1 = xscr1->i2 + xscr1->chg2 - i1;
600
0
      chg2 = xscr2->i2 + xscr2->chg2 - i2;
601
0
      if (ffo < 0) {
602
0
        chg0 -= ffo;
603
0
        chg1 -= ffo;
604
0
      } else
605
0
        chg2 += ffo;
606
0
      if (xdl_append_merge(&c, 0,
607
0
               i0, chg0, i1, chg1, i2, chg2)) {
608
0
        xdl_cleanup_merge(changes);
609
0
        return -1;
610
0
      }
611
0
    }
612
613
0
    i1 = xscr1->i1 + xscr1->chg1;
614
0
    i2 = xscr2->i1 + xscr2->chg1;
615
616
0
    if (i1 >= i2)
617
0
      xscr2 = xscr2->next;
618
0
    if (i2 >= i1)
619
0
      xscr1 = xscr1->next;
620
0
  }
621
0
  while (xscr1) {
622
0
    if (!changes)
623
0
      changes = c;
624
0
    i0 = xscr1->i1;
625
0
    i1 = xscr1->i2;
626
0
    i2 = xscr1->i1 + (long)xe2->xdf2.nrec - (long)xe2->xdf1.nrec;
627
0
    chg0 = xscr1->chg1;
628
0
    chg1 = xscr1->chg2;
629
0
    chg2 = xscr1->chg1;
630
0
    if (xdl_append_merge(&c, 1,
631
0
             i0, chg0, i1, chg1, i2, chg2)) {
632
0
      xdl_cleanup_merge(changes);
633
0
      return -1;
634
0
    }
635
0
    xscr1 = xscr1->next;
636
0
  }
637
0
  while (xscr2) {
638
0
    if (!changes)
639
0
      changes = c;
640
0
    i0 = xscr2->i1;
641
0
    i1 = xscr2->i1 + (long)xe1->xdf2.nrec - (long)xe1->xdf1.nrec;
642
0
    i2 = xscr2->i2;
643
0
    chg0 = xscr2->chg1;
644
0
    chg1 = xscr2->chg1;
645
0
    chg2 = xscr2->chg2;
646
0
    if (xdl_append_merge(&c, 2,
647
0
             i0, chg0, i1, chg1, i2, chg2)) {
648
0
      xdl_cleanup_merge(changes);
649
0
      return -1;
650
0
    }
651
0
    xscr2 = xscr2->next;
652
0
  }
653
0
  if (!changes)
654
0
    changes = c;
655
  /* refine conflicts */
656
0
  if (style == XDL_MERGE_ZEALOUS_DIFF3) {
657
0
    xdl_refine_zdiff3_conflicts(xe1, xe2, changes, xpp);
658
0
  } else if (XDL_MERGE_ZEALOUS <= level &&
659
0
       (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 ||
660
0
        xdl_simplify_non_conflicts(xe1, changes,
661
0
                 XDL_MERGE_ZEALOUS < level) < 0)) {
662
0
    xdl_cleanup_merge(changes);
663
0
    return -1;
664
0
  }
665
  /* output */
666
0
  if (result) {
667
0
    int marker_size = xmp->marker_size;
668
0
    size_t size = xdl_fill_merge_buffer(xe1, name1, xe2, name2,
669
0
                ancestor_name,
670
0
                favor, changes, NULL, style,
671
0
                marker_size);
672
0
    if (size > LONG_MAX) {
673
0
      xdl_cleanup_merge(changes);
674
0
      return -1;
675
0
    }
676
0
    result->ptr = xdl_malloc(size);
677
0
    if (!result->ptr) {
678
0
      xdl_cleanup_merge(changes);
679
0
      return -1;
680
0
    }
681
0
    result->size = size;
682
0
    xdl_fill_merge_buffer(xe1, name1, xe2, name2,
683
0
              ancestor_name, favor, changes,
684
0
              result->ptr, style, marker_size);
685
0
  }
686
0
  return xdl_cleanup_merge(changes);
687
0
}
688
689
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
690
    xmparam_t const *xmp, mmfile_t *result)
691
0
{
692
0
  xdchange_t *xscr1 = NULL, *xscr2 = NULL;
693
0
  xdfenv_t xe1, xe2;
694
0
  int status = -1;
695
0
  xpparam_t const *xpp = &xmp->xpp;
696
697
0
  result->ptr = NULL;
698
0
  result->size = 0;
699
700
0
  if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0)
701
0
    return -1;
702
703
0
  if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0)
704
0
    goto free_xe1; /* avoid double free of xe2 */
705
706
0
  if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 ||
707
0
      xdl_change_compact(&xe1.xdf2, &xe1.xdf1, xpp->flags) < 0 ||
708
0
      xdl_build_script(&xe1, &xscr1) < 0)
709
0
    goto out;
710
711
0
  if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 ||
712
0
      xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 ||
713
0
      xdl_build_script(&xe2, &xscr2) < 0)
714
0
    goto out;
715
716
0
  if (!xscr1) {
717
0
    result->ptr = xdl_malloc(mf2->size);
718
0
    if (!result->ptr)
719
0
      goto out;
720
0
    status = 0;
721
0
    memcpy(result->ptr, mf2->ptr, mf2->size);
722
0
    result->size = mf2->size;
723
0
  } else if (!xscr2) {
724
0
    result->ptr = xdl_malloc(mf1->size);
725
0
    if (!result->ptr)
726
0
      goto out;
727
0
    status = 0;
728
0
    memcpy(result->ptr, mf1->ptr, mf1->size);
729
0
    result->size = mf1->size;
730
0
  } else {
731
0
    status = xdl_do_merge(&xe1, xscr1,
732
0
              &xe2, xscr2,
733
0
              xmp, result);
734
0
  }
735
0
 out:
736
0
  xdl_free_script(xscr1);
737
0
  xdl_free_script(xscr2);
738
739
0
  xdl_free_env(&xe2);
740
0
 free_xe1:
741
0
  xdl_free_env(&xe1);
742
743
0
  return status;
744
0
}