![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to diff3.c CVS log | Up to [local] / src / usr.bin / cvs |
1.3 ! joris 1: /* $OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $ */
1.1 joris 2:
3: /*
4: * Copyright (C) Caldera International Inc. 2001-2002.
5: * All rights reserved.
6: *
7: * Redistribution and use in source and binary forms, with or without
8: * modification, are permitted provided that the following conditions
9: * are met:
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
18: * International, Inc.
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.
22: *
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.
35: */
36: /*-
37: * Copyright (c) 1991, 1993
38: * The Regents of the University of California. All rights reserved.
39: *
40: * Redistribution and use in source and binary forms, with or without
41: * modification, are permitted provided that the following conditions
42: * are met:
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.
51: *
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
62: * SUCH DAMAGE.
63: *
64: * @(#)diff3.c 8.1 (Berkeley) 6/6/93
65: */
66:
67: #ifndef lint
68: static const char copyright[] =
69: "@(#) Copyright (c) 1991, 1993\n\
70: The Regents of the University of California. All rights reserved.\n";
71: #endif /* not lint */
72:
73: #ifndef lint
1.3 ! joris 74: static const char rcsid[] = "$OpenBSD: diff3.c,v 1.2 2005/10/23 03:47:12 joris Exp $";
1.1 joris 75: #endif /* not lint */
76:
77: #include <sys/queue.h>
78:
79: #include <err.h>
80: #include <ctype.h>
81: #include <stdio.h>
82: #include <stdlib.h>
83: #include <string.h>
84: #include <unistd.h>
85:
86: #include "cvs.h"
87: #include "log.h"
88: #include "diff.h"
89:
90: /* diff3 - 3-way differential file comparison */
91:
92: /* diff3 [-ex3EX] d13 d23 f1 f2 f3 [m1 m3]
93: *
94: * d13 = diff report on f1 vs f3
95: * d23 = diff report on f2 vs f3
96: * f1, f2, f3 the 3 files
97: * if changes in f1 overlap with changes in f3, m1 and m3 are used
98: * to mark the overlaps; otherwise, the file names f1 and f3 are used
99: * (only for options E and X).
100: */
101:
102: /*
103: * "from" is first in range of changed lines; "to" is last+1
104: * from=to=line after point of insertion for added lines.
105: */
106: struct range {
107: int from;
108: int to;
109: };
110:
111: struct diff {
112: struct range old;
113: struct range new;
114: };
115:
116: static size_t szchanges;
117:
118: static struct diff *d13;
119: static struct diff *d23;
120:
121: /*
122: * "de" is used to gather editing scripts. These are later spewed out in
123: * reverse order. Its first element must be all zero, the "new" component
124: * of "de" contains line positions or byte positions depending on when you
125: * look (!?). Array overlap indicates which sections in "de" correspond to
126: * lines that are different in all three files.
127: */
128: static struct diff *de;
129: static char *overlap;
1.2 joris 130: static int overlapcnt = 0;
1.1 joris 131: static FILE *fp[3];
132: static int cline[3]; /* # of the last-read line in each file (0-2) */
133:
134: /*
135: * the latest known correspondence between line numbers of the 3 files
136: * is stored in last[1-3];
137: */
138: static int last[4];
139: static int eflag;
140: static int oflag; /* indicates whether to mark overlaps (-E or -X)*/
141: static int debug = 0;
142: static char f1mark[40], f3mark[40]; /* markers for -E and -X */
143:
144: static int duplicate(struct range *, struct range *);
145: static int edit(struct diff *, int, int);
146: static char *getchange(FILE *);
147: static char *getline(FILE *, size_t *);
148: static int number(char **);
149: static int readin(char *, struct diff **);
150: static int skip(int, int, char *);
151: static int edscript(int);
152: static int merge(int, int);
153: static void change(int, struct range *, int);
154: static void keep(int, struct range *);
155: static void prange(struct range *);
156: static void repos(int);
157: static void separate(const char *);
158: static void increase(void);
159: static int diff3_internal(int, char **, const char *, const char *);
160:
161: BUF *
162: cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2)
163: {
164: int ret, argc;
165: char *data, *patch;
166: char *argv[5], r1[16], r2[16];
167: char path1[MAXPATHLEN], path2[MAXPATHLEN], path3[MAXPATHLEN];
168: char dp13[MAXPATHLEN], dp23[MAXPATHLEN];
169: BUF *b1, *b2, *b3, *d1, *d2, *diffb;
170:
171: ret = -1;
172: b1 = b2 = b3 = d1 = d2 = diffb = NULL;
173:
174: rcsnum_tostr(rev1, r1, sizeof(r1));
175: rcsnum_tostr(rev2, r2, sizeof(r2));
176:
177: cvs_printf("merging changes between '%s' and '%s'", r1, r2);
178: cvs_printf(" into '%s'\n", workfile);
179:
180: if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)
181: goto out;
182:
183: if ((b2 = rcs_getrev(rf, rev1)) == NULL)
184: goto out;
185:
186: if ((b3 = rcs_getrev(rf, rev2)) == NULL)
187: goto out;
188:
189: if ((d1 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
190: goto out;
191:
192: if ((d2 = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
193: goto out;
194:
195: if ((diffb = cvs_buf_alloc(128, BUF_AUTOEXT)) == NULL)
196: goto out;
197:
198: strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
199: if (cvs_buf_write_stmp(b1, path1, 0600) == -1)
200: goto out;
201:
202: strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
203: if (cvs_buf_write_stmp(b2, path2, 0600) == -1)
204: goto out;
205:
206: strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));
207: if (cvs_buf_write_stmp(b3, path3, 0600) == -1)
208: goto out;
209:
210: cvs_buf_free(b2);
211: b2 = NULL;
212:
213: cvs_diffreg(path1, path3, d1);
214: cvs_diffreg(path2, path3, d2);
215:
216: strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));
217: if (cvs_buf_write_stmp(d1, dp13, 0600) < 0)
218: goto out;
219:
220: cvs_buf_free(d1);
221: d1 = NULL;
222:
223: strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));
224: if (cvs_buf_write_stmp(d2, dp23, 0600) < 0)
225: goto out;
226:
227: cvs_buf_free(d2);
228: d2 = NULL;
229:
230: argc = 0;
231: diffbuf = diffb;
232: argv[argc++] = dp13;
233: argv[argc++] = dp23;
234: argv[argc++] = path1;
235: argv[argc++] = path2;
236: argv[argc++] = path3;
237: if ((ret = diff3_internal(argc, argv, workfile, r2)) < 0)
238: goto out;
239:
240: if (cvs_buf_putc(diffb, '\0') < 0) {
241: cvs_buf_free(diffb);
242: goto out;
243: }
244:
245: if (cvs_buf_putc(b1, '\0') < 0) {
246: cvs_buf_free(diffb);
247: goto out;
248: }
249:
250: patch = cvs_buf_release(diffb);
251: data = cvs_buf_release(b1);
252: diffb = b1 = NULL;
253:
254: if ((diffb = cvs_patchfile(data, patch, ed_patch_lines)) == NULL)
255: goto out;
256:
257: free(data);
258: free(patch);
259:
260: out:
261: if (b1 != NULL)
262: cvs_buf_free(b1);
263: if (b2 != NULL)
264: cvs_buf_free(b2);
265: if (b3 != NULL)
266: cvs_buf_free(b3);
267: if (d1 != NULL)
268: cvs_buf_free(d1);
269: if (d2 != NULL)
270: cvs_buf_free(d2);
271:
272: (void)unlink(path1);
273: (void)unlink(path2);
274: (void)unlink(path3);
275: (void)unlink(dp13);
276: (void)unlink(dp23);
277:
278: return (diffb);
279: }
280:
281: static int
282: diff3_internal(int argc, char **argv, const char *fmark, const char *rmark)
283: {
284: int i, m, n;
285:
286: /* XXX */
287: eflag = 3;
288: oflag = 1;
289:
290: if (argc < 5)
291: return (-1);
292:
293: snprintf(f1mark, sizeof(f1mark), "<<<<<<< %s", fmark);
294: snprintf(f3mark, sizeof(f3mark), ">>>>>>> %s", rmark);
295:
296: increase();
297: m = readin(argv[0], &d13);
298: n = readin(argv[1], &d23);
299:
300: for (i = 0; i <= 2; i++) {
301: if ((fp[i] = fopen(argv[i + 2], "r")) == NULL) {
302: cvs_log(LP_ERRNO, "%s", argv[i + 2]);
303: return (-1);
304: }
305: }
306:
307: return (merge(m, n));
308: }
309:
310: int
311: ed_patch_lines(struct cvs_lines *dlines, struct cvs_lines *plines)
312: {
313: char op, *ep;
314: struct cvs_line *sort, *lp, *dlp, *ndlp;
315: int start, end, busy, i, lineno;
316:
317: dlp = TAILQ_FIRST(&(dlines->l_lines));
318: lp = TAILQ_FIRST(&(plines->l_lines));
319:
1.3 ! joris 320: busy = end = 0;
1.1 joris 321: for (lp = TAILQ_NEXT(lp, l_list); lp != NULL;
322: lp = TAILQ_NEXT(lp, l_list)) {
323: op = lp->l_line[strlen(lp->l_line) - 1];
324: start = (int)strtol(lp->l_line, &ep, 10);
325: if (op == 'a') {
326: if ((start > dlines->l_nblines) ||
327: (start < 0) || (*ep != 'a'))
328: return (-1);
329: } else if (op == 'c') {
330: if ((start > dlines->l_nblines) ||
1.2 joris 331: (start < 0) || ((*ep != ',') && (*ep != 'c')))
1.1 joris 332: return (-1);
333:
1.2 joris 334: if (*ep == ',') {
335: ep++;
336: end = (int)strtol(ep, &ep, 10);
337: if ((end < 0) || (*ep != 'c'))
338: return (-1);
339: } else {
340: end = start;
341: }
1.1 joris 342: }
343:
1.2 joris 344:
1.1 joris 345: for (;;) {
346: if (dlp == NULL)
347: break;
348: if (dlp->l_lineno == start)
349: break;
350: if (dlp->l_lineno > start) {
351: dlp = TAILQ_PREV(dlp, cvs_tqh, l_list);
352: } else if (dlp->l_lineno < start) {
353: ndlp = TAILQ_NEXT(dlp, l_list);
354: if (ndlp->l_lineno > start)
355: break;
356: dlp = ndlp;
357: }
358: }
359:
360: if (dlp == NULL)
361: return (-1);
362:
1.2 joris 363:
1.1 joris 364: if (op == 'c') {
1.2 joris 365: for (i = 0; i <= (end - start); i++) {
1.1 joris 366: ndlp = TAILQ_NEXT(dlp, l_list);
367: TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
368: dlp = ndlp;
369: }
1.2 joris 370: dlp = TAILQ_PREV(dlp, cvs_tqh, l_list);
1.1 joris 371: }
372:
373: if (op == 'a' || op == 'c') {
374: for (;;) {
375: ndlp = lp;
376: lp = TAILQ_NEXT(lp, l_list);
377: if (lp == NULL)
378: return (-1);
379:
380: if (!strcmp(lp->l_line, "."))
381: break;
382:
383: TAILQ_REMOVE(&(plines->l_lines), lp, l_list);
384: TAILQ_INSERT_AFTER(&(dlines->l_lines), dlp,
385: lp, l_list);
386: dlp = lp;
387:
388: lp->l_lineno = start;
389: lp = ndlp;
390: }
391: }
392:
393: /*
394: * always resort lines as the markers might be put at the
395: * same line as we first started editing.
396: */
397: lineno = 0;
398: TAILQ_FOREACH(sort, &(dlines->l_lines), l_list)
399: sort->l_lineno = lineno++;
400: dlines->l_nblines = lineno - 1;
401: }
402:
403: return (0);
404: }
405:
406: /*
407: * Pick up the line numbers of all changes from one change file.
408: * (This puts the numbers in a vector, which is not strictly necessary,
409: * since the vector is processed in one sequential pass.
410: * The vector could be optimized out of existence)
411: */
412: static int
413: readin(char *name, struct diff **dd)
414: {
415: int a, b, c, d;
416: char kind, *p;
417: size_t i;
418:
419: fp[0] = fopen(name, "r");
420: for (i = 0; (p = getchange(fp[0])); i++) {
421: if (i >= szchanges - 1)
422: increase();
423: a = b = number(&p);
424: if (*p == ',') {
425: p++;
426: b = number(&p);
427: }
428: kind = *p++;
429: c = d = number(&p);
430: if (*p==',') {
431: p++;
432: d = number(&p);
433: }
434: if (kind == 'a')
435: a++;
436: if (kind == 'd')
437: c++;
438: b++;
439: d++;
440: (*dd)[i].old.from = a;
441: (*dd)[i].old.to = b;
442: (*dd)[i].new.from = c;
443: (*dd)[i].new.to = d;
444: }
445:
446: (*dd)[i].old.from = (*dd)[i-1].old.to;
447: (*dd)[i].new.from = (*dd)[i-1].new.to;
448: (void)fclose(fp[0]);
449:
450: return (i);
451: }
452:
453: static int
454: number(char **lc)
455: {
456: int nn;
457:
458: nn = 0;
459: while (isdigit((unsigned char)(**lc)))
460: nn = nn*10 + *(*lc)++ - '0';
461:
462: return (nn);
463: }
464:
465: static char *
466: getchange(FILE *b)
467: {
468: char *line;
469:
470: while ((line = getline(b, NULL))) {
471: if (isdigit((unsigned char)line[0]))
472: return (line);
473: }
474:
475: return (NULL);
476: }
477:
478: static char *
479: getline(FILE *b, size_t *n)
480: {
481: char *cp;
482: size_t len;
483: static char *buf;
484: static size_t bufsize;
485:
486: if ((cp = fgetln(b, &len)) == NULL)
487: return (NULL);
488:
489: if (cp[len - 1] != '\n')
490: len++;
491: if (len + 1 > bufsize) {
492: do {
493: bufsize += 1024;
494: } while (len + 1 > bufsize);
495: if ((buf = realloc(buf, bufsize)) == NULL)
496: err(EXIT_FAILURE, NULL);
497: }
498: memcpy(buf, cp, len - 1);
499: buf[len - 1] = '\n';
500: buf[len] = '\0';
501: if (n != NULL)
502: *n = len;
503:
504: return (buf);
505: }
506:
507: static int
508: merge(int m1, int m2)
509: {
510: struct diff *d1, *d2, *d3;
511: int dpl, j, t1, t2;
512:
513: d1 = d13;
514: d2 = d23;
515: j = 0;
516: while ((t1 = d1 < d13 + m1) | (t2 = d2 < d23 + m2)) {
517: if (debug) {
518: printf("%d,%d=%d,%d %d,%d=%d,%d\n",
519: d1->old.from,d1->old.to,
520: d1->new.from,d1->new.to,
521: d2->old.from,d2->old.to,
522: d2->new.from,d2->new.to);
523: }
524:
525: /* first file is different from others */
526: if (!t2 || (t1 && d1->new.to < d2->new.from)) {
527: /* stuff peculiar to 1st file */
528: if (eflag==0) {
529: separate("1");
530: change(1, &d1->old, 0);
531: keep(2, &d1->new);
532: change(3, &d1->new, 0);
533: }
534: d1++;
535: continue;
536: }
537:
538: /* second file is different from others */
539: if (!t1 || (t2 && d2->new.to < d1->new.from)) {
540: if (eflag==0) {
541: separate("2");
542: keep(1, &d2->new);
543: change(2, &d2->old, 0);
544: change(3, &d2->new, 0);
545: }
546: d2++;
547: continue;
548: }
549:
550: /*
551: * Merge overlapping changes in first file
552: * this happens after extension (see below).
553: */
554: if (d1 + 1 < d13 + m1 && d1->new.to >= d1[1].new.from) {
555: d1[1].old.from = d1->old.from;
556: d1[1].new.from = d1->new.from;
557: d1++;
558: continue;
559: }
560:
561: /* merge overlapping changes in second */
562: if (d2 + 1 < d23 + m2 && d2->new.to >= d2[1].new.from) {
563: d2[1].old.from = d2->old.from;
564: d2[1].new.from = d2->new.from;
565: d2++;
566: continue;
567: }
568: /* stuff peculiar to third file or different in all */
569: if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) {
570: dpl = duplicate(&d1->old,&d2->old);
571: if (dpl == -1)
572: return (-1);
573:
574: /*
575: * dpl = 0 means all files differ
576: * dpl = 1 means files 1 and 2 identical
577: */
578: if (eflag==0) {
579: separate(dpl ? "3" : "");
580: change(1, &d1->old, dpl);
581: change(2, &d2->old, 0);
582: d3 = d1->old.to > d1->old.from ? d1 : d2;
583: change(3, &d3->new, 0);
584: } else
585: j = edit(d1, dpl, j);
586: d1++;
587: d2++;
588: continue;
589: }
590:
591: /*
592: * Overlapping changes from file 1 and 2; extend changes
593: * appropriately to make them coincide.
594: */
595: if (d1->new.from < d2->new.from) {
596: d2->old.from -= d2->new.from-d1->new.from;
597: d2->new.from = d1->new.from;
598: } else if (d2->new.from < d1->new.from) {
599: d1->old.from -= d1->new.from-d2->new.from;
600: d1->new.from = d2->new.from;
601: }
602: if (d1->new.to > d2->new.to) {
603: d2->old.to += d1->new.to - d2->new.to;
604: d2->new.to = d1->new.to;
605: } else if (d2->new.to > d1->new.to) {
606: d1->old.to += d2->new.to - d1->new.to;
607: d1->new.to = d2->new.to;
608: }
609: }
610:
611: return (edscript(j));
612: }
613:
614: static void
615: separate(const char *s)
616: {
617: diff_output("====%s\n", s);
618: }
619:
620: /*
621: * The range of lines rold.from thru rold.to in file i is to be changed.
622: * It is to be printed only if it does not duplicate something to be
623: * printed later.
624: */
625: static void
626: change(int i, struct range *rold, int fdup)
627: {
628: diff_output("%d:", i);
629: last[i] = rold->to;
630: prange(rold);
631: if (fdup || debug)
632: return;
633: i--;
634: (void)skip(i, rold->from, NULL);
635: (void)skip(i, rold->to, " ");
636: }
637:
638: /*
639: * print the range of line numbers, rold.from thru rold.to, as n1,n2 or n1
640: */
641: static void
642: prange(struct range *rold)
643: {
644: if (rold->to <= rold->from)
645: diff_output("%da\n", rold->from - 1);
646: else {
647: diff_output("%d", rold->from);
648: if (rold->to > rold->from+1)
649: diff_output(",%d", rold->to - 1);
650: diff_output("c\n");
651: }
652: }
653:
654: /*
655: * No difference was reported by diff between file 1 (or 2) and file 3,
656: * and an artificial dummy difference (trange) must be ginned up to
657: * correspond to the change reported in the other file.
658: */
659: static void
660: keep(int i, struct range *rnew)
661: {
662: int delta;
663: struct range trange;
664:
665: delta = last[3] - last[i];
666: trange.from = rnew->from - delta;
667: trange.to = rnew->to - delta;
668: change(i, &trange, 1);
669: }
670:
671: /*
672: * skip to just before line number from in file "i". If "pr" is non-NULL,
673: * print all skipped stuff with string pr as a prefix.
674: */
675: static int
676: skip(int i, int from, char *pr)
677: {
678: size_t j, n;
679: char *line;
680:
681: for (n = 0; cline[i] < from - 1; n += j) {
682: if ((line = getline(fp[i], &j)) == NULL)
683: return (-1);
684: if (pr != NULL)
685: diff_output("%s%s", pr, line);
686: cline[i]++;
687: }
688: return ((int) n);
689: }
690:
691: /*
692: * Return 1 or 0 according as the old range (in file 1) contains exactly
693: * the same data as the new range (in file 2).
694: */
695: static int
696: duplicate(struct range *r1, struct range *r2)
697: {
698: int c,d;
699: int nchar;
700: int nline;
701:
702: if (r1->to-r1->from != r2->to-r2->from)
703: return (0);
704: (void)skip(0, r1->from, NULL);
705: (void)skip(1, r2->from, NULL);
706: nchar = 0;
707: for (nline=0; nline < r1->to - r1->from; nline++) {
708: do {
709: c = getc(fp[0]);
710: d = getc(fp[1]);
711: if (c == -1 || d== -1)
712: return (-1);
713: nchar++;
714: if (c != d) {
715: repos(nchar);
716: return (0);
717: }
718: } while (c != '\n');
719: }
720: repos(nchar);
721: return (1);
722: }
723:
724: static void
725: repos(int nchar)
726: {
727: int i;
728:
729: for (i = 0; i < 2; i++)
730: (void)fseek(fp[i], (long)-nchar, 1);
731: }
732:
733: /*
734: * collect an editing script for later regurgitation
735: */
736: static int
737: edit(struct diff *diff, int fdup, int j)
738: {
739: if (((fdup + 1) & eflag) == 0)
740: return (j);
741: j++;
742: overlap[j] = !fdup;
743: if (!fdup)
744: overlapcnt++;
745: de[j].old.from = diff->old.from;
746: de[j].old.to = diff->old.to;
747: de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, NULL);
748: de[j].new.to = de[j].new.from + skip(2, diff->new.to, NULL);
749: return (j);
750: }
751:
752: /* regurgitate */
753: static int
754: edscript(int n)
755: {
756: int j, k;
1.2 joris 757: char block[BUFSIZ+1];
1.1 joris 758:
759: for (n = n; n > 0; n--) {
760: if (!oflag || !overlap[n])
761: prange(&de[n].old);
762: else
763: diff_output("%da\n=======\n", de[n].old.to -1);
764: (void)fseek(fp[2], (long)de[n].new.from, 0);
765: for (k = de[n].new.to-de[n].new.from; k > 0; k-= j) {
766: j = k > BUFSIZ ? BUFSIZ : k;
767: if (fread(block, 1, j, fp[2]) != (size_t)j)
768: return (-1);
769: block[j] = '\0';
770: diff_output("%s", block);
771: }
1.2 joris 772:
1.1 joris 773: if (!oflag || !overlap[n])
774: diff_output(".\n");
775: else {
776: diff_output("%s\n.\n", f3mark);
777: diff_output("%da\n%s\n.\n", de[n].old.from - 1, f1mark);
778: }
779: }
780:
781: return (overlapcnt);
782: }
783:
784: static void
785: increase(void)
786: {
787: struct diff *p;
788: char *q;
789: size_t newsz, incr;
790:
791: /* are the memset(3) calls needed? */
792: newsz = szchanges == 0 ? 64 : 2 * szchanges;
793: incr = newsz - szchanges;
794:
795: p = realloc(d13, newsz * sizeof(struct diff));
796: if (p == NULL)
797: err(1, NULL);
798: memset(p + szchanges, 0, incr * sizeof(struct diff));
799: d13 = p;
800: p = realloc(d23, newsz * sizeof(struct diff));
801: if (p == NULL)
802: err(1, NULL);
803: memset(p + szchanges, 0, incr * sizeof(struct diff));
804: d23 = p;
805: p = realloc(de, newsz * sizeof(struct diff));
806: if (p == NULL)
807: err(1, NULL);
808: memset(p + szchanges, 0, incr * sizeof(struct diff));
809: de = p;
810: q = realloc(overlap, newsz * sizeof(char));
811: if (q == NULL)
812: err(1, NULL);
813: memset(q + szchanges, 0, incr * sizeof(char));
814: overlap = q;
815: szchanges = newsz;
816: }