![[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.4 ! xsa 1: /* $OpenBSD: diff.c,v 1.3 2006/04/29 05:31:28 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:
316: if (stat(file1, &stb1) < 0) {
317: warn("%s", file1);
318: goto closem;
319: }
320:
321: if (stat(file2, &stb2) < 0) {
322: warn("%s", file2);
323: goto closem;
324: }
325:
326: switch (files_differ(f1, f2)) {
327: case 0:
328: goto closem;
329: case 1:
330: break;
331: default:
332: /* error */
333: goto closem;
334: }
335:
336: if (!asciifile(f1) || !asciifile(f2)) {
1.4 ! xsa 337: rval = D_ERROR;
1.1 joris 338: goto closem;
339: }
340:
341: if (prepare(0, f1, stb1.st_size) < 0 ||
342: prepare(1, f2, stb2.st_size) < 0) {
343: goto closem;
344: }
345:
346: prune();
347: sort(sfile[0], slen[0]);
348: sort(sfile[1], slen[1]);
349:
350: member = (int *)file[1];
351: equiv(sfile[0], slen[0], sfile[1], slen[1], member);
352: tmp = xrealloc(member, slen[1] + 2, sizeof(*member));
353: member = tmp;
354:
355: class = (int *)file[0];
356: unsort(sfile[0], slen[0], class);
357: tmp = xrealloc(class, slen[0] + 2, sizeof(*class));
358: class = tmp;
359:
360: klist = xcalloc(slen[0] + 2, sizeof(*klist));
361: clen = 0;
362: clistlen = 100;
363: clist = xcalloc(clistlen, sizeof(*clist));
364:
365: if ((i = stone(class, slen[0], member, klist)) < 0)
366: goto closem;
367:
368: xfree(member);
369: xfree(class);
370:
371: tmp = xrealloc(J, diff_len[0] + 2, sizeof(*J));
372: J = tmp;
373: unravel(klist[i]);
374: xfree(clist);
375: xfree(klist);
376:
377: tmp = xrealloc(ixold, diff_len[0] + 2, sizeof(*ixold));
378: ixold = tmp;
379:
380: tmp = xrealloc(ixnew, diff_len[1] + 2, sizeof(*ixnew));
381: ixnew = tmp;
382: check(f1, f2);
383: output(f1, f2);
384:
385: closem:
386: if (anychange == 1) {
387: if (rval == D_SAME)
388: rval = D_DIFFER;
389: }
390: if (f1 != NULL)
391: fclose(f1);
392: if (f2 != NULL)
393: fclose(f2);
394:
395: return (rval);
396: }
397:
398: /*
399: * Check to see if the given files differ.
400: * Returns 0 if they are the same, 1 if different, and -1 on error.
401: * XXX - could use code from cmp(1) [faster]
402: */
403: static int
404: files_differ(FILE *f1, FILE *f2)
405: {
406: char buf1[BUFSIZ], buf2[BUFSIZ];
407: size_t i, j;
408:
409: if (stb1.st_size != stb2.st_size)
410: return (1);
411: for (;;) {
412: i = fread(buf1, (size_t)1, sizeof(buf1), f1);
413: j = fread(buf2, (size_t)1, sizeof(buf2), f2);
414: if (i != j)
415: return (1);
416: if (i == 0 && j == 0) {
417: if (ferror(f1) || ferror(f2))
418: return (1);
419: return (0);
420: }
421: if (memcmp(buf1, buf2, i) != 0)
422: return (1);
423: }
424: }
425:
426: static int
427: prepare(int i, FILE *fd, off_t filesize)
428: {
429: void *tmp;
430: struct line *p;
431: int j, h;
432: size_t sz;
433:
434: rewind(fd);
435:
436: sz = ((size_t)filesize <= SIZE_MAX ? (size_t)filesize : SIZE_MAX) / 25;
437: if (sz < 100)
438: sz = 100;
439:
440: p = xcalloc(sz + 3, sizeof(*p));
441: for (j = 0; (h = readhash(fd));) {
442: if (j == (int)sz) {
443: sz = sz * 3 / 2;
444: tmp = xrealloc(p, sz + 3, sizeof(*p));
445: p = tmp;
446: }
447: p[++j].value = h;
448: }
449: diff_len[i] = j;
450: file[i] = p;
451:
452: return (0);
453: }
454:
455: static void
456: prune(void)
457: {
458: int i, j;
459:
460: for (pref = 0; pref < diff_len[0] && pref < diff_len[1] &&
461: file[0][pref + 1].value == file[1][pref + 1].value;
462: pref++)
463: ;
464: for (suff = 0;
465: (suff < diff_len[0] - pref) && (suff < diff_len[1] - pref) &&
466: (file[0][diff_len[0] - suff].value ==
467: file[1][diff_len[1] - suff].value);
468: suff++)
469: ;
470: for (j = 0; j < 2; j++) {
471: sfile[j] = file[j] + pref;
472: slen[j] = diff_len[j] - pref - suff;
473: for (i = 0; i <= slen[j]; i++)
474: sfile[j][i].serial = i;
475: }
476: }
477:
478: static void
479: equiv(struct line *a, int n, struct line *b, int m, int *c)
480: {
481: int i, j;
482:
483: i = j = 1;
484: while (i <= n && j <= m) {
485: if (a[i].value < b[j].value)
486: a[i++].value = 0;
487: else if (a[i].value == b[j].value)
488: a[i++].value = j;
489: else
490: j++;
491: }
492: while (i <= n)
493: a[i++].value = 0;
494: b[m + 1].value = 0;
495: j = 0;
496: while (++j <= m) {
497: c[j] = -b[j].serial;
498: while (b[j + 1].value == b[j].value) {
499: j++;
500: c[j] = b[j].serial;
501: }
502: }
503: c[j] = -1;
504: }
505:
506: /* Code taken from ping.c */
507: static int
508: isqrt(int n)
509: {
510: int y, x = 1;
511:
512: if (n == 0)
513: return (0);
514:
515: do { /* newton was a stinker */
516: y = x;
517: x = n / x;
518: x += y;
519: x /= 2;
520: } while (x - y > 1 || x - y < -1);
521:
522: return (x);
523: }
524:
525: static int
526: stone(int *a, int n, int *b, int *c)
527: {
528: int ret;
529: int i, k, y, j, l;
530: int oldc, tc, oldl;
531: u_int numtries;
532:
533: /* XXX move the isqrt() out of the macro to avoid multiple calls */
534: const u_int bound = dflag ? UINT_MAX : MAX(256, (u_int)isqrt(n));
535:
536: k = 0;
537: if ((ret = newcand(0, 0, 0)) < 0)
538: return (-1);
539: c[0] = ret;
540: for (i = 1; i <= n; i++) {
541: j = a[i];
542: if (j == 0)
543: continue;
544: y = -b[j];
545: oldl = 0;
546: oldc = c[0];
547: numtries = 0;
548: do {
549: if (y <= clist[oldc].y)
550: continue;
551: l = search(c, k, y);
552: if (l != oldl + 1)
553: oldc = c[l - 1];
554: if (l <= k) {
555: if (clist[c[l]].y <= y)
556: continue;
557: tc = c[l];
558: if ((ret = newcand(i, y, oldc)) < 0)
559: return (-1);
560: c[l] = ret;
561: oldc = tc;
562: oldl = l;
563: numtries++;
564: } else {
565: if ((ret = newcand(i, y, oldc)) < 0)
566: return (-1);
567: c[l] = ret;
568: k++;
569: break;
570: }
571: } while ((y = b[++j]) > 0 && numtries < bound);
572: }
573: return (k);
574: }
575:
576: static int
577: newcand(int x, int y, int pred)
578: {
579: struct cand *q, *tmp;
580: int newclistlen;
581:
582: if (clen == clistlen) {
583: newclistlen = clistlen * 11 / 10;
584: tmp = xrealloc(clist, newclistlen, sizeof(*clist));
585: clist = tmp;
586: clistlen = newclistlen;
587: }
588: q = clist + clen;
589: q->x = x;
590: q->y = y;
591: q->pred = pred;
592: return (clen++);
593: }
594:
595: static int
596: search(int *c, int k, int y)
597: {
598: int i, j, l, t;
599:
600: if (clist[c[k]].y < y) /* quick look for typical case */
601: return (k + 1);
602: i = 0;
603: j = k + 1;
604: for (;;) {
605: l = (i + j) / 2;
606: if (l <= i)
607: break;
608: t = clist[c[l]].y;
609: if (t > y)
610: j = l;
611: else if (t < y)
612: i = l;
613: else
614: return (l);
615: }
616: return (l + 1);
617: }
618:
619: static void
620: unravel(int p)
621: {
622: struct cand *q;
623: int i;
624:
625: for (i = 0; i <= diff_len[0]; i++)
626: J[i] = i <= pref ? i :
627: i > diff_len[0] - suff ? i + diff_len[1] - diff_len[0] : 0;
628: for (q = clist + p; q->y != 0; q = clist + q->pred)
629: J[q->x + pref] = q->y + pref;
630: }
631:
632: /*
633: * Check does double duty:
634: * 1. ferret out any fortuitous correspondences due
635: * to confounding by hashing (which result in "jackpot")
636: * 2. collect random access indexes to the two files
637: */
638: static void
639: check(FILE *f1, FILE *f2)
640: {
641: int i, j, jackpot, c, d;
642: long ctold, ctnew;
643:
644: rewind(f1);
645: rewind(f2);
646: j = 1;
647: ixold[0] = ixnew[0] = 0;
648: jackpot = 0;
649: ctold = ctnew = 0;
650: for (i = 1; i <= diff_len[0]; i++) {
651: if (J[i] == 0) {
652: ixold[i] = ctold += skipline(f1);
653: continue;
654: }
655: while (j < J[i]) {
656: ixnew[j] = ctnew += skipline(f2);
657: j++;
658: }
659: if (bflag == 1 || wflag == 1 || iflag == 1) {
660: for (;;) {
661: c = getc(f1);
662: d = getc(f2);
663: /*
664: * GNU diff ignores a missing newline
665: * in one file if bflag || wflag.
666: */
667: if ((bflag == 1 || wflag == 1) &&
668: ((c == EOF && d == '\n') ||
669: (c == '\n' && d == EOF))) {
670: break;
671: }
672: ctold++;
673: ctnew++;
674: if (bflag == 1 && isspace(c) && isspace(d)) {
675: do {
676: if (c == '\n')
677: break;
678: ctold++;
679: } while (isspace(c = getc(f1)));
680: do {
681: if (d == '\n')
682: break;
683: ctnew++;
684: } while (isspace(d = getc(f2)));
685: } else if (wflag == 1) {
686: while (isspace(c) && c != '\n') {
687: c = getc(f1);
688: ctold++;
689: }
690: while (isspace(d) && d != '\n') {
691: d = getc(f2);
692: ctnew++;
693: }
694: }
695: if (chrtran[c] != chrtran[d]) {
696: jackpot++;
697: J[i] = 0;
698: if (c != '\n' && c != EOF)
699: ctold += skipline(f1);
700: if (d != '\n' && c != EOF)
701: ctnew += skipline(f2);
702: break;
703: }
704: if (c == '\n' || c == EOF)
705: break;
706: }
707: } else {
708: for (;;) {
709: ctold++;
710: ctnew++;
711: if ((c = getc(f1)) != (d = getc(f2))) {
712: /* jackpot++; */
713: J[i] = 0;
714: if (c != '\n' && c != EOF)
715: ctold += skipline(f1);
716: if (d != '\n' && c != EOF)
717: ctnew += skipline(f2);
718: break;
719: }
720: if (c == '\n' || c == EOF)
721: break;
722: }
723: }
724: ixold[i] = ctold;
725: ixnew[j] = ctnew;
726: j++;
727: }
728: for (; j <= diff_len[1]; j++)
729: ixnew[j] = ctnew += skipline(f2);
730: /*
731: * if (jackpot != 0)
732: * printf("jackpot\n");
733: */
734: }
735:
736: /* shellsort CACM #201 */
737: static void
738: sort(struct line *a, int n)
739: {
740: struct line *ai, *aim, w;
741: int j, m = 0, k;
742:
743: if (n == 0)
744: return;
745: for (j = 1; j <= n; j *= 2)
746: m = 2 * j - 1;
747: for (m /= 2; m != 0; m /= 2) {
748: k = n - m;
749: for (j = 1; j <= k; j++) {
750: for (ai = &a[j]; ai > a; ai -= m) {
751: aim = &ai[m];
752: if (aim < ai)
753: break; /* wraparound */
754: if (aim->value > ai[0].value ||
755: (aim->value == ai[0].value &&
756: aim->serial > ai[0].serial))
757: break;
758: w.value = ai[0].value;
759: ai[0].value = aim->value;
760: aim->value = w.value;
761: w.serial = ai[0].serial;
762: ai[0].serial = aim->serial;
763: aim->serial = w.serial;
764: }
765: }
766: }
767: }
768:
769: static void
770: unsort(struct line *f, int l, int *b)
771: {
772: int *a, i;
773:
774: a = xcalloc(l + 1, sizeof(*a));
775: for (i = 1; i <= l; i++)
776: a[f[i].serial] = f[i].value;
777: for (i = 1; i <= l; i++)
778: b[i] = a[i];
779: xfree(a);
780: }
781:
782: static int
783: skipline(FILE *f)
784: {
785: int i, c;
786:
787: for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
788: continue;
789: return (i);
790: }
791:
792: static void
793: output(FILE *f1, FILE *f2)
794: {
795: int m, i0, i1, j0, j1;
796:
797: rewind(f1);
798: rewind(f2);
799: m = diff_len[0];
800: J[0] = 0;
801: J[m + 1] = diff_len[1] + 1;
802: for (i0 = 1; i0 <= m; i0 = i1 + 1) {
803: while (i0 <= m && J[i0] == J[i0 - 1] + 1)
804: i0++;
805: j0 = J[i0 - 1] + 1;
806: i1 = i0 - 1;
807: while (i1 < m && J[i1 + 1] == 0)
808: i1++;
809: j1 = J[i1 + 1] - 1;
810: J[i1] = j1;
811: change(f1, f2, i0, i1, j0, j1);
812: }
813: if (m == 0)
814: change(f1, f2, 1, 0, 1, diff_len[1]);
815: if (diff_format == D_IFDEF) {
816: for (;;) {
817: #define c i0
818: if ((c = getc(f1)) == EOF)
819: return;
820: diff_output("%c", c);
821: }
822: #undef c
823: }
824: if (anychange != 0) {
825: if (diff_format == D_CONTEXT)
826: dump_context_vec(f1, f2);
827: else if (diff_format == D_UNIFIED)
828: dump_unified_vec(f1, f2);
829: }
830: }
831:
832: static __inline void
833: range(int a, int b, char *separator)
834: {
835: diff_output("%d", a > b ? b : a);
836: if (a < b)
837: diff_output("%s%d", separator, b);
838: }
839:
840: static __inline void
841: uni_range(int a, int b)
842: {
843: if (a < b)
844: diff_output("%d,%d", a, b - a + 1);
845: else if (a == b)
846: diff_output("%d", b);
847: else
848: diff_output("%d,0", b);
849: }
850:
851: static char *
852: preadline(int fd, size_t rlen, off_t off)
853: {
854: char *line;
855: ssize_t nr;
856:
857: line = xmalloc(rlen + 1);
858: if ((nr = pread(fd, line, rlen, off)) < 0) {
859: warn("preadline failed");
860: return (NULL);
861: }
862: line[nr] = '\0';
863: return (line);
864: }
865:
866: static int
867: ignoreline(char *line)
868: {
869: int ret;
870:
871: ret = regexec(&ignore_re, line, (size_t)0, NULL, 0);
872: xfree(line);
873: return (ret == 0); /* if it matched, it should be ignored. */
874: }
875:
876: /*
877: * Indicate that there is a difference between lines a and b of the from file
878: * to get to lines c to d of the to file. If a is greater then b then there
879: * are no lines in the from file involved and this means that there were
880: * lines appended (beginning at b). If c is greater than d then there are
881: * lines missing from the to file.
882: */
883: static void
884: change(FILE *f1, FILE *f2, int a, int b, int c, int d)
885: {
886: int i;
887: static size_t max_context = 64;
888: char buf[64];
889: struct tm *t;
890:
891: if (diff_format != D_IFDEF && a > b && c > d)
892: return;
893: if (ignore_pats != NULL) {
894: char *line;
895: /*
896: * All lines in the change, insert, or delete must
897: * match an ignore pattern for the change to be
898: * ignored.
899: */
900: if (a <= b) { /* Changes and deletes. */
901: for (i = a; i <= b; i++) {
902: line = preadline(fileno(f1),
903: ixold[i] - ixold[i - 1], ixold[i - 1]);
904: if (!ignoreline(line))
905: goto proceed;
906: }
907: }
908: if (a > b || c <= d) { /* Changes and inserts. */
909: for (i = c; i <= d; i++) {
910: line = preadline(fileno(f2),
911: ixnew[i] - ixnew[i - 1], ixnew[i - 1]);
912: if (!ignoreline(line))
913: goto proceed;
914: }
915: }
916: return;
917: }
918: proceed:
919: if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) {
920: /*
921: * Allocate change records as needed.
922: */
923: if (context_vec_ptr == context_vec_end - 1) {
924: struct context_vec *tmp;
925: ptrdiff_t offset = context_vec_ptr - context_vec_start;
926: max_context <<= 1;
927: tmp = xrealloc(context_vec_start, max_context,
928: sizeof(*context_vec_start));
929: context_vec_start = tmp;
930: context_vec_end = context_vec_start + max_context;
931: context_vec_ptr = context_vec_start + offset;
932: }
933: if (anychange == 0) {
934: /*
935: * Print the context/unidiff header first time through.
936: */
937: t = localtime(&stb1.st_mtime);
938: (void)strftime(buf, sizeof(buf),
939: "%Y/%m/%d %H:%M:%S", t);
940:
941: diff_output("%s %s %s",
942: diff_format == D_CONTEXT ? "***" : "---", diff_file,
943: buf);
944:
945: if (diff_rev1 != NULL) {
946: rcsnum_tostr(diff_rev1, buf, sizeof(buf));
947: diff_output("\t%s", buf);
948: }
949:
950: printf("\n");
951:
952: t = localtime(&stb2.st_mtime);
953: (void)strftime(buf, sizeof(buf),
954: "%Y/%m/%d %H:%M:%S", t);
955:
956: diff_output("%s %s %s",
957: diff_format == D_CONTEXT ? "---" : "+++", diff_file,
958: buf);
959:
960: if (diff_rev2 != NULL) {
961: rcsnum_tostr(diff_rev2, buf, sizeof(buf));
962: diff_output("\t%s", buf);
963: }
964:
965: printf("\n");
966: anychange = 1;
967: } else if (a > context_vec_ptr->b + (2 * context) + 1 &&
968: c > context_vec_ptr->d + (2 * context) + 1) {
969: /*
970: * If this change is more than 'context' lines from the
971: * previous change, dump the record and reset it.
972: */
973: if (diff_format == D_CONTEXT)
974: dump_context_vec(f1, f2);
975: else
976: dump_unified_vec(f1, f2);
977: }
978: context_vec_ptr++;
979: context_vec_ptr->a = a;
980: context_vec_ptr->b = b;
981: context_vec_ptr->c = c;
982: context_vec_ptr->d = d;
983: return;
984: }
985: if (anychange == 0)
986: anychange = 1;
987: switch (diff_format) {
988: case D_BRIEF:
989: return;
990: case D_NORMAL:
991: range(a, b, ",");
992: diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
993: if (diff_format == D_NORMAL)
994: range(c, d, ",");
995: diff_output("\n");
996: break;
997: case D_RCSDIFF:
998: if (a > b)
999: diff_output("a%d %d\n", b, d - c + 1);
1000: else {
1001: diff_output("d%d %d\n", a, b - a + 1);
1002:
1003: if (!(c > d)) /* add changed lines */
1004: diff_output("a%d %d\n", b, d - c + 1);
1005: }
1006: break;
1007: }
1008: if (diff_format == D_NORMAL || diff_format == D_IFDEF) {
1009: fetch(ixold, a, b, f1, '<', 1);
1010: if (a <= b && c <= d && diff_format == D_NORMAL)
1011: diff_output("---\n");
1012: }
1013: fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0);
1014: if (inifdef) {
1015: diff_output("#endif /* %s */\n", ifdefname);
1016: inifdef = 0;
1017: }
1018: }
1019:
1020: static void
1021: fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile)
1022: {
1023: long j, nc;
1024: int i, c, col;
1025:
1026: /*
1027: * When doing #ifdef's, copy down to current line
1028: * if this is the first file, so that stuff makes it to output.
1029: */
1030: if (diff_format == D_IFDEF && oldfile) {
1031: long curpos = ftell(lb);
1032: /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1033: nc = f[a > b ? b : a - 1] - curpos;
1034: for (i = 0; i < nc; i++)
1035: diff_output("%c", getc(lb));
1036: }
1037: if (a > b)
1038: return;
1039: if (diff_format == D_IFDEF) {
1040: if (inifdef) {
1041: diff_output("#else /* %s%s */\n",
1042: oldfile == 1 ? "!" : "", ifdefname);
1043: } else {
1044: if (oldfile)
1045: diff_output("#ifndef %s\n", ifdefname);
1046: else
1047: diff_output("#ifdef %s\n", ifdefname);
1048: }
1049: inifdef = 1 + oldfile;
1050: }
1051: for (i = a; i <= b; i++) {
1052: fseek(lb, f[i - 1], SEEK_SET);
1053: nc = f[i] - f[i - 1];
1054: if (diff_format != D_IFDEF && ch != '\0') {
1055: diff_output("%c", ch);
1056: if (Tflag == 1 && (diff_format == D_NORMAL ||
1057: diff_format == D_CONTEXT ||
1058: diff_format == D_UNIFIED))
1059: diff_output("\t");
1060: else if (diff_format != D_UNIFIED)
1061: diff_output(" ");
1062: }
1063: col = 0;
1064: for (j = 0; j < nc; j++) {
1065: if ((c = getc(lb)) == EOF) {
1066: if (diff_format == D_RCSDIFF)
1067: warn("No newline at end of file");
1068: else
1069: diff_output("\n\\ No newline at end of "
1070: "file");
1071: return;
1072: }
1073: if (c == '\t' && tflag == 1) {
1074: do {
1075: diff_output(" ");
1076: } while (++col & 7);
1077: } else {
1078: diff_output("%c", c);
1079: col++;
1080: }
1081: }
1082: }
1083: }
1084:
1085: /*
1086: * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1087: */
1088: static int
1089: readhash(FILE *f)
1090: {
1091: int i, t, space;
1092: int sum;
1093:
1094: sum = 1;
1095: space = 0;
1096: if (bflag != 1 && wflag != 1) {
1097: if (iflag == 1)
1098: for (i = 0; (t = getc(f)) != '\n'; i++) {
1099: if (t == EOF) {
1100: if (i == 0)
1101: return (0);
1102: break;
1103: }
1104: sum = sum * 127 + chrtran[t];
1105: }
1106: else
1107: for (i = 0; (t = getc(f)) != '\n'; i++) {
1108: if (t == EOF) {
1109: if (i == 0)
1110: return (0);
1111: break;
1112: }
1113: sum = sum * 127 + t;
1114: }
1115: } else {
1116: for (i = 0;;) {
1117: switch (t = getc(f)) {
1118: case '\t':
1119: case ' ':
1120: space++;
1121: continue;
1122: default:
1123: if (space != 0 && wflag != 1) {
1124: i++;
1125: space = 0;
1126: }
1127: sum = sum * 127 + chrtran[t];
1128: i++;
1129: continue;
1130: case EOF:
1131: if (i == 0)
1132: return (0);
1133: /* FALLTHROUGH */
1134: case '\n':
1135: break;
1136: }
1137: break;
1138: }
1139: }
1140: /*
1141: * There is a remote possibility that we end up with a zero sum.
1142: * Zero is used as an EOF marker, so return 1 instead.
1143: */
1144: return (sum == 0 ? 1 : sum);
1145: }
1146:
1147: static int
1148: asciifile(FILE *f)
1149: {
1150: char buf[BUFSIZ];
1151: size_t i, cnt;
1152:
1153: if (aflag == 1 || f == NULL)
1154: return (1);
1155:
1156: rewind(f);
1157: cnt = fread(buf, (size_t)1, sizeof(buf), f);
1158: for (i = 0; i < cnt; i++)
1159: if (!isprint(buf[i]) && !isspace(buf[i]))
1160: return (0);
1161: return (1);
1162: }
1163:
1164: static char*
1165: match_function(const long *f, int pos, FILE *fp)
1166: {
1167: unsigned char buf[FUNCTION_CONTEXT_SIZE];
1168: size_t nc;
1169: int last = lastline;
1170: char *p;
1171:
1172: lastline = pos;
1173: while (pos > last) {
1174: fseek(fp, f[pos - 1], SEEK_SET);
1175: nc = f[pos] - f[pos - 1];
1176: if (nc >= sizeof(buf))
1177: nc = sizeof(buf) - 1;
1178: nc = fread(buf, (size_t)1, nc, fp);
1179: if (nc > 0) {
1180: buf[nc] = '\0';
1181: p = strchr((const char *)buf, '\n');
1182: if (p != NULL)
1183: *p = '\0';
1184: if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1.3 ray 1185: if (strlcpy(lastbuf, (const char *)buf,
1186: sizeof(lastbuf)) >= sizeof(lastbuf))
1187: errx(1, "match_function: strlcpy");
1.1 joris 1188: lastmatchline = pos;
1189: return lastbuf;
1190: }
1191: }
1192: pos--;
1193: }
1194: return (lastmatchline > 0) ? lastbuf : NULL;
1195: }
1196:
1197:
1198: /* dump accumulated "context" diff changes */
1199: static void
1200: dump_context_vec(FILE *f1, FILE *f2)
1201: {
1202: struct context_vec *cvp = context_vec_start;
1203: int lowa, upb, lowc, upd, do_output;
1204: int a, b, c, d;
1205: char ch, *f;
1206:
1207: if (context_vec_start > context_vec_ptr)
1208: return;
1209:
1210: b = d = 0; /* gcc */
1211: lowa = MAX(1, cvp->a - context);
1212: upb = MIN(diff_len[0], context_vec_ptr->b + context);
1213: lowc = MAX(1, cvp->c - context);
1214: upd = MIN(diff_len[1], context_vec_ptr->d + context);
1215:
1216: diff_output("***************");
1217: if (pflag == 1) {
1218: f = match_function(ixold, lowa - 1, f1);
1219: if (f != NULL) {
1220: diff_output(" ");
1221: diff_output("%s", f);
1222: }
1223: }
1224: diff_output("\n*** ");
1225: range(lowa, upb, ",");
1226: diff_output(" ****\n");
1227:
1228: /*
1229: * Output changes to the "old" file. The first loop suppresses
1230: * output if there were no changes to the "old" file (we'll see
1231: * the "old" lines as context in the "new" list).
1232: */
1233: do_output = 0;
1234: for (; cvp <= context_vec_ptr; cvp++)
1235: if (cvp->a <= cvp->b) {
1236: cvp = context_vec_start;
1237: do_output++;
1238: break;
1239: }
1240: if (do_output != 0) {
1241: while (cvp <= context_vec_ptr) {
1242: a = cvp->a;
1243: b = cvp->b;
1244: c = cvp->c;
1245: d = cvp->d;
1246:
1247: if (a <= b && c <= d)
1248: ch = 'c';
1249: else
1250: ch = (a <= b) ? 'd' : 'a';
1251:
1252: if (ch == 'a')
1253: fetch(ixold, lowa, b, f1, ' ', 0);
1254: else {
1255: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1256: fetch(ixold, a, b, f1,
1257: ch == 'c' ? '!' : '-', 0);
1258: }
1259: lowa = b + 1;
1260: cvp++;
1261: }
1262: fetch(ixold, b + 1, upb, f1, ' ', 0);
1263: }
1264: /* output changes to the "new" file */
1265: diff_output("--- ");
1266: range(lowc, upd, ",");
1267: diff_output(" ----\n");
1268:
1269: do_output = 0;
1270: for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++)
1271: if (cvp->c <= cvp->d) {
1272: cvp = context_vec_start;
1273: do_output++;
1274: break;
1275: }
1276: if (do_output != 0) {
1277: while (cvp <= context_vec_ptr) {
1278: a = cvp->a;
1279: b = cvp->b;
1280: c = cvp->c;
1281: d = cvp->d;
1282:
1283: if (a <= b && c <= d)
1284: ch = 'c';
1285: else
1286: ch = (a <= b) ? 'd' : 'a';
1287:
1288: if (ch == 'd')
1289: fetch(ixnew, lowc, d, f2, ' ', 0);
1290: else {
1291: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1292: fetch(ixnew, c, d, f2,
1293: ch == 'c' ? '!' : '+', 0);
1294: }
1295: lowc = d + 1;
1296: cvp++;
1297: }
1298: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1299: }
1300: context_vec_ptr = context_vec_start - 1;
1301: }
1302:
1303: /* dump accumulated "unified" diff changes */
1304: static void
1305: dump_unified_vec(FILE *f1, FILE *f2)
1306: {
1307: struct context_vec *cvp = context_vec_start;
1308: int lowa, upb, lowc, upd;
1309: int a, b, c, d;
1310: char ch, *f;
1311:
1312: if (context_vec_start > context_vec_ptr)
1313: return;
1314:
1315: b = d = 0; /* gcc */
1316: lowa = MAX(1, cvp->a - context);
1317: upb = MIN(diff_len[0], context_vec_ptr->b + context);
1318: lowc = MAX(1, cvp->c - context);
1319: upd = MIN(diff_len[1], context_vec_ptr->d + context);
1320:
1321: diff_output("@@ -");
1322: uni_range(lowa, upb);
1323: diff_output(" +");
1324: uni_range(lowc, upd);
1325: diff_output(" @@");
1326: if (pflag == 1) {
1327: f = match_function(ixold, lowa - 1, f1);
1328: if (f != NULL) {
1329: diff_output(" ");
1330: diff_output("%s", f);
1331: }
1332: }
1333: diff_output("\n");
1334:
1335: /*
1336: * Output changes in "unified" diff format--the old and new lines
1337: * are printed together.
1338: */
1339: for (; cvp <= context_vec_ptr; cvp++) {
1340: a = cvp->a;
1341: b = cvp->b;
1342: c = cvp->c;
1343: d = cvp->d;
1344:
1345: /*
1346: * c: both new and old changes
1347: * d: only changes in the old file
1348: * a: only changes in the new file
1349: */
1350: if (a <= b && c <= d)
1351: ch = 'c';
1352: else
1353: ch = (a <= b) ? 'd' : 'a';
1354:
1355: switch (ch) {
1356: case 'c':
1357: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1358: fetch(ixold, a, b, f1, '-', 0);
1359: fetch(ixnew, c, d, f2, '+', 0);
1360: break;
1361: case 'd':
1362: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1363: fetch(ixold, a, b, f1, '-', 0);
1364: break;
1365: case 'a':
1366: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1367: fetch(ixnew, c, d, f2, '+', 0);
1368: break;
1369: }
1370: lowa = b + 1;
1371: lowc = d + 1;
1372: }
1373: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1374:
1375: context_vec_ptr = context_vec_start - 1;
1376: }
1377:
1378: void
1379: diff_output(const char *fmt, ...)
1380: {
1381: va_list vap;
1382: int i;
1383: char *str;
1384:
1385: va_start(vap, fmt);
1386: i = vasprintf(&str, fmt, vap);
1387: va_end(vap);
1388: if (i == -1)
1.2 xsa 1389: err(1, "diff_output");
1.1 joris 1390: if (diffbuf != NULL)
1391: rcs_buf_append(diffbuf, str, strlen(str));
1392: else
1393: printf("%s", str);
1394: xfree(str);
1395: }