blob: b39a301b9f88de7663ac1b0b2ea590c546dfab75 [file] [log] [blame]
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001/* vi: set sw=4 ts=4: */
2/*
3 * Mini diff implementation for busybox, adapted from OpenBSD diff.
4 *
5 * Copyright (C) 2006 by Robert Sullivan <cogito.ergo.cogito@hotmail.com>
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00006 * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
7 *
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00008 * Sponsored in part by the Defense Advanced Research Projects
9 * Agency (DARPA) and Air Force Research Laboratory, Air Force
10 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
Bernhard Reutner-Fischer14aa06f2006-05-19 13:02:27 +000011 *
Rob Landleye4386342006-04-18 20:41:51 +000012 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000013 */
14
Denis Vlasenkob6adbf12007-05-26 19:00:18 +000015#include "libbb.h"
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000016
17#define FSIZE_MAX 32768
18
19/*
20 * Output flags
21 */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +000022#define D_HEADER 1 /* Print a header/footer between files */
23#define D_EMPTY1 2 /* Treat first file as empty (/dev/null) */
24#define D_EMPTY2 4 /* Treat second file as empty (/dev/null) */
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000025
26/*
27 * Status values for print_status() and diffreg() return values
28 * Guide:
29 * D_SAME - files are the same
30 * D_DIFFER - files differ
31 * D_BINARY - binary files differ
32 * D_COMMON - subdirectory common to both dirs
33 * D_ONLY - file only exists in one dir
34 * D_MISMATCH1 - path1 a dir, path2 a file
35 * D_MISMATCH2 - path1 a file, path2 a dir
36 * D_ERROR - error occurred
37 * D_SKIPPED1 - skipped path1 as it is a special file
38 * D_SKIPPED2 - skipped path2 as it is a special file
39 */
40
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +000041#define D_SAME 0
42#define D_DIFFER (1<<0)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000043#define D_BINARY (1<<1)
44#define D_COMMON (1<<2)
45#define D_ONLY (1<<3)
46#define D_MISMATCH1 (1<<4)
47#define D_MISMATCH2 (1<<5)
48#define D_ERROR (1<<6)
49#define D_SKIPPED1 (1<<7)
50#define D_SKIPPED2 (1<<8)
51
52/* Command line options */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +000053#define FLAG_a (1<<0)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000054#define FLAG_b (1<<1)
55#define FLAG_d (1<<2)
56#define FLAG_i (1<<3)
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +000057#define FLAG_L (1<<4)
58#define FLAG_N (1<<5)
59#define FLAG_q (1<<6)
60#define FLAG_r (1<<7)
61#define FLAG_s (1<<8)
62#define FLAG_S (1<<9)
63#define FLAG_t (1<<10)
64#define FLAG_T (1<<11)
65#define FLAG_U (1<<12)
66#define FLAG_w (1<<13)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000067
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000068struct cand {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +000069 int x;
70 int y;
71 int pred;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000072};
73
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000074struct line {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +000075 int serial;
76 int value;
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000077};
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000078
79/*
80 * The following struct is used to record change information
81 * doing a "context" or "unified" diff. (see routine "change" to
82 * understand the highly mnemonic field names)
83 */
84struct context_vec {
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000085 int a; /* start line in old file */
86 int b; /* end line in old file */
87 int c; /* start line in new file */
88 int d; /* end line in new file */
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000089};
90
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000091struct globals {
92 USE_FEATURE_DIFF_DIR(char **dl;)
93 USE_FEATURE_DIFF_DIR(int dl_count;)
94 /* This is the default number of lines of context. */
95 int context;
96 size_t max_context;
97 int status;
98 char *start;
99 const char *label1;
100 const char *label2;
101 struct line *file[2];
102 int *J; /* will be overlaid on class */
103 int *class; /* will be overlaid on file[0] */
104 int *klist; /* will be overlaid on file[0] after class */
105 int *member; /* will be overlaid on file[1] */
106 int clen;
107 int len[2];
108 int pref, suff; /* length of prefix and suffix */
109 int slen[2];
110 bool anychange;
111 long *ixnew; /* will be overlaid on file[1] */
112 long *ixold; /* will be overlaid on klist */
113 struct cand *clist; /* merely a free storage pot for candidates */
114 int clistlen; /* the length of clist */
115 struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
116 struct context_vec *context_vec_start;
117 struct context_vec *context_vec_end;
118 struct context_vec *context_vec_ptr;
119 struct stat stb1, stb2;
120};
121#define G (*ptr_to_globals)
122#define dl (G.dl )
123#define dl_count (G.dl_count )
124#define context (G.context )
125#define max_context (G.max_context )
126#define status (G.status )
127#define start (G.start )
128#define label1 (G.label1 )
129#define label2 (G.label2 )
130#define file (G.file )
131#define J (G.J )
132#define class (G.class )
133#define klist (G.klist )
134#define member (G.member )
135#define clen (G.clen )
136#define len (G.len )
137#define pref (G.pref )
138#define suff (G.suff )
139#define slen (G.slen )
140#define anychange (G.anychange )
141#define ixnew (G.ixnew )
142#define ixold (G.ixold )
143#define clist (G.clist )
144#define clistlen (G.clistlen )
145#define sfile (G.sfile )
146#define context_vec_start (G.context_vec_start )
147#define context_vec_end (G.context_vec_end )
148#define context_vec_ptr (G.context_vec_ptr )
149#define stb1 (G.stb1 )
150#define stb2 (G.stb2 )
151#define INIT_G() do { \
152 PTR_TO_GLOBALS = xzalloc(sizeof(G)); \
153 context = 3; \
154 max_context = 64; \
155} while (0)
156
157
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000158static void print_only(const char *path, size_t dirlen, const char *entry)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000159{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000160 if (dirlen > 1)
161 dirlen--;
162 printf("Only in %.*s: %s\n", (int) dirlen, path, entry);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000163}
164
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000165static void print_status(int val, char *path1, char *path2, char *entry)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000166{
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000167 const char * const _entry = entry ? entry : "";
168 char * const _path1 = entry ? concat_path_file(path1, _entry) : path1;
169 char * const _path2 = entry ? concat_path_file(path2, _entry) : path2;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000170
171 switch (val) {
172 case D_ONLY:
173 print_only(path1, strlen(path1), entry);
174 break;
175 case D_COMMON:
176 printf("Common subdirectories: %s and %s\n", _path1, _path2);
177 break;
178 case D_BINARY:
179 printf("Binary files %s and %s differ\n", _path1, _path2);
180 break;
181 case D_DIFFER:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000182 if (option_mask32 & FLAG_q)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000183 printf("Files %s and %s differ\n", _path1, _path2);
184 break;
185 case D_SAME:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000186 if (option_mask32 & FLAG_s)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000187 printf("Files %s and %s are identical\n", _path1, _path2);
188 break;
189 case D_MISMATCH1:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000190 printf("File %s is a %s while file %s is a %s\n",
191 _path1, "directory", _path2, "regular file");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000192 break;
193 case D_MISMATCH2:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000194 printf("File %s is a %s while file %s is a %s\n",
195 _path1, "regular file", _path2, "directory");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000196 break;
197 case D_SKIPPED1:
198 printf("File %s is not a regular file or directory and was skipped\n",
199 _path1);
200 break;
201 case D_SKIPPED2:
202 printf("File %s is not a regular file or directory and was skipped\n",
203 _path2);
204 break;
205 }
206 if (entry) {
207 free(_path1);
208 free(_path2);
209 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000210}
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000211static void fiddle_sum(int *sum, int t)
212{
213 *sum = (int)(*sum * 127 + t);
214}
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000215/*
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000216 * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
217 */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000218static int readhash(FILE * f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000219{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000220 int i, t, space;
221 int sum;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000222
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000223 sum = 1;
224 space = 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000225 if (!(option_mask32 & (FLAG_b | FLAG_w))) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000226 for (i = 0; (t = getc(f)) != '\n'; i++) {
227 if (t == EOF) {
228 if (i == 0)
229 return 0;
230 break;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000231 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000232 fiddle_sum(&sum, t);
233 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000234 } else {
235 for (i = 0;;) {
236 switch (t = getc(f)) {
237 case '\t':
238 case '\r':
239 case '\v':
240 case '\f':
241 case ' ':
242 space++;
243 continue;
244 default:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000245 if (space && !(option_mask32 & FLAG_w)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000246 i++;
247 space = 0;
248 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000249 fiddle_sum(&sum, t);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000250 i++;
251 continue;
252 case EOF:
253 if (i == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000254 return 0;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000255 /* FALLTHROUGH */
256 case '\n':
257 break;
258 }
259 break;
260 }
261 }
262 /*
263 * There is a remote possibility that we end up with a zero sum.
264 * Zero is used as an EOF marker, so return 1 instead.
265 */
266 return (sum == 0 ? 1 : sum);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000267}
268
269
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000270/*
271 * Check to see if the given files differ.
272 * Returns 0 if they are the same, 1 if different, and -1 on error.
273 */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000274static int files_differ(FILE * f1, FILE * f2, int flags)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000275{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000276 size_t i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000277
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000278 if ((flags & (D_EMPTY1 | D_EMPTY2)) || stb1.st_size != stb2.st_size
279 || (stb1.st_mode & S_IFMT) != (stb2.st_mode & S_IFMT)
280 ) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000281 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000282 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000283 while (1) {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000284 i = fread(bb_common_bufsiz1, 1, BUFSIZ/2, f1);
285 j = fread(bb_common_bufsiz1 + BUFSIZ/2, 1, BUFSIZ/2, f2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000286 if (i != j)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000287 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000288 if (i == 0)
289 return (ferror(f1) || ferror(f2));
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000290 if (memcmp(bb_common_bufsiz1,
291 bb_common_bufsiz1 + BUFSIZ/2, i) != 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000292 return 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000293 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000294}
295
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000296
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000297static void prepare(int i, FILE * fd, off_t filesize)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000298{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000299 struct line *p;
300 int h;
301 size_t j, sz;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000302
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000303 rewind(fd);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000304
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000305 sz = (filesize <= FSIZE_MAX ? filesize : FSIZE_MAX) / 25;
306 if (sz < 100)
307 sz = 100;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000308
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000309 p = xmalloc((sz + 3) * sizeof(struct line));
Denis Vlasenko8336f082007-01-07 00:21:41 +0000310 j = 0;
311 while ((h = readhash(fd))) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000312 if (j == sz) {
313 sz = sz * 3 / 2;
314 p = xrealloc(p, (sz + 3) * sizeof(struct line));
315 }
316 p[++j].value = h;
317 }
318 len[i] = j;
319 file[i] = p;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000320}
321
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000322
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000323static void prune(void)
324{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000325 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000326
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000327 for (pref = 0; pref < len[0] && pref < len[1] &&
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000328 file[0][pref + 1].value == file[1][pref + 1].value; pref++)
329 ;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000330 for (suff = 0; suff < len[0] - pref && suff < len[1] - pref &&
331 file[0][len[0] - suff].value == file[1][len[1] - suff].value;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000332 suff++)
333 ;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000334 for (j = 0; j < 2; j++) {
335 sfile[j] = file[j] + pref;
336 slen[j] = len[j] - pref - suff;
337 for (i = 0; i <= slen[j]; i++)
338 sfile[j][i].serial = i;
339 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000340}
341
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000342
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000343static void equiv(struct line *a, int n, struct line *b, int m, int *c)
344{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000345 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000346
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000347 i = j = 1;
348 while (i <= n && j <= m) {
349 if (a[i].value < b[j].value)
350 a[i++].value = 0;
351 else if (a[i].value == b[j].value)
352 a[i++].value = j;
353 else
354 j++;
355 }
356 while (i <= n)
357 a[i++].value = 0;
358 b[m + 1].value = 0;
359 j = 0;
360 while (++j <= m) {
361 c[j] = -b[j].serial;
362 while (b[j + 1].value == b[j].value) {
363 j++;
364 c[j] = b[j].serial;
365 }
366 }
367 c[j] = -1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000368}
369
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000370
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000371static int isqrt(int n)
372{
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000373 int y, x;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000374
375 if (n == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000376 return 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000377 x = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000378 do {
379 y = x;
380 x = n / x;
381 x += y;
382 x /= 2;
383 } while ((x - y) > 1 || (x - y) < -1);
384
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000385 return x;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000386}
387
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000388
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000389static int newcand(int x, int y, int pred)
390{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000391 struct cand *q;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000392
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000393 if (clen == clistlen) {
394 clistlen = clistlen * 11 / 10;
395 clist = xrealloc(clist, clistlen * sizeof(struct cand));
396 }
397 q = clist + clen;
398 q->x = x;
399 q->y = y;
400 q->pred = pred;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000401 return clen++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000402}
403
404
405static int search(int *c, int k, int y)
406{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000407 int i, j, l, t;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000408
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000409 if (clist[c[k]].y < y) /* quick look for typical case */
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000410 return k + 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000411 i = 0;
412 j = k + 1;
413 while (1) {
414 l = i + j;
415 if ((l >>= 1) <= i)
416 break;
417 t = clist[c[l]].y;
418 if (t > y)
419 j = l;
420 else if (t < y)
421 i = l;
422 else
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000423 return l;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000424 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000425 return l + 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000426}
427
428
429static int stone(int *a, int n, int *b, int *c)
430{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000431 int i, k, y, j, l;
432 int oldc, tc, oldl;
433 unsigned int numtries;
434
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000435#if ENABLE_FEATURE_DIFF_MINIMAL
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000436 const unsigned int bound =
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000437 (option_mask32 & FLAG_d) ? UINT_MAX : MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000438#else
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000439 const unsigned int bound = MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000440#endif
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000441 k = 0;
442 c[0] = newcand(0, 0, 0);
443 for (i = 1; i <= n; i++) {
444 j = a[i];
445 if (j == 0)
446 continue;
447 y = -b[j];
448 oldl = 0;
449 oldc = c[0];
450 numtries = 0;
451 do {
452 if (y <= clist[oldc].y)
453 continue;
454 l = search(c, k, y);
455 if (l != oldl + 1)
456 oldc = c[l - 1];
457 if (l <= k) {
458 if (clist[c[l]].y <= y)
459 continue;
460 tc = c[l];
461 c[l] = newcand(i, y, oldc);
462 oldc = tc;
463 oldl = l;
464 numtries++;
465 } else {
466 c[l] = newcand(i, y, oldc);
467 k++;
468 break;
469 }
470 } while ((y = b[++j]) > 0 && numtries < bound);
471 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000472 return k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000473}
474
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000475
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000476static void unravel(int p)
477{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000478 struct cand *q;
479 int i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000480
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000481 for (i = 0; i <= len[0]; i++)
482 J[i] = i <= pref ? i : i > len[0] - suff ? i + len[1] - len[0] : 0;
483 for (q = clist + p; q->y != 0; q = clist + q->pred)
484 J[q->x + pref] = q->y + pref;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000485}
486
487
488static void unsort(struct line *f, int l, int *b)
489{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000490 int *a, i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000491
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000492 a = xmalloc((l + 1) * sizeof(int));
493 for (i = 1; i <= l; i++)
494 a[f[i].serial] = f[i].value;
495 for (i = 1; i <= l; i++)
496 b[i] = a[i];
497 free(a);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000498}
499
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000500
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000501static int skipline(FILE * f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000502{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000503 int i, c;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000504
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000505 for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
506 continue;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000507 return i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000508}
509
510
511/*
512 * Check does double duty:
513 * 1. ferret out any fortuitous correspondences due
514 * to confounding by hashing (which result in "jackpot")
515 * 2. collect random access indexes to the two files
516 */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000517static void check(FILE * f1, FILE * f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000518{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000519 int i, j, jackpot, c, d;
520 long ctold, ctnew;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000521
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000522 rewind(f1);
523 rewind(f2);
524 j = 1;
525 ixold[0] = ixnew[0] = 0;
526 jackpot = 0;
527 ctold = ctnew = 0;
528 for (i = 1; i <= len[0]; i++) {
529 if (J[i] == 0) {
530 ixold[i] = ctold += skipline(f1);
531 continue;
532 }
533 while (j < J[i]) {
534 ixnew[j] = ctnew += skipline(f2);
535 j++;
536 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000537 if ((option_mask32 & FLAG_b) || (option_mask32 & FLAG_w)
538 || (option_mask32 & FLAG_i)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000539 while (1) {
540 c = getc(f1);
541 d = getc(f2);
542 /*
543 * GNU diff ignores a missing newline
544 * in one file if bflag || wflag.
545 */
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000546 if (((option_mask32 & FLAG_b) || (option_mask32 & FLAG_w)) &&
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000547 ((c == EOF && d == '\n') || (c == '\n' && d == EOF))) {
548 break;
549 }
550 ctold++;
551 ctnew++;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000552 if ((option_mask32 & FLAG_b) && isspace(c) && isspace(d)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000553 do {
554 if (c == '\n')
555 break;
556 ctold++;
557 } while (isspace(c = getc(f1)));
558 do {
559 if (d == '\n')
560 break;
561 ctnew++;
562 } while (isspace(d = getc(f2)));
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000563 } else if (option_mask32 & FLAG_w) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000564 while (isspace(c) && c != '\n') {
565 c = getc(f1);
566 ctold++;
567 }
568 while (isspace(d) && d != '\n') {
569 d = getc(f2);
570 ctnew++;
571 }
572 }
573 if (c != d) {
574 jackpot++;
575 J[i] = 0;
576 if (c != '\n' && c != EOF)
577 ctold += skipline(f1);
578 if (d != '\n' && c != EOF)
579 ctnew += skipline(f2);
580 break;
581 }
582 if (c == '\n' || c == EOF)
583 break;
584 }
585 } else {
586 while (1) {
587 ctold++;
588 ctnew++;
589 if ((c = getc(f1)) != (d = getc(f2))) {
590 J[i] = 0;
591 if (c != '\n' && c != EOF)
592 ctold += skipline(f1);
593 if (d != '\n' && c != EOF)
594 ctnew += skipline(f2);
595 break;
596 }
597 if (c == '\n' || c == EOF)
598 break;
599 }
600 }
601 ixold[i] = ctold;
602 ixnew[j] = ctnew;
603 j++;
604 }
605 for (; j <= len[1]; j++)
606 ixnew[j] = ctnew += skipline(f2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000607}
608
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000609
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000610/* shellsort CACM #201 */
611static void sort(struct line *a, int n)
612{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000613 struct line *ai, *aim, w;
614 int j, m = 0, k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000615
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000616 if (n == 0)
617 return;
618 for (j = 1; j <= n; j *= 2)
619 m = 2 * j - 1;
620 for (m /= 2; m != 0; m /= 2) {
621 k = n - m;
622 for (j = 1; j <= k; j++) {
623 for (ai = &a[j]; ai > a; ai -= m) {
624 aim = &ai[m];
625 if (aim < ai)
626 break; /* wraparound */
627 if (aim->value > ai[0].value ||
628 (aim->value == ai[0].value && aim->serial > ai[0].serial))
629 break;
630 w.value = ai[0].value;
631 ai[0].value = aim->value;
632 aim->value = w.value;
633 w.serial = ai[0].serial;
634 ai[0].serial = aim->serial;
635 aim->serial = w.serial;
636 }
637 }
638 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000639}
640
641
642static void uni_range(int a, int b)
643{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000644 if (a < b)
645 printf("%d,%d", a, b - a + 1);
646 else if (a == b)
647 printf("%d", b);
648 else
649 printf("%d,0", b);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000650}
651
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000652
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000653static void fetch(long *f, int a, int b, FILE * lb, int ch)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000654{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000655 int i, j, c, lastc, col, nc;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000656
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000657 if (a > b)
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000658 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000659 for (i = a; i <= b; i++) {
660 fseek(lb, f[i - 1], SEEK_SET);
661 nc = f[i] - f[i - 1];
662 if (ch != '\0') {
663 putchar(ch);
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000664 if (option_mask32 & FLAG_T)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000665 putchar('\t');
666 }
667 col = 0;
668 for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
669 if ((c = getc(lb)) == EOF) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000670 printf("\n\\ No newline at end of file\n");
671 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000672 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000673 if (c == '\t' && (option_mask32 & FLAG_t)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000674 do {
675 putchar(' ');
676 } while (++col & 7);
677 } else {
678 putchar(c);
679 col++;
680 }
681 }
682 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000683}
684
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000685
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000686static int asciifile(FILE * f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000687{
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000688#if ENABLE_FEATURE_DIFF_BINARY
Bernhard Reutner-Fischer5fb0fec2006-04-06 11:28:19 +0000689 int i, cnt;
690#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000691
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000692 if ((option_mask32 & FLAG_a) || f == NULL)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000693 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000694
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000695#if ENABLE_FEATURE_DIFF_BINARY
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000696 rewind(f);
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000697 cnt = fread(bb_common_bufsiz1, 1, BUFSIZ, f);
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000698 for (i = 0; i < cnt; i++) {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000699 if (!isprint(bb_common_bufsiz1[i])
700 && !isspace(bb_common_bufsiz1[i])) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000701 return 0;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000702 }
703 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000704#endif
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000705 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000706}
707
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000708
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000709/* dump accumulated "unified" diff changes */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000710static void dump_unified_vec(FILE * f1, FILE * f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000711{
712 struct context_vec *cvp = context_vec_start;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000713 int lowa, upb, lowc, upd;
714 int a, b, c, d;
715 char ch;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000716
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000717 if (context_vec_start > context_vec_ptr)
718 return;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000719
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000720 b = d = 0; /* gcc */
721 lowa = MAX(1, cvp->a - context);
722 upb = MIN(len[0], context_vec_ptr->b + context);
723 lowc = MAX(1, cvp->c - context);
724 upd = MIN(len[1], context_vec_ptr->d + context);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000725
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000726 printf("@@ -");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000727 uni_range(lowa, upb);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000728 printf(" +");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000729 uni_range(lowc, upd);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000730 printf(" @@\n");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000731
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000732 /*
733 * Output changes in "unified" diff format--the old and new lines
734 * are printed together.
735 */
736 for (; cvp <= context_vec_ptr; cvp++) {
737 a = cvp->a;
738 b = cvp->b;
739 c = cvp->c;
740 d = cvp->d;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000741
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000742 /*
743 * c: both new and old changes
744 * d: only changes in the old file
745 * a: only changes in the new file
746 */
747 if (a <= b && c <= d)
748 ch = 'c';
749 else
750 ch = (a <= b) ? 'd' : 'a';
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000751 if (ch == 'c' || ch == 'd') {
752 fetch(ixold, lowa, a - 1, f1, ' ');
753 fetch(ixold, a, b, f1, '-');
754 }
755 if (ch == 'a')
756 fetch(ixnew, lowc, c - 1, f2, ' ');
757 if (ch == 'c' || ch == 'a')
758 fetch(ixnew, c, d, f2, '+');
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000759 lowa = b + 1;
760 lowc = d + 1;
761 }
762 fetch(ixnew, d + 1, upd, f2, ' ');
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000763
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000764 context_vec_ptr = context_vec_start - 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000765}
766
767
768static void print_header(const char *file1, const char *file2)
769{
Denis Vlasenko8336f082007-01-07 00:21:41 +0000770 if (label1)
771 printf("--- %s\n", label1);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000772 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000773 printf("--- %s\t%s", file1, ctime(&stb1.st_mtime));
774 if (label2)
775 printf("+++ %s\n", label2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000776 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000777 printf("+++ %s\t%s", file2, ctime(&stb2.st_mtime));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000778}
779
780
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000781/*
782 * Indicate that there is a difference between lines a and b of the from file
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000783 * to get to lines c to d of the to file. If a is greater than b then there
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000784 * are no lines in the from file involved and this means that there were
785 * lines appended (beginning at b). If c is greater than d then there are
786 * lines missing from the to file.
787 */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000788static void change(char *file1, FILE * f1, char *file2, FILE * f2, int a,
789 int b, int c, int d)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000790{
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000791 if ((a > b && c > d) || (option_mask32 & FLAG_q)) {
792 anychange = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000793 return;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000794 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000795
796 /*
797 * Allocate change records as needed.
798 */
799 if (context_vec_ptr == context_vec_end - 1) {
800 ptrdiff_t offset = context_vec_ptr - context_vec_start;
801
802 max_context <<= 1;
803 context_vec_start = xrealloc(context_vec_start,
Denis Vlasenko8336f082007-01-07 00:21:41 +0000804 max_context * sizeof(struct context_vec));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000805 context_vec_end = context_vec_start + max_context;
806 context_vec_ptr = context_vec_start + offset;
807 }
808 if (anychange == 0) {
809 /*
810 * Print the context/unidiff header first time through.
811 */
812 print_header(file1, file2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000813 } else if (a > context_vec_ptr->b + (2 * context) + 1 &&
814 c > context_vec_ptr->d + (2 * context) + 1) {
815 /*
816 * If this change is more than 'context' lines from the
817 * previous change, dump the record and reset it.
818 */
819 dump_unified_vec(f1, f2);
820 }
821 context_vec_ptr++;
822 context_vec_ptr->a = a;
823 context_vec_ptr->b = b;
824 context_vec_ptr->c = c;
825 context_vec_ptr->d = d;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000826 anychange = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000827}
828
829
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000830static void output(char *file1, FILE * f1, char *file2, FILE * f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000831{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000832 /* Note that j0 and j1 can't be used as they are defined in math.h.
833 * This also allows the rather amusing variable 'j00'... */
834 int m, i0, i1, j00, j01;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000835
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000836 rewind(f1);
837 rewind(f2);
838 m = len[0];
839 J[0] = 0;
840 J[m + 1] = len[1] + 1;
841 for (i0 = 1; i0 <= m; i0 = i1 + 1) {
842 while (i0 <= m && J[i0] == J[i0 - 1] + 1)
843 i0++;
844 j00 = J[i0 - 1] + 1;
845 i1 = i0 - 1;
846 while (i1 < m && J[i1 + 1] == 0)
847 i1++;
848 j01 = J[i1 + 1] - 1;
849 J[i1] = j01;
850 change(file1, f1, file2, f2, i0, i1, j00, j01);
851 }
852 if (m == 0) {
853 change(file1, f1, file2, f2, 1, 0, 1, len[1]);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000854 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000855 if (anychange != 0 && !(option_mask32 & FLAG_q)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000856 dump_unified_vec(f1, f2);
857 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000858}
859
860/*
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000861 * The following code uses an algorithm due to Harold Stone,
862 * which finds a pair of longest identical subsequences in
863 * the two files.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000864 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000865 * The major goal is to generate the match vector J.
866 * J[i] is the index of the line in file1 corresponding
867 * to line i file0. J[i] = 0 if there is no
868 * such line in file1.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000869 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000870 * Lines are hashed so as to work in core. All potential
871 * matches are located by sorting the lines of each file
872 * on the hash (called ``value''). In particular, this
873 * collects the equivalence classes in file1 together.
874 * Subroutine equiv replaces the value of each line in
875 * file0 by the index of the first element of its
876 * matching equivalence in (the reordered) file1.
877 * To save space equiv squeezes file1 into a single
878 * array member in which the equivalence classes
879 * are simply concatenated, except that their first
880 * members are flagged by changing sign.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000881 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000882 * Next the indices that point into member are unsorted into
883 * array class according to the original order of file0.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000884 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000885 * The cleverness lies in routine stone. This marches
886 * through the lines of file0, developing a vector klist
887 * of "k-candidates". At step i a k-candidate is a matched
888 * pair of lines x,y (x in file0 y in file1) such that
889 * there is a common subsequence of length k
890 * between the first i lines of file0 and the first y
891 * lines of file1, but there is no such subsequence for
892 * any smaller y. x is the earliest possible mate to y
893 * that occurs in such a subsequence.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000894 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000895 * Whenever any of the members of the equivalence class of
896 * lines in file1 matable to a line in file0 has serial number
897 * less than the y of some k-candidate, that k-candidate
898 * with the smallest such y is replaced. The new
899 * k-candidate is chained (via pred) to the current
900 * k-1 candidate so that the actual subsequence can
901 * be recovered. When a member has serial number greater
902 * that the y of all k-candidates, the klist is extended.
903 * At the end, the longest subsequence is pulled out
904 * and placed in the array J by unravel
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000905 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000906 * With J in hand, the matches there recorded are
907 * checked against reality to assure that no spurious
908 * matches have crept in due to hashing. If they have,
909 * they are broken, and "jackpot" is recorded--a harmless
910 * matter except that a true match for a spuriously
911 * mated line may now be unnecessarily reported as a change.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000912 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000913 * Much of the complexity of the program comes simply
914 * from trying to minimize core utilization and
915 * maximize the range of doable problems by dynamically
916 * allocating what is needed and reusing what is not.
917 * The core requirements for problems larger than somewhat
918 * are (in words) 2*length(file0) + length(file1) +
919 * 3*(number of k-candidates installed), typically about
920 * 6n words for files of length n.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000921 */
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000922static unsigned diffreg(char * ofile1, char * ofile2, int flags)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000923{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000924 char *file1 = ofile1;
925 char *file2 = ofile2;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000926 FILE *f1 = stdin, *f2 = stdin;
927 unsigned rval;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000928 int i;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000929
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000930 anychange = 0;
931 context_vec_ptr = context_vec_start - 1;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000932
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000933 if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
934 return (S_ISDIR(stb1.st_mode) ? D_MISMATCH1 : D_MISMATCH2);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000935
936 rval = D_SAME;
937
Denis Vlasenko9f739442006-12-16 23:49:13 +0000938 if (LONE_DASH(file1) && LONE_DASH(file2))
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000939 goto closem;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000940
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000941 if (flags & D_EMPTY1)
Rob Landleyd921b2e2006-08-03 15:41:12 +0000942 f1 = xfopen(bb_dev_null, "r");
Denis Vlasenko9f739442006-12-16 23:49:13 +0000943 else if (NOT_LONE_DASH(file1))
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000944 f1 = xfopen(file1, "r");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000945 if (flags & D_EMPTY2)
Rob Landleyd921b2e2006-08-03 15:41:12 +0000946 f2 = xfopen(bb_dev_null, "r");
Denis Vlasenko9f739442006-12-16 23:49:13 +0000947 else if (NOT_LONE_DASH(file2))
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000948 f2 = xfopen(file2, "r");
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000949
Denis Vlasenko8336f082007-01-07 00:21:41 +0000950/* We can't diff non-seekable stream - we use rewind(), fseek().
951 * This can be fixed (volunteers?).
952 * Meanwhile we should check it here by stat'ing input fds,
953 * but I am lazy and check that in main() instead.
954 * Check in main won't catch "diffing fifos buried in subdirectories"
955 * failure scenario - not very likely in real life... */
956
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000957 i = files_differ(f1, f2, flags);
958 if (i == 0)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000959 goto closem;
960 else if (i != 1) { /* 1 == ok */
961 /* error */
962 status |= 2;
963 goto closem;
964 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000965
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000966 if (!asciifile(f1) || !asciifile(f2)) {
967 rval = D_BINARY;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000968 status |= 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000969 goto closem;
970 }
971
972 prepare(0, f1, stb1.st_size);
973 prepare(1, f2, stb2.st_size);
974 prune();
975 sort(sfile[0], slen[0]);
976 sort(sfile[1], slen[1]);
977
978 member = (int *) file[1];
979 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
980 member = xrealloc(member, (slen[1] + 2) * sizeof(int));
981
982 class = (int *) file[0];
983 unsort(sfile[0], slen[0], class);
984 class = xrealloc(class, (slen[0] + 2) * sizeof(int));
985
986 klist = xmalloc((slen[0] + 2) * sizeof(int));
987 clen = 0;
988 clistlen = 100;
989 clist = xmalloc(clistlen * sizeof(struct cand));
990 i = stone(class, slen[0], member, klist);
991 free(member);
992 free(class);
993
994 J = xrealloc(J, (len[0] + 2) * sizeof(int));
995 unravel(klist[i]);
996 free(clist);
997 free(klist);
998
999 ixold = xrealloc(ixold, (len[0] + 2) * sizeof(long));
1000 ixnew = xrealloc(ixnew, (len[1] + 2) * sizeof(long));
1001 check(f1, f2);
1002 output(file1, f1, file2, f2);
1003
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001004 closem:
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001005 if (anychange) {
1006 status |= 1;
1007 if (rval == D_SAME)
1008 rval = D_DIFFER;
1009 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001010 fclose_if_not_stdin(f1);
1011 fclose_if_not_stdin(f2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001012 if (file1 != ofile1)
1013 free(file1);
1014 if (file2 != ofile2)
1015 free(file2);
Denis Vlasenkod9e15f22006-11-27 16:49:55 +00001016 return rval;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001017}
1018
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001019
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001020#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001021static void do_diff(char *dir1, char *path1, char *dir2, char *path2)
1022{
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001023 int flags = D_HEADER;
1024 int val;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001025 char *fullpath1 = NULL; /* if -N */
1026 char *fullpath2 = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001027
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001028 if (path1)
1029 fullpath1 = concat_path_file(dir1, path1);
1030 if (path2)
1031 fullpath2 = concat_path_file(dir2, path2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001032
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001033 if (!fullpath1 || stat(fullpath1, &stb1) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001034 flags |= D_EMPTY1;
1035 memset(&stb1, 0, sizeof(stb1));
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001036 if (path2) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001037 free(fullpath1);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001038 fullpath1 = concat_path_file(dir1, path2);
1039 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001040 }
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001041 if (!fullpath2 || stat(fullpath2, &stb2) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001042 flags |= D_EMPTY2;
1043 memset(&stb2, 0, sizeof(stb2));
1044 stb2.st_mode = stb1.st_mode;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001045 if (path1) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001046 free(fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001047 fullpath2 = concat_path_file(dir2, path1);
1048 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001049 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001050
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001051 if (stb1.st_mode == 0)
1052 stb1.st_mode = stb2.st_mode;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001053
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001054 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
1055 printf("Common subdirectories: %s and %s\n", fullpath1, fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001056 goto ret;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001057 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001058
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001059 if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
1060 val = D_SKIPPED1;
1061 else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
1062 val = D_SKIPPED2;
1063 else
1064 val = diffreg(fullpath1, fullpath2, flags);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001065
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001066 print_status(val, fullpath1, fullpath2, NULL);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001067 ret:
1068 free(fullpath1);
1069 free(fullpath2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001070}
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001071#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001072
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001073
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001074#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001075static int dir_strcmp(const void *p1, const void *p2)
1076{
1077 return strcmp(*(char *const *) p1, *(char *const *) p2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001078}
1079
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001080
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001081/* This function adds a filename to dl, the directory listing. */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001082static int add_to_dirlist(const char *filename,
Bernhard Reutner-Fischer5b6f7762006-12-13 16:50:15 +00001083 struct stat ATTRIBUTE_UNUSED * sb, void *userdata,
1084 int depth ATTRIBUTE_UNUSED)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001085{
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001086 /* +2: with space for eventual trailing NULL */
1087 dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0]));
Denis Vlasenkoa4688bf2007-03-11 10:56:37 +00001088 dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001089 dl_count++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001090 return TRUE;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001091}
1092
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001093
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001094/* This returns a sorted directory listing. */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001095static char **get_dir(char *path)
1096{
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001097 dl_count = 0;
Denis Vlasenkodf5bbb92007-04-05 21:29:42 +00001098 dl = xzalloc(sizeof(dl[0]));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001099
1100 /* If -r has been set, then the recursive_action function will be
1101 * used. Unfortunately, this outputs the root directory along with
1102 * the recursed paths, so use void *userdata to specify the string
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001103 * length of the root directory - '(void*)(strlen(path)+)'.
1104 * add_to_dirlist then removes root dir prefix. */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001105
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001106 if (option_mask32 & FLAG_r) {
Denis Vlasenkobbd695d2007-04-08 10:52:28 +00001107 recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS,
Bernhard Reutner-Fischer3e816c12007-03-29 10:30:50 +00001108 add_to_dirlist, NULL,
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001109 (void*)(strlen(path)+1), 0);
1110 } else {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001111 DIR *dp;
1112 struct dirent *ep;
Bernhard Reutner-Fischercb448162006-04-12 07:35:12 +00001113
Rob Landleyd921b2e2006-08-03 15:41:12 +00001114 dp = warn_opendir(path);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001115 while ((ep = readdir(dp))) {
Denis Vlasenkobf66fbc2006-12-21 13:23:14 +00001116 if (!strcmp(ep->d_name, "..") || LONE_CHAR(ep->d_name, '.'))
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001117 continue;
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001118 add_to_dirlist(ep->d_name, NULL, (void*)(int)0, 0);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001119 }
1120 closedir(dp);
1121 }
1122
1123 /* Sort dl alphabetically. */
1124 qsort(dl, dl_count, sizeof(char *), dir_strcmp);
1125
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001126 dl[dl_count] = NULL;
1127 return dl;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001128}
1129
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001130
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001131static void diffdir(char *p1, char *p2)
1132{
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001133 char **dirlist1, **dirlist2;
1134 char *dp1, *dp2;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001135 int pos;
1136
1137 /* Check for trailing slashes. */
Bernhard Reutner-Fischer56b95692006-12-14 11:27:58 +00001138 dp1 = last_char_is(p1, '/');
1139 if (dp1 != NULL)
1140 *dp1 = '\0';
1141 dp2 = last_char_is(p2, '/');
1142 if (dp2 != NULL)
1143 *dp2 = '\0';
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001144
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001145 /* Get directory listings for p1 and p2. */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001146
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001147 dirlist1 = get_dir(p1);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001148 dirlist2 = get_dir(p2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001149
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001150 /* If -S was set, find the starting point. */
1151 if (start) {
1152 while (*dirlist1 != NULL && strcmp(*dirlist1, start) < 0)
1153 dirlist1++;
1154 while (*dirlist2 != NULL && strcmp(*dirlist2, start) < 0)
1155 dirlist2++;
1156 if ((*dirlist1 == NULL) || (*dirlist2 == NULL))
Bernhard Reutner-Fischer19008b82006-06-07 20:17:41 +00001157 bb_error_msg(bb_msg_invalid_arg, "NULL", "-S");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001158 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001159
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001160 /* Now that both dirlist1 and dirlist2 contain sorted directory
1161 * listings, we can start to go through dirlist1. If both listings
1162 * contain the same file, then do a normal diff. Otherwise, behaviour
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001163 * is determined by whether the -N flag is set. */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001164 while (*dirlist1 != NULL || *dirlist2 != NULL) {
1165 dp1 = *dirlist1;
1166 dp2 = *dirlist2;
1167 pos = dp1 == NULL ? 1 : dp2 == NULL ? -1 : strcmp(dp1, dp2);
1168 if (pos == 0) {
1169 do_diff(p1, dp1, p2, dp2);
1170 dirlist1++;
1171 dirlist2++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001172 } else if (pos < 0) {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001173 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001174 do_diff(p1, dp1, p2, NULL);
1175 else
1176 print_only(p1, strlen(p1) + 1, dp1);
1177 dirlist1++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001178 } else {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001179 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001180 do_diff(p1, NULL, p2, dp2);
1181 else
1182 print_only(p2, strlen(p2) + 1, dp2);
1183 dirlist2++;
1184 }
1185 }
1186}
1187#endif
1188
1189
Denis Vlasenko06af2162007-02-03 17:28:39 +00001190int diff_main(int argc, char **argv);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001191int diff_main(int argc, char **argv)
1192{
Bernhard Reutner-Fischer088a2122007-01-20 21:29:50 +00001193 bool gotstdin = 0;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001194 char *U_opt;
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001195 char *f1, *f2;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001196 llist_t *L_arg = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001197
Denis Vlasenkoef4bb262007-06-04 12:21:53 +00001198 INIT_G();
1199
Denis Vlasenko8336f082007-01-07 00:21:41 +00001200 /* exactly 2 params; collect multiple -L <label> */
1201 opt_complementary = "=2:L::";
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001202 getopt32(argc, argv, "abdiL:NqrsS:tTU:wu"
1203 "p" /* ignored (for compatibility) */,
Denis Vlasenko7d219aa2006-10-05 10:17:08 +00001204 &L_arg, &start, &U_opt);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001205 /*argc -= optind;*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001206 argv += optind;
Denis Vlasenko8336f082007-01-07 00:21:41 +00001207 while (L_arg) {
1208 if (label1 && label2)
1209 bb_show_usage();
1210 if (!label1)
1211 label1 = L_arg->data;
1212 else { /* then label2 is NULL */
1213 label2 = label1;
1214 label1 = L_arg->data;
1215 }
1216 /* we leak L_arg here... */
1217 L_arg = L_arg->link;
1218 }
1219 if (option_mask32 & FLAG_U)
Denis Vlasenko0085f232007-03-07 22:45:42 +00001220 context = xatoi_u(U_opt);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001221
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001222 /*
1223 * Do sanity checks, fill in stb1 and stb2 and call the appropriate
1224 * driver routine. Both drivers use the contents of stb1 and stb2.
1225 */
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001226
1227 f1 = argv[0];
1228 f2 = argv[1];
1229 if (LONE_DASH(f1)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001230 fstat(STDIN_FILENO, &stb1);
1231 gotstdin = 1;
1232 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001233 xstat(f1, &stb1);
1234 if (LONE_DASH(f2)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001235 fstat(STDIN_FILENO, &stb2);
1236 gotstdin = 1;
1237 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001238 xstat(f2, &stb2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001239 if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
Denis Vlasenkoea620772006-10-14 02:23:43 +00001240 bb_error_msg_and_die("can't compare - to a directory");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001241 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001242#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001243 diffdir(f1, f2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001244#else
Denis Vlasenkoea620772006-10-14 02:23:43 +00001245 bb_error_msg_and_die("directory comparison not supported");
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001246#endif
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001247 } else {
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001248 if (S_ISDIR(stb1.st_mode)) {
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001249 f1 = concat_path_file(f1, f2);
1250 xstat(f1, &stb1);
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001251 }
1252 if (S_ISDIR(stb2.st_mode)) {
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001253 f2 = concat_path_file(f2, f1);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001254 xstat(f2, &stb2);
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001255 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001256/* XXX: FIXME: */
Denis Vlasenko8336f082007-01-07 00:21:41 +00001257/* We can't diff e.g. stdin supplied by a pipe - we use rewind(), fseek().
1258 * This can be fixed (volunteers?) */
1259 if (!S_ISREG(stb1.st_mode) || !S_ISREG(stb2.st_mode))
1260 bb_error_msg_and_die("can't diff non-seekable stream");
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001261 print_status(diffreg(f1, f2, 0), f1, f2, NULL);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001262 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001263 return status;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001264}