1 /* $OpenBSD: diffreg.c,v 1.93 2019/06/28 13:35:00 deraadt Exp $ */
4 * SPDX-License-Identifier: BSD-4-Clause
6 * Copyright (C) Caldera International Inc. 2001-2002.
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions
12 * 1. Redistributions of source code and documentation must retain the above
13 * copyright notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the
16 * documentation and/or other materials provided with the distribution.
17 * 3. All advertising materials mentioning features or use of this software
18 * must display the following acknowledgement:
19 * This product includes software developed or owned by Caldera
21 * 4. Neither the name of Caldera International, Inc. nor the names of other
22 * contributors may be used to endorse or promote products derived from
23 * this software without specific prior written permission.
25 * USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA
26 * INTERNATIONAL, INC. AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR
27 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
28 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
29 * IN NO EVENT SHALL CALDERA INTERNATIONAL, INC. BE LIABLE FOR ANY DIRECT,
30 * INDIRECT INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
34 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
35 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE.
39 * Copyright (c) 1991, 1993
40 * The Regents of the University of California. All rights reserved.
42 * Redistribution and use in source and binary forms, with or without
43 * modification, are permitted provided that the following conditions
45 * 1. Redistributions of source code must retain the above copyright
46 * notice, this list of conditions and the following disclaimer.
47 * 2. Redistributions in binary form must reproduce the above copyright
48 * notice, this list of conditions and the following disclaimer in the
49 * documentation and/or other materials provided with the distribution.
50 * 3. Neither the name of the University nor the names of its contributors
51 * may be used to endorse or promote products derived from this software
52 * without specific prior written permission.
54 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
55 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
56 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
57 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
58 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
59 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
60 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
61 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
62 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
63 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
66 * @(#)diffreg.c 8.1 (Berkeley) 6/6/93
69 #include <sys/cdefs.h>
70 __FBSDID("$FreeBSD$");
72 #include <sys/capsicum.h>
75 #include <capsicum_helpers.h>
94 * diff - compare two files.
98 * Uses an algorithm due to Harold Stone, which finds
99 * a pair of longest identical subsequences in the two
102 * The major goal is to generate the match vector J.
103 * J[i] is the index of the line in file1 corresponding
104 * to line i file0. J[i] = 0 if there is no
105 * such line in file1.
107 * Lines are hashed so as to work in core. All potential
108 * matches are located by sorting the lines of each file
109 * on the hash (called ``value''). In particular, this
110 * collects the equivalence classes in file1 together.
111 * Subroutine equiv replaces the value of each line in
112 * file0 by the index of the first element of its
113 * matching equivalence in (the reordered) file1.
114 * To save space equiv squeezes file1 into a single
115 * array member in which the equivalence classes
116 * are simply concatenated, except that their first
117 * members are flagged by changing sign.
119 * Next the indices that point into member are unsorted into
120 * array class according to the original order of file0.
122 * The cleverness lies in routine stone. This marches
123 * through the lines of file0, developing a vector klist
124 * of "k-candidates". At step i a k-candidate is a matched
125 * pair of lines x,y (x in file0 y in file1) such that
126 * there is a common subsequence of length k
127 * between the first i lines of file0 and the first y
128 * lines of file1, but there is no such subsequence for
129 * any smaller y. x is the earliest possible mate to y
130 * that occurs in such a subsequence.
132 * Whenever any of the members of the equivalence class of
133 * lines in file1 matable to a line in file0 has serial number
134 * less than the y of some k-candidate, that k-candidate
135 * with the smallest such y is replaced. The new
136 * k-candidate is chained (via pred) to the current
137 * k-1 candidate so that the actual subsequence can
138 * be recovered. When a member has serial number greater
139 * that the y of all k-candidates, the klist is extended.
140 * At the end, the longest subsequence is pulled out
141 * and placed in the array J by unravel
143 * With J in hand, the matches there recorded are
144 * check'ed against reality to assure that no spurious
145 * matches have crept in due to hashing. If they have,
146 * they are broken, and "jackpot" is recorded--a harmless
147 * matter except that a true match for a spuriously
148 * mated line may now be unnecessarily reported as a change.
150 * Much of the complexity of the program comes simply
151 * from trying to minimize core utilization and
152 * maximize the range of doable problems by dynamically
153 * allocating what is needed and reusing what is not.
154 * The core requirements for problems larger than somewhat
155 * are (in words) 2*length(file0) + length(file1) +
156 * 3*(number of k-candidates installed), typically about
157 * 6n words for files of length n.
172 * The following struct is used to record change information when
173 * doing a "context" or "unified" diff. (see routine "change" to
174 * understand the highly mnemonic field names)
177 int a; /* start line in old file */
178 int b; /* end line in old file */
179 int c; /* start line in new file */
180 int d; /* end line in new file */
183 #define diff_output printf
184 static FILE *opentemp(const char *);
185 static void output(char *, FILE *, char *, FILE *, int);
186 static void check(FILE *, FILE *, int);
187 static void range(int, int, const char *);
188 static void uni_range(int, int);
189 static void dump_context_vec(FILE *, FILE *, int);
190 static void dump_unified_vec(FILE *, FILE *, int);
191 static void prepare(int, FILE *, size_t, int);
192 static void prune(void);
193 static void equiv(struct line *, int, struct line *, int, int *);
194 static void unravel(int);
195 static void unsort(struct line *, int, int *);
196 static void change(char *, FILE *, char *, FILE *, int, int, int, int, int *);
197 static void sort(struct line *, int);
198 static void print_header(const char *, const char *);
199 static bool ignoreline_pattern(char *);
200 static bool ignoreline(char *, bool);
201 static int asciifile(FILE *);
202 static int fetch(long *, int, int, FILE *, int, int, int);
203 static int newcand(int, int, int);
204 static int search(int *, int, int);
205 static int skipline(FILE *);
206 static int isqrt(int);
207 static int stone(int *, int, int *, int *, int);
208 static int readhash(FILE *, int);
209 static int files_differ(FILE *, FILE *, int);
210 static char *match_function(const long *, int, FILE *);
211 static char *preadline(int, size_t, off_t);
213 static int *J; /* will be overlaid on class */
214 static int *class; /* will be overlaid on file[0] */
215 static int *klist; /* will be overlaid on file[0] after class */
216 static int *member; /* will be overlaid on file[1] */
218 static int inifdef; /* whether or not we are in a #ifdef block */
220 static int pref, suff; /* length of prefix and suffix */
222 static int anychange;
223 static long *ixnew; /* will be overlaid on file[1] */
224 static long *ixold; /* will be overlaid on klist */
225 static struct cand *clist; /* merely a free storage pot for candidates */
226 static int clistlen; /* the length of clist */
227 static struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
228 static int (*chrtran)(int); /* translation table for case-folding */
229 static struct context_vec *context_vec_start;
230 static struct context_vec *context_vec_end;
231 static struct context_vec *context_vec_ptr;
233 #define FUNCTION_CONTEXT_SIZE 55
234 static char lastbuf[FUNCTION_CONTEXT_SIZE];
236 static int lastmatchline;
253 diffreg(char *file1, char *file2, int flags, int capsicum)
257 struct pr *pr = NULL;
258 cap_rights_t rights_ro;
265 context_vec_ptr = context_vec_start - 1;
266 if (flags & D_IGNORECASE)
270 if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
271 return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
272 if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0)
275 if (flags & D_EMPTY1)
276 f1 = fopen(_PATH_DEVNULL, "r");
278 if (!S_ISREG(stb1.st_mode)) {
279 if ((f1 = opentemp(file1)) == NULL ||
280 fstat(fileno(f1), &stb1) == -1) {
285 } else if (strcmp(file1, "-") == 0)
288 f1 = fopen(file1, "r");
296 if (flags & D_EMPTY2)
297 f2 = fopen(_PATH_DEVNULL, "r");
299 if (!S_ISREG(stb2.st_mode)) {
300 if ((f2 = opentemp(file2)) == NULL ||
301 fstat(fileno(f2), &stb2) == -1) {
306 } else if (strcmp(file2, "-") == 0)
309 f2 = fopen(file2, "r");
318 pr = start_pr(file1, file2);
321 cap_rights_init(&rights_ro, CAP_READ, CAP_FSTAT, CAP_SEEK);
322 if (caph_rights_limit(fileno(f1), &rights_ro) < 0)
323 err(2, "unable to limit rights on: %s", file1);
324 if (caph_rights_limit(fileno(f2), &rights_ro) < 0)
325 err(2, "unable to limit rights on: %s", file2);
326 if (fileno(f1) == STDIN_FILENO || fileno(f2) == STDIN_FILENO) {
327 /* stding has already been limited */
328 if (caph_limit_stderr() == -1)
329 err(2, "unable to limit stderr");
330 if (caph_limit_stdout() == -1)
331 err(2, "unable to limit stdout");
332 } else if (caph_limit_stdio() == -1)
333 err(2, "unable to limit stdio");
335 caph_cache_catpages();
337 if (caph_enter() < 0)
338 err(2, "unable to enter capability mode");
341 switch (files_differ(f1, f2, flags)) {
352 if (diff_format == D_BRIEF && ignore_pats == NULL) {
357 if ((flags & D_FORCEASCII) == 0 &&
358 (!asciifile(f1) || !asciifile(f2))) {
363 prepare(0, f1, stb1.st_size, flags);
364 prepare(1, f2, stb2.st_size, flags);
367 sort(sfile[0], slen[0]);
368 sort(sfile[1], slen[1]);
370 member = (int *)file[1];
371 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
372 member = xreallocarray(member, slen[1] + 2, sizeof(*member));
374 class = (int *)file[0];
375 unsort(sfile[0], slen[0], class);
376 class = xreallocarray(class, slen[0] + 2, sizeof(*class));
378 klist = xcalloc(slen[0] + 2, sizeof(*klist));
381 clist = xcalloc(clistlen, sizeof(*clist));
382 i = stone(class, slen[0], member, klist, flags);
386 J = xreallocarray(J, len[0] + 2, sizeof(*J));
391 ixold = xreallocarray(ixold, len[0] + 2, sizeof(*ixold));
392 ixnew = xreallocarray(ixnew, len[1] + 2, sizeof(*ixnew));
393 check(f1, f2, flags);
394 output(file1, f1, file2, f2, flags);
413 * Check to see if the given files differ.
414 * Returns 0 if they are the same, 1 if different, and -1 on error.
415 * XXX - could use code from cmp(1) [faster]
418 files_differ(FILE *f1, FILE *f2, int flags)
420 char buf1[BUFSIZ], buf2[BUFSIZ];
423 if ((flags & (D_EMPTY1|D_EMPTY2)) || stb1.st_size != stb2.st_size ||
424 (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT))
427 i = fread(buf1, 1, sizeof(buf1), f1);
428 j = fread(buf2, 1, sizeof(buf2), f2);
429 if ((!i && ferror(f1)) || (!j && ferror(f2)))
435 if (memcmp(buf1, buf2, i) != 0)
441 opentemp(const char *f)
443 char buf[BUFSIZ], tempfile[PATH_MAX];
447 if (strcmp(f, "-") == 0)
449 else if ((ifd = open(f, O_RDONLY, 0644)) == -1)
452 (void)strlcpy(tempfile, _PATH_TMP "/diff.XXXXXXXX", sizeof(tempfile));
454 if ((ofd = mkstemp(tempfile)) == -1) {
459 while ((nread = read(ifd, buf, BUFSIZ)) > 0) {
460 if (write(ofd, buf, nread) != nread) {
467 lseek(ofd, (off_t)0, SEEK_SET);
468 return (fdopen(ofd, "r"));
472 splice(char *dir, char *path)
477 dirlen = strlen(dir);
478 while (dirlen != 0 && dir[dirlen - 1] == '/')
480 if ((tail = strrchr(path, '/')) == NULL)
484 xasprintf(&buf, "%.*s/%s", (int)dirlen, dir, tail);
489 prepare(int i, FILE *fd, size_t filesize, int flags)
497 sz = MIN(filesize, SIZE_MAX) / 25;
501 p = xcalloc(sz + 3, sizeof(*p));
502 for (j = 0; (h = readhash(fd, flags));) {
505 p = xreallocarray(p, sz + 3, sizeof(*p));
518 for (pref = 0; pref < len[0] && pref < len[1] &&
519 file[0][pref + 1].value == file[1][pref + 1].value;
522 for (suff = 0; suff < len[0] - pref && suff < len[1] - pref &&
523 file[0][len[0] - suff].value == file[1][len[1] - suff].value;
526 for (j = 0; j < 2; j++) {
527 sfile[j] = file[j] + pref;
528 slen[j] = len[j] - pref - suff;
529 for (i = 0; i <= slen[j]; i++)
530 sfile[j][i].serial = i;
535 equiv(struct line *a, int n, struct line *b, int m, int *c)
540 while (i <= n && j <= m) {
541 if (a[i].value < b[j].value)
543 else if (a[i].value == b[j].value)
554 while (b[j + 1].value == b[j].value) {
562 /* Code taken from ping.c */
571 do { /* newton was a stinker */
576 } while ((x - y) > 1 || (x - y) < -1);
582 stone(int *a, int n, int *b, int *c, int flags)
585 int oldc, tc, oldl, sq;
586 u_int numtries, bound;
588 if (flags & D_MINIMAL)
592 bound = MAX(256, sq);
596 c[0] = newcand(0, 0, 0);
597 for (i = 1; i <= n; i++) {
606 if (y <= clist[oldc].y)
612 if (clist[c[l]].y <= y)
615 c[l] = newcand(i, y, oldc);
620 c[l] = newcand(i, y, oldc);
624 } while ((y = b[++j]) > 0 && numtries < bound);
630 newcand(int x, int y, int pred)
634 if (clen == clistlen) {
635 clistlen = clistlen * 11 / 10;
636 clist = xreallocarray(clist, clistlen, sizeof(*clist));
646 search(int *c, int k, int y)
650 if (clist[c[k]].y < y) /* quick look for typical case */
675 for (i = 0; i <= len[0]; i++)
676 J[i] = i <= pref ? i :
677 i > len[0] - suff ? i + len[1] - len[0] : 0;
678 for (q = clist + p; q->y != 0; q = clist + q->pred)
679 J[q->x + pref] = q->y + pref;
683 * Check does double duty:
684 * 1. ferret out any fortuitous correspondences due
685 * to confounding by hashing (which result in "jackpot")
686 * 2. collect random access indexes to the two files
689 check(FILE *f1, FILE *f2, int flags)
691 int i, j, jackpot, c, d;
697 ixold[0] = ixnew[0] = 0;
700 for (i = 1; i <= len[0]; i++) {
702 ixold[i] = ctold += skipline(f1);
706 ixnew[j] = ctnew += skipline(f2);
709 if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS|D_IGNORECASE|D_STRIPCR)) {
714 * GNU diff ignores a missing newline
715 * in one file for -b or -w.
717 if (flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) {
718 if (c == EOF && d == '\n') {
721 } else if (c == '\n' && d == EOF) {
728 if (flags & D_STRIPCR && (c == '\r' || d == '\r')) {
730 if ((c = getc(f1)) == '\n') {
737 if ((d = getc(f2)) == '\n') {
745 if ((flags & D_FOLDBLANKS) && isspace(c) &&
751 } while (isspace(c = getc(f1)));
756 } while (isspace(d = getc(f2)));
757 } else if ((flags & D_IGNOREBLANKS)) {
758 while (isspace(c) && c != '\n') {
762 while (isspace(d) && d != '\n') {
767 if (chrtran(c) != chrtran(d)) {
770 if (c != '\n' && c != EOF)
771 ctold += skipline(f1);
772 if (d != '\n' && c != EOF)
773 ctnew += skipline(f2);
776 if (c == '\n' || c == EOF)
783 if ((c = getc(f1)) != (d = getc(f2))) {
786 if (c != '\n' && c != EOF)
787 ctold += skipline(f1);
788 if (d != '\n' && c != EOF)
789 ctnew += skipline(f2);
792 if (c == '\n' || c == EOF)
800 for (; j <= len[1]; j++) {
801 ixnew[j] = ctnew += skipline(f2);
805 * fprintf(stderr, "jackpot\n");
809 /* shellsort CACM #201 */
811 sort(struct line *a, int n)
813 struct line *ai, *aim, w;
818 for (j = 1; j <= n; j *= 2)
820 for (m /= 2; m != 0; m /= 2) {
822 for (j = 1; j <= k; j++) {
823 for (ai = &a[j]; ai > a; ai -= m) {
826 break; /* wraparound */
827 if (aim->value > ai[0].value ||
828 (aim->value == ai[0].value &&
829 aim->serial > ai[0].serial))
831 w.value = ai[0].value;
832 ai[0].value = aim->value;
833 aim->value = w.value;
834 w.serial = ai[0].serial;
835 ai[0].serial = aim->serial;
836 aim->serial = w.serial;
843 unsort(struct line *f, int l, int *b)
847 a = xcalloc(l + 1, sizeof(*a));
848 for (i = 1; i <= l; i++)
849 a[f[i].serial] = f[i].value;
850 for (i = 1; i <= l; i++)
860 for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
866 output(char *file1, FILE *f1, char *file2, FILE *f2, int flags)
868 int m, i0, i1, j0, j1;
874 J[m + 1] = len[1] + 1;
875 if (diff_format != D_EDIT) {
876 for (i0 = 1; i0 <= m; i0 = i1 + 1) {
877 while (i0 <= m && J[i0] == J[i0 - 1] + 1)
881 while (i1 < m && J[i1 + 1] == 0)
885 change(file1, f1, file2, f2, i0, i1, j0, j1, &flags);
888 for (i0 = m; i0 >= 1; i0 = i1 - 1) {
889 while (i0 >= 1 && J[i0] == J[i0 + 1] - 1 && J[i0] != 0)
893 while (i1 > 1 && J[i1 - 1] == 0)
897 change(file1, f1, file2, f2, i1, i0, j1, j0, &flags);
901 change(file1, f1, file2, f2, 1, 0, 1, len[1], &flags);
902 if (diff_format == D_IFDEF || diff_format == D_GFORMAT) {
905 if ((c = getc(f1)) == EOF)
907 diff_output("%c", c);
911 if (anychange != 0) {
912 if (diff_format == D_CONTEXT)
913 dump_context_vec(f1, f2, flags);
914 else if (diff_format == D_UNIFIED)
915 dump_unified_vec(f1, f2, flags);
920 range(int a, int b, const char *separator)
922 diff_output("%d", a > b ? b : a);
924 diff_output("%s%d", separator, b);
928 uni_range(int a, int b)
931 diff_output("%d,%d", a, b - a + 1);
933 diff_output("%d", b);
935 diff_output("%d,0", b);
939 preadline(int fd, size_t rlen, off_t off)
944 line = xmalloc(rlen + 1);
945 if ((nr = pread(fd, line, rlen, off)) == -1)
947 if (nr > 0 && line[nr-1] == '\n')
954 ignoreline_pattern(char *line)
958 ret = regexec(&ignore_re, line, 0, NULL, 0);
960 return (ret == 0); /* if it matched, it should be ignored. */
964 ignoreline(char *line, bool skip_blanks)
967 if (ignore_pats != NULL && skip_blanks)
968 return (ignoreline_pattern(line) || *line == '\0');
969 if (ignore_pats != NULL)
970 return (ignoreline_pattern(line));
972 return (*line == '\0');
973 /* No ignore criteria specified */
978 * Indicate that there is a difference between lines a and b of the from file
979 * to get to lines c to d of the to file. If a is greater then b then there
980 * are no lines in the from file involved and this means that there were
981 * lines appended (beginning at b). If c is greater than d then there are
982 * lines missing from the to file.
985 change(char *file1, FILE *f1, char *file2, FILE *f2, int a, int b, int c, int d,
988 static size_t max_context = 64;
994 skip_blanks = (*pflags & D_SKIPBLANKLINES);
996 if ((diff_format != D_IFDEF || diff_format == D_GFORMAT) &&
999 if (ignore_pats != NULL || skip_blanks) {
1002 * All lines in the change, insert, or delete must
1003 * match an ignore pattern for the change to be
1006 if (a <= b) { /* Changes and deletes. */
1007 for (i = a; i <= b; i++) {
1008 line = preadline(fileno(f1),
1009 ixold[i] - ixold[i - 1], ixold[i - 1]);
1010 if (!ignoreline(line, skip_blanks))
1014 if (a > b || c <= d) { /* Changes and inserts. */
1015 for (i = c; i <= d; i++) {
1016 line = preadline(fileno(f2),
1017 ixnew[i] - ixnew[i - 1], ixnew[i - 1]);
1018 if (!ignoreline(line, skip_blanks))
1025 if (*pflags & D_HEADER && diff_format != D_BRIEF) {
1026 diff_output("%s %s %s\n", diffargs, file1, file2);
1027 *pflags &= ~D_HEADER;
1029 if (diff_format == D_CONTEXT || diff_format == D_UNIFIED) {
1031 * Allocate change records as needed.
1033 if (context_vec_ptr == context_vec_end - 1) {
1034 ptrdiff_t offset = context_vec_ptr - context_vec_start;
1036 context_vec_start = xreallocarray(context_vec_start,
1037 max_context, sizeof(*context_vec_start));
1038 context_vec_end = context_vec_start + max_context;
1039 context_vec_ptr = context_vec_start + offset;
1041 if (anychange == 0) {
1043 * Print the context/unidiff header first time through.
1045 print_header(file1, file2);
1047 } else if (a > context_vec_ptr->b + (2 * diff_context) + 1 &&
1048 c > context_vec_ptr->d + (2 * diff_context) + 1) {
1050 * If this change is more than 'diff_context' lines from the
1051 * previous change, dump the record and reset it.
1053 if (diff_format == D_CONTEXT)
1054 dump_context_vec(f1, f2, *pflags);
1056 dump_unified_vec(f1, f2, *pflags);
1059 context_vec_ptr->a = a;
1060 context_vec_ptr->b = b;
1061 context_vec_ptr->c = c;
1062 context_vec_ptr->d = d;
1067 switch (diff_format) {
1073 diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
1074 if (diff_format == D_NORMAL)
1079 diff_output("%c", a > b ? 'a' : c > d ? 'd' : 'c');
1085 diff_output("a%d %d\n", b, d - c + 1);
1087 diff_output("d%d %d\n", a, b - a + 1);
1089 /* add changed lines */
1090 diff_output("a%d %d\n", b, d - c + 1);
1094 if (diff_format == D_GFORMAT) {
1096 /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1097 nc = ixold[a > b ? b : a - 1] - curpos;
1098 for (i = 0; i < nc; i++)
1099 diff_output("%c", getc(f1));
1100 for (walk = group_format; *walk != '\0'; walk++) {
1105 fetch(ixold, a, b, f1, '<', 1, *pflags);
1108 fetch(ixnew, c, d, f2, '>', 0, *pflags);
1111 diff_output("%%%c", *walk);
1116 diff_output("%c", *walk);
1119 if (diff_format == D_NORMAL || diff_format == D_IFDEF) {
1120 fetch(ixold, a, b, f1, '<', 1, *pflags);
1121 if (a <= b && c <= d && diff_format == D_NORMAL)
1122 diff_output("---\n");
1125 if (diff_format != D_GFORMAT)
1126 f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
1127 if (f != 0 && diff_format == D_EDIT) {
1129 * A non-zero return value for D_EDIT indicates that the
1130 * last line printed was a bare dot (".") that has been
1131 * escaped as ".." to prevent ed(1) from misinterpreting
1132 * it. We have to add a substitute command to change this
1133 * back and restart where we left off.
1136 diff_output("%ds/.//\n", a + f - 1);
1142 if ((diff_format == D_EDIT || diff_format == D_REVERSE) && c <= d)
1145 diff_output("#endif /* %s */\n", ifdefname);
1151 fetch(long *f, int a, int b, FILE *lb, int ch, int oldfile, int flags)
1153 int i, j, c, lastc, col, nc;
1157 * When doing #ifdef's, copy down to current line
1158 * if this is the first file, so that stuff makes it to output.
1160 if ((diff_format == D_IFDEF) && oldfile) {
1161 long curpos = ftell(lb);
1162 /* print through if append (a>b), else to (nb: 0 vs 1 orig) */
1163 nc = f[a > b ? b : a - 1] - curpos;
1164 for (i = 0; i < nc; i++)
1165 diff_output("%c", getc(lb));
1169 if (diff_format == D_IFDEF) {
1171 diff_output("#else /* %s%s */\n",
1172 oldfile == 1 ? "!" : "", ifdefname);
1175 diff_output("#ifndef %s\n", ifdefname);
1177 diff_output("#ifdef %s\n", ifdefname);
1179 inifdef = 1 + oldfile;
1181 for (i = a; i <= b; i++) {
1182 fseek(lb, f[i - 1], SEEK_SET);
1183 nc = f[i] - f[i - 1];
1184 if ((diff_format != D_IFDEF && diff_format != D_GFORMAT) &&
1186 diff_output("%c", ch);
1187 if (Tflag && (diff_format == D_NORMAL || diff_format == D_CONTEXT
1188 || diff_format == D_UNIFIED))
1190 else if (diff_format != D_UNIFIED)
1194 for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
1195 if ((c = getc(lb)) == EOF) {
1196 if (diff_format == D_EDIT || diff_format == D_REVERSE ||
1197 diff_format == D_NREVERSE)
1198 warnx("No newline at end of file");
1200 diff_output("\n\\ No newline at end of "
1204 if (c == '\t' && (flags & D_EXPANDTABS)) {
1205 newcol = ((col/tabsize)+1)*tabsize;
1208 } while (++col < newcol);
1210 if (diff_format == D_EDIT && j == 1 && c == '\n'
1213 * Don't print a bare "." line
1214 * since that will confuse ed(1).
1215 * Print ".." instead and return,
1216 * giving the caller an offset
1217 * from which to restart.
1222 diff_output("%c", c);
1231 * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
1234 readhash(FILE *f, int flags)
1241 if ((flags & (D_FOLDBLANKS|D_IGNOREBLANKS)) == 0) {
1242 if (flags & D_IGNORECASE)
1243 for (i = 0; (t = getc(f)) != '\n'; i++) {
1244 if (flags & D_STRIPCR && t == '\r') {
1255 sum = sum * 127 + chrtran(t);
1258 for (i = 0; (t = getc(f)) != '\n'; i++) {
1259 if (flags & D_STRIPCR && t == '\r') {
1270 sum = sum * 127 + t;
1274 switch (t = getc(f)) {
1283 if (space && (flags & D_IGNOREBLANKS) == 0) {
1287 sum = sum * 127 + chrtran(t);
1301 * There is a remote possibility that we end up with a zero sum.
1302 * Zero is used as an EOF marker, so return 1 instead.
1304 return (sum == 0 ? 1 : sum);
1310 unsigned char buf[BUFSIZ];
1317 cnt = fread(buf, 1, sizeof(buf), f);
1318 return (memchr(buf, '\0', cnt) == NULL);
1321 #define begins_with(s, pre) (strncmp(s, pre, sizeof(pre)-1) == 0)
1324 match_function(const long *f, int pos, FILE *fp)
1326 unsigned char buf[FUNCTION_CONTEXT_SIZE];
1328 int last = lastline;
1329 const char *state = NULL;
1332 while (pos > last) {
1333 fseek(fp, f[pos - 1], SEEK_SET);
1334 nc = f[pos] - f[pos - 1];
1335 if (nc >= sizeof(buf))
1336 nc = sizeof(buf) - 1;
1337 nc = fread(buf, 1, nc, fp);
1340 buf[strcspn(buf, "\n")] = '\0';
1341 if (isalpha(buf[0]) || buf[0] == '_' || buf[0] == '$') {
1342 if (begins_with(buf, "private:")) {
1344 state = " (private)";
1345 } else if (begins_with(buf, "protected:")) {
1347 state = " (protected)";
1348 } else if (begins_with(buf, "public:")) {
1350 state = " (public)";
1352 strlcpy(lastbuf, buf, sizeof lastbuf);
1354 strlcat(lastbuf, state,
1356 lastmatchline = pos;
1363 return lastmatchline > 0 ? lastbuf : NULL;
1366 /* dump accumulated "context" diff changes */
1368 dump_context_vec(FILE *f1, FILE *f2, int flags)
1370 struct context_vec *cvp = context_vec_start;
1371 int lowa, upb, lowc, upd, do_output;
1375 if (context_vec_start > context_vec_ptr)
1378 b = d = 0; /* gcc */
1379 lowa = MAX(1, cvp->a - diff_context);
1380 upb = MIN(len[0], context_vec_ptr->b + diff_context);
1381 lowc = MAX(1, cvp->c - diff_context);
1382 upd = MIN(len[1], context_vec_ptr->d + diff_context);
1384 diff_output("***************");
1385 if ((flags & D_PROTOTYPE)) {
1386 f = match_function(ixold, lowa-1, f1);
1388 diff_output(" %s", f);
1390 diff_output("\n*** ");
1391 range(lowa, upb, ",");
1392 diff_output(" ****\n");
1395 * Output changes to the "old" file. The first loop suppresses
1396 * output if there were no changes to the "old" file (we'll see
1397 * the "old" lines as context in the "new" list).
1400 for (; cvp <= context_vec_ptr; cvp++)
1401 if (cvp->a <= cvp->b) {
1402 cvp = context_vec_start;
1407 while (cvp <= context_vec_ptr) {
1413 if (a <= b && c <= d)
1416 ch = (a <= b) ? 'd' : 'a';
1419 fetch(ixold, lowa, b, f1, ' ', 0, flags);
1421 fetch(ixold, lowa, a - 1, f1, ' ', 0, flags);
1422 fetch(ixold, a, b, f1,
1423 ch == 'c' ? '!' : '-', 0, flags);
1428 fetch(ixold, b + 1, upb, f1, ' ', 0, flags);
1430 /* output changes to the "new" file */
1431 diff_output("--- ");
1432 range(lowc, upd, ",");
1433 diff_output(" ----\n");
1436 for (cvp = context_vec_start; cvp <= context_vec_ptr; cvp++)
1437 if (cvp->c <= cvp->d) {
1438 cvp = context_vec_start;
1443 while (cvp <= context_vec_ptr) {
1449 if (a <= b && c <= d)
1452 ch = (a <= b) ? 'd' : 'a';
1455 fetch(ixnew, lowc, d, f2, ' ', 0, flags);
1457 fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags);
1458 fetch(ixnew, c, d, f2,
1459 ch == 'c' ? '!' : '+', 0, flags);
1464 fetch(ixnew, d + 1, upd, f2, ' ', 0, flags);
1466 context_vec_ptr = context_vec_start - 1;
1469 /* dump accumulated "unified" diff changes */
1471 dump_unified_vec(FILE *f1, FILE *f2, int flags)
1473 struct context_vec *cvp = context_vec_start;
1474 int lowa, upb, lowc, upd;
1478 if (context_vec_start > context_vec_ptr)
1481 b = d = 0; /* gcc */
1482 lowa = MAX(1, cvp->a - diff_context);
1483 upb = MIN(len[0], context_vec_ptr->b + diff_context);
1484 lowc = MAX(1, cvp->c - diff_context);
1485 upd = MIN(len[1], context_vec_ptr->d + diff_context);
1487 diff_output("@@ -");
1488 uni_range(lowa, upb);
1490 uni_range(lowc, upd);
1492 if ((flags & D_PROTOTYPE)) {
1493 f = match_function(ixold, lowa-1, f1);
1495 diff_output(" %s", f);
1500 * Output changes in "unified" diff format--the old and new lines
1501 * are printed together.
1503 for (; cvp <= context_vec_ptr; cvp++) {
1510 * c: both new and old changes
1511 * d: only changes in the old file
1512 * a: only changes in the new file
1514 if (a <= b && c <= d)
1517 ch = (a <= b) ? 'd' : 'a';
1521 fetch(ixold, lowa, a - 1, f1, ' ', 0, flags);
1522 fetch(ixold, a, b, f1, '-', 0, flags);
1523 fetch(ixnew, c, d, f2, '+', 0, flags);
1526 fetch(ixold, lowa, a - 1, f1, ' ', 0, flags);
1527 fetch(ixold, a, b, f1, '-', 0, flags);
1530 fetch(ixnew, lowc, c - 1, f2, ' ', 0, flags);
1531 fetch(ixnew, c, d, f2, '+', 0, flags);
1537 fetch(ixnew, d + 1, upd, f2, ' ', 0, flags);
1539 context_vec_ptr = context_vec_start - 1;
1543 print_header(const char *file1, const char *file2)
1545 const char *time_format;
1550 struct tm tm1, tm2, *tm_ptr1, *tm_ptr2;
1551 int nsec1 = stb1.st_mtim.tv_nsec;
1552 int nsec2 = stb2.st_mtim.tv_nsec;
1554 time_format = "%Y-%m-%d %H:%M:%S";
1558 tm_ptr1 = localtime_r(&stb1.st_mtime, &tm1);
1559 tm_ptr2 = localtime_r(&stb2.st_mtime, &tm2);
1560 strftime(buf1, 256, time_format, tm_ptr1);
1561 strftime(buf2, 256, time_format, tm_ptr2);
1563 strftime(end1, 10, "%z", tm_ptr1);
1564 strftime(end2, 10, "%z", tm_ptr2);
1565 sprintf(buf1, "%s.%.9d %s", buf1, nsec1, end1);
1566 sprintf(buf2, "%s.%.9d %s", buf2, nsec2, end2);
1568 if (label[0] != NULL)
1569 diff_output("%s %s\n", diff_format == D_CONTEXT ? "***" : "---",
1572 diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "***" : "---",
1574 if (label[1] != NULL)
1575 diff_output("%s %s\n", diff_format == D_CONTEXT ? "---" : "+++",
1578 diff_output("%s %s\t%s\n", diff_format == D_CONTEXT ? "---" : "+++",