1 /* $OpenBSD: diff3.c,v 1.41 2016/10/18 21:06:52 millert Exp $ */
4 * Copyright (C) Caldera International Inc. 2001-2002.
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions
10 * 1. Redistributions of source code and documentation must retain the above
11 * copyright notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution.
15 * 3. All advertising materials mentioning features or use of this software
16 * must display the following acknowledgement:
17 * This product includes software developed or owned by Caldera
19 * 4. Neither the name of Caldera International, Inc. nor the names of other
20 * contributors may be used to endorse or promote products derived from
21 * this software without specific prior written permission.
23 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
24 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
25 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
26 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
27 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
28 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
29 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
32 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
33 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34 * POSSIBILITY OF SUCH DAMAGE.
37 * Copyright (c) 1991, 1993
38 * The Regents of the University of California. All rights reserved.
40 * Redistribution and use in source and binary forms, with or without
41 * modification, are permitted provided that the following conditions
43 * 1. Redistributions of source code must retain the above copyright
44 * notice, this list of conditions and the following disclaimer.
45 * 2. Redistributions in binary form must reproduce the above copyright
46 * notice, this list of conditions and the following disclaimer in the
47 * documentation and/or other materials provided with the distribution.
48 * 3. Neither the name of the University nor the names of its contributors
49 * may be used to endorse or promote products derived from this software
50 * without specific prior written permission.
52 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
53 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
54 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
55 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
56 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
57 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
58 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
59 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
60 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
61 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
64 * @(#)diff3.c 8.1 (Berkeley) 6/6/93
68 #include <sys/queue.h>
79 #include "got_error.h"
80 #include "got_opentemp.h"
81 #include "got_object.h"
85 #include "got_lib_diff.h"
89 #define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
92 /* diff3 - 3-way differential file comparison */
94 /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
96 * d13 = diff report on f1 vs f3
97 * d23 = diff report on f2 vs f3
98 * f1, f2, f3 the 3 files
99 * if changes in f1 overlap with changes in f3, m1 and m3 are used
100 * to mark the overlaps; otherwise, the file names f1 and f3 are used
101 * (only for options E and X).
105 * "from" is first in range of changed lines; "to" is last+1
106 * from=to=line after point of insertion for added lines.
125 * "de" is used to gather editing scripts. These are later spewed out
126 * in reverse order. Its first element must be all zero, the "new"
127 * component of "de" contains line positions or byte positions
128 * depending on when you look (!?). Array overlap indicates which
129 * sections in "de" correspond to lines that are different in all
136 int cline[3]; /* # of the last-read line in each file (0-2) */
139 * the latest known correspondence between line numbers of the 3 files
140 * is stored in last[1-3];
143 char f1mark[PATH_MAX], f3mark[PATH_MAX]; /* markers for -E and -X */
151 static const struct got_error *duplicate(int *, struct range *, struct range *,
152 struct diff3_state *);
153 static const struct got_error *edit(struct diff *, int, int *,
154 struct diff3_state *);
155 static const struct got_error *getchange(char **, FILE *, struct diff3_state *);
156 static const struct got_error *get_line(char **, FILE *, size_t *,
157 struct diff3_state *);
158 static int number(char **);
159 static const struct got_error *readin(size_t *, char *, struct diff **,
160 struct diff3_state *);
161 static int ed_patch_lines(struct rcs_lines *, struct rcs_lines *);
162 static const struct got_error *skip(int *, int, int, struct diff3_state *);
163 static const struct got_error *edscript(int, struct diff3_state *);
164 static const struct got_error *merge(size_t, size_t, struct diff3_state *);
165 static const struct got_error *prange(struct range *, struct diff3_state *);
166 static const struct got_error *repos(int, struct diff3_state *);
167 static const struct got_error *increase(struct diff3_state *);
168 static const struct got_error *diff3_internal(char *, char *, char *,
169 char *, char *, const char *, const char *, struct diff3_state *,
170 const char *, const char *);
172 static const struct got_error *
173 diff_output(BUF *diffbuf, const char *fmt, ...)
175 const struct got_error *err = NULL;
182 i = vasprintf(&str, fmt, vap);
185 return got_error_from_errno("vasprintf");
186 err = buf_append(&newsize, diffbuf, str, strlen(str));
191 static const struct got_error*
192 diffreg(BUF **d, const char *path1, const char *path2)
194 const struct got_error *err = NULL;
195 FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
196 char *outpath = NULL;
197 struct got_diff_state ds;
198 struct got_diff_args args;
203 f1 = fopen(path1, "r");
205 err = got_error_from_errno2("fopen", path1);
208 f2 = fopen(path2, "r");
210 err = got_error_from_errno2("fopen", path2);
214 err = got_opentemp_named(&outpath, &outfile, "/tmp/got-diffreg");
218 memset(&ds, 0, sizeof(ds));
219 /* XXX should stat buffers be passed in args instead of ds? */
220 if (stat(path1, &ds.stb1) == -1) {
221 err = got_error_from_errno2("stat", path1);
224 if (stat(path2, &ds.stb2) == -1) {
225 err = got_error_from_errno2("stat", path2);
229 memset(&args, 0, sizeof(args));
230 args.diff_format = D_NORMAL;
233 args.diff_context = 0;
235 err = got_diffreg(&res, f1, f2, D_FORCEASCII, &args, &ds,
240 if (fflush(outfile) != 0) {
241 err = got_error_from_errno2("fflush", outpath);
245 err = buf_load(d, outpath);
251 if (outfile && fclose(outfile) != 0 && err == NULL)
252 err = got_error_from_errno("fclose");
253 if (f1 && fclose(f1) != 0 && err == NULL)
254 err = got_error_from_errno("fclose");
255 if (f2 && fclose(f2) != 0 && err == NULL)
256 err = got_error_from_errno("fclose");
263 const struct got_error *
264 got_merge_diff3(int *overlapcnt, int outfd, const char *p1, const char *p2,
265 const char *p3, const char *label1, const char *label3)
267 const struct got_error *err = NULL;
268 char *dp13, *dp23, *path1, *path2, *path3;
269 BUF *b1, *b2, *b3, *d1, *d2, *diffb;
270 u_char *data, *patch;
272 struct wklhead temp_files;
273 struct diff3_state *d3s;
278 SLIST_INIT(&temp_files);
280 d3s = calloc(1, sizeof(*d3s));
282 return got_error_from_errno("calloc");
284 b1 = b2 = b3 = d1 = d2 = diffb = NULL;
285 dp13 = dp23 = path1 = path2 = path3 = NULL;
288 err = buf_load(&b1, p1);
291 err = buf_load(&b2, p2);
294 err = buf_load(&b3, p3);
298 err = buf_alloc(&diffb, 128);
302 if (asprintf(&path1, "/tmp/got-diff1.XXXXXXXX") == -1) {
303 err = got_error_from_errno("asprintf");
306 if (asprintf(&path2, "/tmp/got-diff2.XXXXXXXX") == -1) {
307 err = got_error_from_errno("asprintf");
310 if (asprintf(&path3, "/tmp/got-diff3.XXXXXXXX") == -1) {
311 err = got_error_from_errno("asprintf");
315 err = buf_write_stmp(b1, path1, &temp_files);
318 err = buf_write_stmp(b2, path2, &temp_files);
321 err = buf_write_stmp(b3, path3, &temp_files);
328 err = diffreg(&d1, path1, path3);
335 err = diffreg(&d2, path2, path3);
342 if (asprintf(&dp13, "/tmp/got-d13.XXXXXXXXXX") == -1) {
343 err = got_error_from_errno("asprintf");
346 err = buf_write_stmp(d1, dp13, &temp_files);
353 if (asprintf(&dp23, "/tmp/got-d23.XXXXXXXXXX") == -1) {
354 err = got_error_from_errno("asprintf");
357 err = buf_write_stmp(d2, dp23, &temp_files);
364 d3s->diffbuf = diffb;
365 err = diff3_internal(dp13, dp23, path1, path2, path3,
366 label1, label3, d3s, label1, label3);
373 plen = buf_len(diffb);
374 patch = buf_release(diffb);
376 data = buf_release(b1);
378 diffb = rcs_patchfile(data, dlen, patch, plen, ed_patch_lines);
399 worklist_clean(&temp_files, worklist_unlink);
401 for (i = 0; i < nitems(d3s->fp); i++) {
402 if (d3s->fp[i] && fclose(d3s->fp[i]) != 0 && err == NULL)
403 err = got_error_from_errno("fclose");
405 if (err == NULL && diffb) {
406 if (buf_write_fd(diffb, outfd) < 0)
407 err = got_error_from_errno("buf_write_fd");
408 *overlapcnt = d3s->overlapcnt;
415 static const struct got_error *
416 diff3_internal(char *dp13, char *dp23, char *path1, char *path2, char *path3,
417 const char *fmark, const char *rmark, struct diff3_state *d3s,
418 const char *label1, const char *label3)
420 const struct got_error *err = NULL;
424 i = snprintf(d3s->f1mark, sizeof(d3s->f1mark),
425 "%s %s", GOT_DIFF_CONFLICT_MARKER_BEGIN, label1);
426 if (i < 0 || i >= (int)sizeof(d3s->f1mark))
427 return got_error(GOT_ERR_NO_SPACE);
429 i = snprintf(d3s->f3mark, sizeof(d3s->f3mark),
430 "%s %s", GOT_DIFF_CONFLICT_MARKER_END, label3);
431 if (i < 0 || i >= (int)sizeof(d3s->f3mark))
432 return got_error(GOT_ERR_NO_SPACE);
438 err = readin(&m, dp13, &d3s->d13, d3s);
441 err = readin(&n, dp23, &d3s->d23, d3s);
445 if ((d3s->fp[0] = fopen(path1, "r")) == NULL)
446 return got_error_from_errno2("fopen", path1);
447 if ((d3s->fp[1] = fopen(path2, "r")) == NULL)
448 return got_error_from_errno2("fopen", path2);
449 if ((d3s->fp[2] = fopen(path3, "r")) == NULL)
450 return got_error_from_errno2("fopen", path3);
452 return merge(m, n, d3s);
456 ed_patch_lines(struct rcs_lines *dlines, struct rcs_lines *plines)
459 struct rcs_line *sort, *lp, *dlp, *ndlp, *insert_after;
460 int start, end, i, lineno;
463 dlp = TAILQ_FIRST(&(dlines->l_lines));
464 lp = TAILQ_FIRST(&(plines->l_lines));
467 for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
468 lp = TAILQ_NEXT(lp, l_list)) {
469 /* Skip blank lines */
473 /* NUL-terminate line buffer for strtol() safety. */
474 tmp = lp->l_line[lp->l_len - 1];
475 lp->l_line[lp->l_len - 1] = '\0';
477 /* len - 1 is NUL terminator so we use len - 2 for 'op' */
478 op = lp->l_line[lp->l_len - 2];
479 start = (int)strtol(lp->l_line, &ep, 10);
481 /* Restore the last byte of the buffer */
482 lp->l_line[lp->l_len - 1] = tmp;
485 if (start > dlines->l_nblines ||
486 start < 0 || *ep != 'a')
488 } else if (op == 'c') {
489 if (start > dlines->l_nblines ||
490 start < 0 || (*ep != ',' && *ep != 'c'))
495 end = (int)strtol(ep, &ep, 10);
496 if (end < 0 || *ep != 'c')
507 if (dlp->l_lineno == start)
509 if (dlp->l_lineno > start) {
510 dlp = TAILQ_PREV(dlp, tqh, l_list);
511 } else if (dlp->l_lineno < start) {
512 ndlp = TAILQ_NEXT(dlp, l_list);
513 if (ndlp->l_lineno > start)
524 insert_after = TAILQ_PREV(dlp, tqh, l_list);
525 for (i = 0; i <= (end - start); i++) {
526 ndlp = TAILQ_NEXT(dlp, l_list);
527 TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
533 if (op == 'a' || op == 'c') {
536 lp = TAILQ_NEXT(lp, l_list);
540 if (lp->l_len == 2 &&
541 lp->l_line[0] == '.' &&
542 lp->l_line[1] == '\n')
545 TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
546 TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
550 lp->l_lineno = start;
556 * always resort lines as the markers might be put at the
557 * same line as we first started editing.
560 TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
561 sort->l_lineno = lineno++;
562 dlines->l_nblines = lineno - 1;
569 * Pick up the line numbers of all changes from one change file.
570 * (This puts the numbers in a vector, which is not strictly necessary,
571 * since the vector is processed in one sequential pass.
572 * The vector could be optimized out of existence)
574 static const struct got_error *
575 readin(size_t *n, char *name, struct diff **dd, struct diff3_state *d3s)
577 const struct got_error *err = NULL;
584 d3s->fp[0] = fopen(name, "r");
585 if (d3s->fp[0] == NULL)
586 return got_error_from_errno2("fopen", name);
587 err = getchange(&p, d3s->fp[0], d3s);
590 for (i = 0; p; i++) {
591 if (i >= d3s->szchanges - 1) {
613 (*dd)[i].old.from = a;
615 (*dd)[i].new.from = c;
618 err = getchange(&p, d3s->fp[0], d3s);
624 (*dd)[i].old.from = (*dd)[i - 1].old.to;
625 (*dd)[i].new.from = (*dd)[i - 1].new.to;
628 if (fclose(d3s->fp[0]) != 0)
629 err = got_error_from_errno("fclose");
641 while (isdigit((unsigned char)(**lc)))
642 nn = nn*10 + *(*lc)++ - '0';
647 static const struct got_error *
648 getchange(char **line, FILE *b, struct diff3_state *d3s)
650 const struct got_error *err = NULL;
654 if (*line && isdigit((unsigned char)(*line)[0]))
656 err = get_line(line, b, NULL, d3s);
664 static const struct got_error *
665 get_line(char **ret, FILE *b, size_t *n, struct diff3_state *d3s)
667 const struct got_error *err = NULL;
675 len = getline(&cp, &size, b);
678 err = got_error_from_errno("getline");
682 if (cp[len - 1] != '\n') {
684 if (len + 1 > size) {
685 new = realloc(cp, len + 1);
687 err = got_error_from_errno("realloc");
697 *ret = d3s->buf = cp;
706 static const struct got_error *
707 merge(size_t m1, size_t m2, struct diff3_state *d3s)
709 const struct got_error *err = NULL;
710 struct diff *d1, *d2;
717 t1 = (d1 < d3s->d13 + m1);
718 t2 = (d2 < d3s->d23 + m2);
722 /* first file is different from others */
723 if (!t2 || (t1 && d1->new.to < d2->new.from)) {
724 /* stuff peculiar to 1st file */
729 /* second file is different from others */
730 if (!t1 || (t2 && d2->new.to < d1->new.from)) {
736 * Merge overlapping changes in first file
737 * this happens after extension (see below).
739 if (d1 + 1 < d3s->d13 + m1 && d1->new.to >= d1[1].new.from) {
740 d1[1].old.from = d1->old.from;
741 d1[1].new.from = d1->new.from;
746 /* merge overlapping changes in second */
747 if (d2 + 1 < d3s->d23 + m2 && d2->new.to >= d2[1].new.from) {
748 d2[1].old.from = d2->old.from;
749 d2[1].new.from = d2->new.from;
753 /* stuff peculiar to third file or different in all */
754 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
755 err = duplicate(&dpl, &d1->old, &d2->old, d3s);
760 * dpl = 0 means all files differ
761 * dpl = 1 means files 1 and 2 identical
763 err = edit(d1, dpl, &j, d3s);
772 * Overlapping changes from file 1 and 2; extend changes
773 * appropriately to make them coincide.
775 if (d1->new.from < d2->new.from) {
776 d2->old.from -= d2->new.from - d1->new.from;
777 d2->new.from = d1->new.from;
778 } else if (d2->new.from < d1->new.from) {
779 d1->old.from -= d1->new.from - d2->new.from;
780 d1->new.from = d2->new.from;
782 if (d1->new.to > d2->new.to) {
783 d2->old.to += d1->new.to - d2->new.to;
784 d2->new.to = d1->new.to;
785 } else if (d2->new.to > d1->new.to) {
786 d1->old.to += d2->new.to - d1->new.to;
787 d1->new.to = d2->new.to;
791 return (edscript(j, d3s));
795 * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
797 static const struct got_error *
798 prange(struct range *rold, struct diff3_state *d3s)
800 const struct got_error *err = NULL;
802 if (rold->to <= rold->from) {
803 err = diff_output(d3s->diffbuf, "%da\n", rold->from - 1);
807 err = diff_output(d3s->diffbuf, "%d", rold->from);
810 if (rold->to > rold->from + 1) {
811 err = diff_output(d3s->diffbuf, ",%d", rold->to - 1);
815 err = diff_output(d3s->diffbuf, "c\n");
823 /* skip to just before line number from in file "i". */
824 static const struct got_error *
825 skip(int *nskipped, int i, int from, struct diff3_state *d3s)
827 const struct got_error *err = NULL;
832 for (n = 0; d3s->cline[i] < from - 1; n += j) {
833 err = get_line(&line, d3s->fp[i], &j, d3s);
843 * Set *dpl to 1 or 0 according as the old range (in file 1) contains exactly
844 * the same data as the new range (in file 2).
846 static const struct got_error *
847 duplicate(int *dpl, struct range *r1, struct range *r2, struct diff3_state *d3s)
849 const struct got_error *err = NULL;
856 if (r1->to - r1->from != r2->to - r2->from)
859 err = skip(&nskipped, 0, r1->from, d3s);
862 err = skip(&nskipped, 1, r2->from, d3s);
866 for (nline = 0; nline < r1->to - r1->from; nline++) {
868 c = getc(d3s->fp[0]);
870 return got_ferror(d3s->fp[0], GOT_ERR_EOF);
871 d = getc(d3s->fp[1]);
873 return got_ferror(d3s->fp[1], GOT_ERR_EOF);
876 return repos(nchar, d3s);
879 err = repos(nchar, d3s);
886 static const struct got_error *
887 repos(int nchar, struct diff3_state *d3s)
891 for (i = 0; i < 2; i++) {
892 if (fseek(d3s->fp[i], (long)-nchar, SEEK_CUR) == -1)
893 return got_ferror(d3s->fp[i], GOT_ERR_IO);
900 * collect an editing script for later regurgitation
902 static const struct got_error *
903 edit(struct diff *diff, int fdup, int *j, struct diff3_state *d3s)
905 const struct got_error *err = NULL;
908 if (((fdup + 1) & 3) == 0)
911 d3s->overlap[*j] = !fdup;
914 d3s->de[*j].old.from = diff->old.from;
915 d3s->de[*j].old.to = diff->old.to;
916 err = skip(&nskipped, 2, diff->new.from, d3s);
919 d3s->de[*j].new.from = d3s->de[*j - 1].new.to + nskipped;
920 err = skip(&nskipped, 2, diff->new.to, d3s);
921 d3s->de[*j].new.to = d3s->de[*j].new.from + nskipped;
926 static const struct got_error *
927 edscript(int n, struct diff3_state *d3s)
929 const struct got_error *err = NULL;
931 char block[BUFSIZ+1];
934 if (!d3s->overlap[n]) {
935 err = prange(&d3s->de[n].old, d3s);
939 err = diff_output(d3s->diffbuf, "%da\n%s\n",
940 d3s->de[n].old.to -1, GOT_DIFF_CONFLICT_MARKER_SEP);
944 if (fseek(d3s->fp[2], (long)d3s->de[n].new.from, SEEK_SET)
946 return got_error_from_errno("fseek");
947 k = d3s->de[n].new.to - d3s->de[n].new.from;
948 for (; k > 0; k -= j) {
949 j = k > BUFSIZ ? BUFSIZ : k;
950 if (fread(block, 1, j, d3s->fp[2]) != (size_t)j)
951 return got_ferror(d3s->fp[2], GOT_ERR_IO);
953 err = diff_output(d3s->diffbuf, "%s", block);
958 if (!d3s->overlap[n]) {
959 err = diff_output(d3s->diffbuf, ".\n");
963 err = diff_output(d3s->diffbuf, "%s\n.\n", d3s->f3mark);
966 err = diff_output(d3s->diffbuf, "%da\n%s\n.\n",
967 d3s->de[n].old.from - 1, d3s->f1mark);
976 static const struct got_error *
977 increase(struct diff3_state *d3s)
983 /* are the memset(3) calls needed? */
984 newsz = d3s->szchanges == 0 ? 64 : 2 * d3s->szchanges;
985 incr = newsz - d3s->szchanges;
987 d = reallocarray(d3s->d13, newsz, sizeof(*d3s->d13));
989 return got_error_from_errno("reallocarray");
991 memset(d3s->d13 + d3s->szchanges, 0, incr * sizeof(*d3s->d13));
993 d = reallocarray(d3s->d23, newsz, sizeof(*d3s->d23));
995 return got_error_from_errno("reallocarray");
997 memset(d3s->d23 + d3s->szchanges, 0, incr * sizeof(*d3s->d23));
999 d = reallocarray(d3s->de, newsz, sizeof(*d3s->de));
1001 return got_error_from_errno("reallocarray");
1003 memset(d3s->de + d3s->szchanges, 0, incr * sizeof(*d3s->de));
1005 s = reallocarray(d3s->overlap, newsz, sizeof(*d3s->overlap));
1007 return got_error_from_errno("reallocarray");
1009 memset(d3s->overlap + d3s->szchanges, 0, incr * sizeof(*d3s->overlap));
1010 d3s->szchanges = newsz;