blob: 42aba9ae0e29a8b0835cf14acd29dfe0354c54ad [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
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +000017// #define FSIZE_MAX 32768
18
19/* NOINLINEs added to prevent gcc from merging too much into diffreg()
20 * (it bites more than it can (efficiently) chew). */
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000021
22/*
23 * Output flags
24 */
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +000025enum {
26 /* Print a header/footer between files */
27 /* D_HEADER = 1, - unused */
28 /* Treat file as empty (/dev/null) */
29 D_EMPTY1 = 2 * ENABLE_FEATURE_DIFF_DIR,
30 D_EMPTY2 = 4 * ENABLE_FEATURE_DIFF_DIR,
31};
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000032
33/*
34 * Status values for print_status() and diffreg() return values
35 * Guide:
36 * D_SAME - files are the same
37 * D_DIFFER - files differ
38 * D_BINARY - binary files differ
39 * D_COMMON - subdirectory common to both dirs
40 * D_ONLY - file only exists in one dir
Denis Vlasenko04211fd2008-03-24 14:44:59 +000041 * D_ISDIR1 - path1 a dir, path2 a file
42 * D_ISDIR2 - path1 a file, path2 a dir
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000043 * D_ERROR - error occurred
44 * D_SKIPPED1 - skipped path1 as it is a special file
45 * D_SKIPPED2 - skipped path2 as it is a special file
46 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +000047#define D_SAME 0
48#define D_DIFFER (1 << 0)
49#define D_BINARY (1 << 1)
50#define D_COMMON (1 << 2)
51/*#define D_ONLY (1 << 3) - unused */
Denis Vlasenko04211fd2008-03-24 14:44:59 +000052#define D_ISDIR1 (1 << 4)
53#define D_ISDIR2 (1 << 5)
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +000054#define D_ERROR (1 << 6)
55#define D_SKIPPED1 (1 << 7)
56#define D_SKIPPED2 (1 << 8)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000057
58/* Command line options */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +000059#define FLAG_a (1 << 0)
60#define FLAG_b (1 << 1)
61#define FLAG_d (1 << 2)
62#define FLAG_i (1 << 3)
63#define FLAG_L (1 << 4)
64#define FLAG_N (1 << 5)
65#define FLAG_q (1 << 6)
66#define FLAG_r (1 << 7)
67#define FLAG_s (1 << 8)
68#define FLAG_S (1 << 9)
69#define FLAG_t (1 << 10)
70#define FLAG_T (1 << 11)
71#define FLAG_U (1 << 12)
72#define FLAG_w (1 << 13)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000073
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +000074
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000075struct cand {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +000076 int x;
77 int y;
78 int pred;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000079};
80
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000081struct line {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +000082 int serial;
83 int value;
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000084};
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000085
86/*
87 * The following struct is used to record change information
88 * doing a "context" or "unified" diff. (see routine "change" to
89 * understand the highly mnemonic field names)
90 */
91struct context_vec {
Denis Vlasenkoef4bb262007-06-04 12:21:53 +000092 int a; /* start line in old file */
93 int b; /* end line in old file */
94 int c; /* start line in new file */
95 int d; /* end line in new file */
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +000096};
97
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +000098
99#define g_read_buf bb_common_bufsiz1
100
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000101struct globals {
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000102 bool anychange;
103 smallint exit_status;
104 int opt_U_context;
Denys Vlasenko3e020502009-09-21 01:22:18 +0200105 int context_idx;
Denis Vlasenko5e34ff22009-04-21 11:09:40 +0000106 IF_FEATURE_DIFF_DIR(int dl_count;)
107 IF_FEATURE_DIFF_DIR(char **dl;)
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000108 char *opt_S_start;
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000109 const char *label1;
110 const char *label2;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000111 int *J; /* will be overlaid on class */
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000112 int clen;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000113 int pref, suff; /* length of prefix and suffix */
114 int nlen[2];
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000115 int slen[2];
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000116 int clistlen; /* the length of clist */
117 struct cand *clist; /* merely a free storage pot for candidates */
118 long *ixnew; /* will be overlaid on nfile[1] */
119 long *ixold; /* will be overlaid on klist */
120 struct line *nfile[2];
121 struct line *sfile[2]; /* shortened by pruning common prefix/suffix */
Denys Vlasenko3e020502009-09-21 01:22:18 +0200122 struct context_vec *context_vector;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000123 char *tempname1, *tempname2;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000124 struct stat stb1, stb2;
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000125};
126#define G (*ptr_to_globals)
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000127#define anychange (G.anychange )
128#define exit_status (G.exit_status )
129#define opt_U_context (G.opt_U_context )
Denys Vlasenko3e020502009-09-21 01:22:18 +0200130#define context_idx (G.context_idx )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000131#define dl_count (G.dl_count )
132#define dl (G.dl )
133#define opt_S_start (G.opt_S_start )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000134#define label1 (G.label1 )
135#define label2 (G.label2 )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000136#define J (G.J )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000137#define clen (G.clen )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000138#define pref (G.pref )
139#define suff (G.suff )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000140#define nlen (G.nlen )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000141#define slen (G.slen )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000142#define clistlen (G.clistlen )
143#define clist (G.clist )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000144#define ixnew (G.ixnew )
145#define ixold (G.ixold )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000146#define nfile (G.nfile )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000147#define sfile (G.sfile )
Denys Vlasenko3e020502009-09-21 01:22:18 +0200148#define context_vector (G.context_vector )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000149#define stb1 (G.stb1 )
150#define stb2 (G.stb2 )
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000151#define tempname1 (G.tempname1 )
152#define tempname2 (G.tempname2 )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000153#define INIT_G() do { \
Denis Vlasenko574f2f42008-02-27 18:41:59 +0000154 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000155 opt_U_context = 3; \
Denys Vlasenko3e020502009-09-21 01:22:18 +0200156 context_vector = xrealloc_vector(context_vector, 6, 0); \
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000157} while (0)
158
159
Denis Vlasenkocc3f20b2008-06-23 22:31:52 +0000160#if ENABLE_FEATURE_DIFF_DIR
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000161static void print_only(const char *path, const char *entry)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000162{
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000163 printf("Only in %s: %s\n", path, entry);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000164}
Denis Vlasenkocc3f20b2008-06-23 22:31:52 +0000165#endif
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000166
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000167
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000168static void print_status(int val, char *_path1, char *_path2)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000169{
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000170 /*const char *const _entry = entry ? entry : "";*/
171 /*char *const _path1 = entry ? concat_path_file(path1, _entry) : path1;*/
172 /*char *const _path2 = entry ? concat_path_file(path2, _entry) : path2;*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000173
174 switch (val) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000175/* case D_ONLY:
176 print_only(path1, entry);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000177 break;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000178*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000179 case D_COMMON:
180 printf("Common subdirectories: %s and %s\n", _path1, _path2);
181 break;
182 case D_BINARY:
183 printf("Binary files %s and %s differ\n", _path1, _path2);
184 break;
185 case D_DIFFER:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000186 if (option_mask32 & FLAG_q)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000187 printf("Files %s and %s differ\n", _path1, _path2);
188 break;
189 case D_SAME:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000190 if (option_mask32 & FLAG_s)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000191 printf("Files %s and %s are identical\n", _path1, _path2);
192 break;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000193 case D_ISDIR1:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000194 printf("File %s is a %s while file %s is a %s\n",
195 _path1, "directory", _path2, "regular file");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000196 break;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000197 case D_ISDIR2:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000198 printf("File %s is a %s while file %s is a %s\n",
199 _path1, "regular file", _path2, "directory");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000200 break;
201 case D_SKIPPED1:
202 printf("File %s is not a regular file or directory and was skipped\n",
203 _path1);
204 break;
205 case D_SKIPPED2:
206 printf("File %s is not a regular file or directory and was skipped\n",
207 _path2);
208 break;
209 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000210/*
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000211 if (entry) {
212 free(_path1);
213 free(_path2);
214 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000215*/
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000216}
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000217
218
219/* Read line, return its nonzero hash. Return 0 if EOF.
220 *
221 * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
222 */
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000223static ALWAYS_INLINE int fiddle_sum(int sum, int t)
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000224{
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000225 return sum * 127 + t;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000226}
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000227static int readhash(FILE *fp)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000228{
Denys Vlasenko3e020502009-09-21 01:22:18 +0200229 int i, t;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000230 int sum;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000231
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000232 sum = 1;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000233 i = 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000234 if (!(option_mask32 & (FLAG_b | FLAG_w))) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000235 while ((t = getc(fp)) != '\n') {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000236 if (t == EOF) {
237 if (i == 0)
238 return 0;
239 break;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000240 }
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000241 sum = fiddle_sum(sum, t);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000242 i = 1;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000243 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000244 } else {
Denys Vlasenko3e020502009-09-21 01:22:18 +0200245 int space = 0;
246
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000247 while (1) {
Denys Vlasenko3e020502009-09-21 01:22:18 +0200248 t = getc(fp);
249 switch (t) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000250 case '\t':
251 case '\r':
252 case '\v':
253 case '\f':
254 case ' ':
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000255 space = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000256 continue;
257 default:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000258 if (space && !(option_mask32 & FLAG_w)) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000259 i = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000260 space = 0;
261 }
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000262 sum = fiddle_sum(sum, t);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000263 i = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000264 continue;
265 case EOF:
266 if (i == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000267 return 0;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000268 /* FALLTHROUGH */
269 case '\n':
270 break;
271 }
272 break;
273 }
274 }
275 /*
276 * There is a remote possibility that we end up with a zero sum.
277 * Zero is used as an EOF marker, so return 1 instead.
278 */
279 return (sum == 0 ? 1 : sum);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000280}
281
282
Denis Vlasenkodccfe052008-03-24 18:40:32 +0000283/* Our diff implementation is using seek.
284 * When we meet non-seekable file, we must make a temp copy.
285 */
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000286static char *make_temp(FILE *f, struct stat *sb)
287{
288 char *name;
289 int fd;
290
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000291 if (S_ISREG(sb->st_mode) || S_ISBLK(sb->st_mode))
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000292 return NULL;
293 name = xstrdup("/tmp/difXXXXXX");
294 fd = mkstemp(name);
295 if (fd < 0)
296 bb_perror_msg_and_die("mkstemp");
297 if (bb_copyfd_eof(fileno(f), fd) < 0) {
298 clean_up:
299 unlink(name);
300 xfunc_die(); /* error message is printed by bb_copyfd_eof */
301 }
302 fstat(fd, sb);
303 close(fd);
304 if (freopen(name, "r+", f) == NULL) {
305 bb_perror_msg("freopen");
306 goto clean_up;
307 }
308 return name;
309}
310
311
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000312/*
313 * Check to see if the given files differ.
314 * Returns 0 if they are the same, 1 if different, and -1 on error.
315 */
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +0000316static NOINLINE int files_differ(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000317{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000318 size_t i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000319
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000320 /* Prevent making copies for "/dev/null" (too common) */
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000321 /* Deal with input from pipes etc */
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000322 tempname1 = make_temp(f1, &stb1);
323 tempname2 = make_temp(f2, &stb2);
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000324 if (stb1.st_size != stb2.st_size) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000325 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000326 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000327 while (1) {
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000328 i = fread(g_read_buf, 1, COMMON_BUFSIZE/2, f1);
329 j = fread(g_read_buf + COMMON_BUFSIZE/2, 1, COMMON_BUFSIZE/2, f2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000330 if (i != j)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000331 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000332 if (i == 0)
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000333 return (ferror(f1) || ferror(f2)) ? -1 : 0;
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000334 if (memcmp(g_read_buf,
335 g_read_buf + COMMON_BUFSIZE/2, i) != 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000336 return 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000337 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000338}
339
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000340
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000341static void prepare(int i, FILE *fp /*, off_t filesize*/)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000342{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000343 struct line *p;
344 int h;
345 size_t j, sz;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000346
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000347 rewind(fp);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000348
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000349 /*sz = (filesize <= FSIZE_MAX ? filesize : FSIZE_MAX) / 25;*/
350 /*if (sz < 100)*/
351 sz = 100;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000352
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000353 p = xmalloc((sz + 3) * sizeof(p[0]));
Denis Vlasenko8336f082007-01-07 00:21:41 +0000354 j = 0;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000355 while ((h = readhash(fp)) != 0) { /* while not EOF */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000356 if (j == sz) {
357 sz = sz * 3 / 2;
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000358 p = xrealloc(p, (sz + 3) * sizeof(p[0]));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000359 }
360 p[++j].value = h;
361 }
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000362 nlen[i] = j;
363 nfile[i] = p;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000364}
365
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000366
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000367static void prune(void)
368{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000369 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000370
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000371 for (pref = 0; pref < nlen[0] && pref < nlen[1] &&
372 nfile[0][pref + 1].value == nfile[1][pref + 1].value; pref++)
Denis Vlasenkob71c6682007-07-21 15:08:09 +0000373 continue;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000374 for (suff = 0; suff < nlen[0] - pref && suff < nlen[1] - pref &&
375 nfile[0][nlen[0] - suff].value == nfile[1][nlen[1] - suff].value;
376 suff++)
Denis Vlasenkob71c6682007-07-21 15:08:09 +0000377 continue;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000378 for (j = 0; j < 2; j++) {
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000379 sfile[j] = nfile[j] + pref;
380 slen[j] = nlen[j] - pref - suff;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000381 for (i = 0; i <= slen[j]; i++)
382 sfile[j][i].serial = i;
383 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000384}
385
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000386
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000387static void equiv(struct line *a, int n, struct line *b, int m, int *c)
388{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000389 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000390
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000391 i = j = 1;
392 while (i <= n && j <= m) {
393 if (a[i].value < b[j].value)
394 a[i++].value = 0;
395 else if (a[i].value == b[j].value)
396 a[i++].value = j;
397 else
398 j++;
399 }
400 while (i <= n)
401 a[i++].value = 0;
402 b[m + 1].value = 0;
403 j = 0;
404 while (++j <= m) {
405 c[j] = -b[j].serial;
406 while (b[j + 1].value == b[j].value) {
407 j++;
408 c[j] = b[j].serial;
409 }
410 }
411 c[j] = -1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000412}
413
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000414
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000415static int isqrt(int n)
416{
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000417 int y, x;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000418
419 if (n == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000420 return 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000421 x = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000422 do {
423 y = x;
424 x = n / x;
425 x += y;
426 x /= 2;
427 } while ((x - y) > 1 || (x - y) < -1);
428
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000429 return x;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000430}
431
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000432
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000433static int newcand(int x, int y, int pred)
434{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000435 struct cand *q;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000436
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000437 if (clen == clistlen) {
438 clistlen = clistlen * 11 / 10;
439 clist = xrealloc(clist, clistlen * sizeof(struct cand));
440 }
441 q = clist + clen;
442 q->x = x;
443 q->y = y;
444 q->pred = pred;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000445 return clen++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000446}
447
448
449static int search(int *c, int k, int y)
450{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000451 int i, j, l, t;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000452
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000453 if (clist[c[k]].y < y) /* quick look for typical case */
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000454 return k + 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000455 i = 0;
456 j = k + 1;
457 while (1) {
458 l = i + j;
459 if ((l >>= 1) <= i)
460 break;
461 t = clist[c[l]].y;
462 if (t > y)
463 j = l;
464 else if (t < y)
465 i = l;
466 else
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000467 return l;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000468 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000469 return l + 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000470}
471
472
473static int stone(int *a, int n, int *b, int *c)
474{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000475 int i, k, y, j, l;
476 int oldc, tc, oldl;
477 unsigned int numtries;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000478#if ENABLE_FEATURE_DIFF_MINIMAL
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000479 const unsigned int bound =
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000480 (option_mask32 & FLAG_d) ? UINT_MAX : MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000481#else
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000482 const unsigned int bound = MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000483#endif
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000484
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000485 k = 0;
486 c[0] = newcand(0, 0, 0);
487 for (i = 1; i <= n; i++) {
488 j = a[i];
489 if (j == 0)
490 continue;
491 y = -b[j];
492 oldl = 0;
493 oldc = c[0];
494 numtries = 0;
495 do {
496 if (y <= clist[oldc].y)
497 continue;
498 l = search(c, k, y);
499 if (l != oldl + 1)
500 oldc = c[l - 1];
501 if (l <= k) {
502 if (clist[c[l]].y <= y)
503 continue;
504 tc = c[l];
505 c[l] = newcand(i, y, oldc);
506 oldc = tc;
507 oldl = l;
508 numtries++;
509 } else {
510 c[l] = newcand(i, y, oldc);
511 k++;
512 break;
513 }
514 } while ((y = b[++j]) > 0 && numtries < bound);
515 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000516 return k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000517}
518
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000519
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000520static void unravel(int p)
521{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000522 struct cand *q;
523 int i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000524
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000525 for (i = 0; i <= nlen[0]; i++)
526 J[i] = i <= pref ? i : i > nlen[0] - suff ? i + nlen[1] - nlen[0] : 0;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000527 for (q = clist + p; q->y != 0; q = clist + q->pred)
528 J[q->x + pref] = q->y + pref;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000529}
530
531
532static void unsort(struct line *f, int l, int *b)
533{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000534 int *a, i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000535
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000536 a = xmalloc((l + 1) * sizeof(int));
537 for (i = 1; i <= l; i++)
538 a[f[i].serial] = f[i].value;
539 for (i = 1; i <= l; i++)
540 b[i] = a[i];
541 free(a);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000542}
543
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000544
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000545static int skipline(FILE *f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000546{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000547 int i, c;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000548
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000549 for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
550 continue;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000551 return i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000552}
553
554
555/*
556 * Check does double duty:
557 * 1. ferret out any fortuitous correspondences due
558 * to confounding by hashing (which result in "jackpot")
559 * 2. collect random access indexes to the two files
560 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000561static NOINLINE void check(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000562{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000563 int i, j, jackpot, c, d;
564 long ctold, ctnew;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000565
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000566 rewind(f1);
567 rewind(f2);
568 j = 1;
569 ixold[0] = ixnew[0] = 0;
570 jackpot = 0;
571 ctold = ctnew = 0;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000572 for (i = 1; i <= nlen[0]; i++) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000573 if (J[i] == 0) {
574 ixold[i] = ctold += skipline(f1);
575 continue;
576 }
577 while (j < J[i]) {
578 ixnew[j] = ctnew += skipline(f2);
579 j++;
580 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000581 if (option_mask32 & (FLAG_b | FLAG_w | FLAG_i)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000582 while (1) {
583 c = getc(f1);
584 d = getc(f2);
585 /*
586 * GNU diff ignores a missing newline
587 * in one file if bflag || wflag.
588 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000589 if ((option_mask32 & (FLAG_b | FLAG_w))
590 && ((c == EOF && d == '\n') || (c == '\n' && d == EOF))
591 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000592 break;
593 }
594 ctold++;
595 ctnew++;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000596 if ((option_mask32 & FLAG_b) && isspace(c) && isspace(d)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000597 do {
598 if (c == '\n')
599 break;
600 ctold++;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000601 c = getc(f1);
602 } while (isspace(c));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000603 do {
604 if (d == '\n')
605 break;
606 ctnew++;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000607 d = getc(f2);
608 } while (isspace(d));
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000609 } else if (option_mask32 & FLAG_w) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000610 while (isspace(c) && c != '\n') {
611 c = getc(f1);
612 ctold++;
613 }
614 while (isspace(d) && d != '\n') {
615 d = getc(f2);
616 ctnew++;
617 }
618 }
619 if (c != d) {
620 jackpot++;
621 J[i] = 0;
622 if (c != '\n' && c != EOF)
623 ctold += skipline(f1);
624 if (d != '\n' && c != EOF)
625 ctnew += skipline(f2);
626 break;
627 }
628 if (c == '\n' || c == EOF)
629 break;
630 }
631 } else {
632 while (1) {
633 ctold++;
634 ctnew++;
Denis Vlasenko6bef3d12007-11-06 03:05:54 +0000635 c = getc(f1);
636 d = getc(f2);
637 if (c != d) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000638 J[i] = 0;
639 if (c != '\n' && c != EOF)
640 ctold += skipline(f1);
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000641/* was buggy? "if (d != '\n' && c != EOF)" */
642 if (d != '\n' && d != EOF)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000643 ctnew += skipline(f2);
644 break;
645 }
646 if (c == '\n' || c == EOF)
647 break;
648 }
649 }
650 ixold[i] = ctold;
651 ixnew[j] = ctnew;
652 j++;
653 }
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000654 for (; j <= nlen[1]; j++)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000655 ixnew[j] = ctnew += skipline(f2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000656}
657
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000658
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000659/* shellsort CACM #201 */
660static void sort(struct line *a, int n)
661{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000662 struct line *ai, *aim, w;
663 int j, m = 0, k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000664
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000665 if (n == 0)
666 return;
667 for (j = 1; j <= n; j *= 2)
668 m = 2 * j - 1;
669 for (m /= 2; m != 0; m /= 2) {
670 k = n - m;
671 for (j = 1; j <= k; j++) {
672 for (ai = &a[j]; ai > a; ai -= m) {
673 aim = &ai[m];
674 if (aim < ai)
675 break; /* wraparound */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000676 if (aim->value > ai[0].value
677 || (aim->value == ai[0].value && aim->serial > ai[0].serial)
678 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000679 break;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000680 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000681 w.value = ai[0].value;
682 ai[0].value = aim->value;
683 aim->value = w.value;
684 w.serial = ai[0].serial;
685 ai[0].serial = aim->serial;
686 aim->serial = w.serial;
687 }
688 }
689 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000690}
691
692
693static void uni_range(int a, int b)
694{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000695 if (a < b)
696 printf("%d,%d", a, b - a + 1);
697 else if (a == b)
698 printf("%d", b);
699 else
700 printf("%d,0", b);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000701}
702
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000703
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000704static void fetch(long *f, int a, int b, FILE *lb, int ch)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000705{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000706 int i, j, c, lastc, col, nc;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000707
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000708 if (a > b)
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000709 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000710 for (i = a; i <= b; i++) {
711 fseek(lb, f[i - 1], SEEK_SET);
712 nc = f[i] - f[i - 1];
713 if (ch != '\0') {
714 putchar(ch);
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000715 if (option_mask32 & FLAG_T)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000716 putchar('\t');
717 }
718 col = 0;
719 for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
Denis Vlasenko6bef3d12007-11-06 03:05:54 +0000720 c = getc(lb);
721 if (c == EOF) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000722 printf("\n\\ No newline at end of file\n");
723 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000724 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000725 if (c == '\t' && (option_mask32 & FLAG_t)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000726 do {
727 putchar(' ');
728 } while (++col & 7);
729 } else {
730 putchar(c);
731 col++;
732 }
733 }
734 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000735}
736
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000737
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000738#if ENABLE_FEATURE_DIFF_BINARY
739static int asciifile(FILE *f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000740{
Bernhard Reutner-Fischer5fb0fec2006-04-06 11:28:19 +0000741 int i, cnt;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000742
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000743 if (option_mask32 & FLAG_a)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000744 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000745 rewind(f);
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000746 cnt = fread(g_read_buf, 1, COMMON_BUFSIZE, f);
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000747 for (i = 0; i < cnt; i++) {
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000748 if (!isprint(g_read_buf[i])
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000749 && !isspace(g_read_buf[i])
750 ) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000751 return 0;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000752 }
753 }
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000754 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000755}
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000756#else
757#define asciifile(f) 1
758#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000759
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000760
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000761/* dump accumulated "unified" diff changes */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000762static void dump_unified_vec(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000763{
Denys Vlasenko3e020502009-09-21 01:22:18 +0200764 struct context_vec *cvp = context_vector;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000765 int lowa, upb, lowc, upd;
766 int a, b, c, d;
767 char ch;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000768
Denys Vlasenko3e020502009-09-21 01:22:18 +0200769 if (context_idx < 0)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000770 return;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000771
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000772 b = d = 0; /* gcc */
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000773 lowa = MAX(1, cvp->a - opt_U_context);
Denys Vlasenko3e020502009-09-21 01:22:18 +0200774 upb = MIN(nlen[0], context_vector[context_idx].b + opt_U_context);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000775 lowc = MAX(1, cvp->c - opt_U_context);
Denys Vlasenko3e020502009-09-21 01:22:18 +0200776 upd = MIN(nlen[1], context_vector[context_idx].d + opt_U_context);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000777
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000778 printf("@@ -");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000779 uni_range(lowa, upb);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000780 printf(" +");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000781 uni_range(lowc, upd);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000782 printf(" @@\n");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000783
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000784 /*
785 * Output changes in "unified" diff format--the old and new lines
786 * are printed together.
787 */
Denys Vlasenko3e020502009-09-21 01:22:18 +0200788 for (; cvp <= &context_vector[context_idx]; cvp++) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000789 a = cvp->a;
790 b = cvp->b;
791 c = cvp->c;
792 d = cvp->d;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000793
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000794 /*
795 * c: both new and old changes
796 * d: only changes in the old file
797 * a: only changes in the new file
798 */
799 if (a <= b && c <= d)
800 ch = 'c';
801 else
802 ch = (a <= b) ? 'd' : 'a';
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000803#if 0
804 switch (ch) {
805 case 'c':
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000806// fetch() seeks!
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000807 fetch(ixold, lowa, a - 1, f1, ' ');
808 fetch(ixold, a, b, f1, '-');
809 fetch(ixnew, c, d, f2, '+');
810 break;
811 case 'd':
812 fetch(ixold, lowa, a - 1, f1, ' ');
813 fetch(ixold, a, b, f1, '-');
814 break;
815 case 'a':
816 fetch(ixnew, lowc, c - 1, f2, ' ');
817 fetch(ixnew, c, d, f2, '+');
818 break;
819 }
820#else
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000821 if (ch == 'c' || ch == 'd') {
822 fetch(ixold, lowa, a - 1, f1, ' ');
823 fetch(ixold, a, b, f1, '-');
824 }
825 if (ch == 'a')
826 fetch(ixnew, lowc, c - 1, f2, ' ');
827 if (ch == 'c' || ch == 'a')
828 fetch(ixnew, c, d, f2, '+');
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000829#endif
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000830 lowa = b + 1;
831 lowc = d + 1;
832 }
833 fetch(ixnew, d + 1, upd, f2, ' ');
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000834
Denys Vlasenko3e020502009-09-21 01:22:18 +0200835 context_idx = -1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000836}
837
838
839static void print_header(const char *file1, const char *file2)
840{
Denis Vlasenko8336f082007-01-07 00:21:41 +0000841 if (label1)
842 printf("--- %s\n", label1);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000843 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000844 printf("--- %s\t%s", file1, ctime(&stb1.st_mtime));
845 if (label2)
846 printf("+++ %s\n", label2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000847 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000848 printf("+++ %s\t%s", file2, ctime(&stb2.st_mtime));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000849}
850
851
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000852/*
853 * Indicate that there is a difference between lines a and b of the from file
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000854 * 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 +0000855 * are no lines in the from file involved and this means that there were
856 * lines appended (beginning at b). If c is greater than d then there are
857 * lines missing from the to file.
858 */
Denis Vlasenko4c830252008-11-23 14:40:00 +0000859static void change(const char *file1, FILE *f1, const char *file2, FILE *f2,
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000860 int a, int b, int c, int d)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000861{
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000862 if ((a > b && c > d) || (option_mask32 & FLAG_q)) {
863 anychange = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000864 return;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000865 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000866
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000867 if (anychange == 0) {
868 /*
869 * Print the context/unidiff header first time through.
870 */
871 print_header(file1, file2);
Denys Vlasenko3e020502009-09-21 01:22:18 +0200872 } else if (a > context_vector[context_idx].b + (2 * opt_U_context) + 1
873 && c > context_vector[context_idx].d + (2 * opt_U_context) + 1
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000874 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000875 /*
876 * If this change is more than 'context' lines from the
877 * previous change, dump the record and reset it.
878 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000879// dump_unified_vec() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000880 dump_unified_vec(f1, f2);
881 }
Denys Vlasenko3e020502009-09-21 01:22:18 +0200882 context_idx++;
883 context_vector = xrealloc_vector(context_vector, 6, context_idx);
884 context_vector[context_idx].a = a;
885 context_vector[context_idx].b = b;
886 context_vector[context_idx].c = c;
887 context_vector[context_idx].d = d;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000888 anychange = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000889}
890
891
Denis Vlasenko4c830252008-11-23 14:40:00 +0000892static void output(const char *file1, FILE *f1, const char *file2, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000893{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000894 /* Note that j0 and j1 can't be used as they are defined in math.h.
895 * This also allows the rather amusing variable 'j00'... */
896 int m, i0, i1, j00, j01;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000897
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000898 rewind(f1);
899 rewind(f2);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000900 m = nlen[0];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000901 J[0] = 0;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000902 J[m + 1] = nlen[1] + 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000903 for (i0 = 1; i0 <= m; i0 = i1 + 1) {
904 while (i0 <= m && J[i0] == J[i0 - 1] + 1)
905 i0++;
906 j00 = J[i0 - 1] + 1;
907 i1 = i0 - 1;
908 while (i1 < m && J[i1 + 1] == 0)
909 i1++;
910 j01 = J[i1 + 1] - 1;
911 J[i1] = j01;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000912// change() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000913 change(file1, f1, file2, f2, i0, i1, j00, j01);
914 }
915 if (m == 0) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000916// change() seeks!
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000917 change(file1, f1, file2, f2, 1, 0, 1, nlen[1]);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000918 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000919 if (anychange != 0 && !(option_mask32 & FLAG_q)) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000920// dump_unified_vec() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000921 dump_unified_vec(f1, f2);
922 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000923}
924
925/*
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000926 * The following code uses an algorithm due to Harold Stone,
927 * which finds a pair of longest identical subsequences in
928 * the two files.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000929 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000930 * The major goal is to generate the match vector J.
931 * J[i] is the index of the line in file1 corresponding
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000932 * to line i in file0. J[i] = 0 if there is no
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000933 * such line in file1.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000934 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000935 * Lines are hashed so as to work in core. All potential
936 * matches are located by sorting the lines of each file
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000937 * on the hash (called "value"). In particular, this
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000938 * collects the equivalence classes in file1 together.
939 * Subroutine equiv replaces the value of each line in
940 * file0 by the index of the first element of its
941 * matching equivalence in (the reordered) file1.
942 * To save space equiv squeezes file1 into a single
943 * array member in which the equivalence classes
944 * are simply concatenated, except that their first
945 * members are flagged by changing sign.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000946 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000947 * Next the indices that point into member are unsorted into
948 * array class according to the original order of file0.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000949 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000950 * The cleverness lies in routine stone. This marches
951 * through the lines of file0, developing a vector klist
952 * of "k-candidates". At step i a k-candidate is a matched
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000953 * pair of lines x,y (x in file0, y in file1) such that
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000954 * there is a common subsequence of length k
955 * between the first i lines of file0 and the first y
956 * lines of file1, but there is no such subsequence for
957 * any smaller y. x is the earliest possible mate to y
958 * that occurs in such a subsequence.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000959 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000960 * Whenever any of the members of the equivalence class of
961 * lines in file1 matable to a line in file0 has serial number
962 * less than the y of some k-candidate, that k-candidate
963 * with the smallest such y is replaced. The new
964 * k-candidate is chained (via pred) to the current
965 * k-1 candidate so that the actual subsequence can
966 * be recovered. When a member has serial number greater
967 * that the y of all k-candidates, the klist is extended.
968 * At the end, the longest subsequence is pulled out
969 * and placed in the array J by unravel
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000970 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000971 * With J in hand, the matches there recorded are
972 * checked against reality to assure that no spurious
973 * matches have crept in due to hashing. If they have,
974 * they are broken, and "jackpot" is recorded--a harmless
975 * matter except that a true match for a spuriously
976 * mated line may now be unnecessarily reported as a change.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000977 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000978 * Much of the complexity of the program comes simply
979 * from trying to minimize core utilization and
980 * maximize the range of doable problems by dynamically
981 * allocating what is needed and reusing what is not.
982 * The core requirements for problems larger than somewhat
983 * are (in words) 2*length(file0) + length(file1) +
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000984 * 3*(number of k-candidates installed), typically about
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000985 * 6n words for files of length n.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000986 */
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000987/* NB: files can be not REGular. The only sure thing that they
988 * are not both DIRectories. */
Denis Vlasenko4c830252008-11-23 14:40:00 +0000989static unsigned diffreg(const char *file1, const char *file2, int flags)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000990{
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000991 int *member; /* will be overlaid on nfile[1] */
992 int *class; /* will be overlaid on nfile[0] */
993 int *klist; /* will be overlaid on nfile[0] after class */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000994 FILE *f1;
995 FILE *f2;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000996 unsigned rval;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000997 int i;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000998
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000999 anychange = 0;
Denys Vlasenko3e020502009-09-21 01:22:18 +02001000 context_idx = -1;
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001001 tempname1 = tempname2 = NULL;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001002
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001003 /* Is any of them a directory? Then it's simple */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001004 if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001005 return (S_ISDIR(stb1.st_mode) ? D_ISDIR1 : D_ISDIR2);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001006
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001007 /* None of them are directories */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001008 rval = D_SAME;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001009
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001010 if (flags & D_EMPTY1)
Denis Vlasenkoa05c0712008-06-07 05:19:31 +00001011 /* can't be stdin, but xfopen_stdin() is smaller code */
Denis Vlasenko4c830252008-11-23 14:40:00 +00001012 file1 = bb_dev_null;
1013 f1 = xfopen_stdin(file1);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001014 if (flags & D_EMPTY2)
Denis Vlasenko4c830252008-11-23 14:40:00 +00001015 file2 = bb_dev_null;
1016 f2 = xfopen_stdin(file2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001017
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001018 /* NB: if D_EMPTY1/2 is set, other file is always a regular file,
1019 * not pipe/fifo/chardev/etc - D_EMPTY is used by "diff -r" only,
1020 * and it never diffs non-ordinary files in subdirs. */
1021 if (!(flags & (D_EMPTY1 | D_EMPTY2))) {
1022 /* Quick check whether they are different */
1023 /* NB: copies non-REG files to tempfiles and fills tempname1/2 */
1024 i = files_differ(f1, f2);
1025 if (i != 1) { /* not different? */
1026 if (i != 0) /* error? */
1027 exit_status |= 2;
1028 goto closem;
1029 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001030 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001031
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001032 if (!asciifile(f1) || !asciifile(f2)) {
1033 rval = D_BINARY;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001034 exit_status |= 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001035 goto closem;
1036 }
1037
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001038// Rewind inside!
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +00001039 prepare(0, f1 /*, stb1.st_size*/);
1040 prepare(1, f2 /*, stb2.st_size*/);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001041 prune();
1042 sort(sfile[0], slen[0]);
1043 sort(sfile[1], slen[1]);
1044
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001045 member = (int *) nfile[1];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001046 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
Denis Vlasenkodeeed592008-07-08 05:14:36 +00001047//TODO: xrealloc_vector?
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001048 member = xrealloc(member, (slen[1] + 2) * sizeof(int));
1049
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001050 class = (int *) nfile[0];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001051 unsort(sfile[0], slen[0], class);
1052 class = xrealloc(class, (slen[0] + 2) * sizeof(int));
1053
1054 klist = xmalloc((slen[0] + 2) * sizeof(int));
1055 clen = 0;
1056 clistlen = 100;
1057 clist = xmalloc(clistlen * sizeof(struct cand));
1058 i = stone(class, slen[0], member, klist);
1059 free(member);
1060 free(class);
1061
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001062 J = xrealloc(J, (nlen[0] + 2) * sizeof(int));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001063 unravel(klist[i]);
1064 free(clist);
1065 free(klist);
1066
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001067 ixold = xrealloc(ixold, (nlen[0] + 2) * sizeof(long));
1068 ixnew = xrealloc(ixnew, (nlen[1] + 2) * sizeof(long));
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001069// Rewind inside!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001070 check(f1, f2);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001071// Rewind inside!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001072 output(file1, f1, file2, f2);
1073
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001074 closem:
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001075 if (anychange) {
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001076 exit_status |= 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001077 if (rval == D_SAME)
1078 rval = D_DIFFER;
1079 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001080 fclose_if_not_stdin(f1);
1081 fclose_if_not_stdin(f2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001082 if (tempname1) {
1083 unlink(tempname1);
1084 free(tempname1);
1085 }
1086 if (tempname2) {
1087 unlink(tempname2);
1088 free(tempname2);
1089 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +00001090 return rval;
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#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001095static void do_diff(char *dir1, char *path1, char *dir2, char *path2)
1096{
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001097 int flags = 0; /*D_HEADER;*/
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001098 int val;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001099 char *fullpath1 = NULL; /* if -N */
1100 char *fullpath2 = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001101
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001102 if (path1)
1103 fullpath1 = concat_path_file(dir1, path1);
1104 if (path2)
1105 fullpath2 = concat_path_file(dir2, path2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001106
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001107 if (!fullpath1 || stat(fullpath1, &stb1) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001108 flags |= D_EMPTY1;
1109 memset(&stb1, 0, sizeof(stb1));
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001110 if (path2) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001111 free(fullpath1);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001112 fullpath1 = concat_path_file(dir1, path2);
1113 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001114 }
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001115 if (!fullpath2 || stat(fullpath2, &stb2) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001116 flags |= D_EMPTY2;
1117 memset(&stb2, 0, sizeof(stb2));
1118 stb2.st_mode = stb1.st_mode;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001119 if (path1) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001120 free(fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001121 fullpath2 = concat_path_file(dir2, path1);
1122 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001123 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001124
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001125 if (stb1.st_mode == 0)
1126 stb1.st_mode = stb2.st_mode;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001127
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001128 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
1129 printf("Common subdirectories: %s and %s\n", fullpath1, fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001130 goto ret;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001131 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001132
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001133 if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
1134 val = D_SKIPPED1;
1135 else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
1136 val = D_SKIPPED2;
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001137 else {
1138 /* Both files are either REGular or DIRectories */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001139 val = diffreg(fullpath1, fullpath2, flags);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001140 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001141
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001142 print_status(val, fullpath1, fullpath2 /*, NULL*/);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001143 ret:
1144 free(fullpath1);
1145 free(fullpath2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001146}
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001147#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001148
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001149
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001150#if ENABLE_FEATURE_DIFF_DIR
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001151/* This function adds a filename to dl, the directory listing. */
Denis Vlasenkodefc1ea2008-06-27 02:52:20 +00001152static int FAST_FUNC add_to_dirlist(const char *filename,
Denis Vlasenkoa60f84e2008-07-05 09:18:54 +00001153 struct stat *sb UNUSED_PARAM,
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001154 void *userdata,
Denis Vlasenkoa60f84e2008-07-05 09:18:54 +00001155 int depth UNUSED_PARAM)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001156{
Denis Vlasenkodeeed592008-07-08 05:14:36 +00001157 dl = xrealloc_vector(dl, 5, dl_count);
Denis Vlasenkoa4688bf2007-03-11 10:56:37 +00001158 dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001159 dl_count++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001160 return TRUE;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001161}
1162
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001163
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001164/* This returns a sorted directory listing. */
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001165static char **get_recursive_dirlist(char *path)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001166{
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001167 dl_count = 0;
Denis Vlasenkodf5bbb92007-04-05 21:29:42 +00001168 dl = xzalloc(sizeof(dl[0]));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001169
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001170 /* We need to trim root directory prefix.
1171 * Using void *userdata to specify its length,
1172 * add_to_dirlist will remove it. */
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001173 if (option_mask32 & FLAG_r) {
Denis Vlasenkobbd695d2007-04-08 10:52:28 +00001174 recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS,
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001175 add_to_dirlist, /* file_action */
1176 NULL, /* dir_action */
Denis Vlasenko582dff02008-10-19 19:36:30 +00001177 (void*)(ptrdiff_t)(strlen(path) + 1),
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001178 0);
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001179 } else {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001180 DIR *dp;
1181 struct dirent *ep;
Bernhard Reutner-Fischercb448162006-04-12 07:35:12 +00001182
Rob Landleyd921b2e2006-08-03 15:41:12 +00001183 dp = warn_opendir(path);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001184 while ((ep = readdir(dp))) {
Denis Vlasenkobf66fbc2006-12-21 13:23:14 +00001185 if (!strcmp(ep->d_name, "..") || LONE_CHAR(ep->d_name, '.'))
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001186 continue;
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001187 add_to_dirlist(ep->d_name, NULL, (void*)(int)0, 0);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001188 }
1189 closedir(dp);
1190 }
1191
1192 /* Sort dl alphabetically. */
Denis Vlasenkofb290382008-03-02 12:51:26 +00001193 qsort_string_vector(dl, dl_count);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001194
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001195 dl[dl_count] = NULL;
1196 return dl;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001197}
1198
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001199
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001200static void diffdir(char *p1, char *p2)
1201{
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001202 char **dirlist1, **dirlist2;
1203 char *dp1, *dp2;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001204 int pos;
1205
1206 /* Check for trailing slashes. */
Bernhard Reutner-Fischer56b95692006-12-14 11:27:58 +00001207 dp1 = last_char_is(p1, '/');
1208 if (dp1 != NULL)
1209 *dp1 = '\0';
1210 dp2 = last_char_is(p2, '/');
1211 if (dp2 != NULL)
1212 *dp2 = '\0';
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001213
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001214 /* Get directory listings for p1 and p2. */
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001215 dirlist1 = get_recursive_dirlist(p1);
1216 dirlist2 = get_recursive_dirlist(p2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001217
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001218 /* If -S was set, find the starting point. */
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001219 if (opt_S_start) {
1220 while (*dirlist1 != NULL && strcmp(*dirlist1, opt_S_start) < 0)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001221 dirlist1++;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001222 while (*dirlist2 != NULL && strcmp(*dirlist2, opt_S_start) < 0)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001223 dirlist2++;
1224 if ((*dirlist1 == NULL) || (*dirlist2 == NULL))
Bernhard Reutner-Fischer19008b82006-06-07 20:17:41 +00001225 bb_error_msg(bb_msg_invalid_arg, "NULL", "-S");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001226 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001227
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001228 /* Now that both dirlist1 and dirlist2 contain sorted directory
1229 * listings, we can start to go through dirlist1. If both listings
1230 * contain the same file, then do a normal diff. Otherwise, behaviour
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001231 * is determined by whether the -N flag is set. */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001232 while (*dirlist1 != NULL || *dirlist2 != NULL) {
1233 dp1 = *dirlist1;
1234 dp2 = *dirlist2;
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001235 pos = dp1 == NULL ? 1 : (dp2 == NULL ? -1 : strcmp(dp1, dp2));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001236 if (pos == 0) {
1237 do_diff(p1, dp1, p2, dp2);
1238 dirlist1++;
1239 dirlist2++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001240 } else if (pos < 0) {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001241 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001242 do_diff(p1, dp1, p2, NULL);
1243 else
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001244 print_only(p1, dp1);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001245 dirlist1++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001246 } else {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001247 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001248 do_diff(p1, NULL, p2, dp2);
1249 else
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001250 print_only(p2, dp2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001251 dirlist2++;
1252 }
1253 }
1254}
1255#endif
1256
1257
Denis Vlasenko9b49a5e2007-10-11 10:05:36 +00001258int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
Denis Vlasenkoa60f84e2008-07-05 09:18:54 +00001259int diff_main(int argc UNUSED_PARAM, char **argv)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001260{
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001261 int gotstdin = 0;
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001262 char *f1, *f2;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001263 llist_t *L_arg = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001264
Denis Vlasenkoef4bb262007-06-04 12:21:53 +00001265 INIT_G();
1266
Denis Vlasenko1d426652008-03-17 09:09:09 +00001267 /* exactly 2 params; collect multiple -L <label>; -U N */
1268 opt_complementary = "=2:L::U+";
Denis Vlasenkofe7cd642007-08-18 15:32:12 +00001269 getopt32(argv, "abdiL:NqrsS:tTU:wu"
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001270 "p" /* ignored (for compatibility) */,
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001271 &L_arg, &opt_S_start, &opt_U_context);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001272 /*argc -= optind;*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001273 argv += optind;
Denis Vlasenko8336f082007-01-07 00:21:41 +00001274 while (L_arg) {
1275 if (label1 && label2)
1276 bb_show_usage();
Denis Vlasenkod50dda82008-06-15 05:40:56 +00001277 if (label1) /* then label2 is NULL */
Denis Vlasenko8336f082007-01-07 00:21:41 +00001278 label2 = label1;
Denis Vlasenkod50dda82008-06-15 05:40:56 +00001279 label1 = llist_pop(&L_arg);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001280 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001281
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001282 /*
1283 * Do sanity checks, fill in stb1 and stb2 and call the appropriate
1284 * driver routine. Both drivers use the contents of stb1 and stb2.
1285 */
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001286 f1 = argv[0];
1287 f2 = argv[1];
Denys Vlasenko38d90722009-06-09 12:55:13 +02001288 /* Compat: "diff file name_which_doesnt_exist" exits with 2 */
1289 xfunc_error_retval = 2;
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001290 if (LONE_DASH(f1)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001291 fstat(STDIN_FILENO, &stb1);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001292 gotstdin++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001293 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001294 xstat(f1, &stb1);
1295 if (LONE_DASH(f2)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001296 fstat(STDIN_FILENO, &stb2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001297 gotstdin++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001298 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001299 xstat(f2, &stb2);
Denys Vlasenko38d90722009-06-09 12:55:13 +02001300 xfunc_error_retval = 1;
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001301
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001302 if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001303 bb_error_msg_and_die("can't compare stdin to a directory");
1304
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001305 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001306#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001307 diffdir(f1, f2);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001308 return exit_status;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001309#else
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001310 bb_error_msg_and_die("no support for directory comparison");
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001311#endif
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001312 }
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001313
1314 if (S_ISDIR(stb1.st_mode)) { /* "diff dir file" */
1315 /* NB: "diff dir dir2/dir3/file" must become
1316 * "diff dir/file dir2/dir3/file" */
1317 char *slash = strrchr(f2, '/');
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001318 f1 = concat_path_file(f1, slash ? slash + 1 : f2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001319 xstat(f1, &stb1);
1320 }
1321 if (S_ISDIR(stb2.st_mode)) {
1322 char *slash = strrchr(f1, '/');
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001323 f2 = concat_path_file(f2, slash ? slash + 1 : f1);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001324 xstat(f2, &stb2);
1325 }
1326
1327 /* diffreg can get non-regular files here,
1328 * they are not both DIRestories */
1329 print_status((gotstdin > 1 ? D_SAME : diffreg(f1, f2, 0)),
1330 f1, f2 /*, NULL*/);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001331 return exit_status;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001332}