1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570
|
/* cmp -- compare two files.
Copyright (C) 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Written by Torbjorn Granlund and David MacKenzie. */
#include "system.h"
#include <stdio.h>
#include "getopt.h"
#include "cmpbuf.h"
extern char const version_string[];
#if __STDC__ && defined (HAVE_VPRINTF)
void error (int, int, char const *, ...);
#else
void error ();
#endif
VOID *xmalloc PARAMS((size_t));
static int cmp PARAMS((void));
static off_t file_position PARAMS((int));
static size_t block_compare PARAMS((char const *, char const *));
static size_t block_compare_and_count PARAMS((char const *, char const *, long *));
static size_t block_read PARAMS((int, char *, size_t));
static void printc PARAMS((int, unsigned));
static void try_help PARAMS((char const *));
static void check_stdout PARAMS((void));
static void usage PARAMS((void));
/* Name under which this program was invoked. */
char const *program_name;
/* Filenames of the compared files. */
static char const *file[2];
/* File descriptors of the files. */
static int file_desc[2];
/* Read buffers for the files. */
static char *buffer[2];
/* Optimal block size for the files. */
static size_t buf_size;
/* Initial prefix to ignore for each file. */
static off_t ignore_initial;
/* Output format:
type_first_diff
to print the offset and line number of the first differing bytes
type_all_diffs
to print the (decimal) offsets and (octal) values of all differing bytes
type_status
to only return an exit status indicating whether the files differ */
static enum
{
type_first_diff, type_all_diffs, type_status
} comparison_type;
/* Type used for fast comparison of several bytes at a time. */
#ifndef word
#define word int
#endif
/* If nonzero, print values of bytes quoted like cat -t does. */
static int opt_print_chars;
static struct option const long_options[] =
{
{"print-chars", 0, 0, 'c'},
{"ignore-initial", 1, 0, 'i'},
{"verbose", 0, 0, 'l'},
{"silent", 0, 0, 's'},
{"quiet", 0, 0, 's'},
{"version", 0, 0, 'v'},
{"help", 0, 0, 129},
{0, 0, 0, 0}
};
static void
try_help (reason)
char const *reason;
{
if (reason)
error (0, 0, "%s", reason);
error (2, 0, "Try `%s --help' for more information.", program_name);
}
static void
check_stdout ()
{
if (ferror (stdout))
error (2, 0, "write error");
else if (fclose (stdout) != 0)
error (2, errno, "write error");
}
static void
usage ()
{
printf ("Usage: %s [OPTION]... FILE1 [FILE2]\n", program_name);
printf ("%s", "\
-c --print-chars Output differing bytes as characters.\n\
-i N --ignore-initial=N Ignore differences in the first N bytes of input.\n\
-l --verbose Output offsets and codes of all differing bytes.\n\
-s --quiet --silent Output nothing; yield exit status only.\n\
-v --version Output version info.\n\
--help Output this help.\n");
printf ("If a FILE is `-' or missing, read standard input.\n");
}
int
main (argc, argv)
int argc;
char *argv[];
{
int c, i, exit_status;
struct stat stat_buf[2];
initialize_main (&argc, &argv);
program_name = argv[0];
/* Parse command line options. */
while ((c = getopt_long (argc, argv, "ci:lsv", long_options, 0))
!= EOF)
switch (c)
{
case 'c':
opt_print_chars = 1;
break;
case 'i':
ignore_initial = 0;
while (*optarg)
{
/* Don't use `atol', because `off_t' may be longer than `long'. */
unsigned digit = *optarg++ - '0';
if (9 < digit)
try_help ("non-digit in --ignore-initial value");
ignore_initial = 10 * ignore_initial + digit;
}
break;
case 'l':
comparison_type = type_all_diffs;
break;
case 's':
comparison_type = type_status;
break;
case 'v':
printf ("cmp - GNU diffutils version %s\n", version_string);
exit (0);
case 129:
usage ();
check_stdout ();
exit (0);
default:
try_help (0);
}
if (optind == argc)
try_help ("missing operand");
file[0] = argv[optind++];
file[1] = optind < argc ? argv[optind++] : "-";
if (optind < argc)
try_help ("extra operands");
for (i = 0; i < 2; i++)
{
/* If file[1] is "-", treat it first; this avoids a misdiagnostic if
stdin is closed and opening file[0] yields file descriptor 0. */
int i1 = i ^ (strcmp (file[1], "-") == 0);
/* Two files with the same name are identical.
But wait until we open the file once, for proper diagnostics. */
if (i && filename_cmp (file[0], file[1]) == 0)
exit (0);
file_desc[i1] = (strcmp (file[i1], "-") == 0
? STDIN_FILENO
: open (file[i1], O_RDONLY, 0));
if (file_desc[i1] < 0 || fstat (file_desc[i1], &stat_buf[i1]) != 0)
{
if (file_desc[i1] < 0 && comparison_type == type_status)
exit (2);
else
error (2, errno, "%s", file[i1]);
}
#if HAVE_SETMODE
setmode (file_desc[i1], O_BINARY);
#endif
}
/* If the files are links to the same inode and have the same file position,
they are identical. */
if (0 < same_file (&stat_buf[0], &stat_buf[1])
&& file_position (0) == file_position (1))
exit (0);
/* If output is redirected to the null device, we may assume `-s'. */
#ifndef _WIN32
if (comparison_type != type_status)
{
struct stat outstat, nullstat;
if (fstat (STDOUT_FILENO, &outstat) == 0
&& stat (NULL_DEVICE, &nullstat) == 0
&& 0 < same_file (&outstat, &nullstat))
comparison_type = type_status;
}
#endif
/* If only a return code is needed,
and if both input descriptors are associated with plain files,
conclude that the files differ if they have different sizes. */
if (comparison_type == type_status
&& S_ISREG (stat_buf[0].st_mode)
&& S_ISREG (stat_buf[1].st_mode))
{
off_t s0 = stat_buf[0].st_size - file_position (0);
off_t s1 = stat_buf[1].st_size - file_position (1);
if (max (0, s0) != max (0, s1))
exit (1);
}
/* Get the optimal block size of the files. */
buf_size = buffer_lcm (STAT_BLOCKSIZE (stat_buf[0]),
STAT_BLOCKSIZE (stat_buf[1]));
/* Allocate buffers, with space for sentinels at the end. */
for (i = 0; i < 2; i++)
buffer[i] = xmalloc (buf_size + sizeof (word));
exit_status = cmp ();
for (i = 0; i < 2; i++)
if (close (file_desc[i]) != 0)
error (2, errno, "%s", file[i]);
if (exit_status != 0 && comparison_type != type_status)
check_stdout ();
exit (exit_status);
return exit_status;
}
/* Compare the two files already open on `file_desc[0]' and `file_desc[1]',
using `buffer[0]' and `buffer[1]'.
Return 0 if identical, 1 if different, >1 if error. */
static int
cmp ()
{
long line_number = 1; /* Line number (1...) of first difference. */
long char_number = ignore_initial + 1;
/* Offset (1...) in files of 1st difference. */
size_t read0, read1; /* Number of chars read from each file. */
size_t first_diff; /* Offset (0...) in buffers of 1st diff. */
size_t smaller; /* The lesser of `read0' and `read1'. */
char *buf0 = buffer[0];
char *buf1 = buffer[1];
int ret = 0;
int i;
if (ignore_initial)
for (i = 0; i < 2; i++)
if (file_position (i) == -1)
{
/* lseek failed; read and discard the ignored initial prefix. */
off_t ig = ignore_initial;
do
{
size_t r = read (file_desc[i], buf0, (size_t) min (ig, buf_size));
if (!r)
break;
if (r == -1)
error (2, errno, "%s", file[i]);
ig -= r;
}
while (ig);
}
do
{
read0 = block_read (file_desc[0], buf0, buf_size);
if (read0 == -1)
error (2, errno, "%s", file[0]);
read1 = block_read (file_desc[1], buf1, buf_size);
if (read1 == -1)
error (2, errno, "%s", file[1]);
/* Insert sentinels for the block compare. */
buf0[read0] = ~buf1[read0];
buf1[read1] = ~buf0[read1];
/* If the line number should be written for differing files,
compare the blocks and count the number of newlines
simultaneously. */
first_diff = (comparison_type == type_first_diff
? block_compare_and_count (buf0, buf1, &line_number)
: block_compare (buf0, buf1));
char_number += first_diff;
smaller = min (read0, read1);
if (first_diff < smaller)
{
switch (comparison_type)
{
case type_first_diff:
/* See Posix.2 section 4.10.6.1 for this format. */
printf ("%s %s differ: char %lu, line %lu",
file[0], file[1], char_number, line_number);
if (opt_print_chars)
{
unsigned char c0 = buf0[first_diff];
unsigned char c1 = buf1[first_diff];
printf (" is %3o ", c0);
printc (0, c0);
printf (" %3o ", c1);
printc (0, c1);
}
putchar ('\n');
/* Fall through. */
case type_status:
return 1;
case type_all_diffs:
do
{
unsigned char c0 = buf0[first_diff];
unsigned char c1 = buf1[first_diff];
if (c0 != c1)
{
if (opt_print_chars)
{
printf ("%6lu %3o ", char_number, c0);
printc (4, c0);
printf (" %3o ", c1);
printc (0, c1);
putchar ('\n');
}
else
/* See Posix.2 section 4.10.6.1 for this format. */
printf ("%6lu %3o %3o\n", char_number, c0, c1);
}
char_number++;
first_diff++;
}
while (first_diff < smaller);
ret = 1;
break;
}
}
if (read0 != read1)
{
if (comparison_type != type_status)
/* See Posix.2 section 4.10.6.2 for this format. */
fprintf (stderr, "cmp: EOF on %s\n", file[read1 < read0]);
return 1;
}
}
while (read0 == buf_size);
return ret;
}
/* Compare two blocks of memory P0 and P1 until they differ,
and count the number of '\n' occurrences in the common
part of P0 and P1.
Assumes that P0 and P1 are aligned at word addresses!
If the blocks are not guaranteed to be different, put sentinels at the ends
of the blocks before calling this function.
Return the offset of the first byte that differs.
Increment *COUNT by the count of '\n' occurrences. */
static size_t
block_compare_and_count (p0, p1, count)
char const *p0, *p1;
long *count;
{
word l; /* One word from first buffer. */
word const *l0, *l1; /* Pointers into each buffer. */
char const *c0, *c1; /* Pointers for finding exact address. */
long cnt = 0; /* Number of '\n' occurrences. */
word nnnn; /* Newline, sizeof (word) times. */
int i;
l0 = (word const *) p0;
l1 = (word const *) p1;
nnnn = 0;
for (i = 0; i < sizeof (word); i++)
nnnn = (nnnn << CHAR_BIT) | '\n';
/* Find the rough position of the first difference by reading words,
not bytes. */
while ((l = *l0++) == *l1++)
{
l ^= nnnn;
for (i = 0; i < sizeof (word); i++)
{
cnt += ! (unsigned char) l;
l >>= CHAR_BIT;
}
}
/* Find the exact differing position (endianness independent). */
c0 = (char const *) (l0 - 1);
c1 = (char const *) (l1 - 1);
while (*c0 == *c1)
{
cnt += *c0 == '\n';
c0++;
c1++;
}
*count += cnt;
return c0 - p0;
}
/* Compare two blocks of memory P0 and P1 until they differ.
Assumes that P0 and P1 are aligned at word addresses!
If the blocks are not guaranteed to be different, put sentinels at the ends
of the blocks before calling this function.
Return the offset of the first byte that differs. */
static size_t
block_compare (p0, p1)
char const *p0, *p1;
{
word const *l0, *l1;
char const *c0, *c1;
l0 = (word const *) p0;
l1 = (word const *) p1;
/* Find the rough position of the first difference by reading words,
not bytes. */
while (*l0++ == *l1++)
;
/* Find the exact differing position (endianness independent). */
c0 = (char const *) (l0 - 1);
c1 = (char const *) (l1 - 1);
while (*c0 == *c1)
{
c0++;
c1++;
}
return c0 - p0;
}
/* Read NCHARS bytes from descriptor FD into BUF.
Return the number of characters successfully read.
The number returned is always NCHARS unless end-of-file or error. */
static size_t
block_read (fd, buf, nchars)
int fd;
char *buf;
size_t nchars;
{
char *bp = buf;
do
{
size_t nread = read (fd, bp, nchars);
if (nread == -1)
return -1;
if (nread == 0)
break;
bp += nread;
nchars -= nread;
}
while (nchars != 0);
return bp - buf;
}
/* Print character C, making unprintable characters
visible by quoting like cat -t does.
Pad with spaces on the right to WIDTH characters. */
static void
printc (width, c)
int width;
unsigned c;
{
register FILE *fs = stdout;
if (! ISPRINT (c))
{
if (c >= 128)
{
putc ('M', fs);
putc ('-', fs);
c -= 128;
width -= 2;
}
if (c < 32)
{
putc ('^', fs);
c += 64;
--width;
}
else if (c == 127)
{
putc ('^', fs);
c = '?';
--width;
}
}
putc (c, fs);
while (--width > 0)
putc (' ', fs);
}
/* Position file I to `ignore_initial' bytes from its initial position,
and yield its new position. Don't try more than once. */
static off_t
file_position (i)
int i;
{
static int positioned[2];
static off_t position[2];
if (! positioned[i])
{
positioned[i] = 1;
position[i] = lseek (file_desc[i], ignore_initial, SEEK_CUR);
}
return position[i];
}
|