![[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 / cvs|
Return to diff.c CVS log | Up to [local] / src / usr.bin / cvs |
1.21 ! jfb 1: /* $OpenBSD: diff.c,v 1.20 2005/02/01 18:03:32 jfb Exp $ */
1.1 jfb 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 <sys/param.h>
130: #include <sys/stat.h>
131: #include <sys/wait.h>
132:
133: #include <errno.h>
134: #include <ctype.h>
135: #include <stdio.h>
136: #include <fcntl.h>
137: #include <paths.h>
138: #include <regex.h>
139: #include <dirent.h>
140: #include <stdlib.h>
141: #include <stddef.h>
142: #include <unistd.h>
143: #include <string.h>
144: #include <sysexits.h>
145:
146: #include "cvs.h"
147: #include "log.h"
148: #include "buf.h"
1.4 jfb 149: #include "proto.h"
1.1 jfb 150:
151:
152: #define CVS_DIFF_DEFCTX 3 /* default context length */
153:
154:
155: /*
156: * Output format options
157: */
158: #define D_NORMAL 0 /* Normal output */
159: #define D_CONTEXT 1 /* Diff with context */
160: #define D_UNIFIED 2 /* Unified context diff */
161: #define D_IFDEF 3 /* Diff with merged #ifdef's */
162: #define D_BRIEF 4 /* Say if the files differ */
163:
164: /*
165: * Status values for print_status() and diffreg() return values
166: */
167: #define D_SAME 0 /* Files are the same */
168: #define D_DIFFER 1 /* Files are different */
169: #define D_BINARY 2 /* Binary files are different */
170: #define D_COMMON 3 /* Subdirectory common to both dirs */
171: #define D_ONLY 4 /* Only exists in one directory */
172: #define D_MISMATCH1 5 /* path1 was a dir, path2 a file */
173: #define D_MISMATCH2 6 /* path1 was a file, path2 a dir */
174: #define D_ERROR 7 /* An error occurred */
175: #define D_SKIPPED1 8 /* path1 was a special file */
176: #define D_SKIPPED2 9 /* path2 was a special file */
177:
178: struct cand {
179: int x;
180: int y;
181: int pred;
182: } cand;
183:
184: struct line {
185: int serial;
186: int value;
187: } *file[2];
188:
189: /*
190: * The following struct is used to record change information when
191: * doing a "context" or "unified" diff. (see routine "change" to
192: * understand the highly mnemonic field names)
193: */
194: struct context_vec {
195: int a; /* start line in old file */
196: int b; /* end line in old file */
197: int c; /* start line in new file */
198: int d; /* end line in new file */
199: };
200:
1.4 jfb 201: struct diff_arg {
202: char *rev1;
203: char *rev2;
204: char *date1;
205: char *date2;
206: };
207:
1.1 jfb 208:
209: struct excludes {
210: char *pattern;
211: struct excludes *next;
212: };
213:
214:
215: char *splice(char *, char *);
216: int cvs_diffreg(const char *, const char *);
1.9 jfb 217: int cvs_diff_file(struct cvs_file *, void *);
218: int cvs_diff_sendflags(struct cvsroot *, struct diff_arg *);
1.1 jfb 219: static void output(const char *, FILE *, const char *, FILE *);
220: static void check(FILE *, FILE *);
221: static void range(int, int, char *);
222: static void uni_range(int, int);
223: static void dump_context_vec(FILE *, FILE *);
224: static void dump_unified_vec(FILE *, FILE *);
1.20 jfb 225: static int prepare(int, FILE *, off_t);
1.1 jfb 226: static void prune(void);
227: static void equiv(struct line *, int, struct line *, int, int *);
228: static void unravel(int);
229: static void unsort(struct line *, int, int *);
230: static void change(const char *, FILE *, const char *, FILE *, int, int, int, int);
231: static void sort(struct line *, int);
232: static int ignoreline(char *);
233: static int asciifile(FILE *);
234: static int fetch(long *, int, int, FILE *, int, int);
235: static int newcand(int, int, int);
236: static int search(int *, int, int);
237: static int skipline(FILE *);
238: static int isqrt(int);
239: static int stone(int *, int, int *, int *);
240: static int readhash(FILE *);
241: static int files_differ(FILE *, FILE *);
1.17 jfb 242: static char *match_function(const long *, int, FILE *);
1.1 jfb 243: static char *preadline(int, size_t, off_t);
244:
245:
246: extern int cvs_client;
247:
1.17 jfb 248: static int aflag, bflag, dflag, iflag, Nflag, pflag, tflag, Tflag, wflag;
1.1 jfb 249: static int context, status;
250: static int format = D_NORMAL;
251: static struct stat stb1, stb2;
1.2 jfb 252: static char *ifdefname, *ignore_pats, diffargs[128];
253: static const char *diff_file;
1.1 jfb 254: regex_t ignore_re;
255:
256: static int *J; /* will be overlaid on class */
257: static int *class; /* will be overlaid on file[0] */
258: static int *klist; /* will be overlaid on file[0] after class */
259: static int *member; /* will be overlaid on file[1] */
260: static int clen;
261: static int inifdef; /* whether or not we are in a #ifdef block */
262: static int len[2];
263: static int pref, suff; /* length of prefix and suffix */
264: static int slen[2];
265: static int anychange;
266: static long *ixnew; /* will be overlaid on file[1] */
267: static long *ixold; /* will be overlaid on klist */
268: static struct cand *clist; /* merely a free storage pot for candidates */
269: static int clistlen; /* the length of clist */
270: static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
271: static u_char *chrtran; /* translation table for case-folding */
272: static struct context_vec *context_vec_start;
273: static struct context_vec *context_vec_end;
274: static struct context_vec *context_vec_ptr;
275:
276: #define FUNCTION_CONTEXT_SIZE 41
1.17 jfb 277: static char lastbuf[FUNCTION_CONTEXT_SIZE];
278: static int lastline;
279: static int lastmatchline;
1.1 jfb 280:
281:
282: /*
283: * chrtran points to one of 2 translation tables: cup2low if folding upper to
284: * lower case clow2low if not folding case
285: */
286: u_char clow2low[256] = {
287: 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
288: 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
289: 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
290: 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
291: 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
292: 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x41,
293: 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a, 0x4b, 0x4c,
294: 0x4d, 0x4e, 0x4f, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
295: 0x58, 0x59, 0x5a, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 0x60, 0x61, 0x62,
296: 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
297: 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
298: 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
299: 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
300: 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
301: 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
302: 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
303: 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
304: 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
305: 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
306: 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
307: 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
308: 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
309: 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
310: 0xfd, 0xfe, 0xff
311: };
312:
313: u_char cup2low[256] = {
314: 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
315: 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15,
316: 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
317: 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
318: 0x2c, 0x2d, 0x2e, 0x2f, 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
319: 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x60, 0x61,
320: 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c,
321: 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
322: 0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x60, 0x61, 0x62,
323: 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d,
324: 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
325: 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83,
326: 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e,
327: 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
328: 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4,
329: 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
330: 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba,
331: 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5,
332: 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
333: 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb,
334: 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6,
335: 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1,
336: 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc,
337: 0xfd, 0xfe, 0xff
338: };
339:
340:
341: /*
342: * cvs_diff()
343: *
344: * Handler for the `cvs diff' command.
345: *
346: * SYNOPSIS: cvs [args] diff [-clipu] [-D date] [-r rev]
347: */
348: int
349: cvs_diff(int argc, char **argv)
350: {
1.4 jfb 351: int ch, recurse, flags;
352: struct diff_arg darg;
353: struct cvsroot *root;
1.1 jfb 354:
355: context = CVS_DIFF_DEFCTX;
1.4 jfb 356: flags = CF_RECURSE|CF_IGNORE|CF_SORT|CF_KNOWN;
357: recurse = 1;
358:
359: memset(&darg, 0, sizeof(darg));
1.2 jfb 360: strlcpy(diffargs, argv[0], sizeof(diffargs));
1.1 jfb 361:
1.17 jfb 362: while ((ch = getopt(argc, argv, "cD:liNpr:u")) != -1) {
1.1 jfb 363: switch (ch) {
364: case 'c':
1.2 jfb 365: strlcat(diffargs, " -c", sizeof(diffargs));
1.1 jfb 366: format = D_CONTEXT;
367: break;
368: case 'D':
1.4 jfb 369: if (darg.date1 == NULL && darg.rev1 == NULL)
370: darg.date1 = optarg;
371: else if (darg.date2 == NULL && darg.rev2 == NULL)
372: darg.date2 = optarg;
1.1 jfb 373: else {
374: cvs_log(LP_ERR,
375: "no more than two revisions/dates can "
376: "be specified");
377: }
378: break;
379: case 'l':
1.2 jfb 380: strlcat(diffargs, " -l", sizeof(diffargs));
1.1 jfb 381: recurse = 0;
1.4 jfb 382: flags &= ~CF_RECURSE;
1.1 jfb 383: break;
384: case 'i':
1.2 jfb 385: strlcat(diffargs, " -i", sizeof(diffargs));
1.1 jfb 386: iflag = 1;
387: break;
1.8 jfb 388: case 'N':
389: strlcat(diffargs, " -N", sizeof(diffargs));
390: Nflag = 1;
391: break;
1.17 jfb 392: case 'p':
393: strlcat(diffargs, " -p", sizeof(diffargs));
394: pflag = 1;
395: break;
1.1 jfb 396: case 'r':
1.4 jfb 397: if ((darg.rev1 == NULL) && (darg.date1 == NULL))
398: darg.rev1 = optarg;
399: else if ((darg.rev2 == NULL) && (darg.date2 == NULL))
400: darg.rev2 = optarg;
1.1 jfb 401: else {
402: cvs_log(LP_ERR,
403: "no more than two revisions/dates can "
404: "be specified");
405: return (EX_USAGE);
406: }
407: break;
408: case 'u':
1.2 jfb 409: strlcat(diffargs, " -u", sizeof(diffargs));
1.1 jfb 410: format = D_UNIFIED;
411: break;
412: default:
413: return (EX_USAGE);
414: }
415: }
416:
417: argc -= optind;
418: argv += optind;
419:
420: if (argc == 0) {
1.6 jfb 421: cvs_files = cvs_file_get(".", flags);
1.10 deraadt 422: } else
1.6 jfb 423: cvs_files = cvs_file_getspec(argv, argc, 0);
1.7 jfb 424: if (cvs_files == NULL)
425: return (EX_DATAERR);
1.1 jfb 426:
1.6 jfb 427: cvs_file_examine(cvs_files, cvs_diff_file, &darg);
1.1 jfb 428:
1.6 jfb 429: root = cvs_files->cf_ddat->cd_root;
1.5 jfb 430: if (root->cr_method != CVS_METHOD_LOCAL) {
1.6 jfb 431: cvs_senddir(root, cvs_files);
1.4 jfb 432: cvs_sendreq(root, CVS_REQ_DIFF, NULL);
1.5 jfb 433: }
1.1 jfb 434:
1.4 jfb 435: return (0);
436: }
1.1 jfb 437:
438:
1.4 jfb 439: /*
440: * cvs_diff_sendflags()
441: *
442: */
443: int
444: cvs_diff_sendflags(struct cvsroot *root, struct diff_arg *dap)
445: {
446: /* send the flags */
1.17 jfb 447: if (Nflag && (cvs_sendarg(root, "-N", 0) < 0))
448: return (-1);
449: if (pflag && (cvs_sendarg(root, "-p", 0) < 0))
450: return (-1);
451:
1.4 jfb 452: if (format == D_CONTEXT)
453: cvs_sendarg(root, "-c", 0);
454: else if (format == D_UNIFIED)
455: cvs_sendarg(root, "-u", 0);
456:
457: if (dap->rev1 != NULL) {
458: cvs_sendarg(root, "-r", 0);
1.14 jfb 459: cvs_sendarg(root, dap->rev1, 0);
1.10 deraadt 460: } else if (dap->date1 != NULL) {
1.4 jfb 461: cvs_sendarg(root, "-D", 0);
1.14 jfb 462: cvs_sendarg(root, dap->date1, 0);
1.4 jfb 463: }
464: if (dap->rev2 != NULL) {
465: cvs_sendarg(root, "-r", 0);
1.14 jfb 466: cvs_sendarg(root, dap->rev2, 0);
1.10 deraadt 467: } else if (dap->date2 != NULL) {
1.4 jfb 468: cvs_sendarg(root, "-D", 0);
1.14 jfb 469: cvs_sendarg(root, dap->date2, 0);
1.1 jfb 470: }
471:
472: return (0);
473: }
474:
475:
476: /*
477: * cvs_diff_file()
478: *
479: * Diff a single file.
480: */
481: int
1.4 jfb 482: cvs_diff_file(struct cvs_file *cfp, void *arg)
1.1 jfb 483: {
1.8 jfb 484: char *dir, *repo, buf[64];
485: char fpath[MAXPATHLEN], dfpath[MAXPATHLEN], rcspath[MAXPATHLEN];
1.12 djm 486: char path_tmp1[MAXPATHLEN], path_tmp2[MAXPATHLEN];
1.1 jfb 487: BUF *b1, *b2;
488: RCSNUM *r1, *r2;
489: RCSFILE *rf;
1.4 jfb 490: struct diff_arg *dap;
1.1 jfb 491: struct cvs_ent *entp;
1.4 jfb 492: struct cvsroot *root;
1.1 jfb 493:
1.4 jfb 494: dap = (struct diff_arg *)arg;
1.1 jfb 495:
1.4 jfb 496: if (cfp->cf_type == DT_DIR) {
1.7 jfb 497: if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {
498: root = cfp->cf_parent->cf_ddat->cd_root;
1.8 jfb 499: cvs_sendreq(root, CVS_REQ_QUESTIONABLE,
500: CVS_FILE_NAME(cfp));
1.10 deraadt 501: } else {
1.7 jfb 502: root = cfp->cf_ddat->cd_root;
503: if ((cfp->cf_parent == NULL) ||
504: (root != cfp->cf_parent->cf_ddat->cd_root)) {
505: cvs_connect(root);
506: cvs_diff_sendflags(root, dap);
507: }
508:
509: cvs_senddir(root, cfp);
1.4 jfb 510: }
1.1 jfb 511:
1.13 jfb 512: return (0);
513: }
514:
515: if (cfp->cf_cvstat == CVS_FST_LOST) {
516: cvs_log(LP_WARN, "cannot find file %s", CVS_FILE_NAME(cfp));
1.4 jfb 517: return (0);
1.1 jfb 518: }
519:
1.4 jfb 520: rf = NULL;
1.8 jfb 521: diff_file = cvs_file_getpath(cfp, fpath, sizeof(fpath));
1.7 jfb 522:
1.4 jfb 523: if (cfp->cf_parent != NULL) {
1.8 jfb 524: dir = cvs_file_getpath(cfp->cf_parent, dfpath, sizeof(dfpath));
1.7 jfb 525: root = cfp->cf_parent->cf_ddat->cd_root;
1.4 jfb 526: repo = cfp->cf_parent->cf_ddat->cd_repo;
1.10 deraadt 527: } else {
1.4 jfb 528: dir = ".";
1.7 jfb 529: root = NULL;
1.4 jfb 530: repo = NULL;
1.1 jfb 531: }
532:
1.4 jfb 533: if (cfp->cf_cvstat == CVS_FST_UNKNOWN) {
534: if (root->cr_method == CVS_METHOD_LOCAL)
535: cvs_log(LP_WARN, "I know nothing about %s", diff_file);
536: else
1.8 jfb 537: cvs_sendreq(root, CVS_REQ_QUESTIONABLE,
538: CVS_FILE_NAME(cfp));
1.4 jfb 539: return (0);
1.1 jfb 540: }
541:
1.4 jfb 542: entp = cvs_ent_getent(diff_file);
543: if (entp == NULL)
544: return (-1);
1.1 jfb 545:
1.4 jfb 546: if (root->cr_method != CVS_METHOD_LOCAL) {
547: if (cvs_sendentry(root, entp) < 0) {
548: cvs_ent_free(entp);
549: return (-1);
550: }
1.1 jfb 551: }
552:
1.4 jfb 553: if (cfp->cf_cvstat == CVS_FST_UPTODATE) {
554: if (root->cr_method != CVS_METHOD_LOCAL)
1.8 jfb 555: cvs_sendreq(root, CVS_REQ_UNCHANGED,
556: CVS_FILE_NAME(cfp));
1.4 jfb 557: cvs_ent_free(entp);
1.1 jfb 558: return (0);
559: }
560:
561: /* at this point, the file is modified */
1.4 jfb 562: if (root->cr_method != CVS_METHOD_LOCAL) {
1.8 jfb 563: cvs_sendreq(root, CVS_REQ_MODIFIED, CVS_FILE_NAME(cfp));
1.4 jfb 564: cvs_sendfile(root, diff_file);
1.10 deraadt 565: } else {
1.1 jfb 566: snprintf(rcspath, sizeof(rcspath), "%s/%s/%s%s",
1.4 jfb 567: root->cr_dir, repo, diff_file, RCS_FILE_EXT);
1.1 jfb 568:
569: rf = rcs_open(rcspath, RCS_MODE_READ);
1.4 jfb 570: if (rf == NULL) {
571: cvs_ent_free(entp);
1.1 jfb 572: return (-1);
1.4 jfb 573: }
1.1 jfb 574:
1.4 jfb 575: cvs_printf("Index: %s\n%s\nRCS file: %s\n", diff_file,
1.1 jfb 576: RCS_DIFF_DIV, rcspath);
577:
1.4 jfb 578: if (dap->rev1 == NULL)
1.1 jfb 579: r1 = entp->ce_rev;
580: else {
1.21 ! jfb 581: if ((r1 = rcsnum_parse(dap->rev1)) == NULL) {
1.20 jfb 582: cvs_ent_free(entp);
583: return (-1);
584: }
1.1 jfb 585: }
586:
1.4 jfb 587: cvs_printf("retrieving revision %s\n",
1.1 jfb 588: rcsnum_tostr(r1, buf, sizeof(buf)));
589: b1 = rcs_getrev(rf, r1);
590:
1.20 jfb 591: if (r1 != entp->ce_rev)
592: rcsnum_free(r1);
593:
1.4 jfb 594: if (dap->rev2 != NULL) {
595: cvs_printf("retrieving revision %s\n", dap->rev2);
1.21 ! jfb 596: if ((r2 = rcsnum_parse(dap->rev2)) == NULL) {
1.20 jfb 597: cvs_ent_free(entp);
598: return (-1);
599: }
1.1 jfb 600: b2 = rcs_getrev(rf, r2);
1.20 jfb 601: rcsnum_free(r2);
1.10 deraadt 602: } else {
1.4 jfb 603: b2 = cvs_buf_load(diff_file, BUF_AUTOEXT);
1.1 jfb 604: }
605:
1.4 jfb 606: rcs_close(rf);
607:
1.2 jfb 608: printf("%s", diffargs);
609: printf(" -r%s", buf);
1.4 jfb 610: if (dap->rev2 != NULL)
611: printf(" -r%s", dap->rev2);
612: printf(" %s\n", diff_file);
1.12 djm 613: strlcpy(path_tmp1, "/tmp/diff1.XXXXXXXXXX", sizeof(path_tmp1));
1.20 jfb 614: if (cvs_buf_write_stmp(b1, path_tmp1, 0600) == -1) {
615: cvs_buf_free(b1);
616: cvs_buf_free(b2);
1.12 djm 617: return (-1);
1.20 jfb 618: }
619: cvs_buf_free(b1);
620:
1.19 jfb 621: strlcpy(path_tmp2, "/tmp/diff2.XXXXXXXXXX", sizeof(path_tmp2));
1.12 djm 622: if (cvs_buf_write_stmp(b2, path_tmp2, 0600) == -1) {
1.20 jfb 623: cvs_buf_free(b2);
1.12 djm 624: (void)unlink(path_tmp1);
625: return (-1);
626: }
1.20 jfb 627: cvs_buf_free(b2);
628:
1.12 djm 629: cvs_diffreg(path_tmp1, path_tmp2);
630: (void)unlink(path_tmp1);
631: (void)unlink(path_tmp2);
1.1 jfb 632: }
633:
1.4 jfb 634: cvs_ent_free(entp);
1.1 jfb 635: return (0);
636: }
637:
638:
639: int
640: cvs_diffreg(const char *file1, const char *file2)
641: {
642: FILE *f1, *f2;
643: int i, rval;
1.20 jfb 644: void *tmp;
1.1 jfb 645:
646: f1 = f2 = NULL;
647: rval = D_SAME;
648: anychange = 0;
649: lastline = 0;
650: lastmatchline = 0;
651: context_vec_ptr = context_vec_start - 1;
652: chrtran = (iflag ? cup2low : clow2low);
653:
654: f1 = fopen(file1, "r");
655: if (f1 == NULL) {
656: cvs_log(LP_ERRNO, "%s", file1);
657: status |= 2;
658: goto closem;
659: }
660:
661: f2 = fopen(file2, "r");
662: if (f2 == NULL) {
663: cvs_log(LP_ERRNO, "%s", file2);
664: status |= 2;
665: goto closem;
666: }
667:
668: switch (files_differ(f1, f2)) {
669: case 0:
670: goto closem;
671: case 1:
672: break;
673: default:
674: /* error */
675: status |= 2;
676: goto closem;
677: }
678:
679: if (!asciifile(f1) || !asciifile(f2)) {
680: rval = D_BINARY;
681: status |= 1;
682: goto closem;
683: }
1.20 jfb 684: if ((prepare(0, f1, stb1.st_size) < 0) ||
685: (prepare(1, f2, stb2.st_size) < 0)) {
686: status |= 2;
687: goto closem;
688: }
1.1 jfb 689: prune();
690: sort(sfile[0], slen[0]);
691: sort(sfile[1], slen[1]);
692:
693: member = (int *)file[1];
694: equiv(sfile[0], slen[0], sfile[1], slen[1], member);
1.20 jfb 695: if ((tmp = realloc(member, (slen[1] + 2) * sizeof(int))) == NULL) {
696: status |= 2;
697: goto closem;
698: }
699: member = (int *)tmp;
1.1 jfb 700:
701: class = (int *)file[0];
702: unsort(sfile[0], slen[0], class);
1.20 jfb 703: if ((tmp = realloc(class, (slen[0] + 2) * sizeof(int))) == NULL) {
704: status |= 2;
705: goto closem;
706: }
707: class = (int *)tmp;
1.1 jfb 708:
1.20 jfb 709: if ((klist = malloc((slen[0] + 2) * sizeof(int))) == NULL) {
710: cvs_log(LP_ERRNO, "failed to allocate klist");
711: status |= 2;
712: goto closem;
713: }
1.1 jfb 714: clen = 0;
715: clistlen = 100;
1.20 jfb 716: if ((clist = malloc(clistlen * sizeof(cand))) == NULL) {
717: cvs_log(LP_ERRNO, "failed to allocate clist");
718: status |= 2;
719: goto closem;
720: }
1.1 jfb 721: i = stone(class, slen[0], member, klist);
722: free(member);
723: free(class);
724:
725: J = realloc(J, (len[0] + 2) * sizeof(int));
726: unravel(klist[i]);
727: free(clist);
728: free(klist);
729:
730: ixold = realloc(ixold, (len[0] + 2) * sizeof(long));
731: ixnew = realloc(ixnew, (len[1] + 2) * sizeof(long));
732: check(f1, f2);
733: output(file1, f1, file2, f2);
734:
735: closem:
736: if (anychange) {
737: status |= 1;
738: if (rval == D_SAME)
739: rval = D_DIFFER;
740: }
741: if (f1 != NULL)
742: fclose(f1);
743: if (f2 != NULL)
744: fclose(f2);
1.20 jfb 745:
1.1 jfb 746: return (rval);
747: }
748:
749: /*
750: * Check to see if the given files differ.
751: * Returns 0 if they are the same, 1 if different, and -1 on error.
752: * XXX - could use code from cmp(1) [faster]
753: */
754: static int
755: files_differ(FILE *f1, FILE *f2)
756: {
757: char buf1[BUFSIZ], buf2[BUFSIZ];
758: size_t i, j;
759:
760: if (stb1.st_size != stb2.st_size)
761: return (1);
762: for (;;) {
763: i = fread(buf1, 1, sizeof(buf1), f1);
764: j = fread(buf2, 1, sizeof(buf2), f2);
765: if (i != j)
766: return (1);
767: if (i == 0 && j == 0) {
768: if (ferror(f1) || ferror(f2))
769: return (1);
770: return (0);
771: }
772: if (memcmp(buf1, buf2, i) != 0)
773: return (1);
774: }
775: }
776:
777:
778: char *
1.15 jfb 779: splice(char *dir, char *filename)
1.1 jfb 780: {
781: char *tail, *buf;
782:
1.15 jfb 783: if ((tail = strrchr(filename, '/')) == NULL)
784: tail = filename;
1.1 jfb 785: else
786: tail++;
787: asprintf(&buf, "%s/%s", dir, tail);
788: return (buf);
789: }
790:
1.20 jfb 791: static int
1.1 jfb 792: prepare(int i, FILE *fd, off_t filesize)
793: {
1.20 jfb 794: void *tmp;
1.1 jfb 795: struct line *p;
796: int j, h;
797: size_t sz;
798:
799: rewind(fd);
800:
1.16 xsa 801: sz = ((size_t)filesize <= SIZE_MAX ? (size_t)filesize : SIZE_MAX) / 25;
1.1 jfb 802: if (sz < 100)
803: sz = 100;
804:
1.20 jfb 805: p = (struct line *)malloc((sz + 3) * sizeof(struct line));
806: if (p == NULL) {
807: cvs_log(LP_ERRNO, "failed to prepare line array");
808: return (-1);
809: }
1.1 jfb 810: for (j = 0; (h = readhash(fd));) {
811: if (j == (int)sz) {
812: sz = sz * 3 / 2;
1.20 jfb 813: tmp = realloc(p, (sz + 3) * sizeof(struct line));
814: if (tmp == NULL) {
815: cvs_log(LP_ERRNO, "failed to grow line array");
816: free(p);
817: return (-1);
818: }
819: p = (struct line *)tmp;
1.1 jfb 820: }
821: p[++j].value = h;
822: }
823: len[i] = j;
824: file[i] = p;
1.20 jfb 825:
826: return (0);
1.1 jfb 827: }
828:
829: static void
830: prune(void)
831: {
832: int i, j;
833:
834: for (pref = 0; pref < len[0] && pref < len[1] &&
835: file[0][pref + 1].value == file[1][pref + 1].value;
836: pref++)
837: ;
838: for (suff = 0; suff < len[0] - pref && suff < len[1] - pref &&
839: file[0][len[0] - suff].value == file[1][len[1] - suff].value;
840: suff++)
841: ;
842: for (j = 0; j < 2; j++) {
843: sfile[j] = file[j] + pref;
844: slen[j] = len[j] - pref - suff;
845: for (i = 0; i <= slen[j]; i++)
846: sfile[j][i].serial = i;
847: }
848: }
849:
850: static void
851: equiv(struct line *a, int n, struct line *b, int m, int *c)
852: {
853: int i, j;
854:
855: i = j = 1;
856: while (i <= n && j <= m) {
857: if (a[i].value < b[j].value)
858: a[i++].value = 0;
859: else if (a[i].value == b[j].value)
860: a[i++].value = j;
861: else
862: j++;
863: }
864: while (i <= n)
865: a[i++].value = 0;
866: b[m + 1].value = 0;
867: j = 0;
868: while (++j <= m) {
869: c[j] = -b[j].serial;
870: while (b[j + 1].value == b[j].value) {
871: j++;
872: c[j] = b[j].serial;
873: }
874: }
875: c[j] = -1;
876: }
877:
878: /* Code taken from ping.c */
879: static int
880: isqrt(int n)
881: {
882: int y, x = 1;
883:
884: if (n == 0)
1.18 jfb 885: return (0);
1.1 jfb 886:
887: do { /* newton was a stinker */
888: y = x;
889: x = n / x;
890: x += y;
891: x /= 2;
892: } while ((x - y) > 1 || (x - y) < -1);
893:
894: return (x);
895: }
896:
897: static int
898: stone(int *a, int n, int *b, int *c)
899: {
900: int i, k, y, j, l;
901: int oldc, tc, oldl;
902: u_int numtries;
903:
1.18 jfb 904: /* XXX move the isqrt() out of the macro to avoid multiple calls */
905: const u_int bound = dflag ? UINT_MAX : MAX(256, (u_int)isqrt(n));
1.1 jfb 906:
907: k = 0;
908: c[0] = newcand(0, 0, 0);
909: for (i = 1; i <= n; i++) {
910: j = a[i];
911: if (j == 0)
912: continue;
913: y = -b[j];
914: oldl = 0;
915: oldc = c[0];
916: numtries = 0;
917: do {
918: if (y <= clist[oldc].y)
919: continue;
920: l = search(c, k, y);
921: if (l != oldl + 1)
922: oldc = c[l - 1];
923: if (l <= k) {
924: if (clist[c[l]].y <= y)
925: continue;
926: tc = c[l];
927: c[l] = newcand(i, y, oldc);
928: oldc = tc;
929: oldl = l;
930: numtries++;
931: } else {
932: c[l] = newcand(i, y, oldc);
933: k++;
934: break;
935: }
936: } while ((y = b[++j]) > 0 && numtries < bound);
937: }
938: return (k);
939: }
940:
941: static int
942: newcand(int x, int y, int pred)
943: {
944: struct cand *q;
945:
946: if (clen == clistlen) {
947: clistlen = clistlen * 11 / 10;
948: clist = realloc(clist, clistlen * sizeof(cand));
1.20 jfb 949: if (clist == NULL) {
950: cvs_log(LP_ERRNO, "failed to resize clist");
951: return (-1);
952: }
1.1 jfb 953: }
954: q = clist + clen;
955: q->x = x;
956: q->y = y;
957: q->pred = pred;
958: return (clen++);
959: }
960:
961: static int
962: search(int *c, int k, int y)
963: {
964: int i, j, l, t;
965:
966: if (clist[c[k]].y < y) /* quick look for typical case */
967: return (k + 1);
968: i = 0;
969: j = k + 1;
970: while (1) {
971: l = i + j;
972: if ((l >>= 1) <= i)
973: break;
974: t = clist[c[l]].y;
975: if (t > y)
976: j = l;
977: else if (t < y)
978: i = l;
979: else
980: return (l);
981: }
982: return (l + 1);
983: }
984:
985: static void
986: unravel(int p)
987: {
988: struct cand *q;
989: int i;
990:
991: for (i = 0; i <= len[0]; i++)
992: J[i] = i <= pref ? i :
993: i > len[0] - suff ? i + len[1] - len[0] : 0;
994: for (q = clist + p; q->y != 0; q = clist + q->pred)
995: J[q->x + pref] = q->y + pref;
996: }
997:
998: /*
999: * Check does double duty:
1000: * 1. ferret out any fortuitous correspondences due
1001: * to confounding by hashing (which result in "jackpot")
1002: * 2. collect random access indexes to the two files
1003: */
1004: static void
1005: check(FILE *f1, FILE *f2)
1006: {
1007: int i, j, jackpot, c, d;
1008: long ctold, ctnew;
1009:
1010: rewind(f1);
1011: rewind(f2);
1012: j = 1;
1013: ixold[0] = ixnew[0] = 0;
1014: jackpot = 0;
1015: ctold = ctnew = 0;
1016: for (i = 1; i <= len[0]; i++) {
1017: if (J[i] == 0) {
1018: ixold[i] = ctold += skipline(f1);
1019: continue;
1020: }
1021: while (j < J[i]) {
1022: ixnew[j] = ctnew += skipline(f2);
1023: j++;
1024: }
1025: if (bflag || wflag || iflag) {
1026: for (;;) {
1027: c = getc(f1);
1028: d = getc(f2);
1029: /*
1030: * GNU diff ignores a missing newline
1031: * in one file if bflag || wflag.
1032: */
1033: if ((bflag || wflag) &&
1034: ((c == EOF && d == '\n') ||
1035: (c == '\n' && d == EOF))) {
1036: break;
1037: }
1038: ctold++;
1039: ctnew++;
1040: if (bflag && isspace(c) && isspace(d)) {
1041: do {
1042: if (c == '\n')
1043: break;
1044: ctold++;
1045: } while (isspace(c = getc(f1)));
1046: do {
1047: if (d == '\n')
1048: break;
1049: ctnew++;
1050: } while (isspace(d = getc(f2)));
1051: } else if (wflag) {
1052: while (isspace(c) && c != '\n') {
1053: c = getc(f1);
1054: ctold++;
1055: }
1056: while (isspace(d) && d != '\n') {
1057: d = getc(f2);
1058: ctnew++;
1059: }
1060: }
1061: if (chrtran[c] != chrtran[d]) {
1062: jackpot++;
1063: J[i] = 0;
1064: if (c != '\n' && c != EOF)
1065: ctold += skipline(f1);
1066: if (d != '\n' && c != EOF)
1067: ctnew += skipline(f2);
1068: break;
1069: }
1070: if (c == '\n' || c == EOF)
1071: break;
1072: }
1073: } else {
1074: for (;;) {
1075: ctold++;
1076: ctnew++;
1077: if ((c = getc(f1)) != (d = getc(f2))) {
1078: /* jackpot++; */
1079: J[i] = 0;
1080: if (c != '\n' && c != EOF)
1081: ctold += skipline(f1);
1082: if (d != '\n' && c != EOF)
1083: ctnew += skipline(f2);
1084: break;
1085: }
1086: if (c == '\n' || c == EOF)
1087: break;
1088: }
1089: }
1090: ixold[i] = ctold;
1091: ixnew[j] = ctnew;
1092: j++;
1093: }
1094: for (; j <= len[1]; j++)
1095: ixnew[j] = ctnew += skipline(f2);
1096: /*
1097: * if (jackpot)
1098: * fprintf(stderr, "jackpot\n");
1099: */
1100: }
1101:
1102: /* shellsort CACM #201 */
1103: static void
1104: sort(struct line *a, int n)
1105: {
1106: struct line *ai, *aim, w;
1107: int j, m = 0, k;
1108:
1109: if (n == 0)
1110: return;
1111: for (j = 1; j <= n; j *= 2)
1112: m = 2 * j - 1;
1113: for (m /= 2; m != 0; m /= 2) {
1114: k = n - m;
1115: for (j = 1; j <= k; j++) {
1116: for (ai = &a[j]; ai > a; ai -= m) {
1117: aim = &ai[m];
1118: if (aim < ai)
1119: break; /* wraparound */
1120: if (aim->value > ai[0].value ||
1121: (aim->value == ai[0].value &&
1122: aim->serial > ai[0].serial))
1123: break;
1124: w.value = ai[0].value;
1125: ai[0].value = aim->value;
1126: aim->value = w.value;
1127: w.serial = ai[0].serial;
1128: ai[0].serial = aim->serial;
1129: aim->serial = w.serial;
1130: }
1131: }
1132: }
1133: }
1134:
1135: static void
1136: unsort(struct line *f, int l, int *b)
1137: {
1138: int *a, i;
1139:
1.20 jfb 1140: if ((a = (int *)malloc((l + 1) * sizeof(int))) == NULL) {
1141: cvs_log(LP_ERRNO, "failed to allocate sort array");
1142: return;
1143: }
1.1 jfb 1144: for (i = 1; i <= l; i++)
1145: a[f[i].serial] = f[i].value;
1146: for (i = 1; i <= l; i++)
1147: b[i] = a[i];
1148: free(a);
1149: }
1150:
1151: static int
1152: skipline(FILE *f)
1153: {
1154: int i, c;
1155:
1156: for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
1157: continue;
1158: return (i);
1159: }
1160:
1161: static void
1162: output(const char *file1, FILE *f1, const char *file2, FILE *f2)
1163: {
1164: int m, i0, i1, j0, j1;
1165:
1166: rewind(f1);
1167: rewind(f2);
1168: m = len[0];
1169: J[0] = 0;
1170: J[m + 1] = len[1] + 1;
1171: for (i0 = 1; i0 <= m; i0 = i1 + 1) {
1172: while (i0 <= m && J[i0] == J[i0 - 1] + 1)
1173: i0++;
1174: j0 = J[i0 - 1] + 1;
1175: i1 = i0 - 1;
1176: while (i1 < m && J[i1 + 1] == 0)
1177: i1++;
1178: j1 = J[i1 + 1] - 1;
1179: J[i1] = j1;
1180: change(file1, f1, file2, f2, i0, i1, j0, j1);
1181: }
1182: if (m == 0)
1183: change(file1, f1, file2, f2, 1, 0, 1, len[1]);
1184: if (format == D_IFDEF) {
1185: for (;;) {
1186: #define c i0
1187: if ((c = getc(f1)) == EOF)
1188: return;
1189: putchar(c);
1190: }
1191: #undef c
1192: }
1193: if (anychange != 0) {
1194: if (format == D_CONTEXT)
1195: dump_context_vec(f1, f2);
1196: else if (format == D_UNIFIED)
1197: dump_unified_vec(f1, f2);
1198: }
1199: }
1200:
1201: static __inline void
1202: range(int a, int b, char *separator)
1203: {
1204: printf("%d", a > b ? b : a);
1205: if (a < b)
1206: printf("%s%d", separator, b);
1207: }
1208:
1209: static __inline void
1210: uni_range(int a, int b)
1211: {
1212: if (a < b)
1213: printf("%d,%d", a, b - a + 1);
1214: else if (a == b)
1215: printf("%d", b);
1216: else
1217: printf("%d,0", b);
1218: }
1219:
1220: static char *
1.15 jfb 1221: preadline(int fd, size_t rlen, off_t off)
1.1 jfb 1222: {
1223: char *line;
1224: ssize_t nr;
1225:
1.15 jfb 1226: line = malloc(rlen + 1);
1.1 jfb 1227: if (line == NULL) {
1228: cvs_log(LP_ERRNO, "failed to allocate line");
1229: return (NULL);
1230: }
1.15 jfb 1231: if ((nr = pread(fd, line, rlen, off)) < 0) {
1.1 jfb 1232: cvs_log(LP_ERRNO, "preadline failed");
1233: return (NULL);
1234: }
1235: line[nr] = '\0';
1236: return (line);
1237: }
1238:
1239: static int
1240: ignoreline(char *line)
1241: {
1242: int ret;
1243:
1244: ret = regexec(&ignore_re, line, 0, NULL, 0);
1245: free(line);
1246: return (ret == 0); /* if it matched, it should be ignored. */
1247: }
1248:
1249: /*
1250: * Indicate that there is a difference between lines a and b of the from file
1251: * to get to lines c to d of the to file. If a is greater then b then there
1252: * are no lines in the from file involved and this means that there were
1253: * lines appended (beginning at b). If c is greater than d then there are
1254: * lines missing from the to file.
1255: */
1256: static void
1257: change(const char *file1, FILE *f1, const char *file2, FILE *f2,
1258: int a, int b, int c, int d)
1259: {
1260: static size_t max_context = 64;
1261: int i;
1262:
1263: if (format != D_IFDEF && a > b && c > d)
1264: return;
1265: if (ignore_pats != NULL) {
1266: char *line;
1267: /*
1268: * All lines in the change, insert, or delete must
1269: * match an ignore pattern for the change to be
1270: * ignored.
1271: */
1272: if (a <= b) { /* Changes and deletes. */
1273: for (i = a; i <= b; i++) {
1274: line = preadline(fileno(f1),
1275: ixold[i] - ixold[i - 1], ixold[i - 1]);
1276: if (!ignoreline(line))
1277: goto proceed;
1278: }
1279: }
1280: if (a > b || c <= d) { /* Changes and inserts. */
1281: for (i = c; i <= d; i++) {
1282: line = preadline(fileno(f2),
1283: ixnew[i] - ixnew[i - 1], ixnew[i - 1]);
1284: if (!ignoreline(line))
1285: goto proceed;
1286: }
1287: }
1288: return;
1289: }
1290: proceed:
1291: if (format == D_CONTEXT || format == D_UNIFIED) {
1292: /*
1293: * Allocate change records as needed.
1294: */
1295: if (context_vec_ptr == context_vec_end - 1) {
1296: ptrdiff_t offset = context_vec_ptr - context_vec_start;
1297: max_context <<= 1;
1298: context_vec_start = realloc(context_vec_start,
1299: max_context * sizeof(struct context_vec));
1300: context_vec_end = context_vec_start + max_context;
1301: context_vec_ptr = context_vec_start + offset;
1302: }
1303: if (anychange == 0) {
1304: /*
1305: * Print the context/unidiff header first time through.
1306: */
1307: printf("%s %s %s",
1308: format == D_CONTEXT ? "***" : "---", diff_file,
1309: ctime(&stb1.st_mtime));
1310: printf("%s %s %s",
1311: format == D_CONTEXT ? "---" : "+++", diff_file,
1312: ctime(&stb2.st_mtime));
1313: anychange = 1;
1314: } else if (a > context_vec_ptr->b + (2 * context) + 1 &&
1315: c > context_vec_ptr->d + (2 * context) + 1) {
1316: /*
1317: * If this change is more than 'context' lines from the
1318: * previous change, dump the record and reset it.
1319: */
1320: if (format == D_CONTEXT)
1321: dump_context_vec(f1, f2);
1322: else
1323: dump_unified_vec(f1, f2);
1324: }
1325: context_vec_ptr++;
1326: context_vec_ptr->a = a;
1327: context_vec_ptr->b = b;
1328: context_vec_ptr->c = c;
1329: context_vec_ptr->d = d;
1330: return;
1331: }
1332: if (anychange == 0)
1333: anychange = 1;
1334: switch (format) {
1335: case D_BRIEF:
1336: return;
1337: case D_NORMAL:
1338: range(a, b, ",");
1339: putchar(a > b ? 'a' : c > d ? 'd' : 'c');
1340: if (format == D_NORMAL)
1341: range(c, d, ",");
1342: putchar('\n');
1343: break;
1344: }
1345: if (format == D_NORMAL || format == D_IFDEF) {
1346: fetch(ixold, a, b, f1, '<', 1);
1347: if (a <= b && c <= d && format == D_NORMAL)
1348: puts("---");
1349: }
1350: i = fetch(ixnew, c, d, f2, format == D_NORMAL ? '>' : '\0', 0);
1351: if (inifdef) {
1352: printf("#endif /* %s */\n", ifdefname);
1353: inifdef = 0;
1354: }
1355: }
1356:
1357: static int
1358: fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile)
1359: {
1360: int i, j, c, lastc, col, nc;
1361:
1362: /*
1363: * When doing #ifdef's, copy down to current line
1364: * if this is the first file, so that stuff makes it to output.
1365: */
1366: if (format == D_IFDEF && oldfile) {
1367: long curpos = ftell(lb);
1368: /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1369: nc = f[a > b ? b : a - 1] - curpos;
1370: for (i = 0; i < nc; i++)
1371: putchar(getc(lb));
1372: }
1373: if (a > b)
1374: return (0);
1375: if (format == D_IFDEF) {
1376: if (inifdef) {
1377: printf("#else /* %s%s */\n",
1378: oldfile == 1 ? "!" : "", ifdefname);
1379: } else {
1380: if (oldfile)
1381: printf("#ifndef %s\n", ifdefname);
1382: else
1383: printf("#ifdef %s\n", ifdefname);
1384: }
1385: inifdef = 1 + oldfile;
1386: }
1387: for (i = a; i <= b; i++) {
1388: fseek(lb, f[i - 1], SEEK_SET);
1389: nc = f[i] - f[i - 1];
1390: if (format != D_IFDEF && ch != '\0') {
1391: putchar(ch);
1392: if (Tflag && (format == D_NORMAL || format == D_CONTEXT
1393: || format == D_UNIFIED))
1394: putchar('\t');
1395: else if (format != D_UNIFIED)
1396: putchar(' ');
1397: }
1398: col = 0;
1399: for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
1400: if ((c = getc(lb)) == EOF) {
1401: puts("\n\\ No newline at end of file");
1402: return (0);
1403: }
1404: if (c == '\t' && tflag) {
1405: do {
1406: putchar(' ');
1407: } while (++col & 7);
1408: } else {
1409: putchar(c);
1410: col++;
1411: }
1412: }
1413: }
1414: return (0);
1415: }
1416:
1417: /*
1418: * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1419: */
1420: static int
1421: readhash(FILE *f)
1422: {
1423: int i, t, space;
1424: int sum;
1425:
1426: sum = 1;
1427: space = 0;
1428: if (!bflag && !wflag) {
1429: if (iflag)
1430: for (i = 0; (t = getc(f)) != '\n'; i++) {
1431: if (t == EOF) {
1432: if (i == 0)
1433: return (0);
1434: break;
1435: }
1436: sum = sum * 127 + chrtran[t];
1437: }
1438: else
1439: for (i = 0; (t = getc(f)) != '\n'; i++) {
1440: if (t == EOF) {
1441: if (i == 0)
1442: return (0);
1443: break;
1444: }
1445: sum = sum * 127 + t;
1446: }
1447: } else {
1448: for (i = 0;;) {
1449: switch (t = getc(f)) {
1450: case '\t':
1451: case ' ':
1452: space++;
1453: continue;
1454: default:
1455: if (space && !wflag) {
1456: i++;
1457: space = 0;
1458: }
1459: sum = sum * 127 + chrtran[t];
1460: i++;
1461: continue;
1462: case EOF:
1463: if (i == 0)
1464: return (0);
1465: /* FALLTHROUGH */
1466: case '\n':
1467: break;
1468: }
1469: break;
1470: }
1471: }
1472: /*
1473: * There is a remote possibility that we end up with a zero sum.
1474: * Zero is used as an EOF marker, so return 1 instead.
1475: */
1476: return (sum == 0 ? 1 : sum);
1477: }
1478:
1479: static int
1480: asciifile(FILE *f)
1481: {
1482: char buf[BUFSIZ];
1483: int i, cnt;
1484:
1485: if (aflag || f == NULL)
1486: return (1);
1487:
1488: rewind(f);
1489: cnt = fread(buf, 1, sizeof(buf), f);
1490: for (i = 0; i < cnt; i++)
1491: if (!isprint(buf[i]) && !isspace(buf[i]))
1492: return (0);
1493: return (1);
1494: }
1495:
1.17 jfb 1496: static char*
1497: match_function(const long *f, int pos, FILE *fp)
1498: {
1499: unsigned char buf[FUNCTION_CONTEXT_SIZE];
1500: size_t nc;
1501: int last = lastline;
1502: char *p;
1503:
1504: lastline = pos;
1505: while (pos > last) {
1506: fseek(fp, f[pos - 1], SEEK_SET);
1507: nc = f[pos] - f[pos - 1];
1508: if (nc >= sizeof(buf))
1509: nc = sizeof(buf) - 1;
1510: nc = fread(buf, 1, nc, fp);
1511: if (nc > 0) {
1512: buf[nc] = '\0';
1513: p = strchr(buf, '\n');
1514: if (p != NULL)
1515: *p = '\0';
1516: if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1517: strlcpy(lastbuf, buf, sizeof lastbuf);
1518: lastmatchline = pos;
1519: return lastbuf;
1520: }
1521: }
1522: pos--;
1523: }
1524: return (lastmatchline > 0) ? lastbuf : NULL;
1525: }
1526:
1.1 jfb 1527:
1528: /* dump accumulated "context" diff changes */
1529: static void
1530: dump_context_vec(FILE *f1, FILE *f2)
1531: {
1532: struct context_vec *cvp = context_vec_start;
1533: int lowa, upb, lowc, upd, do_output;
1534: int a, b, c, d;
1.17 jfb 1535: char ch, *f;
1.1 jfb 1536:
1537: if (context_vec_start > context_vec_ptr)
1538: return;
1539:
1540: b = d = 0; /* gcc */
1.4 jfb 1541: lowa = MAX(1, cvp->a - context);
1542: upb = MIN(len[0], context_vec_ptr->b + context);
1543: lowc = MAX(1, cvp->c - context);
1544: upd = MIN(len[1], context_vec_ptr->d + context);
1.1 jfb 1545:
1546: printf("***************");
1.17 jfb 1547: if (pflag) {
1548: f = match_function(ixold, lowa - 1, f1);
1549: if (f != NULL) {
1550: putchar(' ');
1551: fputs(f, stdout);
1552: }
1553: }
1.1 jfb 1554: printf("\n*** ");
1555: range(lowa, upb, ",");
1556: printf(" ****\n");
1557:
1558: /*
1559: * Output changes to the "old" file. The first loop suppresses
1560: * output if there were no changes to the "old" file (we'll see
1561: * the "old" lines as context in the "new" list).
1562: */
1563: do_output = 0;
1564: for (; cvp <= context_vec_ptr; cvp++)
1565: if (cvp->a <= cvp->b) {
1566: cvp = context_vec_start;
1567: do_output++;
1568: break;
1569: }
1570: if (do_output) {
1571: while (cvp <= context_vec_ptr) {
1572: a = cvp->a;
1573: b = cvp->b;
1574: c = cvp->c;
1575: d = cvp->d;
1576:
1577: if (a <= b && c <= d)
1578: ch = 'c';
1579: else
1580: ch = (a <= b) ? 'd' : 'a';
1581:
1582: if (ch == 'a')
1583: fetch(ixold, lowa, b, f1, ' ', 0);
1584: else {
1585: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1586: fetch(ixold, a, b, f1,
1587: ch == 'c' ? '!' : '-', 0);
1588: }
1589: lowa = b + 1;
1590: cvp++;
1591: }
1592: fetch(ixold, b + 1, upb, f1, ' ', 0);
1593: }
1594: /* output changes to the "new" file */
1595: printf("--- ");
1596: range(lowc, upd, ",");
1597: printf(" ----\n");
1598:
1599: do_output = 0;
1600: for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++)
1601: if (cvp->c <= cvp->d) {
1602: cvp = context_vec_start;
1603: do_output++;
1604: break;
1605: }
1606: if (do_output) {
1607: while (cvp <= context_vec_ptr) {
1608: a = cvp->a;
1609: b = cvp->b;
1610: c = cvp->c;
1611: d = cvp->d;
1612:
1613: if (a <= b && c <= d)
1614: ch = 'c';
1615: else
1616: ch = (a <= b) ? 'd' : 'a';
1617:
1618: if (ch == 'd')
1619: fetch(ixnew, lowc, d, f2, ' ', 0);
1620: else {
1621: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1622: fetch(ixnew, c, d, f2,
1623: ch == 'c' ? '!' : '+', 0);
1624: }
1625: lowc = d + 1;
1626: cvp++;
1627: }
1628: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1629: }
1630: context_vec_ptr = context_vec_start - 1;
1631: }
1632:
1633: /* dump accumulated "unified" diff changes */
1634: static void
1635: dump_unified_vec(FILE *f1, FILE *f2)
1636: {
1637: struct context_vec *cvp = context_vec_start;
1638: int lowa, upb, lowc, upd;
1639: int a, b, c, d;
1.17 jfb 1640: char ch, *f;
1.1 jfb 1641:
1642: if (context_vec_start > context_vec_ptr)
1643: return;
1644:
1645: b = d = 0; /* gcc */
1.4 jfb 1646: lowa = MAX(1, cvp->a - context);
1647: upb = MIN(len[0], context_vec_ptr->b + context);
1648: lowc = MAX(1, cvp->c - context);
1649: upd = MIN(len[1], context_vec_ptr->d + context);
1.1 jfb 1650:
1651: fputs("@@ -", stdout);
1652: uni_range(lowa, upb);
1653: fputs(" +", stdout);
1654: uni_range(lowc, upd);
1655: fputs(" @@", stdout);
1.17 jfb 1656: if (pflag) {
1657: f = match_function(ixold, lowa - 1, f1);
1658: if (f != NULL) {
1659: putchar(' ');
1660: fputs(f, stdout);
1661: }
1662: }
1.1 jfb 1663: putchar('\n');
1664:
1665: /*
1666: * Output changes in "unified" diff format--the old and new lines
1667: * are printed together.
1668: */
1669: for (; cvp <= context_vec_ptr; cvp++) {
1670: a = cvp->a;
1671: b = cvp->b;
1672: c = cvp->c;
1673: d = cvp->d;
1674:
1675: /*
1676: * c: both new and old changes
1677: * d: only changes in the old file
1678: * a: only changes in the new file
1679: */
1680: if (a <= b && c <= d)
1681: ch = 'c';
1682: else
1683: ch = (a <= b) ? 'd' : 'a';
1684:
1685: switch (ch) {
1686: case 'c':
1687: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1688: fetch(ixold, a, b, f1, '-', 0);
1689: fetch(ixnew, c, d, f2, '+', 0);
1690: break;
1691: case 'd':
1692: fetch(ixold, lowa, a - 1, f1, ' ', 0);
1693: fetch(ixold, a, b, f1, '-', 0);
1694: break;
1695: case 'a':
1696: fetch(ixnew, lowc, c - 1, f2, ' ', 0);
1697: fetch(ixnew, c, d, f2, '+', 0);
1698: break;
1699: }
1700: lowa = b + 1;
1701: lowc = d + 1;
1702: }
1703: fetch(ixnew, d + 1, upd, f2, ' ', 0);
1704:
1705: context_vec_ptr = context_vec_start - 1;
1706: }