1 5993a8f2 2003-11-23 devnull #include <u.h>
2 5993a8f2 2003-11-23 devnull #include <libc.h>
3 5993a8f2 2003-11-23 devnull #include <bio.h>
4 5993a8f2 2003-11-23 devnull #include <ctype.h>
5 5993a8f2 2003-11-23 devnull #include "diff.h"
7 5993a8f2 2003-11-23 devnull struct line {
8 5993a8f2 2003-11-23 devnull int serial;
9 5993a8f2 2003-11-23 devnull int value;
11 5993a8f2 2003-11-23 devnull extern struct line *file[2];
12 5993a8f2 2003-11-23 devnull extern int len[2];
13 5993a8f2 2003-11-23 devnull extern long *ixold, *ixnew;
14 5993a8f2 2003-11-23 devnull extern int *J;
16 5993a8f2 2003-11-23 devnull static Biobuf *input[2];
17 5993a8f2 2003-11-23 devnull static char *file1, *file2;
18 5993a8f2 2003-11-23 devnull static int firstchange;
20 5993a8f2 2003-11-23 devnull #define MAXLINELEN 4096
21 5993a8f2 2003-11-23 devnull #define MIN(x, y) ((x) < (y) ? (x): (y))
23 5993a8f2 2003-11-23 devnull static int
24 5993a8f2 2003-11-23 devnull readline(Biobuf *bp, char *buf)
27 5993a8f2 2003-11-23 devnull char *p, *e;
30 5993a8f2 2003-11-23 devnull e = p + MAXLINELEN-1;
32 5993a8f2 2003-11-23 devnull c = Bgetc(bp);
33 5993a8f2 2003-11-23 devnull if (c < 0) {
34 5993a8f2 2003-11-23 devnull if (p == buf)
35 5993a8f2 2003-11-23 devnull return -1;
38 5993a8f2 2003-11-23 devnull if (c == '\n')
40 5993a8f2 2003-11-23 devnull *p++ = c;
41 5993a8f2 2003-11-23 devnull } while (p < e);
43 5993a8f2 2003-11-23 devnull if (c != '\n' && c >= 0) {
44 5993a8f2 2003-11-23 devnull do c = Bgetc(bp);
45 5993a8f2 2003-11-23 devnull while (c >= 0 && c != '\n');
47 5993a8f2 2003-11-23 devnull return p - buf;
50 5993a8f2 2003-11-23 devnull #define HALFLONG 16
51 5993a8f2 2003-11-23 devnull #define low(x) (x&((1L<<HALFLONG)-1))
52 5993a8f2 2003-11-23 devnull #define high(x) (x>>HALFLONG)
55 5993a8f2 2003-11-23 devnull * hashing has the effect of
56 5993a8f2 2003-11-23 devnull * arranging line in 7-bit bytes and then
57 5993a8f2 2003-11-23 devnull * summing 1-s complement in 16-bit hunks
59 5993a8f2 2003-11-23 devnull static int
60 5993a8f2 2003-11-23 devnull readhash(Biobuf *bp, char *buf)
62 5993a8f2 2003-11-23 devnull long sum;
63 5993a8f2 2003-11-23 devnull unsigned shift;
65 5993a8f2 2003-11-23 devnull int len, space;
68 5993a8f2 2003-11-23 devnull shift = 0;
69 5993a8f2 2003-11-23 devnull if ((len = readline(bp, buf)) == -1)
70 5993a8f2 2003-11-23 devnull return 0;
72 5993a8f2 2003-11-23 devnull switch(bflag) /* various types of white space handling */
75 5993a8f2 2003-11-23 devnull while (len--) {
76 5993a8f2 2003-11-23 devnull sum += (long)*p++ << (shift &= (HALFLONG-1));
77 5993a8f2 2003-11-23 devnull shift += 7;
82 5993a8f2 2003-11-23 devnull * coalesce multiple white-space
84 5993a8f2 2003-11-23 devnull for (space = 0; len--; p++) {
85 3bd56b04 2005-09-09 devnull if (isspace((uchar)*p)) {
87 5993a8f2 2003-11-23 devnull continue;
89 5993a8f2 2003-11-23 devnull if (space) {
90 5993a8f2 2003-11-23 devnull shift += 7;
91 5993a8f2 2003-11-23 devnull space = 0;
93 5993a8f2 2003-11-23 devnull sum += (long)*p << (shift &= (HALFLONG-1));
94 5993a8f2 2003-11-23 devnull shift += 7;
99 5993a8f2 2003-11-23 devnull * strip all white-space
101 5993a8f2 2003-11-23 devnull while (len--) {
102 3bd56b04 2005-09-09 devnull if (isspace((uchar)*p)) {
104 5993a8f2 2003-11-23 devnull continue;
106 5993a8f2 2003-11-23 devnull sum += (long)*p++ << (shift &= (HALFLONG-1));
107 5993a8f2 2003-11-23 devnull shift += 7;
111 5993a8f2 2003-11-23 devnull sum = low(sum) + high(sum);
112 5993a8f2 2003-11-23 devnull return ((short)low(sum) + (short)high(sum));
115 5993a8f2 2003-11-23 devnull Biobuf *
116 5993a8f2 2003-11-23 devnull prepare(int i, char *arg)
118 5993a8f2 2003-11-23 devnull struct line *p;
119 5993a8f2 2003-11-23 devnull int j, h;
120 5993a8f2 2003-11-23 devnull Biobuf *bp;
121 5993a8f2 2003-11-23 devnull char *cp, buf[MAXLINELEN];
122 5993a8f2 2003-11-23 devnull int nbytes;
125 5993a8f2 2003-11-23 devnull bp = Bopen(arg, OREAD);
126 5993a8f2 2003-11-23 devnull if (!bp) {
127 5993a8f2 2003-11-23 devnull panic(mflag ? 0: 2, "cannot open %s: %r\n", arg);
128 5993a8f2 2003-11-23 devnull return 0;
130 5993a8f2 2003-11-23 devnull if (binary)
131 5993a8f2 2003-11-23 devnull return bp;
132 5993a8f2 2003-11-23 devnull nbytes = Bread(bp, buf, MIN(1024, MAXLINELEN));
133 5993a8f2 2003-11-23 devnull if (nbytes > 0) {
134 5993a8f2 2003-11-23 devnull cp = buf;
135 5993a8f2 2003-11-23 devnull while (cp < buf+nbytes-UTFmax) {
137 5993a8f2 2003-11-23 devnull * heuristic for a binary file in the
138 5993a8f2 2003-11-23 devnull * brave new UNICODE world
140 5993a8f2 2003-11-23 devnull cp += chartorune(&r, cp);
141 5993a8f2 2003-11-23 devnull if (r == 0 || (r > 0x7f && r <= 0xa0)) {
142 5993a8f2 2003-11-23 devnull binary++;
143 5993a8f2 2003-11-23 devnull return bp;
146 5993a8f2 2003-11-23 devnull Bseek(bp, 0, 0);
148 5993a8f2 2003-11-23 devnull p = MALLOC(struct line, 3);
149 5993a8f2 2003-11-23 devnull for (j = 0; h = readhash(bp, buf); p[j].value = h)
150 5993a8f2 2003-11-23 devnull p = REALLOC(p, struct line, (++j+3));
151 5993a8f2 2003-11-23 devnull len[i] = j;
152 5993a8f2 2003-11-23 devnull file[i] = p;
153 5993a8f2 2003-11-23 devnull input[i] = bp; /*fix*/
154 5993a8f2 2003-11-23 devnull if (i == 0) { /*fix*/
155 5993a8f2 2003-11-23 devnull file1 = arg;
156 5993a8f2 2003-11-23 devnull firstchange = 0;
159 5993a8f2 2003-11-23 devnull file2 = arg;
160 5993a8f2 2003-11-23 devnull return bp;
163 5993a8f2 2003-11-23 devnull static int
164 5993a8f2 2003-11-23 devnull squishspace(char *buf)
166 5993a8f2 2003-11-23 devnull char *p, *q;
167 5993a8f2 2003-11-23 devnull int space;
169 5993a8f2 2003-11-23 devnull for (space = 0, q = p = buf; *q; q++) {
170 3bd56b04 2005-09-09 devnull if (isspace((uchar)*q)) {
171 5993a8f2 2003-11-23 devnull space++;
172 5993a8f2 2003-11-23 devnull continue;
174 5993a8f2 2003-11-23 devnull if (space && bflag == 1) {
175 5993a8f2 2003-11-23 devnull *p++ = ' ';
176 5993a8f2 2003-11-23 devnull space = 0;
178 5993a8f2 2003-11-23 devnull *p++ = *q;
181 5993a8f2 2003-11-23 devnull return p - buf;
185 5993a8f2 2003-11-23 devnull * need to fix up for unexpected EOF's
188 5993a8f2 2003-11-23 devnull check(Biobuf *bf, Biobuf *bt)
190 5993a8f2 2003-11-23 devnull int f, t, flen, tlen;
191 5993a8f2 2003-11-23 devnull char fbuf[MAXLINELEN], tbuf[MAXLINELEN];
193 5993a8f2 2003-11-23 devnull ixold[0] = ixnew[0] = 0;
194 5993a8f2 2003-11-23 devnull for (f = t = 1; f < len[0]; f++) {
195 5993a8f2 2003-11-23 devnull flen = readline(bf, fbuf);
196 5993a8f2 2003-11-23 devnull ixold[f] = ixold[f-1] + flen + 1; /* ftell(bf) */
197 5993a8f2 2003-11-23 devnull if (J[f] == 0)
198 5993a8f2 2003-11-23 devnull continue;
200 5993a8f2 2003-11-23 devnull tlen = readline(bt, tbuf);
201 5993a8f2 2003-11-23 devnull ixnew[t] = ixnew[t-1] + tlen + 1; /* ftell(bt) */
202 5993a8f2 2003-11-23 devnull } while (t++ < J[f]);
203 5993a8f2 2003-11-23 devnull if (bflag) {
204 5993a8f2 2003-11-23 devnull flen = squishspace(fbuf);
205 5993a8f2 2003-11-23 devnull tlen = squishspace(tbuf);
207 5993a8f2 2003-11-23 devnull if (flen != tlen || strcmp(fbuf, tbuf))
208 5993a8f2 2003-11-23 devnull J[f] = 0;
210 5993a8f2 2003-11-23 devnull while (t < len[1]) {
211 5993a8f2 2003-11-23 devnull tlen = readline(bt, tbuf);
212 5993a8f2 2003-11-23 devnull ixnew[t] = ixnew[t-1] + tlen + 1; /* fseek(bt) */
217 5993a8f2 2003-11-23 devnull static void
218 5993a8f2 2003-11-23 devnull range(int a, int b, char *separator)
220 5993a8f2 2003-11-23 devnull Bprint(&stdout, "%d", a > b ? b: a);
221 5993a8f2 2003-11-23 devnull if (a < b)
222 5993a8f2 2003-11-23 devnull Bprint(&stdout, "%s%d", separator, b);
225 5993a8f2 2003-11-23 devnull static void
226 5993a8f2 2003-11-23 devnull fetch(long *f, int a, int b, Biobuf *bp, char *s)
228 5993a8f2 2003-11-23 devnull char buf[MAXLINELEN];
229 4ac5f249 2005-01-26 devnull int maxb;
231 4ac5f249 2005-01-26 devnull if(a <= 1)
233 4ac5f249 2005-01-26 devnull if(bp == input[0])
234 4ac5f249 2005-01-26 devnull maxb = len[0];
236 4ac5f249 2005-01-26 devnull maxb = len[1];
237 4ac5f249 2005-01-26 devnull if(b > maxb)
238 4ac5f249 2005-01-26 devnull b = maxb;
239 4ac5f249 2005-01-26 devnull if(a > maxb)
241 5993a8f2 2003-11-23 devnull Bseek(bp, f[a-1], 0);
242 5993a8f2 2003-11-23 devnull while (a++ <= b) {
243 5993a8f2 2003-11-23 devnull readline(bp, buf);
244 5993a8f2 2003-11-23 devnull Bprint(&stdout, "%s%s\n", s, buf);
248 4ac5f249 2005-01-26 devnull typedef struct Change Change;
249 4ac5f249 2005-01-26 devnull struct Change
257 4ac5f249 2005-01-26 devnull Change *changes;
258 4ac5f249 2005-01-26 devnull int nchanges;
261 5993a8f2 2003-11-23 devnull change(int a, int b, int c, int d)
263 5993a8f2 2003-11-23 devnull char verb;
264 5993a8f2 2003-11-23 devnull char buf[4];
265 4ac5f249 2005-01-26 devnull Change *ch;
267 5993a8f2 2003-11-23 devnull if (a > b && c > d)
269 5993a8f2 2003-11-23 devnull anychange = 1;
270 5993a8f2 2003-11-23 devnull if (mflag && firstchange == 0) {
271 5993a8f2 2003-11-23 devnull if(mode) {
272 5993a8f2 2003-11-23 devnull buf[0] = '-';
273 5993a8f2 2003-11-23 devnull buf[1] = mode;
274 5993a8f2 2003-11-23 devnull buf[2] = ' ';
275 5993a8f2 2003-11-23 devnull buf[3] = '\0';
276 5993a8f2 2003-11-23 devnull } else {
277 5993a8f2 2003-11-23 devnull buf[0] = '\0';
279 5993a8f2 2003-11-23 devnull Bprint(&stdout, "diff %s%s %s\n", buf, file1, file2);
280 5993a8f2 2003-11-23 devnull firstchange = 1;
282 5993a8f2 2003-11-23 devnull verb = a > b ? 'a': c > d ? 'd': 'c';
283 5993a8f2 2003-11-23 devnull switch(mode) {
284 5993a8f2 2003-11-23 devnull case 'e':
285 5993a8f2 2003-11-23 devnull range(a, b, ",");
286 5993a8f2 2003-11-23 devnull Bputc(&stdout, verb);
289 5993a8f2 2003-11-23 devnull range(a, b, ",");
290 5993a8f2 2003-11-23 devnull Bputc(&stdout, verb);
291 5993a8f2 2003-11-23 devnull range(c, d, ",");
293 5993a8f2 2003-11-23 devnull case 'n':
294 5993a8f2 2003-11-23 devnull Bprint(&stdout, "%s:", file1);
295 5993a8f2 2003-11-23 devnull range(a, b, ",");
296 5993a8f2 2003-11-23 devnull Bprint(&stdout, " %c ", verb);
297 5993a8f2 2003-11-23 devnull Bprint(&stdout, "%s:", file2);
298 5993a8f2 2003-11-23 devnull range(c, d, ",");
300 5993a8f2 2003-11-23 devnull case 'f':
301 5993a8f2 2003-11-23 devnull Bputc(&stdout, verb);
302 5993a8f2 2003-11-23 devnull range(a, b, " ");
304 4ac5f249 2005-01-26 devnull case 'c':
305 a2d66357 2005-01-29 devnull case 'a':
306 4ac5f249 2005-01-26 devnull if(nchanges%1024 == 0)
307 4ac5f249 2005-01-26 devnull changes = erealloc(changes, (nchanges+1024)*sizeof(changes[0]));
308 4ac5f249 2005-01-26 devnull ch = &changes[nchanges++];
309 4ac5f249 2005-01-26 devnull ch->a = a;
310 4ac5f249 2005-01-26 devnull ch->b = b;
311 4ac5f249 2005-01-26 devnull ch->c = c;
312 4ac5f249 2005-01-26 devnull ch->d = d;
315 5993a8f2 2003-11-23 devnull Bputc(&stdout, '\n');
316 5993a8f2 2003-11-23 devnull if (mode == 0 || mode == 'n') {
317 5993a8f2 2003-11-23 devnull fetch(ixold, a, b, input[0], "< ");
318 5993a8f2 2003-11-23 devnull if (a <= b && c <= d)
319 5993a8f2 2003-11-23 devnull Bprint(&stdout, "---\n");
321 5993a8f2 2003-11-23 devnull fetch(ixnew, c, d, input[1], mode == 0 || mode == 'n' ? "> ": "");
322 5993a8f2 2003-11-23 devnull if (mode != 0 && mode != 'n' && c <= d)
323 5993a8f2 2003-11-23 devnull Bprint(&stdout, ".\n");
328 4ac5f249 2005-01-26 devnull Lines = 3, /* number of lines of context shown */
332 4ac5f249 2005-01-26 devnull changeset(int i)
334 4ac5f249 2005-01-26 devnull while(i<nchanges && changes[i].b+1+2*Lines > changes[i+1].a)
336 4ac5f249 2005-01-26 devnull if(i<nchanges)
337 4ac5f249 2005-01-26 devnull return i+1;
338 4ac5f249 2005-01-26 devnull return nchanges;
342 4ac5f249 2005-01-26 devnull flushchanges(void)
344 4ac5f249 2005-01-26 devnull int a, b, c, d, at;
345 4ac5f249 2005-01-26 devnull int i, j;
347 4ac5f249 2005-01-26 devnull if(nchanges == 0)
350 4ac5f249 2005-01-26 devnull for(i=0; i<nchanges; ){
351 4ac5f249 2005-01-26 devnull j = changeset(i);
352 a2d66357 2005-01-29 devnull a = changes[i].a-Lines;
353 a2d66357 2005-01-29 devnull b = changes[j-1].b+Lines;
354 a2d66357 2005-01-29 devnull c = changes[i].c-Lines;
355 a2d66357 2005-01-29 devnull d = changes[j-1].d+Lines;
356 a2d66357 2005-01-29 devnull if(a < 1)
358 a2d66357 2005-01-29 devnull if(c < 1)
360 a2d66357 2005-01-29 devnull if(b > len[0])
361 a2d66357 2005-01-29 devnull b = len[0];
362 a2d66357 2005-01-29 devnull if(d > len[1])
363 a2d66357 2005-01-29 devnull d = len[1];
364 a2d66357 2005-01-29 devnull if(mode == 'a'){
366 a2d66357 2005-01-29 devnull b = len[0];
368 a2d66357 2005-01-29 devnull d = len[1];
369 a2d66357 2005-01-29 devnull j = nchanges;
371 4ac5f249 2005-01-26 devnull Bprint(&stdout, "%s:", file1);
372 4ac5f249 2005-01-26 devnull range(a, b, ",");
373 4ac5f249 2005-01-26 devnull Bprint(&stdout, " - ");
374 4ac5f249 2005-01-26 devnull Bprint(&stdout, "%s:", file2);
375 4ac5f249 2005-01-26 devnull range(c, d, ",");
376 4ac5f249 2005-01-26 devnull Bputc(&stdout, '\n');
378 4ac5f249 2005-01-26 devnull for(; i<j; i++){
379 4ac5f249 2005-01-26 devnull fetch(ixold, at, changes[i].a-1, input[0], " ");
380 e0405f4c 2005-07-13 devnull fetch(ixold, changes[i].a, changes[i].b, input[0], "- ");
381 e0405f4c 2005-07-13 devnull fetch(ixnew, changes[i].c, changes[i].d, input[1], "+ ");
382 4ac5f249 2005-01-26 devnull at = changes[i].b+1;
384 a2d66357 2005-01-29 devnull fetch(ixold, at, b, input[0], " ");
386 4ac5f249 2005-01-26 devnull nchanges = 0;