blob: 26f352780ba1d0ef342d66fb5d94d5ec00508d1b [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;
105 size_t max_context; /* size of context_vec_start */
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000106 USE_FEATURE_DIFF_DIR(int dl_count;)
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000107 USE_FEATURE_DIFF_DIR(char **dl;)
108 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 */
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000122 struct context_vec *context_vec_start;
123 struct context_vec *context_vec_end;
124 struct context_vec *context_vec_ptr;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000125 char *tempname1, *tempname2;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000126 struct stat stb1, stb2;
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000127};
128#define G (*ptr_to_globals)
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000129#define anychange (G.anychange )
130#define exit_status (G.exit_status )
131#define opt_U_context (G.opt_U_context )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000132#define max_context (G.max_context )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000133#define dl_count (G.dl_count )
134#define dl (G.dl )
135#define opt_S_start (G.opt_S_start )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000136#define label1 (G.label1 )
137#define label2 (G.label2 )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000138#define J (G.J )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000139#define clen (G.clen )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000140#define pref (G.pref )
141#define suff (G.suff )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000142#define nlen (G.nlen )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000143#define slen (G.slen )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000144#define clistlen (G.clistlen )
145#define clist (G.clist )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000146#define ixnew (G.ixnew )
147#define ixold (G.ixold )
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000148#define nfile (G.nfile )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000149#define sfile (G.sfile )
150#define context_vec_start (G.context_vec_start )
151#define context_vec_end (G.context_vec_end )
152#define context_vec_ptr (G.context_vec_ptr )
153#define stb1 (G.stb1 )
154#define stb2 (G.stb2 )
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000155#define tempname1 (G.tempname1 )
156#define tempname2 (G.tempname2 )
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000157#define INIT_G() do { \
Denis Vlasenko574f2f42008-02-27 18:41:59 +0000158 SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000159 opt_U_context = 3; \
Denis Vlasenkoef4bb262007-06-04 12:21:53 +0000160 max_context = 64; \
161} while (0)
162
163
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000164/*static void print_only(const char *path, size_t dirlen, const char *entry)*/
165static void print_only(const char *path, const char *entry)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000166{
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000167 printf("Only in %s: %s\n", path, entry);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000168}
169
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000170
171/*static void print_status(int val, char *path1, char *path2, char *entry)*/
172static void print_status(int val, char *_path1, char *_path2)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000173{
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000174 /*const char *const _entry = entry ? entry : "";*/
175 /*char *const _path1 = entry ? concat_path_file(path1, _entry) : path1;*/
176 /*char *const _path2 = entry ? concat_path_file(path2, _entry) : path2;*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000177
178 switch (val) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000179/* case D_ONLY:
180 print_only(path1, entry);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000181 break;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000182*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000183 case D_COMMON:
184 printf("Common subdirectories: %s and %s\n", _path1, _path2);
185 break;
186 case D_BINARY:
187 printf("Binary files %s and %s differ\n", _path1, _path2);
188 break;
189 case D_DIFFER:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000190 if (option_mask32 & FLAG_q)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000191 printf("Files %s and %s differ\n", _path1, _path2);
192 break;
193 case D_SAME:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000194 if (option_mask32 & FLAG_s)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000195 printf("Files %s and %s are identical\n", _path1, _path2);
196 break;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000197 case D_ISDIR1:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000198 printf("File %s is a %s while file %s is a %s\n",
199 _path1, "directory", _path2, "regular file");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000200 break;
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000201 case D_ISDIR2:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000202 printf("File %s is a %s while file %s is a %s\n",
203 _path1, "regular file", _path2, "directory");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000204 break;
205 case D_SKIPPED1:
206 printf("File %s is not a regular file or directory and was skipped\n",
207 _path1);
208 break;
209 case D_SKIPPED2:
210 printf("File %s is not a regular file or directory and was skipped\n",
211 _path2);
212 break;
213 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000214/*
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000215 if (entry) {
216 free(_path1);
217 free(_path2);
218 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000219*/
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000220}
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000221
222
223/* Read line, return its nonzero hash. Return 0 if EOF.
224 *
225 * Hash function taken from Robert Sedgewick, Algorithms in C, 3d ed., p 578.
226 */
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000227static ALWAYS_INLINE int fiddle_sum(int sum, int t)
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000228{
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000229 return sum * 127 + t;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000230}
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000231static int readhash(FILE *fp)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000232{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000233 int i, t, space;
234 int sum;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000235
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000236 sum = 1;
237 space = 0;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000238 i = 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000239 if (!(option_mask32 & (FLAG_b | FLAG_w))) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000240 while ((t = getc(fp)) != '\n') {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000241 if (t == EOF) {
242 if (i == 0)
243 return 0;
244 break;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000245 }
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000246 sum = fiddle_sum(sum, t);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000247 i = 1;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000248 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000249 } else {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000250 while (1) {
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000251 switch (t = getc(fp)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000252 case '\t':
253 case '\r':
254 case '\v':
255 case '\f':
256 case ' ':
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000257 space = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000258 continue;
259 default:
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000260 if (space && !(option_mask32 & FLAG_w)) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000261 i = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000262 space = 0;
263 }
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000264 sum = fiddle_sum(sum, t);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000265 i = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000266 continue;
267 case EOF:
268 if (i == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000269 return 0;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000270 /* FALLTHROUGH */
271 case '\n':
272 break;
273 }
274 break;
275 }
276 }
277 /*
278 * There is a remote possibility that we end up with a zero sum.
279 * Zero is used as an EOF marker, so return 1 instead.
280 */
281 return (sum == 0 ? 1 : sum);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000282}
283
284
Denis Vlasenkodccfe052008-03-24 18:40:32 +0000285/* Our diff implementation is using seek.
286 * When we meet non-seekable file, we must make a temp copy.
287 */
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000288static char *make_temp(FILE *f, struct stat *sb)
289{
290 char *name;
291 int fd;
292
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000293 if (S_ISREG(sb->st_mode) || S_ISBLK(sb->st_mode))
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000294 return NULL;
295 name = xstrdup("/tmp/difXXXXXX");
296 fd = mkstemp(name);
297 if (fd < 0)
298 bb_perror_msg_and_die("mkstemp");
299 if (bb_copyfd_eof(fileno(f), fd) < 0) {
300 clean_up:
301 unlink(name);
302 xfunc_die(); /* error message is printed by bb_copyfd_eof */
303 }
304 fstat(fd, sb);
305 close(fd);
306 if (freopen(name, "r+", f) == NULL) {
307 bb_perror_msg("freopen");
308 goto clean_up;
309 }
310 return name;
311}
312
313
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000314/*
315 * Check to see if the given files differ.
316 * Returns 0 if they are the same, 1 if different, and -1 on error.
317 */
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +0000318static NOINLINE int files_differ(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000319{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000320 size_t i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000321
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000322 /* Prevent making copies for "/dev/null" (too common) */
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000323 /* Deal with input from pipes etc */
Denis Vlasenko04211fd2008-03-24 14:44:59 +0000324 tempname1 = make_temp(f1, &stb1);
325 tempname2 = make_temp(f2, &stb2);
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000326 if (stb1.st_size != stb2.st_size) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000327 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000328 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000329 while (1) {
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000330 i = fread(g_read_buf, 1, COMMON_BUFSIZE/2, f1);
331 j = fread(g_read_buf + COMMON_BUFSIZE/2, 1, COMMON_BUFSIZE/2, f2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000332 if (i != j)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000333 return 1;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000334 if (i == 0)
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000335 return (ferror(f1) || ferror(f2)) ? -1 : 0;
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000336 if (memcmp(g_read_buf,
337 g_read_buf + COMMON_BUFSIZE/2, i) != 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000338 return 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000339 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000340}
341
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000342
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000343static void prepare(int i, FILE *fp /*, off_t filesize*/)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000344{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000345 struct line *p;
346 int h;
347 size_t j, sz;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000348
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000349 rewind(fp);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000350
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000351 /*sz = (filesize <= FSIZE_MAX ? filesize : FSIZE_MAX) / 25;*/
352 /*if (sz < 100)*/
353 sz = 100;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000354
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000355 p = xmalloc((sz + 3) * sizeof(p[0]));
Denis Vlasenko8336f082007-01-07 00:21:41 +0000356 j = 0;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000357 while ((h = readhash(fp)) != 0) { /* while not EOF */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000358 if (j == sz) {
359 sz = sz * 3 / 2;
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000360 p = xrealloc(p, (sz + 3) * sizeof(p[0]));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000361 }
362 p[++j].value = h;
363 }
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000364 nlen[i] = j;
365 nfile[i] = p;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000366}
367
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000368
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000369static void prune(void)
370{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000371 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000372
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000373 for (pref = 0; pref < nlen[0] && pref < nlen[1] &&
374 nfile[0][pref + 1].value == nfile[1][pref + 1].value; pref++)
Denis Vlasenkob71c6682007-07-21 15:08:09 +0000375 continue;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000376 for (suff = 0; suff < nlen[0] - pref && suff < nlen[1] - pref &&
377 nfile[0][nlen[0] - suff].value == nfile[1][nlen[1] - suff].value;
378 suff++)
Denis Vlasenkob71c6682007-07-21 15:08:09 +0000379 continue;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000380 for (j = 0; j < 2; j++) {
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000381 sfile[j] = nfile[j] + pref;
382 slen[j] = nlen[j] - pref - suff;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000383 for (i = 0; i <= slen[j]; i++)
384 sfile[j][i].serial = i;
385 }
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 void equiv(struct line *a, int n, struct line *b, int m, int *c)
390{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000391 int i, j;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000392
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000393 i = j = 1;
394 while (i <= n && j <= m) {
395 if (a[i].value < b[j].value)
396 a[i++].value = 0;
397 else if (a[i].value == b[j].value)
398 a[i++].value = j;
399 else
400 j++;
401 }
402 while (i <= n)
403 a[i++].value = 0;
404 b[m + 1].value = 0;
405 j = 0;
406 while (++j <= m) {
407 c[j] = -b[j].serial;
408 while (b[j + 1].value == b[j].value) {
409 j++;
410 c[j] = b[j].serial;
411 }
412 }
413 c[j] = -1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000414}
415
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000416
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000417static int isqrt(int n)
418{
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000419 int y, x;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000420
421 if (n == 0)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000422 return 0;
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000423 x = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000424 do {
425 y = x;
426 x = n / x;
427 x += y;
428 x /= 2;
429 } while ((x - y) > 1 || (x - y) < -1);
430
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000431 return x;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000432}
433
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000434
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000435static int newcand(int x, int y, int pred)
436{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000437 struct cand *q;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000438
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000439 if (clen == clistlen) {
440 clistlen = clistlen * 11 / 10;
441 clist = xrealloc(clist, clistlen * sizeof(struct cand));
442 }
443 q = clist + clen;
444 q->x = x;
445 q->y = y;
446 q->pred = pred;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000447 return clen++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000448}
449
450
451static int search(int *c, int k, int y)
452{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000453 int i, j, l, t;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000454
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000455 if (clist[c[k]].y < y) /* quick look for typical case */
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000456 return k + 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000457 i = 0;
458 j = k + 1;
459 while (1) {
460 l = i + j;
461 if ((l >>= 1) <= i)
462 break;
463 t = clist[c[l]].y;
464 if (t > y)
465 j = l;
466 else if (t < y)
467 i = l;
468 else
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000469 return l;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000470 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000471 return l + 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000472}
473
474
475static int stone(int *a, int n, int *b, int *c)
476{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000477 int i, k, y, j, l;
478 int oldc, tc, oldl;
479 unsigned int numtries;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000480#if ENABLE_FEATURE_DIFF_MINIMAL
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000481 const unsigned int bound =
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000482 (option_mask32 & FLAG_d) ? UINT_MAX : MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000483#else
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000484 const unsigned int bound = MAX(256, isqrt(n));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000485#endif
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000486
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000487 k = 0;
488 c[0] = newcand(0, 0, 0);
489 for (i = 1; i <= n; i++) {
490 j = a[i];
491 if (j == 0)
492 continue;
493 y = -b[j];
494 oldl = 0;
495 oldc = c[0];
496 numtries = 0;
497 do {
498 if (y <= clist[oldc].y)
499 continue;
500 l = search(c, k, y);
501 if (l != oldl + 1)
502 oldc = c[l - 1];
503 if (l <= k) {
504 if (clist[c[l]].y <= y)
505 continue;
506 tc = c[l];
507 c[l] = newcand(i, y, oldc);
508 oldc = tc;
509 oldl = l;
510 numtries++;
511 } else {
512 c[l] = newcand(i, y, oldc);
513 k++;
514 break;
515 }
516 } while ((y = b[++j]) > 0 && numtries < bound);
517 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000518 return k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000519}
520
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000521
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000522static void unravel(int p)
523{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000524 struct cand *q;
525 int i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000526
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000527 for (i = 0; i <= nlen[0]; i++)
528 J[i] = i <= pref ? i : i > nlen[0] - suff ? i + nlen[1] - nlen[0] : 0;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000529 for (q = clist + p; q->y != 0; q = clist + q->pred)
530 J[q->x + pref] = q->y + pref;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000531}
532
533
534static void unsort(struct line *f, int l, int *b)
535{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000536 int *a, i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000537
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000538 a = xmalloc((l + 1) * sizeof(int));
539 for (i = 1; i <= l; i++)
540 a[f[i].serial] = f[i].value;
541 for (i = 1; i <= l; i++)
542 b[i] = a[i];
543 free(a);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000544}
545
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000546
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000547static int skipline(FILE *f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000548{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000549 int i, c;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000550
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000551 for (i = 1; (c = getc(f)) != '\n' && c != EOF; i++)
552 continue;
Denis Vlasenkod9e15f22006-11-27 16:49:55 +0000553 return i;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000554}
555
556
557/*
558 * Check does double duty:
559 * 1. ferret out any fortuitous correspondences due
560 * to confounding by hashing (which result in "jackpot")
561 * 2. collect random access indexes to the two files
562 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000563static NOINLINE void check(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000564{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000565 int i, j, jackpot, c, d;
566 long ctold, ctnew;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000567
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000568 rewind(f1);
569 rewind(f2);
570 j = 1;
571 ixold[0] = ixnew[0] = 0;
572 jackpot = 0;
573 ctold = ctnew = 0;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000574 for (i = 1; i <= nlen[0]; i++) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000575 if (J[i] == 0) {
576 ixold[i] = ctold += skipline(f1);
577 continue;
578 }
579 while (j < J[i]) {
580 ixnew[j] = ctnew += skipline(f2);
581 j++;
582 }
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000583 if (option_mask32 & (FLAG_b | FLAG_w | FLAG_i)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000584 while (1) {
585 c = getc(f1);
586 d = getc(f2);
587 /*
588 * GNU diff ignores a missing newline
589 * in one file if bflag || wflag.
590 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000591 if ((option_mask32 & (FLAG_b | FLAG_w))
592 && ((c == EOF && d == '\n') || (c == '\n' && d == EOF))
593 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000594 break;
595 }
596 ctold++;
597 ctnew++;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000598 if ((option_mask32 & FLAG_b) && isspace(c) && isspace(d)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000599 do {
600 if (c == '\n')
601 break;
602 ctold++;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000603 c = getc(f1);
604 } while (isspace(c));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000605 do {
606 if (d == '\n')
607 break;
608 ctnew++;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000609 d = getc(f2);
610 } while (isspace(d));
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000611 } else if (option_mask32 & FLAG_w) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000612 while (isspace(c) && c != '\n') {
613 c = getc(f1);
614 ctold++;
615 }
616 while (isspace(d) && d != '\n') {
617 d = getc(f2);
618 ctnew++;
619 }
620 }
621 if (c != d) {
622 jackpot++;
623 J[i] = 0;
624 if (c != '\n' && c != EOF)
625 ctold += skipline(f1);
626 if (d != '\n' && c != EOF)
627 ctnew += skipline(f2);
628 break;
629 }
630 if (c == '\n' || c == EOF)
631 break;
632 }
633 } else {
634 while (1) {
635 ctold++;
636 ctnew++;
Denis Vlasenko6bef3d12007-11-06 03:05:54 +0000637 c = getc(f1);
638 d = getc(f2);
639 if (c != d) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000640 J[i] = 0;
641 if (c != '\n' && c != EOF)
642 ctold += skipline(f1);
Denis Vlasenkoe9d67a82008-03-24 16:28:47 +0000643/* was buggy? "if (d != '\n' && c != EOF)" */
644 if (d != '\n' && d != EOF)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000645 ctnew += skipline(f2);
646 break;
647 }
648 if (c == '\n' || c == EOF)
649 break;
650 }
651 }
652 ixold[i] = ctold;
653 ixnew[j] = ctnew;
654 j++;
655 }
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000656 for (; j <= nlen[1]; j++)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000657 ixnew[j] = ctnew += skipline(f2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000658}
659
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000660
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000661/* shellsort CACM #201 */
662static void sort(struct line *a, int n)
663{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000664 struct line *ai, *aim, w;
665 int j, m = 0, k;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000666
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000667 if (n == 0)
668 return;
669 for (j = 1; j <= n; j *= 2)
670 m = 2 * j - 1;
671 for (m /= 2; m != 0; m /= 2) {
672 k = n - m;
673 for (j = 1; j <= k; j++) {
674 for (ai = &a[j]; ai > a; ai -= m) {
675 aim = &ai[m];
676 if (aim < ai)
677 break; /* wraparound */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000678 if (aim->value > ai[0].value
679 || (aim->value == ai[0].value && aim->serial > ai[0].serial)
680 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000681 break;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000682 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000683 w.value = ai[0].value;
684 ai[0].value = aim->value;
685 aim->value = w.value;
686 w.serial = ai[0].serial;
687 ai[0].serial = aim->serial;
688 aim->serial = w.serial;
689 }
690 }
691 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000692}
693
694
695static void uni_range(int a, int b)
696{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000697 if (a < b)
698 printf("%d,%d", a, b - a + 1);
699 else if (a == b)
700 printf("%d", b);
701 else
702 printf("%d,0", b);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000703}
704
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000705
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000706static void fetch(long *f, int a, int b, FILE *lb, int ch)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000707{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000708 int i, j, c, lastc, col, nc;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000709
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000710 if (a > b)
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000711 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000712 for (i = a; i <= b; i++) {
713 fseek(lb, f[i - 1], SEEK_SET);
714 nc = f[i] - f[i - 1];
715 if (ch != '\0') {
716 putchar(ch);
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000717 if (option_mask32 & FLAG_T)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000718 putchar('\t');
719 }
720 col = 0;
721 for (j = 0, lastc = '\0'; j < nc; j++, lastc = c) {
Denis Vlasenko6bef3d12007-11-06 03:05:54 +0000722 c = getc(lb);
723 if (c == EOF) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000724 printf("\n\\ No newline at end of file\n");
725 return;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000726 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000727 if (c == '\t' && (option_mask32 & FLAG_t)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000728 do {
729 putchar(' ');
730 } while (++col & 7);
731 } else {
732 putchar(c);
733 col++;
734 }
735 }
736 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000737}
738
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000739
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000740#if ENABLE_FEATURE_DIFF_BINARY
741static int asciifile(FILE *f)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000742{
Bernhard Reutner-Fischer5fb0fec2006-04-06 11:28:19 +0000743 int i, cnt;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000744
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000745 if (option_mask32 & FLAG_a)
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000746 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000747 rewind(f);
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000748 cnt = fread(g_read_buf, 1, COMMON_BUFSIZE, f);
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000749 for (i = 0; i < cnt; i++) {
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +0000750 if (!isprint(g_read_buf[i])
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000751 && !isspace(g_read_buf[i])
752 ) {
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000753 return 0;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +0000754 }
755 }
Denis Vlasenko079f8af2006-11-27 16:49:31 +0000756 return 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000757}
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000758#else
759#define asciifile(f) 1
760#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000761
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000762
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000763/* dump accumulated "unified" diff changes */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000764static void dump_unified_vec(FILE *f1, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000765{
766 struct context_vec *cvp = context_vec_start;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000767 int lowa, upb, lowc, upd;
768 int a, b, c, d;
769 char ch;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000770
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000771 if (context_vec_start > context_vec_ptr)
772 return;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000773
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000774 b = d = 0; /* gcc */
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000775 lowa = MAX(1, cvp->a - opt_U_context);
776 upb = MIN(nlen[0], context_vec_ptr->b + opt_U_context);
777 lowc = MAX(1, cvp->c - opt_U_context);
778 upd = MIN(nlen[1], context_vec_ptr->d + opt_U_context);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000779
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000780 printf("@@ -");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000781 uni_range(lowa, upb);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000782 printf(" +");
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000783 uni_range(lowc, upd);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +0000784 printf(" @@\n");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000785
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000786 /*
787 * Output changes in "unified" diff format--the old and new lines
788 * are printed together.
789 */
790 for (; cvp <= context_vec_ptr; cvp++) {
791 a = cvp->a;
792 b = cvp->b;
793 c = cvp->c;
794 d = cvp->d;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000795
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000796 /*
797 * c: both new and old changes
798 * d: only changes in the old file
799 * a: only changes in the new file
800 */
801 if (a <= b && c <= d)
802 ch = 'c';
803 else
804 ch = (a <= b) ? 'd' : 'a';
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000805#if 0
806 switch (ch) {
807 case 'c':
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000808// fetch() seeks!
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000809 fetch(ixold, lowa, a - 1, f1, ' ');
810 fetch(ixold, a, b, f1, '-');
811 fetch(ixnew, c, d, f2, '+');
812 break;
813 case 'd':
814 fetch(ixold, lowa, a - 1, f1, ' ');
815 fetch(ixold, a, b, f1, '-');
816 break;
817 case 'a':
818 fetch(ixnew, lowc, c - 1, f2, ' ');
819 fetch(ixnew, c, d, f2, '+');
820 break;
821 }
822#else
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000823 if (ch == 'c' || ch == 'd') {
824 fetch(ixold, lowa, a - 1, f1, ' ');
825 fetch(ixold, a, b, f1, '-');
826 }
827 if (ch == 'a')
828 fetch(ixnew, lowc, c - 1, f2, ' ');
829 if (ch == 'c' || ch == 'a')
830 fetch(ixnew, c, d, f2, '+');
Bernhard Reutner-Fischer1622cb82007-06-07 12:11:24 +0000831#endif
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000832 lowa = b + 1;
833 lowc = d + 1;
834 }
835 fetch(ixnew, d + 1, upd, f2, ' ');
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000836
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000837 context_vec_ptr = context_vec_start - 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000838}
839
840
841static void print_header(const char *file1, const char *file2)
842{
Denis Vlasenko8336f082007-01-07 00:21:41 +0000843 if (label1)
844 printf("--- %s\n", label1);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000845 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000846 printf("--- %s\t%s", file1, ctime(&stb1.st_mtime));
847 if (label2)
848 printf("+++ %s\n", label2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000849 else
Denis Vlasenko8336f082007-01-07 00:21:41 +0000850 printf("+++ %s\t%s", file2, ctime(&stb2.st_mtime));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000851}
852
853
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000854/*
855 * Indicate that there is a difference between lines a and b of the from file
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000856 * 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 +0000857 * are no lines in the from file involved and this means that there were
858 * lines appended (beginning at b). If c is greater than d then there are
859 * lines missing from the to file.
860 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000861static void change(char *file1, FILE *f1, char *file2, FILE *f2,
862 int a, int b, int c, int d)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000863{
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000864 if ((a > b && c > d) || (option_mask32 & FLAG_q)) {
865 anychange = 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000866 return;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000867 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000868
869 /*
870 * Allocate change records as needed.
871 */
872 if (context_vec_ptr == context_vec_end - 1) {
873 ptrdiff_t offset = context_vec_ptr - context_vec_start;
874
875 max_context <<= 1;
876 context_vec_start = xrealloc(context_vec_start,
Denis Vlasenko8336f082007-01-07 00:21:41 +0000877 max_context * sizeof(struct context_vec));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000878 context_vec_end = context_vec_start + max_context;
879 context_vec_ptr = context_vec_start + offset;
880 }
881 if (anychange == 0) {
882 /*
883 * Print the context/unidiff header first time through.
884 */
885 print_header(file1, file2);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000886 } else if (a > context_vec_ptr->b + (2 * opt_U_context) + 1
887 && c > context_vec_ptr->d + (2 * opt_U_context) + 1
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000888 ) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000889 /*
890 * If this change is more than 'context' lines from the
891 * previous change, dump the record and reset it.
892 */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000893// dump_unified_vec() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000894 dump_unified_vec(f1, f2);
895 }
896 context_vec_ptr++;
897 context_vec_ptr->a = a;
898 context_vec_ptr->b = b;
899 context_vec_ptr->c = c;
900 context_vec_ptr->d = d;
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000901 anychange = 1;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000902}
903
904
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000905static void output(char *file1, FILE *f1, char *file2, FILE *f2)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000906{
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000907 /* Note that j0 and j1 can't be used as they are defined in math.h.
908 * This also allows the rather amusing variable 'j00'... */
909 int m, i0, i1, j00, j01;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000910
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000911 rewind(f1);
912 rewind(f2);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000913 m = nlen[0];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000914 J[0] = 0;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000915 J[m + 1] = nlen[1] + 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000916 for (i0 = 1; i0 <= m; i0 = i1 + 1) {
917 while (i0 <= m && J[i0] == J[i0 - 1] + 1)
918 i0++;
919 j00 = J[i0 - 1] + 1;
920 i1 = i0 - 1;
921 while (i1 < m && J[i1 + 1] == 0)
922 i1++;
923 j01 = J[i1 + 1] - 1;
924 J[i1] = j01;
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000925// change() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000926 change(file1, f1, file2, f2, i0, i1, j00, j01);
927 }
928 if (m == 0) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000929// change() seeks!
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +0000930 change(file1, f1, file2, f2, 1, 0, 1, nlen[1]);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000931 }
Denis Vlasenko6a1d6612006-12-16 22:18:44 +0000932 if (anychange != 0 && !(option_mask32 & FLAG_q)) {
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000933// dump_unified_vec() seeks!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +0000934 dump_unified_vec(f1, f2);
935 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +0000936}
937
938/*
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000939 * The following code uses an algorithm due to Harold Stone,
940 * which finds a pair of longest identical subsequences in
941 * the two files.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000942 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000943 * The major goal is to generate the match vector J.
944 * J[i] is the index of the line in file1 corresponding
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000945 * to line i in file0. J[i] = 0 if there is no
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000946 * such line in file1.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000947 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000948 * Lines are hashed so as to work in core. All potential
949 * matches are located by sorting the lines of each file
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000950 * on the hash (called "value"). In particular, this
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000951 * collects the equivalence classes in file1 together.
952 * Subroutine equiv replaces the value of each line in
953 * file0 by the index of the first element of its
954 * matching equivalence in (the reordered) file1.
955 * To save space equiv squeezes file1 into a single
956 * array member in which the equivalence classes
957 * are simply concatenated, except that their first
958 * members are flagged by changing sign.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000959 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000960 * Next the indices that point into member are unsorted into
961 * array class according to the original order of file0.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000962 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000963 * The cleverness lies in routine stone. This marches
964 * through the lines of file0, developing a vector klist
965 * of "k-candidates". At step i a k-candidate is a matched
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000966 * pair of lines x,y (x in file0, y in file1) such that
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000967 * there is a common subsequence of length k
968 * between the first i lines of file0 and the first y
969 * lines of file1, but there is no such subsequence for
970 * any smaller y. x is the earliest possible mate to y
971 * that occurs in such a subsequence.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000972 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000973 * Whenever any of the members of the equivalence class of
974 * lines in file1 matable to a line in file0 has serial number
975 * less than the y of some k-candidate, that k-candidate
976 * with the smallest such y is replaced. The new
977 * k-candidate is chained (via pred) to the current
978 * k-1 candidate so that the actual subsequence can
979 * be recovered. When a member has serial number greater
980 * that the y of all k-candidates, the klist is extended.
981 * At the end, the longest subsequence is pulled out
982 * and placed in the array J by unravel
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000983 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000984 * With J in hand, the matches there recorded are
985 * checked against reality to assure that no spurious
986 * matches have crept in due to hashing. If they have,
987 * they are broken, and "jackpot" is recorded--a harmless
988 * matter except that a true match for a spuriously
989 * mated line may now be unnecessarily reported as a change.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000990 *
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000991 * Much of the complexity of the program comes simply
992 * from trying to minimize core utilization and
993 * maximize the range of doable problems by dynamically
994 * allocating what is needed and reusing what is not.
995 * The core requirements for problems larger than somewhat
996 * are (in words) 2*length(file0) + length(file1) +
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +0000997 * 3*(number of k-candidates installed), typically about
Denis Vlasenko02f0c4c2007-03-09 10:08:53 +0000998 * 6n words for files of length n.
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +0000999 */
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001000/* NB: files can be not REGular. The only sure thing that they
1001 * are not both DIRectories. */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001002static unsigned diffreg(char *file1, char *file2, int flags)
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001003{
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001004 int *member; /* will be overlaid on nfile[1] */
1005 int *class; /* will be overlaid on nfile[0] */
1006 int *klist; /* will be overlaid on nfile[0] after class */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001007 FILE *f1;
1008 FILE *f2;
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001009 unsigned rval;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001010 int i;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001011
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001012 anychange = 0;
1013 context_vec_ptr = context_vec_start - 1;
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001014 tempname1 = tempname2 = NULL;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001015
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001016 /* Is any of them a directory? Then it's simple */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001017 if (S_ISDIR(stb1.st_mode) != S_ISDIR(stb2.st_mode))
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001018 return (S_ISDIR(stb1.st_mode) ? D_ISDIR1 : D_ISDIR2);
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001019
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001020 /* None of them are directories */
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001021 rval = D_SAME;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001022
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001023 if (flags & D_EMPTY1)
Denis Vlasenkoa05c0712008-06-07 05:19:31 +00001024 /* can't be stdin, but xfopen_stdin() is smaller code */
1025 f1 = xfopen_stdin(bb_dev_null);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001026 else
1027 f1 = xfopen_stdin(file1);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001028 if (flags & D_EMPTY2)
Denis Vlasenkoa05c0712008-06-07 05:19:31 +00001029 f2 = xfopen_stdin(bb_dev_null);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001030 else
1031 f2 = xfopen_stdin(file2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001032
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001033 /* NB: if D_EMPTY1/2 is set, other file is always a regular file,
1034 * not pipe/fifo/chardev/etc - D_EMPTY is used by "diff -r" only,
1035 * and it never diffs non-ordinary files in subdirs. */
1036 if (!(flags & (D_EMPTY1 | D_EMPTY2))) {
1037 /* Quick check whether they are different */
1038 /* NB: copies non-REG files to tempfiles and fills tempname1/2 */
1039 i = files_differ(f1, f2);
1040 if (i != 1) { /* not different? */
1041 if (i != 0) /* error? */
1042 exit_status |= 2;
1043 goto closem;
1044 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001045 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001046
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001047 if (!asciifile(f1) || !asciifile(f2)) {
1048 rval = D_BINARY;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001049 exit_status |= 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001050 goto closem;
1051 }
1052
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001053// Rewind inside!
Denis Vlasenko3ad5d0c2007-06-12 20:54:54 +00001054 prepare(0, f1 /*, stb1.st_size*/);
1055 prepare(1, f2 /*, stb2.st_size*/);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001056 prune();
1057 sort(sfile[0], slen[0]);
1058 sort(sfile[1], slen[1]);
1059
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001060 member = (int *) nfile[1];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001061 equiv(sfile[0], slen[0], sfile[1], slen[1], member);
1062 member = xrealloc(member, (slen[1] + 2) * sizeof(int));
1063
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001064 class = (int *) nfile[0];
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001065 unsort(sfile[0], slen[0], class);
1066 class = xrealloc(class, (slen[0] + 2) * sizeof(int));
1067
1068 klist = xmalloc((slen[0] + 2) * sizeof(int));
1069 clen = 0;
1070 clistlen = 100;
1071 clist = xmalloc(clistlen * sizeof(struct cand));
1072 i = stone(class, slen[0], member, klist);
1073 free(member);
1074 free(class);
1075
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001076 J = xrealloc(J, (nlen[0] + 2) * sizeof(int));
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001077 unravel(klist[i]);
1078 free(clist);
1079 free(klist);
1080
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001081 ixold = xrealloc(ixold, (nlen[0] + 2) * sizeof(long));
1082 ixnew = xrealloc(ixnew, (nlen[1] + 2) * sizeof(long));
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001083// Rewind inside!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001084 check(f1, f2);
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001085// Rewind inside!
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001086 output(file1, f1, file2, f2);
1087
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001088 closem:
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001089 if (anychange) {
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001090 exit_status |= 1;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001091 if (rval == D_SAME)
1092 rval = D_DIFFER;
1093 }
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001094 fclose_if_not_stdin(f1);
1095 fclose_if_not_stdin(f2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001096 if (tempname1) {
1097 unlink(tempname1);
1098 free(tempname1);
1099 }
1100 if (tempname2) {
1101 unlink(tempname2);
1102 free(tempname2);
1103 }
Denis Vlasenkod9e15f22006-11-27 16:49:55 +00001104 return rval;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001105}
1106
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001107
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001108#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001109static void do_diff(char *dir1, char *path1, char *dir2, char *path2)
1110{
Denis Vlasenkoc4c2cd42008-03-24 16:55:13 +00001111 int flags = 0; /*D_HEADER;*/
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001112 int val;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001113 char *fullpath1 = NULL; /* if -N */
1114 char *fullpath2 = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001115
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001116 if (path1)
1117 fullpath1 = concat_path_file(dir1, path1);
1118 if (path2)
1119 fullpath2 = concat_path_file(dir2, path2);
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001120
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001121 if (!fullpath1 || stat(fullpath1, &stb1) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001122 flags |= D_EMPTY1;
1123 memset(&stb1, 0, sizeof(stb1));
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001124 if (path2) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001125 free(fullpath1);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001126 fullpath1 = concat_path_file(dir1, path2);
1127 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001128 }
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001129 if (!fullpath2 || stat(fullpath2, &stb2) != 0) {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001130 flags |= D_EMPTY2;
1131 memset(&stb2, 0, sizeof(stb2));
1132 stb2.st_mode = stb1.st_mode;
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001133 if (path1) {
Bernhard Reutner-Fischer7ae93f02007-01-07 15:56:09 +00001134 free(fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001135 fullpath2 = concat_path_file(dir2, path1);
1136 }
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001137 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001138
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001139 if (stb1.st_mode == 0)
1140 stb1.st_mode = stb2.st_mode;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001141
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001142 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
1143 printf("Common subdirectories: %s and %s\n", fullpath1, fullpath2);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001144 goto ret;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001145 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001146
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001147 if (!S_ISREG(stb1.st_mode) && !S_ISDIR(stb1.st_mode))
1148 val = D_SKIPPED1;
1149 else if (!S_ISREG(stb2.st_mode) && !S_ISDIR(stb2.st_mode))
1150 val = D_SKIPPED2;
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001151 else {
1152 /* Both files are either REGular or DIRectories */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001153 val = diffreg(fullpath1, fullpath2, flags);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001154 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001155
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001156 print_status(val, fullpath1, fullpath2 /*, NULL*/);
Denis Vlasenko3983bd52007-03-26 22:58:21 +00001157 ret:
1158 free(fullpath1);
1159 free(fullpath2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001160}
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001161#endif
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001162
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001163
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001164#if ENABLE_FEATURE_DIFF_DIR
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001165/* This function adds a filename to dl, the directory listing. */
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001166static int add_to_dirlist(const char *filename,
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001167 struct stat *sb ATTRIBUTE_UNUSED,
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001168 void *userdata,
Bernhard Reutner-Fischer5b6f7762006-12-13 16:50:15 +00001169 int depth ATTRIBUTE_UNUSED)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001170{
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001171 /* +2: with space for eventual trailing NULL */
1172 dl = xrealloc(dl, (dl_count+2) * sizeof(dl[0]));
Denis Vlasenkoa4688bf2007-03-11 10:56:37 +00001173 dl[dl_count] = xstrdup(filename + (int)(ptrdiff_t)userdata);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001174 dl_count++;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001175 return TRUE;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001176}
1177
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001178
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001179/* This returns a sorted directory listing. */
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001180static char **get_recursive_dirlist(char *path)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001181{
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001182 dl_count = 0;
Denis Vlasenkodf5bbb92007-04-05 21:29:42 +00001183 dl = xzalloc(sizeof(dl[0]));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001184
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001185 /* We need to trim root directory prefix.
1186 * Using void *userdata to specify its length,
1187 * add_to_dirlist will remove it. */
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001188 if (option_mask32 & FLAG_r) {
Denis Vlasenkobbd695d2007-04-08 10:52:28 +00001189 recursive_action(path, ACTION_RECURSE|ACTION_FOLLOWLINKS,
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001190 add_to_dirlist, /* file_action */
1191 NULL, /* dir_action */
1192 (void*)(strlen(path) + 1),
1193 0);
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001194 } else {
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001195 DIR *dp;
1196 struct dirent *ep;
Bernhard Reutner-Fischercb448162006-04-12 07:35:12 +00001197
Rob Landleyd921b2e2006-08-03 15:41:12 +00001198 dp = warn_opendir(path);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001199 while ((ep = readdir(dp))) {
Denis Vlasenkobf66fbc2006-12-21 13:23:14 +00001200 if (!strcmp(ep->d_name, "..") || LONE_CHAR(ep->d_name, '.'))
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001201 continue;
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001202 add_to_dirlist(ep->d_name, NULL, (void*)(int)0, 0);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001203 }
1204 closedir(dp);
1205 }
1206
1207 /* Sort dl alphabetically. */
Denis Vlasenkofb290382008-03-02 12:51:26 +00001208 qsort_string_vector(dl, dl_count);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001209
Denis Vlasenko6089c2c2007-02-11 19:07:03 +00001210 dl[dl_count] = NULL;
1211 return dl;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001212}
1213
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001214
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001215static void diffdir(char *p1, char *p2)
1216{
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001217 char **dirlist1, **dirlist2;
1218 char *dp1, *dp2;
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001219 int pos;
1220
1221 /* Check for trailing slashes. */
Bernhard Reutner-Fischer56b95692006-12-14 11:27:58 +00001222 dp1 = last_char_is(p1, '/');
1223 if (dp1 != NULL)
1224 *dp1 = '\0';
1225 dp2 = last_char_is(p2, '/');
1226 if (dp2 != NULL)
1227 *dp2 = '\0';
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001228
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001229 /* Get directory listings for p1 and p2. */
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001230 dirlist1 = get_recursive_dirlist(p1);
1231 dirlist2 = get_recursive_dirlist(p2);
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001232
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001233 /* If -S was set, find the starting point. */
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001234 if (opt_S_start) {
1235 while (*dirlist1 != NULL && strcmp(*dirlist1, opt_S_start) < 0)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001236 dirlist1++;
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001237 while (*dirlist2 != NULL && strcmp(*dirlist2, opt_S_start) < 0)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001238 dirlist2++;
1239 if ((*dirlist1 == NULL) || (*dirlist2 == NULL))
Bernhard Reutner-Fischer19008b82006-06-07 20:17:41 +00001240 bb_error_msg(bb_msg_invalid_arg, "NULL", "-S");
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001241 }
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001242
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001243 /* Now that both dirlist1 and dirlist2 contain sorted directory
1244 * listings, we can start to go through dirlist1. If both listings
1245 * contain the same file, then do a normal diff. Otherwise, behaviour
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001246 * is determined by whether the -N flag is set. */
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001247 while (*dirlist1 != NULL || *dirlist2 != NULL) {
1248 dp1 = *dirlist1;
1249 dp2 = *dirlist2;
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001250 pos = dp1 == NULL ? 1 : (dp2 == NULL ? -1 : strcmp(dp1, dp2));
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001251 if (pos == 0) {
1252 do_diff(p1, dp1, p2, dp2);
1253 dirlist1++;
1254 dirlist2++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001255 } else if (pos < 0) {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001256 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001257 do_diff(p1, dp1, p2, NULL);
1258 else
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001259 print_only(p1, dp1);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001260 dirlist1++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001261 } else {
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001262 if (option_mask32 & FLAG_N)
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001263 do_diff(p1, NULL, p2, dp2);
1264 else
Denis Vlasenkodc1cbf82008-03-24 14:44:20 +00001265 print_only(p2, dp2);
Bernhard Reutner-Fischer693a9362006-04-06 08:15:24 +00001266 dirlist2++;
1267 }
1268 }
1269}
1270#endif
1271
1272
Denis Vlasenko9b49a5e2007-10-11 10:05:36 +00001273int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
Denis Vlasenko68404f12008-03-17 09:00:54 +00001274int diff_main(int argc ATTRIBUTE_UNUSED, char **argv)
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001275{
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001276 int gotstdin = 0;
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001277 char *f1, *f2;
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001278 llist_t *L_arg = NULL;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001279
Denis Vlasenkoef4bb262007-06-04 12:21:53 +00001280 INIT_G();
1281
Denis Vlasenko1d426652008-03-17 09:09:09 +00001282 /* exactly 2 params; collect multiple -L <label>; -U N */
1283 opt_complementary = "=2:L::U+";
Denis Vlasenkofe7cd642007-08-18 15:32:12 +00001284 getopt32(argv, "abdiL:NqrsS:tTU:wu"
Denis Vlasenko6a1d6612006-12-16 22:18:44 +00001285 "p" /* ignored (for compatibility) */,
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001286 &L_arg, &opt_S_start, &opt_U_context);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001287 /*argc -= optind;*/
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001288 argv += optind;
Denis Vlasenko8336f082007-01-07 00:21:41 +00001289 while (L_arg) {
1290 if (label1 && label2)
1291 bb_show_usage();
Denis Vlasenkod50dda82008-06-15 05:40:56 +00001292 if (label1) /* then label2 is NULL */
Denis Vlasenko8336f082007-01-07 00:21:41 +00001293 label2 = label1;
Denis Vlasenkod50dda82008-06-15 05:40:56 +00001294 label1 = llist_pop(&L_arg);
Denis Vlasenko8336f082007-01-07 00:21:41 +00001295 }
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001296
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001297 /*
1298 * Do sanity checks, fill in stb1 and stb2 and call the appropriate
1299 * driver routine. Both drivers use the contents of stb1 and stb2.
1300 */
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001301 f1 = argv[0];
1302 f2 = argv[1];
1303 if (LONE_DASH(f1)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001304 fstat(STDIN_FILENO, &stb1);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001305 gotstdin++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001306 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001307 xstat(f1, &stb1);
1308 if (LONE_DASH(f2)) {
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001309 fstat(STDIN_FILENO, &stb2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001310 gotstdin++;
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001311 } else
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001312 xstat(f2, &stb2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001313
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001314 if (gotstdin && (S_ISDIR(stb1.st_mode) || S_ISDIR(stb2.st_mode)))
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001315 bb_error_msg_and_die("can't compare stdin to a directory");
1316
Bernhard Reutner-Fischerbbc225e2006-05-29 12:12:45 +00001317 if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
Bernhard Reutner-Fischerbc142142006-04-06 16:07:08 +00001318#if ENABLE_FEATURE_DIFF_DIR
Bernhard Reutner-Fischerea9e35f2007-01-06 21:47:09 +00001319 diffdir(f1, f2);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001320 return exit_status;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001321#else
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001322 bb_error_msg_and_die("no support for directory comparison");
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001323#endif
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001324 }
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001325
1326 if (S_ISDIR(stb1.st_mode)) { /* "diff dir file" */
1327 /* NB: "diff dir dir2/dir3/file" must become
1328 * "diff dir/file dir2/dir3/file" */
1329 char *slash = strrchr(f2, '/');
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001330 f1 = concat_path_file(f1, slash ? slash + 1 : f2);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001331 xstat(f1, &stb1);
1332 }
1333 if (S_ISDIR(stb2.st_mode)) {
1334 char *slash = strrchr(f1, '/');
Denis Vlasenkodccfe052008-03-24 18:40:32 +00001335 f2 = concat_path_file(f2, slash ? slash + 1 : f1);
Denis Vlasenko04211fd2008-03-24 14:44:59 +00001336 xstat(f2, &stb2);
1337 }
1338
1339 /* diffreg can get non-regular files here,
1340 * they are not both DIRestories */
1341 print_status((gotstdin > 1 ? D_SAME : diffreg(f1, f2, 0)),
1342 f1, f2 /*, NULL*/);
Denis Vlasenko7fe0eba2008-03-24 16:19:21 +00001343 return exit_status;
Bernhard Reutner-Fischer8f7d3892006-04-06 08:11:08 +00001344}