source: MondoRescue/branches/3.2/mindi-busybox/editors/diff.c@ 3232

Last change on this file since 3232 was 3232, checked in by Bruno Cornec, 10 years ago
  • Update mindi-busybox to 1.21.1
  • Property svn:eol-style set to native
File size: 29.3 KB
RevLine 
[1765]1/* vi: set sw=4 ts=4: */
2/*
3 * Mini diff implementation for busybox, adapted from OpenBSD diff.
4 *
[2725]5 * Copyright (C) 2010 by Matheus Izvekov <mizvekov@gmail.com>
[1765]6 * Copyright (C) 2006 by Robert Sullivan <cogito.ergo.cogito@hotmail.com>
7 * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
8 *
9 * Sponsored in part by the Defense Advanced Research Projects
10 * Agency (DARPA) and Air Force Research Laboratory, Air Force
11 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
12 *
[2725]13 * Licensed under GPLv2 or later, see file LICENSE in this source tree.
[1765]14 */
15
16/*
[2725]17 * The following code uses an algorithm due to Harold Stone,
18 * which finds a pair of longest identical subsequences in
19 * the two files.
20 *
21 * The major goal is to generate the match vector J.
22 * J[i] is the index of the line in file1 corresponding
23 * to line i in file0. J[i] = 0 if there is no
24 * such line in file1.
25 *
26 * Lines are hashed so as to work in core. All potential
27 * matches are located by sorting the lines of each file
28 * on the hash (called "value"). In particular, this
29 * collects the equivalence classes in file1 together.
30 * Subroutine equiv replaces the value of each line in
31 * file0 by the index of the first element of its
32 * matching equivalence in (the reordered) file1.
33 * To save space equiv squeezes file1 into a single
34 * array member in which the equivalence classes
35 * are simply concatenated, except that their first
36 * members are flagged by changing sign.
37 *
38 * Next the indices that point into member are unsorted into
39 * array class according to the original order of file0.
40 *
41 * The cleverness lies in routine stone. This marches
42 * through the lines of file0, developing a vector klist
43 * of "k-candidates". At step i a k-candidate is a matched
44 * pair of lines x,y (x in file0, y in file1) such that
45 * there is a common subsequence of length k
46 * between the first i lines of file0 and the first y
47 * lines of file1, but there is no such subsequence for
48 * any smaller y. x is the earliest possible mate to y
49 * that occurs in such a subsequence.
50 *
51 * Whenever any of the members of the equivalence class of
52 * lines in file1 matable to a line in file0 has serial number
53 * less than the y of some k-candidate, that k-candidate
54 * with the smallest such y is replaced. The new
55 * k-candidate is chained (via pred) to the current
56 * k-1 candidate so that the actual subsequence can
57 * be recovered. When a member has serial number greater
58 * that the y of all k-candidates, the klist is extended.
59 * At the end, the longest subsequence is pulled out
60 * and placed in the array J by unravel
61 *
62 * With J in hand, the matches there recorded are
63 * checked against reality to assure that no spurious
64 * matches have crept in due to hashing. If they have,
65 * they are broken, and "jackpot" is recorded--a harmless
66 * matter except that a true match for a spuriously
67 * mated line may now be unnecessarily reported as a change.
68 *
69 * Much of the complexity of the program comes simply
70 * from trying to minimize core utilization and
71 * maximize the range of doable problems by dynamically
72 * allocating what is needed and reusing what is not.
73 * The core requirements for problems larger than somewhat
74 * are (in words) 2*length(file0) + length(file1) +
75 * 3*(number of k-candidates installed), typically about
76 * 6n words for files of length n.
[1765]77 */
78
[3232]79//usage:#define diff_trivial_usage
80//usage: "[-abBdiNqrTstw] [-L LABEL] [-S FILE] [-U LINES] FILE1 FILE2"
81//usage:#define diff_full_usage "\n\n"
82//usage: "Compare files line by line and output the differences between them.\n"
83//usage: "This implementation supports unified diffs only.\n"
84//usage: "\n -a Treat all files as text"
85//usage: "\n -b Ignore changes in the amount of whitespace"
86//usage: "\n -B Ignore changes whose lines are all blank"
87//usage: "\n -d Try hard to find a smaller set of changes"
88//usage: "\n -i Ignore case differences"
89//usage: "\n -L Use LABEL instead of the filename in the unified header"
90//usage: "\n -N Treat absent files as empty"
91//usage: "\n -q Output only whether files differ"
92//usage: "\n -r Recurse"
93//usage: "\n -S Start with FILE when comparing directories"
94//usage: "\n -T Make tabs line up by prefixing a tab when necessary"
95//usage: "\n -s Report when two files are the same"
96//usage: "\n -t Expand tabs to spaces in output"
97//usage: "\n -U Output LINES lines of context"
98//usage: "\n -w Ignore all whitespace"
99
[2725]100#include "libbb.h"
[1765]101
[2725]102#if 0
[3232]103# define dbg_error_msg(...) bb_error_msg(__VA_ARGS__)
[2725]104#else
[3232]105# define dbg_error_msg(...) ((void)0)
[2725]106#endif
[1765]107
[2725]108enum { /* print_status() and diffreg() return values */
109 STATUS_SAME, /* files are the same */
110 STATUS_DIFFER, /* files differ */
111 STATUS_BINARY, /* binary files differ */
[1765]112};
113
[2725]114enum { /* Commandline flags */
115 FLAG_a,
116 FLAG_b,
117 FLAG_d,
118 FLAG_i,
119 FLAG_L, /* never used, handled by getopt32 */
120 FLAG_N,
121 FLAG_q,
122 FLAG_r,
123 FLAG_s,
124 FLAG_S, /* never used, handled by getopt32 */
125 FLAG_t,
126 FLAG_T,
127 FLAG_U, /* never used, handled by getopt32 */
128 FLAG_w,
129 FLAG_u, /* ignored, this is the default */
130 FLAG_p, /* not implemented */
131 FLAG_B,
132 FLAG_E, /* not implemented */
[1765]133};
[2725]134#define FLAG(x) (1 << FLAG_##x)
[1765]135
[2725]136/* We cache file position to avoid excessive seeking */
137typedef struct FILE_and_pos_t {
138 FILE *ft_fp;
139 off_t ft_pos;
140} FILE_and_pos_t;
[1765]141
142struct globals {
[2725]143 smallint exit_status;
144 int opt_U_context;
145 const char *other_dir;
146 char *label[2];
147 struct stat stb[2];
[1765]148};
149#define G (*ptr_to_globals)
[2725]150#define exit_status (G.exit_status )
151#define opt_U_context (G.opt_U_context )
152#define label (G.label )
153#define stb (G.stb )
[1765]154#define INIT_G() do { \
[2725]155 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
156 opt_U_context = 3; \
[1765]157} while (0)
158
[2725]159typedef int token_t;
[1765]160
[2725]161enum {
162 /* Public */
163 TOK_EMPTY = 1 << 9, /* Line fully processed, you can proceed to the next */
164 TOK_EOF = 1 << 10, /* File ended */
165 /* Private (Only to be used by read_token() */
166 TOK_EOL = 1 << 11, /* we saw EOL (sticky) */
167 TOK_SPACE = 1 << 12, /* used -b code, means we are skipping spaces */
168 SHIFT_EOF = (sizeof(token_t)*8 - 8) - 1,
169 CHAR_MASK = 0x1ff, /* 8th bit is used to distinguish EOF from 0xff */
170};
[1765]171
[2725]172/* Restores full EOF from one 8th bit: */
173//#define TOK2CHAR(t) (((t) << SHIFT_EOF) >> SHIFT_EOF)
174/* We don't really need the above, we only need to have EOF != any_real_char: */
175#define TOK2CHAR(t) ((t) & CHAR_MASK)
176
177static void seek_ft(FILE_and_pos_t *ft, off_t pos)
[1765]178{
[2725]179 if (ft->ft_pos != pos) {
180 ft->ft_pos = pos;
181 fseeko(ft->ft_fp, pos, SEEK_SET);
[1765]182 }
183}
[2725]184
185/* Reads tokens from given fp, handling -b and -w flags
186 * The user must reset tok every line start
[1765]187 */
[2725]188static int read_token(FILE_and_pos_t *ft, token_t tok)
[1765]189{
[2725]190 tok |= TOK_EMPTY;
191 while (!(tok & TOK_EOL)) {
192 bool is_space;
193 int t;
[1765]194
[2725]195 t = fgetc(ft->ft_fp);
196 if (t != EOF)
197 ft->ft_pos++;
198 is_space = (t == EOF || isspace(t));
199
200 /* If t == EOF (-1), set both TOK_EOF and TOK_EOL */
201 tok |= (t & (TOK_EOF + TOK_EOL));
202 /* Only EOL? */
203 if (t == '\n')
204 tok |= TOK_EOL;
205
206 if (option_mask32 & FLAG(i)) /* Handcoded tolower() */
207 t = (t >= 'A' && t <= 'Z') ? t - ('A' - 'a') : t;
208
209 if ((option_mask32 & FLAG(w)) && is_space)
210 continue;
211
212 /* Trim char value to low 9 bits */
213 t &= CHAR_MASK;
214
215 if (option_mask32 & FLAG(b)) {
216 /* Was prev char whitespace? */
217 if (tok & TOK_SPACE) { /* yes */
218 if (is_space) /* this one too, ignore it */
219 continue;
220 tok &= ~TOK_SPACE;
221 } else if (is_space) {
222 /* 1st whitespace char.
223 * Set TOK_SPACE and replace char by ' ' */
224 t = TOK_SPACE + ' ';
[1765]225 }
226 }
[2725]227 /* Clear EMPTY */
228 tok &= ~(TOK_EMPTY + CHAR_MASK);
229 /* Assign char value (low 9 bits) and maybe set TOK_SPACE */
230 tok |= t;
231 break;
[1765]232 }
[2725]233#if 0
234 bb_error_msg("fp:%p tok:%x '%c'%s%s%s%s", fp, tok, tok & 0xff
235 , tok & TOK_EOF ? " EOF" : ""
236 , tok & TOK_EOL ? " EOL" : ""
237 , tok & TOK_EMPTY ? " EMPTY" : ""
238 , tok & TOK_SPACE ? " SPACE" : ""
239 );
240#endif
241 return tok;
[1765]242}
243
[2725]244struct cand {
245 int x;
246 int y;
247 int pred;
248};
[1765]249
[2725]250static int search(const int *c, int k, int y, const struct cand *list)
[1765]251{
[2725]252 int i, j;
[1765]253
[2725]254 if (list[c[k]].y < y) /* quick look for typical case */
255 return k + 1;
256
257 for (i = 0, j = k + 1;;) {
258 const int l = (i + j) >> 1;
259 if (l > i) {
260 const int t = list[c[l]].y;
261 if (t > y)
262 j = l;
263 else if (t < y)
264 i = l;
265 else
266 return l;
267 } else
268 return l + 1;
[1765]269 }
270}
271
[2725]272static unsigned isqrt(unsigned n)
[1765]273{
[2725]274 unsigned x = 1;
275 while (1) {
276 const unsigned y = x;
277 x = ((n / x) + x) >> 1;
278 if (x <= (y + 1) && x >= (y - 1))
279 return x;
[1765]280 }
281}
282
[2725]283static void stone(const int *a, int n, const int *b, int *J, int pref)
[1765]284{
[2725]285 const unsigned isq = isqrt(n);
286 const unsigned bound =
287 (option_mask32 & FLAG(d)) ? UINT_MAX : MAX(256, isq);
288 int clen = 1;
289 int clistlen = 100;
290 int k = 0;
291 struct cand *clist = xzalloc(clistlen * sizeof(clist[0]));
292 struct cand cand;
293 struct cand *q;
294 int *klist = xzalloc((n + 2) * sizeof(klist[0]));
295 /*clist[0] = (struct cand){0}; - xzalloc did it */
296 /*klist[0] = 0; */
[1765]297
[2725]298 for (cand.x = 1; cand.x <= n; cand.x++) {
299 int j = a[cand.x], oldl = 0;
300 unsigned numtries = 0;
301 if (j == 0)
302 continue;
303 cand.y = -b[j];
304 cand.pred = klist[0];
305 do {
306 int l, tc;
307 if (cand.y <= clist[cand.pred].y)
308 continue;
309 l = search(klist, k, cand.y, clist);
310 if (l != oldl + 1)
311 cand.pred = klist[l - 1];
312 if (l <= k && clist[klist[l]].y <= cand.y)
313 continue;
314 if (clen == clistlen) {
315 clistlen = clistlen * 11 / 10;
316 clist = xrealloc(clist, clistlen * sizeof(clist[0]));
317 }
318 clist[clen] = cand;
319 tc = klist[l];
320 klist[l] = clen++;
321 if (l <= k) {
322 cand.pred = tc;
323 oldl = l;
324 numtries++;
325 } else {
326 k++;
327 break;
328 }
329 } while ((cand.y = b[++j]) > 0 && numtries < bound);
[1765]330 }
[2725]331 /* Unravel */
332 for (q = clist + klist[k]; q->y; q = clist + q->pred)
333 J[q->x + pref] = q->y + pref;
334 free(klist);
335 free(clist);
[1765]336}
337
[2725]338struct line {
339 /* 'serial' is not used in the begining, so we reuse it
340 * to store line offsets, thus reducing memory pressure
341 */
342 union {
343 unsigned serial;
344 off_t offset;
345 };
346 unsigned value;
347};
[1765]348
349static void equiv(struct line *a, int n, struct line *b, int m, int *c)
350{
[2725]351 int i = 1, j = 1;
[1765]352
353 while (i <= n && j <= m) {
354 if (a[i].value < b[j].value)
355 a[i++].value = 0;
356 else if (a[i].value == b[j].value)
357 a[i++].value = j;
358 else
359 j++;
360 }
361 while (i <= n)
362 a[i++].value = 0;
363 b[m + 1].value = 0;
364 j = 0;
365 while (++j <= m) {
366 c[j] = -b[j].serial;
367 while (b[j + 1].value == b[j].value) {
368 j++;
369 c[j] = b[j].serial;
370 }
371 }
372 c[j] = -1;
373}
374
[2725]375static void unsort(const struct line *f, int l, int *b)
[1765]376{
377 int i;
[2725]378 int *a = xmalloc((l + 1) * sizeof(a[0]));
[1765]379 for (i = 1; i <= l; i++)
380 a[f[i].serial] = f[i].value;
381 for (i = 1; i <= l; i++)
382 b[i] = a[i];
383 free(a);
384}
385
[2725]386static int line_compar(const void *a, const void *b)
[1765]387{
[2725]388#define l0 ((const struct line*)a)
389#define l1 ((const struct line*)b)
390 int r = l0->value - l1->value;
391 if (r)
392 return r;
393 return l0->serial - l1->serial;
394#undef l0
395#undef l1
[1765]396}
397
[2725]398static void fetch(FILE_and_pos_t *ft, const off_t *ix, int a, int b, int ch)
[1765]399{
[2725]400 int i, j, col;
[1765]401 for (i = a; i <= b; i++) {
[2725]402 seek_ft(ft, ix[i - 1]);
403 putchar(ch);
404 if (option_mask32 & FLAG(T))
405 putchar('\t');
406 for (j = 0, col = 0; j < ix[i] - ix[i - 1]; j++) {
407 int c = fgetc(ft->ft_fp);
408 if (c == EOF) {
[1765]409 printf("\n\\ No newline at end of file\n");
410 return;
411 }
[2725]412 ft->ft_pos++;
413 if (c == '\t' && (option_mask32 & FLAG(t)))
414 do putchar(' '); while (++col & 7);
415 else {
[1765]416 putchar(c);
417 col++;
418 }
419 }
420 }
421}
422
[2725]423/* Creates the match vector J, where J[i] is the index
424 * of the line in the new file corresponding to the line i
425 * in the old file. Lines start at 1 instead of 0, that value
426 * being used instead to denote no corresponding line.
427 * This vector is dynamically allocated and must be freed by the caller.
428 *
429 * * fp is an input parameter, where fp[0] and fp[1] are the open
430 * old file and new file respectively.
431 * * nlen is an output variable, where nlen[0] and nlen[1]
432 * gets the number of lines in the old and new file respectively.
433 * * ix is an output variable, where ix[0] and ix[1] gets
434 * assigned dynamically allocated vectors of the offsets of the lines
435 * of the old and new file respectively. These must be freed by the caller.
436 */
437static NOINLINE int *create_J(FILE_and_pos_t ft[2], int nlen[2], off_t *ix[2])
[1765]438{
[2725]439 int *J, slen[2], *class, *member;
440 struct line *nfile[2], *sfile[2];
441 int pref = 0, suff = 0, i, j, delta;
[1765]442
[2725]443 /* Lines of both files are hashed, and in the process
444 * their offsets are stored in the array ix[fileno]
445 * where fileno == 0 points to the old file, and
446 * fileno == 1 points to the new one.
447 */
448 for (i = 0; i < 2; i++) {
449 unsigned hash;
450 token_t tok;
451 size_t sz = 100;
452 nfile[i] = xmalloc((sz + 3) * sizeof(nfile[i][0]));
453 /* ft gets here without the correct position, cant use seek_ft */
454 ft[i].ft_pos = 0;
455 fseeko(ft[i].ft_fp, 0, SEEK_SET);
[1765]456
[2725]457 nlen[i] = 0;
458 /* We could zalloc nfile, but then zalloc starts showing in gprof at ~1% */
459 nfile[i][0].offset = 0;
460 goto start; /* saves code */
461 while (1) {
462 tok = read_token(&ft[i], tok);
463 if (!(tok & TOK_EMPTY)) {
464 /* Hash algorithm taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578. */
465 /*hash = hash * 128 - hash + TOK2CHAR(tok);
466 * gcc insists on optimizing above to "hash * 127 + ...", thus... */
467 unsigned o = hash - TOK2CHAR(tok);
468 hash = hash * 128 - o; /* we want SPEED here */
469 continue;
470 }
471 if (nlen[i]++ == sz) {
472 sz = sz * 3 / 2;
473 nfile[i] = xrealloc(nfile[i], (sz + 3) * sizeof(nfile[i][0]));
474 }
475 /* line_compar needs hashes fit into positive int */
476 nfile[i][nlen[i]].value = hash & INT_MAX;
477 /* like ftello(ft[i].ft_fp) but faster (avoids lseek syscall) */
478 nfile[i][nlen[i]].offset = ft[i].ft_pos;
479 if (tok & TOK_EOF) {
480 /* EOF counts as a token, so we have to adjust it here */
481 nfile[i][nlen[i]].offset++;
482 break;
483 }
484start:
485 hash = tok = 0;
[1765]486 }
[2725]487 /* Exclude lone EOF line from the end of the file, to make fetch()'s job easier */
488 if (nfile[i][nlen[i]].offset - nfile[i][nlen[i] - 1].offset == 1)
489 nlen[i]--;
490 /* Now we copy the line offsets into ix */
491 ix[i] = xmalloc((nlen[i] + 2) * sizeof(ix[i][0]));
492 for (j = 0; j < nlen[i] + 1; j++)
493 ix[i][j] = nfile[i][j].offset;
[1765]494 }
495
[2725]496 /* length of prefix and suffix is calculated */
497 for (; pref < nlen[0] && pref < nlen[1] &&
498 nfile[0][pref + 1].value == nfile[1][pref + 1].value;
499 pref++);
500 for (; suff < nlen[0] - pref && suff < nlen[1] - pref &&
501 nfile[0][nlen[0] - suff].value == nfile[1][nlen[1] - suff].value;
502 suff++);
503 /* Arrays are pruned by the suffix and prefix length,
504 * the result being sorted and stored in sfile[fileno],
505 * and their sizes are stored in slen[fileno]
[1765]506 */
[2725]507 for (j = 0; j < 2; j++) {
508 sfile[j] = nfile[j] + pref;
509 slen[j] = nlen[j] - pref - suff;
510 for (i = 0; i <= slen[j]; i++)
511 sfile[j][i].serial = i;
512 qsort(sfile[j] + 1, slen[j], sizeof(*sfile[j]), line_compar);
513 }
514 /* nfile arrays are reused to reduce memory pressure
515 * The #if zeroed out section performs the same task as the
516 * one in the #else section.
517 * Peak memory usage is higher, but one array copy is avoided
518 * by not using unsort()
519 */
520#if 0
521 member = xmalloc((slen[1] + 2) * sizeof(member[0]));
522 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
523 free(nfile[1]);
[1765]524
[2725]525 class = xmalloc((slen[0] + 1) * sizeof(class[0]));
526 for (i = 1; i <= slen[0]; i++) /* Unsorting */
527 class[sfile[0][i].serial] = sfile[0][i].value;
528 free(nfile[0]);
[1765]529#else
[2725]530 member = (int *)nfile[1];
531 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
532 member = xrealloc(member, (slen[1] + 2) * sizeof(member[0]));
533
534 class = (int *)nfile[0];
535 unsort(sfile[0], slen[0], (int *)nfile[0]);
536 class = xrealloc(class, (slen[0] + 2) * sizeof(class[0]));
[1765]537#endif
[2725]538 J = xmalloc((nlen[0] + 2) * sizeof(J[0]));
539 /* The elements of J which fall inside the prefix and suffix regions
540 * are marked as unchanged, while the ones which fall outside
541 * are initialized with 0 (no matches), so that function stone can
542 * then assign them their right values
543 */
544 for (i = 0, delta = nlen[1] - nlen[0]; i <= nlen[0]; i++)
545 J[i] = i <= pref ? i :
546 i > (nlen[0] - suff) ? (i + delta) : 0;
547 /* Here the magic is performed */
548 stone(class, slen[0], member, J, pref);
549 J[nlen[0] + 1] = nlen[1] + 1;
[1765]550
[2725]551 free(class);
552 free(member);
[1765]553
[2725]554 /* Both files are rescanned, in an effort to find any lines
555 * which, due to limitations intrinsic to any hashing algorithm,
556 * are different but ended up confounded as the same
557 */
558 for (i = 1; i <= nlen[0]; i++) {
559 if (!J[i])
560 continue;
[1765]561
[2725]562 seek_ft(&ft[0], ix[0][i - 1]);
563 seek_ft(&ft[1], ix[1][J[i] - 1]);
[1765]564
[2725]565 for (j = J[i]; i <= nlen[0] && J[i] == j; i++, j++) {
566 token_t tok0 = 0, tok1 = 0;
567 do {
568 tok0 = read_token(&ft[0], tok0);
569 tok1 = read_token(&ft[1], tok1);
[1765]570
[2725]571 if (((tok0 ^ tok1) & TOK_EMPTY) != 0 /* one is empty (not both) */
572 || (!(tok0 & TOK_EMPTY) && TOK2CHAR(tok0) != TOK2CHAR(tok1))
573 ) {
574 J[i] = 0; /* Break the correspondence */
575 }
576 } while (!(tok0 & tok1 & TOK_EMPTY));
577 }
[1765]578 }
579
[2725]580 return J;
[1765]581}
582
[2725]583static bool diff(FILE* fp[2], char *file[2])
[1765]584{
[2725]585 int nlen[2];
586 off_t *ix[2];
587 FILE_and_pos_t ft[2];
588 typedef struct { int a, b; } vec_t[2];
589 vec_t *vec = NULL;
590 int i = 1, j, k, idx = -1;
591 bool anychange = false;
592 int *J;
[1765]593
[2725]594 ft[0].ft_fp = fp[0];
595 ft[1].ft_fp = fp[1];
596 /* note that ft[i].ft_pos is unintitalized, create_J()
597 * must not assume otherwise */
598 J = create_J(ft, nlen, ix);
[1765]599
[2725]600 do {
601 bool nonempty = false;
[1765]602
[2725]603 while (1) {
604 vec_t v;
[1765]605
[2725]606 for (v[0].a = i; v[0].a <= nlen[0] && J[v[0].a] == J[v[0].a - 1] + 1; v[0].a++)
607 continue;
608 v[1].a = J[v[0].a - 1] + 1;
[1765]609
[2725]610 for (v[0].b = v[0].a - 1; v[0].b < nlen[0] && !J[v[0].b + 1]; v[0].b++)
611 continue;
612 v[1].b = J[v[0].b + 1] - 1;
613 /*
614 * Indicate that there is a difference between lines a and b of the 'from' file
615 * to get to lines c to d of the 'to' file. If a is greater than b then there
616 * are no lines in the 'from' file involved and this means that there were
617 * lines appended (beginning at b). If c is greater than d then there are
618 * lines missing from the 'to' file.
619 */
620 if (v[0].a <= v[0].b || v[1].a <= v[1].b) {
621 /*
622 * If this change is more than 'context' lines from the
623 * previous change, dump the record and reset it.
624 */
625 int ct = (2 * opt_U_context) + 1;
626 if (idx >= 0
627 && v[0].a > vec[idx][0].b + ct
628 && v[1].a > vec[idx][1].b + ct
629 ) {
630 break;
631 }
[1765]632
[2725]633 for (j = 0; j < 2; j++)
634 for (k = v[j].a; k < v[j].b; k++)
635 nonempty |= (ix[j][k+1] - ix[j][k] != 1);
[1765]636
[2725]637 vec = xrealloc_vector(vec, 6, ++idx);
638 memcpy(vec[idx], v, sizeof(v));
639 }
[1765]640
[2725]641 i = v[0].b + 1;
642 if (i > nlen[0])
643 break;
644 J[v[0].b] = v[1].b;
645 }
646 if (idx < 0 || ((option_mask32 & FLAG(B)) && !nonempty))
647 goto cont;
648 if (!(option_mask32 & FLAG(q))) {
649 int lowa;
650 vec_t span, *cvp = vec;
[1765]651
[2725]652 if (!anychange) {
653 /* Print the context/unidiff header first time through */
654 printf("--- %s\n", label[0] ? label[0] : file[0]);
655 printf("+++ %s\n", label[1] ? label[1] : file[1]);
656 }
[1765]657
[2725]658 printf("@@");
659 for (j = 0; j < 2; j++) {
660 int a = span[j].a = MAX(1, (*cvp)[j].a - opt_U_context);
661 int b = span[j].b = MIN(nlen[j], vec[idx][j].b + opt_U_context);
[1765]662
[2725]663 printf(" %c%d", j ? '+' : '-', MIN(a, b));
664 if (a == b)
665 continue;
666 printf(",%d", (a < b) ? b - a + 1 : 0);
667 }
668 printf(" @@\n");
669 /*
670 * Output changes in "unified" diff format--the old and new lines
671 * are printed together.
672 */
673 for (lowa = span[0].a; ; lowa = (*cvp++)[0].b + 1) {
674 bool end = cvp > &vec[idx];
675 fetch(&ft[0], ix[0], lowa, end ? span[0].b : (*cvp)[0].a - 1, ' ');
676 if (end)
677 break;
678 for (j = 0; j < 2; j++)
679 fetch(&ft[j], ix[j], (*cvp)[j].a, (*cvp)[j].b, j ? '+' : '-');
680 }
681 }
682 anychange = true;
683 cont:
684 idx = -1;
685 } while (i <= nlen[0]);
[1765]686
[2725]687 free(vec);
688 free(ix[0]);
689 free(ix[1]);
690 free(J);
691 return anychange;
[1765]692}
693
[2725]694static int diffreg(char *file[2])
[1765]695{
[3232]696 FILE *fp[2];
[2725]697 bool binary = false, differ = false;
698 int status = STATUS_SAME, i;
[1765]699
[3232]700 fp[0] = stdin;
701 fp[1] = stdin;
[2725]702 for (i = 0; i < 2; i++) {
703 int fd = open_or_warn_stdin(file[i]);
704 if (fd == -1)
705 goto out;
706 /* Our diff implementation is using seek.
707 * When we meet non-seekable file, we must make a temp copy.
708 */
709 if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) {
710 char name[] = "/tmp/difXXXXXX";
711 int fd_tmp = xmkstemp(name);
[1765]712
[2725]713 unlink(name);
714 if (bb_copyfd_eof(fd, fd_tmp) < 0)
715 xfunc_die();
716 if (fd) /* Prevents closing of stdin */
717 close(fd);
718 fd = fd_tmp;
[1765]719 }
[2725]720 fp[i] = fdopen(fd, "r");
[1765]721 }
[2725]722
723 while (1) {
724 const size_t sz = COMMON_BUFSIZE / 2;
725 char *const buf0 = bb_common_bufsiz1;
726 char *const buf1 = buf0 + sz;
727 int j, k;
728 i = fread(buf0, 1, sz, fp[0]);
729 j = fread(buf1, 1, sz, fp[1]);
730 if (i != j) {
731 differ = true;
732 i = MIN(i, j);
[1765]733 }
[2725]734 if (i == 0)
735 break;
736 for (k = 0; k < i; k++) {
737 if (!buf0[k] || !buf1[k])
738 binary = true;
739 if (buf0[k] != buf1[k])
740 differ = true;
741 }
[1765]742 }
[2725]743 if (differ) {
744 if (binary && !(option_mask32 & FLAG(a)))
745 status = STATUS_BINARY;
746 else if (diff(fp, file))
747 status = STATUS_DIFFER;
[1765]748 }
[2725]749 if (status != STATUS_SAME)
750 exit_status |= 1;
751out:
752 fclose_if_not_stdin(fp[0]);
753 fclose_if_not_stdin(fp[1]);
[1765]754
[2725]755 return status;
[1765]756}
757
[2725]758static void print_status(int status, char *path[2])
[1765]759{
[2725]760 switch (status) {
761 case STATUS_BINARY:
762 case STATUS_DIFFER:
763 if ((option_mask32 & FLAG(q)) || status == STATUS_BINARY)
764 printf("Files %s and %s differ\n", path[0], path[1]);
765 break;
766 case STATUS_SAME:
767 if (option_mask32 & FLAG(s))
768 printf("Files %s and %s are identical\n", path[0], path[1]);
769 break;
770 }
[1765]771}
772
[2725]773#if ENABLE_FEATURE_DIFF_DIR
774struct dlist {
775 size_t len;
776 int s, e;
777 char **dl;
778};
[1765]779
780/* This function adds a filename to dl, the directory listing. */
[2725]781static int FAST_FUNC add_to_dirlist(const char *filename,
782 struct stat *sb UNUSED_PARAM,
783 void *userdata, int depth UNUSED_PARAM)
[1765]784{
[2725]785 struct dlist *const l = userdata;
786 const char *file = filename + l->len;
787 while (*file == '/')
788 file++;
789 l->dl = xrealloc_vector(l->dl, 6, l->e);
790 l->dl[l->e] = xstrdup(file);
791 l->e++;
[1765]792 return TRUE;
793}
794
[2725]795/* If recursion is not set, this function adds the directory
796 * to the list and prevents recursive_action from recursing into it.
797 */
798static int FAST_FUNC skip_dir(const char *filename,
799 struct stat *sb, void *userdata,
800 int depth)
[1765]801{
[2725]802 if (!(option_mask32 & FLAG(r)) && depth) {
803 add_to_dirlist(filename, sb, userdata, depth);
804 return SKIP;
805 }
806 if (!(option_mask32 & FLAG(N))) {
807 /* -r without -N: no need to recurse into dirs
808 * which do not exist on the "other side".
809 * Testcase: diff -r /tmp /
810 * (it would recurse deep into /proc without this code) */
811 struct dlist *const l = userdata;
812 filename += l->len;
813 if (filename[0]) {
814 struct stat osb;
815 char *othername = concat_path_file(G.other_dir, filename);
816 int r = stat(othername, &osb);
817 free(othername);
818 if (r != 0 || !S_ISDIR(osb.st_mode)) {
819 /* other dir doesn't have similarly named
[3232]820 * directory, don't recurse; return 1 upon
821 * exit, just like diffutils' diff */
822 exit_status |= 1;
[2725]823 return SKIP;
824 }
[1765]825 }
826 }
[2725]827 return TRUE;
[1765]828}
829
[2725]830static void diffdir(char *p[2], const char *s_start)
[1765]831{
[2725]832 struct dlist list[2];
833 int i;
[1765]834
[2725]835 memset(&list, 0, sizeof(list));
836 for (i = 0; i < 2; i++) {
837 /*list[i].s = list[i].e = 0; - memset did it */
838 /*list[i].dl = NULL; */
[1765]839
[2725]840 G.other_dir = p[1 - i];
841 /* We need to trim root directory prefix.
842 * Using list.len to specify its length,
843 * add_to_dirlist will remove it. */
844 list[i].len = strlen(p[i]);
845 recursive_action(p[i], ACTION_RECURSE | ACTION_FOLLOWLINKS,
[3232]846 add_to_dirlist, skip_dir, &list[i], 0);
[2725]847 /* Sort dl alphabetically.
848 * GNU diff does this ignoring any number of trailing dots.
849 * We don't, so for us dotted files almost always are
850 * first on the list.
851 */
852 qsort_string_vector(list[i].dl, list[i].e);
853 /* If -S was set, find the starting point. */
854 if (!s_start)
855 continue;
856 while (list[i].s < list[i].e && strcmp(list[i].dl[list[i].s], s_start) < 0)
857 list[i].s++;
[1765]858 }
859 /* Now that both dirlist1 and dirlist2 contain sorted directory
860 * listings, we can start to go through dirlist1. If both listings
861 * contain the same file, then do a normal diff. Otherwise, behaviour
862 * is determined by whether the -N flag is set. */
[2725]863 while (1) {
864 char *dp[2];
865 int pos;
866 int k;
867
868 dp[0] = list[0].s < list[0].e ? list[0].dl[list[0].s] : NULL;
869 dp[1] = list[1].s < list[1].e ? list[1].dl[list[1].s] : NULL;
870 if (!dp[0] && !dp[1])
871 break;
872 pos = !dp[0] ? 1 : (!dp[1] ? -1 : strcmp(dp[0], dp[1]));
873 k = pos > 0;
[3232]874 if (pos && !(option_mask32 & FLAG(N))) {
[2725]875 printf("Only in %s: %s\n", p[k], dp[k]);
[3232]876 exit_status |= 1;
877 } else {
[2725]878 char *fullpath[2], *path[2]; /* if -N */
879
880 for (i = 0; i < 2; i++) {
881 if (pos == 0 || i == k) {
882 path[i] = fullpath[i] = concat_path_file(p[i], dp[i]);
883 stat(fullpath[i], &stb[i]);
884 } else {
885 fullpath[i] = concat_path_file(p[i], dp[1 - i]);
886 path[i] = (char *)bb_dev_null;
887 }
888 }
889 if (pos)
890 stat(fullpath[k], &stb[1 - k]);
891
892 if (S_ISDIR(stb[0].st_mode) && S_ISDIR(stb[1].st_mode))
893 printf("Common subdirectories: %s and %s\n", fullpath[0], fullpath[1]);
894 else if (!S_ISREG(stb[0].st_mode) && !S_ISDIR(stb[0].st_mode))
895 printf("File %s is not a regular file or directory and was skipped\n", fullpath[0]);
896 else if (!S_ISREG(stb[1].st_mode) && !S_ISDIR(stb[1].st_mode))
897 printf("File %s is not a regular file or directory and was skipped\n", fullpath[1]);
898 else if (S_ISDIR(stb[0].st_mode) != S_ISDIR(stb[1].st_mode)) {
899 if (S_ISDIR(stb[0].st_mode))
900 printf("File %s is a %s while file %s is a %s\n", fullpath[0], "directory", fullpath[1], "regular file");
901 else
902 printf("File %s is a %s while file %s is a %s\n", fullpath[0], "regular file", fullpath[1], "directory");
903 } else
904 print_status(diffreg(path), fullpath);
905
906 free(fullpath[0]);
907 free(fullpath[1]);
908 }
909 free(dp[k]);
910 list[k].s++;
[1765]911 if (pos == 0) {
[2725]912 free(dp[1 - k]);
913 list[1 - k].s++;
[1765]914 }
915 }
[2725]916 if (ENABLE_FEATURE_CLEAN_UP) {
917 free(list[0].dl);
918 free(list[1].dl);
919 }
[1765]920}
921#endif
922
[2725]923#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
924static const char diff_longopts[] ALIGN1 =
925 "ignore-case\0" No_argument "i"
926 "ignore-tab-expansion\0" No_argument "E"
927 "ignore-space-change\0" No_argument "b"
928 "ignore-all-space\0" No_argument "w"
929 "ignore-blank-lines\0" No_argument "B"
930 "text\0" No_argument "a"
931 "unified\0" Required_argument "U"
932 "label\0" Required_argument "L"
933 "show-c-function\0" No_argument "p"
934 "brief\0" No_argument "q"
935 "expand-tabs\0" No_argument "t"
936 "initial-tab\0" No_argument "T"
937 "recursive\0" No_argument "r"
938 "new-file\0" No_argument "N"
939 "report-identical-files\0" No_argument "s"
940 "starting-file\0" Required_argument "S"
941 "minimal\0" No_argument "d"
942 ;
943#endif
[1765]944
[2725]945int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
946int diff_main(int argc UNUSED_PARAM, char **argv)
[1765]947{
[2725]948 int gotstdin = 0, i;
949 char *file[2], *s_start = NULL;
[1765]950 llist_t *L_arg = NULL;
951
952 INIT_G();
953
[2725]954 /* exactly 2 params; collect multiple -L <label>; -U N */
955 opt_complementary = "=2:L::U+";
956#if ENABLE_FEATURE_DIFF_LONG_OPTIONS
957 applet_long_options = diff_longopts;
958#endif
959 getopt32(argv, "abdiL:NqrsS:tTU:wupBE",
960 &L_arg, &s_start, &opt_U_context);
[1765]961 argv += optind;
[2725]962 while (L_arg)
963 label[!!label[0]] = llist_pop(&L_arg);
964 xfunc_error_retval = 2;
965 for (i = 0; i < 2; i++) {
966 file[i] = argv[i];
967 /* Compat: "diff file name_which_doesnt_exist" exits with 2 */
968 if (LONE_DASH(file[i])) {
969 fstat(STDIN_FILENO, &stb[i]);
970 gotstdin++;
971 } else
972 xstat(file[i], &stb[i]);
[1765]973 }
[2725]974 xfunc_error_retval = 1;
975 if (gotstdin && (S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode)))
976 bb_error_msg_and_die("can't compare stdin to a directory");
[1765]977
[3232]978 /* Compare metadata to check if the files are the same physical file.
979 *
980 * Comment from diffutils source says:
981 * POSIX says that two files are identical if st_ino and st_dev are
982 * the same, but many file systems incorrectly assign the same (device,
983 * inode) pair to two distinct files, including:
984 * GNU/Linux NFS servers that export all local file systems as a
985 * single NFS file system, if a local device number (st_dev) exceeds
986 * 255, or if a local inode number (st_ino) exceeds 16777215.
987 */
988 if (ENABLE_DESKTOP
989 && stb[0].st_ino == stb[1].st_ino
990 && stb[0].st_dev == stb[1].st_dev
991 && stb[0].st_size == stb[1].st_size
992 && stb[0].st_mtime == stb[1].st_mtime
993 && stb[0].st_ctime == stb[1].st_ctime
994 && stb[0].st_mode == stb[1].st_mode
995 && stb[0].st_nlink == stb[1].st_nlink
996 && stb[0].st_uid == stb[1].st_uid
997 && stb[0].st_gid == stb[1].st_gid
998 ) {
999 /* files are physically the same; no need to compare them */
1000 return STATUS_SAME;
1001 }
1002
[2725]1003 if (S_ISDIR(stb[0].st_mode) && S_ISDIR(stb[1].st_mode)) {
[1765]1004#if ENABLE_FEATURE_DIFF_DIR
[2725]1005 diffdir(file, s_start);
[1765]1006#else
[2725]1007 bb_error_msg_and_die("no support for directory comparison");
[1765]1008#endif
1009 } else {
[2725]1010 bool dirfile = S_ISDIR(stb[0].st_mode) || S_ISDIR(stb[1].st_mode);
1011 bool dir = S_ISDIR(stb[1].st_mode);
1012 if (dirfile) {
1013 const char *slash = strrchr(file[!dir], '/');
1014 file[dir] = concat_path_file(file[dir], slash ? slash + 1 : file[!dir]);
1015 xstat(file[dir], &stb[dir]);
[1765]1016 }
[2725]1017 /* diffreg can get non-regular files here */
1018 print_status(gotstdin > 1 ? STATUS_SAME : diffreg(file), file);
1019
1020 if (dirfile)
1021 free(file[dir]);
[1765]1022 }
[2725]1023
1024 return exit_status;
[1765]1025}
Note: See TracBrowser for help on using the repository browser.