![[BACK]](/icons/back.gif){kind=icon}
Return to diff.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / rcs|
Return to diff.c CVS log | Up to [local] / src / usr.bin / rcs |
1.7 ! deraadt 1: /* $OpenBSD: diff.c,v 1.6 2006/05/11 08:40:34 ray Exp $ */
1.1 joris 2: /*
3: * Copyright (C) Caldera International Inc. 2001-2002.
4: * All rights reserved.
5: *
6: * Redistribution and use in source and binary forms, with or without
7: * modification, are permitted provided that the following conditions
8: * are met:
9: * 1. Redistributions of source code and documentation must retain the above
10: * copyright notice, this list of conditions and the following disclaimer.
11: * 2. Redistributions in binary form must reproduce the above copyright
12: * notice, this list of conditions and the following disclaimer in the
13: * documentation and/or other materials provided with the distribution.
14: * 3. All advertising materials mentioning features or use of this software
15: * must display the following acknowledgement:
16: * This product includes software developed or owned by Caldera
17: * International, Inc.
18: * 4. Neither the name of Caldera International, Inc. nor the names of other
19: * contributors may be used to endorse or promote products derived from
20: * this software without specific prior written permission.
21: *
22: * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
23: * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
24: * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
25: * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
26: * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
27: * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
28: * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
29: * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30: * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
31: * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
32: * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
33: * POSSIBILITY OF SUCH DAMAGE.
34: */
35: /*-
36: * Copyright (c) 1991, 1993
37: * The Regents of the University of California. All rights reserved.
38: * Copyright (c) 2004 Jean-Francois Brousseau. 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: * @(#)diffreg.c 8.1 (Berkeley) 6/6/93
65: */
66: /*
67: * Uses an algorithm due to Harold Stone, which finds
68: * a pair of longest identical subsequences in the two
69: * files.
70: *
71: * The major goal is to generate the match vector J.
72: * J[i] is the index of the line in file1 corresponding
73: * to line i file0. J[i] = 0 if there is no
74: * such line in file1.
75: *
76: * Lines are hashed so as to work in core. All potential
77: * matches are located by sorting the lines of each file
78: * on the hash (called ``value''). In particular, this
79: * collects the equivalence classes in file1 together.
80: * Subroutine equiv replaces the value of each line in
81: * file0 by the index of the first element of its
82: * matching equivalence in (the reordered) file1.
83: * To save space equiv squeezes file1 into a single
84: * array member in which the equivalence classes
85: * are simply concatenated, except that their first
86: * members are flagged by changing sign.
87: *
88: * Next the indices that point into member are unsorted into
89: * array class according to the original order of file0.
90: *
91: * The cleverness lies in routine stone. This marches
92: * through the lines of file0, developing a vector klist
93: * of "k-candidates". At step i a k-candidate is a matched
94: * pair of lines x,y (x in file0 y in file1) such that
95: * there is a common subsequence of length k
96: * between the first i lines of file0 and the first y
97: * lines of file1, but there is no such subsequence for
98: * any smaller y. x is the earliest possible mate to y
99: * that occurs in such a subsequence.
100: *
101: * Whenever any of the members of the equivalence class of
102: * lines in file1 matable to a line in file0 has serial number
103: * less than the y of some k-candidate, that k-candidate
104: * with the smallest such y is replaced. The new
105: * k-candidate is chained (via pred) to the current
106: * k-1 candidate so that the actual subsequence can
107: * be recovered. When a member has serial number greater
108: * that the y of all k-candidates, the klist is extended.
109: * At the end, the longest subsequence is pulled out
110: * and placed in the array J by unravel
111: *
112: * With J in hand, the matches there recorded are
113: * check'ed against reality to assure that no spurious
114: * matches have crept in due to hashing. If they have,
115: * they are broken, and "jackpot" is recorded--a harmless
116: * matter except that a true match for a spuriously
117: * mated line may now be unnecessarily reported as a change.
118: *
119: * Much of the complexity of the program comes simply
120: * from trying to minimize core utilization and
121: * maximize the range of doable problems by dynamically
122: * allocating what is needed and reusing what is not.
123: * The core requirements for problems larger than somewhat
124: * are (in words) 2*length(file0) + length(file1) +
125: * 3*(number of k-candidates installed), typically about
126: * 6n words for files of length n.
127: */
128:
129: #include "includes.h"
130:
131: #include "buf.h"
132: #include "diff.h"
133: #include "xmalloc.h"
134:
135: struct cand {
136: int x;
137: int y;
138: int pred;
139: } cand;
140:
141: struct line {
142: int serial;
143: int value;
144: } *file[2];
145:
146: /*
147: * The following struct is used to record change in formation when
148: * doing a "context" or "unified" diff. (see routine "change" to
149: * understand the highly mnemonic field names)
150: */
151: struct context_vec {
152: int a; /* start line in old file */
153: int b; /* end line in old file */
154: int c; /* start line in new file */
155: int d; /* end line in new file */
156: };
157:
158: struct diff_arg {
159: char *rev1;
160: char *rev2;
161: char *date1;
162: char *date2;
163: };
164:
165: static void output(FILE *, FILE *);
166: static void check(FILE *, FILE *);
167: static void range(int, int, char *);
168: static void uni_range(int, int);
169: static void dump_context_vec(FILE *, FILE *);
170: static void dump_unified_vec(FILE *, FILE *);
171: static int prepare(int, FILE *, off_t);
172: static void prune(void);
173: static void equiv(struct line *, int, struct line *, int, int *);
174: static void unravel(int);
175: static void unsort(struct line *, int, int *);
176: static void change(FILE *, FILE *, int, int, int, int);
177: static void sort(struct line *, int);
178: static int ignoreline(char *);
179: static int asciifile(FILE *);
180: static void fetch(long *, int, int, FILE *, int, int);
181: static int newcand(int, int, int);
182: static int search(int *, int, int);
183: static int skipline(FILE *);
184: static int isqrt(int);
185: static int stone(int *, int, int *, int *);
186: static int readhash(FILE *);
187: static int files_differ(FILE *, FILE *);
188: static char *match_function(const long *, int, FILE *);
189: static char *preadline(int, size_t, off_t);
190:
191:
192: static int aflag, bflag, dflag, iflag, pflag, tflag, Tflag, wflag;
193: static int context = 3;
194: int diff_format = D_NORMAL;
195: char *diff_file = NULL;
196: RCSNUM *diff_rev1 = NULL;
197: RCSNUM *diff_rev2 = NULL;
198: char diffargs[128];
199: static struct stat stb1, stb2;
200: static char *ifdefname, *ignore_pats;
201: regex_t ignore_re;
202:
203: static int *J; /* will be overlaid on class */
204: static int *class; /* will be overlaid on file[0] */
205: static int *klist; /* will be overlaid on file[0] after class */
206: static int *member; /* will be overlaid on file[1] */
207: static int clen;
208: static int inifdef; /* whether or not we are in a #ifdef block */
209: static int diff_len[2];
210: static int pref, suff; /* length of prefix and suffix */
211: static int slen[2];
212: static int anychange;
213: static long *ixnew; /* will be overlaid on file[1] */
214: static long *ixold; /* will be overlaid on klist */
215: static struct cand *clist; /* merely a free storage pot for candidates */
216: static int clistlen; /* the length of clist */
217: static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
218: static u_char *chrtran; /* translation table for case-folding */
219: static struct context_vec *context_vec_start;
220: static struct context_vec *context_vec_end;
221: static struct context_vec *context_vec_ptr;
222:
223: #define FUNCTION_CONTEXT_SIZE 41
224: static char lastbuf[FUNCTION_CONTEXT_SIZE];
225: static int lastline;
226: static int lastmatchline;
227: BUF *diffbuf = NULL;
228:
229: /*
230: * chrtran points to one of 2 translation tables: cup2low if folding upper to
231: * lower case clow2low if not folding case
232: */
233: u_char clow2low[256] = {
234: 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
235: 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
236: 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
237: 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
238: 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
239: 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
240: 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
241: 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
242: 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
243: 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
244: 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
245: 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
246: 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
247: 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
248: 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
249: 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
250: 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
251: 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
252: 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
253: 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
254: 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
255: 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
256: 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
257: 0xfd, 0xfe, 0xff
258: };
259:
260: u_char cup2low[256] = {
261: 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
262: 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
263: 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
264: 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
265: 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
266: 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61,
267: 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
268: 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
269: 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62,
270: 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
271: 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
272: 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
273: 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
274: 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
275: 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
276: 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
277: 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
278: 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
279: 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
280: 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
281: 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
282: 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
283: 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
284: 0xfd, 0xfe, 0xff
285: };
286:
287: int
288: rcs_diffreg(const char *file1, const char *file2, BUF *out)
289: {
290: FILE *f1, *f2;
291: int i, rval;
292: void *tmp;
293:
294: f1 = f2 = NULL;
295: rval = D_SAME;
296: anychange = 0;
297: lastline = 0;
298: lastmatchline = 0;
299: context_vec_ptr = context_vec_start - 1;
300: chrtran = (iflag ? cup2low : clow2low);
301: if (out != NULL)
302: diffbuf = out;
303:
304: f1 = fopen(file1, "r");
305: if (f1 == NULL) {
306: warn("%s", file1);
307: goto closem;
308: }
309:
310: f2 = fopen(file2, "r");
311: if (f2 == NULL) {
312: warn("%s", file2);
313: goto closem;
314: }
315:
1.6 ray 316: if (fstat(fileno(f1), &stb1) < 0) {
1.1 joris 317: warn("%s", file1);
318: goto closem;
319: }
320:
1.6 ray 321: if (fstat(fileno(f2), &stb2) < 0) {
1.1 joris 322: warn("%s", file2);
323: goto closem;
324: }
325:
1.6 ray 326: if (files_differ(f1, f2) != 1)
1.1 joris 327: goto closem;
328:
329: if (!asciifile(f1) || !asciifile(f2)) {
1.4 xsa 330: rval = D_ERROR;
1.1 joris 331: goto closem;
332: }
333:
334: if (prepare(0, f1, stb1.st_size) < 0 ||
335: prepare(1, f2, stb2.st_size) < 0) {
336: goto closem;
337: }
338:
339: prune();
340: sort(sfile[0], slen[0]);
341: sort(sfile[1], slen[1]);
342:
343: member = (int *)file[1];
344: equiv(sfile[0], slen[0], sfile[1], slen[1], member);
345: tmp = xrealloc(member, slen[1] + 2, sizeof(*member));
346: member = tmp;
347:
348: class = (int *)file[0];
349: unsort(sfile[0], slen[0], class);
350: tmp = xrealloc(class, slen[0] + 2, sizeof(*class));
351: class = tmp;
352:
353: klist = xcalloc(slen[0] + 2, sizeof(*klist));
354: clen = 0;
355: clistlen = 100;
356: clist = xcalloc(clistlen, sizeof(*clist));
357:
358: if ((i = stone(class, slen[0], member, klist)) < 0)
359: goto closem;
360:
361: xfree(member);
362: xfree(class);
363:
364: tmp = xrealloc(J, diff_len[0] + 2, sizeof(*J));
365: J = tmp;
366: unravel(klist[i]);
367: xfree(clist);
368: xfree(klist);
369:
370: tmp = xrealloc(ixold, diff_len[0] + 2, sizeof(*ixold));
371: ixold = tmp;
372:
373: tmp = xrealloc(ixnew, diff_len[1] + 2, sizeof(*ixnew));
374: ixnew = tmp;
375: check(f1, f2);
376: output(f1, f2);
377:
378: closem:
379: if (anychange == 1) {
380: if (rval == D_SAME)
381: rval = D_DIFFER;
382: }
383: if (f1 != NULL)
384: fclose(f1);
385: if (f2 != NULL)
386: fclose(f2);
387:
388: return (rval);
389: }
390:
391: /*
392: * Check to see if the given files differ.
393: * Returns 0 if they are the same, 1 if different, and -1 on error.
394: * XXX - could use code from cmp(1) [faster]
395: */
396: static int
397: files_differ(FILE *f1, FILE *f2)
398: {
399: char buf1[BUFSIZ], buf2[BUFSIZ];
400: size_t i, j;
401:
402: if (stb1.st_size != stb2.st_size)
403: return (1);
404: for (;;) {
1.5 ray 405: i = fread(buf1, 1, sizeof(buf1), f1);
406: j = fread(buf2, 1, sizeof(buf2), f2);
1.1 joris 407: if (i != j)
408: return (1);
409: if (i == 0 && j == 0) {
410: if (ferror(f1) || ferror(f2))
411: return (1);
412: return (0);
413: }
414: if (memcmp(buf1, buf2, i) != 0)
415: return (1);
416: }
417: }
418:
419: static int
420: prepare(int i, FILE *fd, off_t filesize)
421: {
422: void *tmp;
423: struct line *p;
424: int j, h;
425: size_t sz;
426:
427: rewind(fd);
428:
429: sz = ((size_t)filesize <= SIZE_MAX ? (size_t)filesize : SIZE_MAX) / 25;
430: if (sz < 100)
431: sz = 100;
432:
433: p = xcalloc(sz + 3, sizeof(*p));
434: for (j = 0; (h = readhash(fd));) {
435: if (j == (int)sz) {
436: sz = sz * 3 / 2;
437: tmp = xrealloc(p, sz + 3, sizeof(*p));
438: p = tmp;
439: }
440: p[++j].value = h;
441: }
442: diff_len[i] = j;
443: file[i] = p;
444:
445: return (0);
446: }
447:
448: static void
449: prune(void)
450: {
451: int i, j;
452:
453: for (pref = 0; pref < diff_len[0] && pref < diff_len[1] &&
454: file[0][pref + 1].value == file[1][pref + 1].value;
455: pref++)
456: ;
457: for (suff = 0;
458: (suff < diff_len[0] - pref) && (suff < diff_len[1] - pref) &&
459: (file[0][diff_len[0] - suff].value ==
460: file[1][diff_len[1] - suff].value);
461: suff++)
462: ;
463: for (j = 0; j < 2; j++) {
464: sfile[j] = file[j] + pref;
465: slen[j] = diff_len[j] - pref - suff;
466: for (i = 0; i <= slen[j]; i++)
467: sfile[j][i].serial = i;
468: }
469: }
470:
471: static void
472: equiv(struct line *a, int n, struct line *b, int m, int *c)
473: {
474: int i, j;
475:
476: i = j = 1;
477: while (i <= n && j <= m) {
478: if (a[i].value < b[j].value)
479: a[i++].value = 0;
480: else if (a[i].value == b[j].value)
481: a[i++].value = j;
482: else
483: j++;
484: }
485: while (i <= n)
486: a[i++].value = 0;
487: b[m + 1].value = 0;
488: j = 0;
489: while (++j <= m) {
490: c[j] = -b[j].serial;
491: while (b[j + 1].value == b[j].value) {
492: j++;
493: c[j] = b[j].serial;
494: }
495: }
496: c[j] = -1;
497: }
498:
499: /* Code taken from ping.c */
500: static int
501: isqrt(int n)
502: {
503: int y, x = 1;
504:
505: if (n == 0)
506: return (0);
507:
508: do { /* newton was a stinker */
509: y = x;
510: x = n / x;
511: x += y;
512: x /= 2;
513: } while (x - y > 1 || x - y < -1);
514:
515: return (x);
516: }
517:
518: static int
519: stone(int *a, int n, int *b, int *c)
520: {
521: int ret;
522: int i, k, y, j, l;
523: int oldc, tc, oldl;
524: u_int numtries;
525:
526: /* XXX move the isqrt() out of the macro to avoid multiple calls */
527: const u_int bound = dflag ? UINT_MAX : MAX(256, (u_int)isqrt(n));
528:
529: k = 0;
530: if ((ret = newcand(0, 0, 0)) < 0)
531: return (-1);
532: c[0] = ret;
533: for (i = 1; i <= n; i++) {
534: j = a[i];
535: if (j == 0)
536: continue;
537: y = -b[j];
538: oldl = 0;
539: oldc = c[0];
540: numtries = 0;
541: do {
542: if (y <= clist[oldc].y)
543: continue;
544: l = search(c, k, y);
545: if (l != oldl + 1)
546: oldc = c[l - 1];
547: if (l <= k) {
548: if (clist[c[l]].y <= y)
549: continue;
550: tc = c[l];
551: if ((ret = newcand(i, y, oldc)) < 0)
552: return (-1);
553: c[l] = ret;
554: oldc = tc;
555: oldl = l;
556: numtries++;
557: } else {
558: if ((ret = newcand(i, y, oldc)) < 0)
559: return (-1);
560: c[l] = ret;
561: k++;
562: break;
563: }
564: } while ((y = b[++j]) > 0 && numtries < bound);
565: }
566: return (k);
567: }
568:
569: static int
570: newcand(int x, int y, int pred)
571: {
572: struct cand *q, *tmp;
573: int newclistlen;
574:
575: if (clen == clistlen) {
576: newclistlen = clistlen * 11 / 10;
577: tmp = xrealloc(clist, newclistlen, sizeof(*clist));
578: clist = tmp;
579: clistlen = newclistlen;
580: }
581: q = clist + clen;
582: q->x = x;
583: q->y = y;
584: q->pred = pred;
585: return (clen++);
586: }
587:
588: static int
589: search(int *c, int k, int y)
590: {
591: int i, j, l, t;
592:
593: if (clist[c[k]].y < y) /* quick look for typical case */
594: return (k + 1);
595: i = 0;
596: j = k + 1;
597: for (;;) {
598: l = (i + j) / 2;
599: if (l <= i)
600: break;
601: t = clist[c[l]].y;
602: if (t > y)
603: j = l;
604: else if (t < y)
605: i = l;
606: else
607: return (l);
608: }
609: return (l + 1);
610: }
611:
612: static void
613: unravel(int p)
614: {
615: struct cand *q;
616: int i;
617:
618: for (i = 0; i <= diff_len[0]; i++)
619: J[i] = i <= pref ? i :
620: i > diff_len[0] - suff ? i + diff_len[1] - diff_len[0] : 0;
621: for (q = clist + p; q->y != 0; q = clist + q->pred)
622: J[q->x + pref] = q->y + pref;
623: }
624:
625: /*
626: * Check does double duty:
627: * 1. ferret out any fortuitous correspondences due
628: * to confounding by hashing (which result in "jackpot")
629: * 2. collect random access indexes to the two files
630: */
631: static void
632: check(FILE *f1, FILE *f2)
633: {
634: int i, j, jackpot, c, d;
635: long ctold, ctnew;
636:
637: rewind(f1);
638: rewind(f2);
639: j = 1;
640: ixold[0] = ixnew[0] = 0;
641: jackpot = 0;
642: ctold = ctnew = 0;
643: for (i = 1; i <= diff_len[0]; i++) {
644: if (J[i] == 0) {
645: ixold[i] = ctold += skipline(f1);
646: continue;
647: }
648: while (j < J[i]) {
649: ixnew[j] = ctnew += skipline(f2);
650: j++;
651: }
652: if (bflag == 1 || wflag == 1 || iflag == 1) {
653: for (;;) {
654: c = getc(f1);
655: d = getc(f2);
656: /*
657: * GNU diff ignores a missing newline
658: * in one file if bflag || wflag.
659: */
660: if ((bflag == 1 || wflag == 1) &&
661: ((c == EOF && d == '\n') ||
662: (c == '\n' && d == EOF))) {
663: break;
664: }
665: ctold++;
666: ctnew++;
667: if (bflag == 1 && isspace(c) && isspace(d)) {
668: do {
669: if (c == '\n')
670: break;
671: ctold++;
672: } while (isspace(c = getc(f1)));
673: do {
674: if (d == '\n')
675: break;
676: ctnew++;
677: } while (isspace(d = getc(f2)));
678: } else if (wflag == 1) {
679: while (isspace(c) && c != '\n') {
680: c = getc(f1);
681: ctold++;
682: }
683: while (isspace(d) && d != '\n') {
684: d = getc(f2);
685: ctnew++;
686: }
687: }
688: if (chrtran[c] != chrtran[d]) {
689: jackpot++;
690: J[i] = 0;
691: if (c != '\n' && c != EOF)
692: ctold += skipline(f1);
693: if (d != '\n' && c != EOF)
694: ctnew += skipline(f2);
695: break;
696: }
697: if (c == '\n' || c == EOF)
698: break;
699: }
700: } else {
701: for (;;) {
702: ctold++;
703: ctnew++;
704: if ((c = getc(f1)) != (d = getc(f2))) {
705: /* jackpot++; */
706: J[i] = 0;
707: if (c != '\n' && c != EOF)
708: ctold += skipline(f1);
709: if (d != '\n' && c != EOF)
710: ctnew += skipline(f2);
711: break;
712: }
713: if (c == '\n' || c == EOF)
714: break;
715: }
716: }
717: ixold[i] = ctold;
718: ixnew[j] = ctnew;
719: j++;
720: }
721: for (; j <= diff_len[1]; j++)
722: ixnew[j] = ctnew += skipline(f2);
723: /*
724: * if (jackpot != 0)
725: * printf("jackpot\n");
726: */
727: }
728:
729: /* shellsort CACM #201 */
730: static void
731: sort(struct line *a, int n)
732: {
733: struct line *ai, *aim, w;
734: int j, m = 0, k;
735:
736: if (n == 0)
737: return;
738: for (j = 1; j <= n; j *= 2)
739: m = 2 * j - 1;
740: for (m /= 2; m != 0; m /= 2) {
741: k = n - m;
742: for (j = 1; j <= k; j++) {
743: for (ai = &a[j]; ai > a; ai -= m) {
744: aim = &ai[m];
745: if (aim < ai)
746: break; /* wraparound */
747: if (aim->value > ai[0].value ||
748: (aim->value == ai[0].value &&
749: aim->serial > ai[0].serial))
750: break;
751: w.value = ai[0].value;
752: ai[0].value = aim->value;
753: aim->value = w.value;
754: w.serial = ai[0].serial;
755: ai[0].serial = aim->serial;
756: aim->serial = w.serial;
757: }
758: }
759: }
760: }
761:
762: static void
763: unsort(struct line *f, int l, int *b)
764: {
765: int *a, i;
766:
767: a = xcalloc(l + 1, sizeof(*a));
768: for (i = 1; i <= l; i++)
769: a[f[i].serial] = f[i].value;
770: for (i = 1; i <= l; i++)
771: b[i] = a[i];
772: xfree(a);
773: }
774:
775: static int
776: skipline(FILE *f)
777: {
778: int i, c;
779:
780: for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
781: continue;
782: return (i);
783: }
784:
785: static void
786: output(FILE *f1, FILE *f2)
787: {
788: int m, i0, i1, j0, j1;
789:
790: rewind(f1);
791: rewind(f2);
792: m = diff_len[0];
793: J[0] = 0;
794: J[m + 1] = diff_len[1] + 1;
795: for (i0 = 1; i0 <= m; i0 = i1 + 1) {
796: while (i0 <= m && J[i0] == J[i0 - 1] + 1)
797: i0++;
798: j0 = J[i0 - 1] + 1;
799: i1 = i0 - 1;
800: while (i1 < m && J[i1 + 1] == 0)
801: i1++;
802: j1 = J[i1 + 1] - 1;
803: J[i1] = j1;
804: change(f1, f2, i0, i1, j0, j1);
805: }
806: if (m == 0)
807: change(f1, f2, 1, 0, 1, diff_len[1]);
808: if (diff_format == D_IFDEF) {
809: for (;;) {
810: #define c i0
811: if ((c = getc(f1)) == EOF)
812: return;
813: diff_output("%c", c);
814: }
815: #undef c
816: }
817: if (anychange != 0) {
818: if (diff_format == D_CONTEXT)
819: dump_context_vec(f1, f2);
820: else if (diff_format == D_UNIFIED)
821: dump_unified_vec(f1, f2);
822: }
823: }
824:
1.6 ray 825: static void
1.1 joris 826: range(int a, int b, char *separator)
827: {
828: diff_output("%d", a > b ? b : a);
829: if (a < b)
830: diff_output("%s%d", separator, b);
831: }
832:
1.6 ray 833: static void
1.1 joris 834: uni_range(int a, int b)
835: {
836: if (a < b)
837: diff_output("%d,%d", a, b - a + 1);
838: else if (a == b)
839: diff_output("%d", b);
840: else
841: diff_output("%d,0", b);
842: }
843:
844: static char *
845: preadline(int fd, size_t rlen, off_t off)
846: {
847: char *line;
848: ssize_t nr;
849:
850: line = xmalloc(rlen + 1);
851: if ((nr = pread(fd, line, rlen, off)) < 0) {
852: warn("preadline failed");
853: return (NULL);
854: }
855: line[nr] = '\0';
856: return (line);
857: }
858:
859: static int
860: ignoreline(char *line)
861: {
862: int ret;
863:
1.5 ray 864: ret = regexec(&ignore_re, line, 0, NULL, 0);
1.1 joris 865: xfree(line);
866: return (ret == 0); /* if it matched, it should be ignored. */
867: }
868:
869: /*
870: * Indicate that there is a difference between lines a and b of the from file
871: * to get to lines c to d of the to file. If a is greater then b then there
872: * are no lines in the from file involved and this means that there were
873: * lines appended (beginning at b). If c is greater than d then there are
874: * lines missing from the to file.
875: */
876: static void
877: change(FILE *f1, FILE *f2, int a, int b, int c, int d)
878: {
879: int i;
880: static size_t max_context = 64;
881: char buf[64];
882: struct tm *t;
883:
884: if (diff_format != D_IFDEF && a > b && c > d)
885: return;
886: if (ignore_pats != NULL) {
887: char *line;
888: /*
889: * All lines in the change, insert, or delete must
890: * match an ignore pattern for the change to be
891: * ignored.
892: */
893: if (a <= b) { /* Changes and deletes. */
894: for (i = a; i <= b; i++) {
895: line = preadline(fileno(f1),
896: ixold[i] - ixold[i - 1], ixold[i - 1]);
897: if (!ignoreline(line))
898: goto proceed;
899: }
900: }
901: if (a > b || c <= d) { /* Changes and inserts. */
902: for (i = c; i <= d; i++) {
903: line = preadline(fileno(f2),
904: ixnew[i] - ixnew[i - 1], ixnew[i - 1]);
905: if (!ignoreline(line))
906: goto proceed;
907: }
908: }
909: return;
910: }
911: proceed:
912: if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) {
913: /*
914: * Allocate change records as needed.
915: */
916: if (context_vec_ptr == context_vec_end - 1) {
917: struct context_vec *tmp;
918: ptrdiff_t offset = context_vec_ptr - context_vec_start;
919: max_context <<= 1;
920: tmp = xrealloc(context_vec_start, max_context,
921: sizeof(*context_vec_start));
922: context_vec_start = tmp;
923: context_vec_end = context_vec_start + max_context;
924: context_vec_ptr = context_vec_start + offset;
925: }
926: if (anychange == 0) {
927: /*
928: * Print the context/unidiff header first time through.
929: */
1.7 ! deraadt 930: t = localtime(&stb1.st_mtime);
1.1 joris 931: (void)strftime(buf, sizeof(buf),
932: "%Y/%m/%d %H:%M:%S", t);
933:
934: diff_output("%s %s %s",
935: diff_format == D_CONTEXT ? "***" : "---", diff_file,
936: buf);
937:
938: if (diff_rev1 != NULL) {
939: rcsnum_tostr(diff_rev1, buf, sizeof(buf));
940: diff_output("\t%s", buf);
941: }
942:
943: printf("\n");
944:
945: t = localtime(&stb2.st_mtime);
946: (void)strftime(buf, sizeof(buf),
947: "%Y/%m/%d %H:%M:%S", t);
948:
949: diff_output("%s %s %s",
950: diff_format == D_CONTEXT ? "---" : "+++", diff_file,
951: buf);
952:
953: if (diff_rev2 != NULL) {
954: rcsnum_tostr(diff_rev2, buf, sizeof(buf));
955: diff_output("\t%s", buf);
956: }
957:
958: printf("\n");
959: anychange = 1;
960: } else if (a > context_vec_ptr->b + (2 * context) + 1 &&
961: c > context_vec_ptr->d + (2 * context) + 1) {
962: /*
963: * If this change is more than 'context' lines from the
964: * previous change, dump the record and reset it.
965: */
966: if (diff_format == D_CONTEXT)
967: dump_context_vec(f1, f2);
968: else
969: dump_unified_vec(f1, f2);
970: }
971: context_vec_ptr++;
972: context_vec_ptr->a = a;
973: context_vec_ptr->b = b;
974: context_vec_ptr->c = c;
975: context_vec_ptr->d = d;
976: return;
977: }
978: if (anychange == 0)
979: anychange = 1;
980: switch (diff_format) {
981: case D_BRIEF:
982: return;
983: case D_NORMAL:
984: range(a, b, ",");
985: diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
986: if (diff_format == D_NORMAL)
987: range(c, d, ",");
988: diff_output("\n");
989: break;
990: case D_RCSDIFF:
991: if (a > b)
992: diff_output("a%d %d\n", b, d - c + 1);
993: else {
994: diff_output("d%d %d\n", a, b - a + 1);
995:
996: if (!(c > d)) /* add changed lines */
997: diff_output("a%d %d\n", b, d - c + 1);
998: }
999: break;
1000: }
1001: if (diff_format == D_NORMAL || diff_format == D_IFDEF) {
1002: fetch(ixold, a, b, f1, '<', 1);
1003: if (a <= b && c <= d && diff_format == D_NORMAL)
1004: diff_output("---\n");
1005: }
1006: fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0);
1007: if (inifdef) {
1008: diff_output("#endif /* %s */\n", ifdefname);
1009: inifdef = 0;
1010: }
1011: }
1012:
1013: static void
1014: fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile)
1015: {
1016: long j, nc;
1017: int i, c, col;
1018:
1019: /*
1020: * When doing #ifdef's, copy down to current line
1021: * if this is the first file, so that stuff makes it to output.
1022: */
1023: if (diff_format == D_IFDEF && oldfile) {
1024: long curpos = ftell(lb);
1025: /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1026: nc = f[a > b ? b : a - 1] - curpos;
1027: for (i = 0; i < nc; i++)
1028: diff_output("%c", getc(lb));
1029: }
1030: if (a > b)
1031: return;
1032: if (diff_format == D_IFDEF) {
1033: if (inifdef) {
1034: diff_output("#else /* %s%s */\n",
1035: oldfile == 1 ? "!" : "", ifdefname);
1036: } else {
1037: if (oldfile)
1038: diff_output("#ifndef %s\n", ifdefname);
1039: else
1040: diff_output("#ifdef %s\n", ifdefname);
1041: }
1042: inifdef = 1 + oldfile;
1043: }
1044: for (i = a; i <= b; i++) {
1045: fseek(lb, f[i - 1], SEEK_SET);
1046: nc = f[i] - f[i - 1];
1047: if (diff_format != D_IFDEF && ch != '\0') {
1048: diff_output("%c", ch);
1049: if (Tflag == 1 && (diff_format == D_NORMAL ||
1050: diff_format == D_CONTEXT ||
1051: diff_format == D_UNIFIED))
1052: diff_output("\t");
1053: else if (diff_format != D_UNIFIED)
1054: diff_output(" ");
1055: }
1056: col = 0;
1057: for (j = 0; j < nc; j++) {
1058: if ((c = getc(lb)) == EOF) {
1059: if (diff_format == D_RCSDIFF)
1060: warn("No newline at end of file");
1061: else
1062: diff_output("\n\\ No newline at end of "
1063: "file");
1064: return;
1065: }
1066: if (c == '\t' && tflag == 1) {
1067: do {
1068: diff_output(" ");
1069: } while (++col & 7);
1070: } else {
1071: diff_output("%c", c);
1072: col++;
1073: }
1074: }
1075: }
1076: }
1077:
1078: /*
1079: * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1080: */
1081: static int
1082: readhash(FILE *f)
1083: {
1084: int i, t, space;
1085: int sum;
1086:
1087: sum = 1;
1088: space = 0;
1089: if (bflag != 1 && wflag != 1) {
1090: if (iflag == 1)
1091: for (i = 0; (t = getc(f)) != '\n'; i++) {
1092: if (t == EOF) {
1093: if (i == 0)
1094: return (0);
1095: break;
1096: }
1097: sum = sum * 127 + chrtran[t];
1098: }
1099: else
1100: for (i = 0; (t = getc(f)) != '\n'; i++) {
1101: if (t == EOF) {
1102: if (i == 0)
1103: return (0);
1104: break;
1105: }
1106: sum = sum * 127 + t;
1107: }
1108: } else {
1109: for (i = 0;;) {
1110: switch (t = getc(f)) {
1111: case '\t':
1112: case ' ':
1113: space++;
1114: continue;
1115: default:
1116: if (space != 0 && wflag != 1) {
1117: i++;
1118: space = 0;
1119: }
1120: sum = sum * 127 + chrtran[t];
1121: i++;
1122: continue;
1123: case EOF:
1124: if (i == 0)
1125: return (0);
1126: /* FALLTHROUGH */
1127: case '\n':
1128: break;
1129: }
1130: break;
1131: }
1132: }
1133: /*
1134: * There is a remote possibility that we end up with a zero sum.
1135: * Zero is used as an EOF marker, so return 1 instead.
1136: */
1137: return (sum == 0 ? 1 : sum);
1138: }
1139:
1140: static int
1141: asciifile(FILE *f)
1142: {
1143: char buf[BUFSIZ];
1144: size_t i, cnt;
1145:
1146: if (aflag == 1 || f == NULL)
1147: return (1);
1148:
1149: rewind(f);
1.5 ray 1150: cnt = fread(buf, 1, sizeof(buf), f);
1.1 joris 1151: for (i = 0; i < cnt; i++)
1152: if (!isprint(buf[i]) && !isspace(buf[i]))
1153: return (0);
1154: return (1);
1155: }
1156:
1157: static char*
1158: match_function(const long *f, int pos, FILE *fp)
1159: {
1160: unsigned char buf[FUNCTION_CONTEXT_SIZE];
1161: size_t nc;
1162: int last = lastline;
1163: char *p;
1164:
1165: lastline = pos;
1166: while (pos > last) {
1167: fseek(fp, f[pos - 1], SEEK_SET);
1168: nc = f[pos] - f[pos - 1];
1169: if (nc >= sizeof(buf))
1170: nc = sizeof(buf) - 1;
1.5 ray 1171: nc = fread(buf, 1, nc, fp);
1.1 joris 1172: if (nc > 0) {
1173: buf[nc] = '\0';
1174: p = strchr((const char *)buf, '\n');
1175: if (p != NULL)
1176: *p = '\0';
1177: if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1.3 ray 1178: if (strlcpy(lastbuf, (const char *)buf,
1179: sizeof(lastbuf)) >= sizeof(lastbuf))
1180: errx(1, "match_function: strlcpy");
1.1 joris 1181: lastmatchline = pos;
1182: return lastbuf;
1183: }
1184: }
1185: pos--;
1186: }
1187: return (lastmatchline > 0) ? lastbuf : NULL;
1188: }
1189:
1190:
1191: /* dump accumulated "context" diff changes */
1192: static void
1193: dump_context_vec(FILE *f1, FILE *f2)
1194: {
1195: struct context_vec *cvp = context_vec_start;
1196: int lowa, upb, lowc, upd, do_output;
1197: int a, b, c, d;
1198: char ch, *f;
1199:
1200: if (context_vec_start > context_vec_ptr)
1201: return;
1202:
1203: b = d = 0; /* gcc */
1204: lowa = MAX(1, cvp->a - context);
1205: upb = MIN(diff_len[0], context_vec_ptr->b + context);
1206: lowc = MAX(1, cvp->c - context);
1207: upd = MIN(diff_len[1], context_vec_ptr->d + context);
1208:
1209: diff_output("***************");
1210: if (pflag == 1) {
1211: f = match_function(ixold, lowa - 1, f1);
1212: if (f != NULL) {
1213: diff_output(" ");
1214: diff_output("%s", f);
1215: }
1216: }
1217: diff_output("\n*** ");
1218: range(lowa, upb, ",");
1219: diff_output(" ****\n");
1220:
1221: /*
1222: * Output changes to the "old" file. The first loop suppresses
1223: * output if there were no changes to the "old" file (we'll see
1224: * the "old" lines as context in the "new" list).
1225: */
1226: do_output = 0;
1227: for (; cvp <= context_vec_ptr; cvp++)
1228: if (cvp->a <= cvp->b) {
1229: cvp = context_vec_start;
1230: do_output++;
1231: break;
1232: }
1233: if (do_output != 0) {
1234: while (cvp <= context_vec_ptr) {
1235: a = cvp->a;
1236: b = cvp->b;
1237: c = cvp->c;
1238: d = cvp->d;
1239:
1240: if (a <= b && c <= d)
1241: ch = 'c';
1242: else
1243: ch = (a <= b) ? 'd' : 'a';
1244:
1245: if (ch == 'a')
1246: fetch(ixold, lowa, b, f1, ' ', 0);
1247: else {
1248: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1249: fetch(ixold, a, b, f1,
1250: ch == 'c' ? '!' : '-', 0);
1251: }
1252: lowa = b + 1;
1253: cvp++;
1254: }
1255: fetch(ixold, b + 1, upb, f1, ' ', 0);
1256: }
1257: /* output changes to the "new" file */
1258: diff_output("--- ");
1259: range(lowc, upd, ",");
1260: diff_output(" ----\n");
1261:
1262: do_output = 0;
1263: for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++)
1264: if (cvp->c <= cvp->d) {
1265: cvp = context_vec_start;
1266: do_output++;
1267: break;
1268: }
1269: if (do_output != 0) {
1270: while (cvp <= context_vec_ptr) {
1271: a = cvp->a;
1272: b = cvp->b;
1273: c = cvp->c;
1274: d = cvp->d;
1275:
1276: if (a <= b && c <= d)
1277: ch = 'c';
1278: else
1279: ch = (a <= b) ? 'd' : 'a';
1280:
1281: if (ch == 'd')
1282: fetch(ixnew, lowc, d, f2, ' ', 0);
1283: else {
1284: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1285: fetch(ixnew, c, d, f2,
1286: ch == 'c' ? '!' : '+', 0);
1287: }
1288: lowc = d + 1;
1289: cvp++;
1290: }
1291: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1292: }
1293: context_vec_ptr = context_vec_start - 1;
1294: }
1295:
1296: /* dump accumulated "unified" diff changes */
1297: static void
1298: dump_unified_vec(FILE *f1, FILE *f2)
1299: {
1300: struct context_vec *cvp = context_vec_start;
1301: int lowa, upb, lowc, upd;
1302: int a, b, c, d;
1303: char ch, *f;
1304:
1305: if (context_vec_start > context_vec_ptr)
1306: return;
1307:
1308: b = d = 0; /* gcc */
1309: lowa = MAX(1, cvp->a - context);
1310: upb = MIN(diff_len[0], context_vec_ptr->b + context);
1311: lowc = MAX(1, cvp->c - context);
1312: upd = MIN(diff_len[1], context_vec_ptr->d + context);
1313:
1314: diff_output("@@ -");
1315: uni_range(lowa, upb);
1316: diff_output(" +");
1317: uni_range(lowc, upd);
1318: diff_output(" @@");
1319: if (pflag == 1) {
1320: f = match_function(ixold, lowa - 1, f1);
1321: if (f != NULL) {
1322: diff_output(" ");
1323: diff_output("%s", f);
1324: }
1325: }
1326: diff_output("\n");
1327:
1328: /*
1329: * Output changes in "unified" diff format--the old and new lines
1330: * are printed together.
1331: */
1332: for (; cvp <= context_vec_ptr; cvp++) {
1333: a = cvp->a;
1334: b = cvp->b;
1335: c = cvp->c;
1336: d = cvp->d;
1337:
1338: /*
1339: * c: both new and old changes
1340: * d: only changes in the old file
1341: * a: only changes in the new file
1342: */
1343: if (a <= b && c <= d)
1344: ch = 'c';
1345: else
1346: ch = (a <= b) ? 'd' : 'a';
1347:
1348: switch (ch) {
1349: case 'c':
1350: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1351: fetch(ixold, a, b, f1, '-', 0);
1352: fetch(ixnew, c, d, f2, '+', 0);
1353: break;
1354: case 'd':
1355: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1356: fetch(ixold, a, b, f1, '-', 0);
1357: break;
1358: case 'a':
1359: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1360: fetch(ixnew, c, d, f2, '+', 0);
1361: break;
1362: }
1363: lowa = b + 1;
1364: lowc = d + 1;
1365: }
1366: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1367:
1368: context_vec_ptr = context_vec_start - 1;
1369: }
1370:
1371: void
1372: diff_output(const char *fmt, ...)
1373: {
1374: va_list vap;
1375: int i;
1376: char *str;
1377:
1378: va_start(vap, fmt);
1379: i = vasprintf(&str, fmt, vap);
1380: va_end(vap);
1381: if (i == -1)
1.2 xsa 1382: err(1, "diff_output");
1.1 joris 1383: if (diffbuf != NULL)
1384: rcs_buf_append(diffbuf, str, strlen(str));
1385: else
1386: printf("%s", str);
1387: xfree(str);
1388: }