X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcompare.c;h=b45c6160b6636555902ba174516e6ade22c86ba5;hb=1bcbbcf1ff2c537ffa970dbf82e3843d4ad110e5;hp=cdbf9455e221b191b18b4fe1d4e2668451c5ae2f;hpb=52429bb9563d5b4bfece4cf9036ce9363e05996b;p=chaz%2Ftar diff --git a/src/compare.c b/src/compare.c index cdbf945..b45c616 100644 --- a/src/compare.c +++ b/src/compare.c @@ -1,13 +1,13 @@ /* Diff files from a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. Written by John Gilmore, on 1987-04-30. 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 + Free Software Foundation; either version 3, or (at your option) any later version. This program is distributed in the hope that it will be useful, but @@ -20,15 +20,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include +#include #if HAVE_LINUX_FD_H # include #endif -#include -#include - #include "common.h" +#include #include #include @@ -54,14 +53,13 @@ diff_init (void) /* Sigh about something that differs by writing a MESSAGE to stdlis, given MESSAGE is nonzero. Also set the exit status if not already. */ void -report_difference (struct tar_stat_info *st __attribute__ ((unused)), - const char *fmt, ...) +report_difference (struct tar_stat_info *st, const char *fmt, ...) { if (fmt) { va_list ap; - fprintf (stdlis, "%s: ", quotearg_colon (current_stat_info.file_name)); + fprintf (stdlis, "%s: ", quotearg_colon (st->file_name)); va_start (ap, fmt); vfprintf (stdlis, fmt, ap); va_end (ap); @@ -112,27 +110,10 @@ process_rawdata (size_t bytes, char *buffer) return 1; } -/* Directory contents, only for GNUTYPE_DUMPDIR. */ - -static char *dumpdir_cursor; - -static int -process_dumpdir (size_t bytes, char *buffer) -{ - if (memcmp (buffer, dumpdir_cursor, bytes)) - { - report_difference (¤t_stat_info, _("Contents differ")); - return 0; - } - - dumpdir_cursor += bytes; - return 1; -} - /* Some other routine wants SIZE bytes in the archive. For each chunk of the archive, call PROCESSOR with the size of the chunk, and the address of the chunk it can work with. The PROCESSOR should return - nonzero for success. It it return error once, continue skipping + nonzero for success. Once it returns error, continue skipping without calling PROCESSOR anymore. */ static void @@ -140,8 +121,8 @@ read_and_process (struct tar_stat_info *st, int (*processor) (size_t, char *)) { union block *data_block; size_t data_size; - size_t size = st->stat.st_size; - + off_t size = st->stat.st_size; + mv_begin (st); while (size) { @@ -205,9 +186,10 @@ diff_dir (void) static void diff_file (void) { + char const *file_name = current_stat_info.file_name; struct stat stat_data; - if (!get_stat_data (current_stat_info.file_name, &stat_data)) + if (!get_stat_data (file_name, &stat_data)) skip_member (); else if (!S_ISREG (stat_data.st_mode)) { @@ -225,22 +207,27 @@ diff_file (void) if (!sys_compare_gid (&stat_data, ¤t_stat_info.stat)) report_difference (¤t_stat_info, _("Gid differs")); - if (tar_timespec_cmp (get_stat_mtime (&stat_data), + if (tar_timespec_cmp (get_stat_mtime (&stat_data), current_stat_info.mtime)) report_difference (¤t_stat_info, _("Mod time differs")); - if (current_header->header.typeflag != GNUTYPE_SPARSE && - stat_data.st_size != current_stat_info.stat.st_size) + if (current_header->header.typeflag != GNUTYPE_SPARSE + && stat_data.st_size != current_stat_info.stat.st_size) { report_difference (¤t_stat_info, _("Size differs")); skip_member (); } else { - diff_handle = open (current_stat_info.file_name, O_RDONLY | O_BINARY); + int atime_flag = + (atime_preserve_option == system_atime_preserve + ? O_NOATIME + : 0); + + diff_handle = open (file_name, O_RDONLY | O_BINARY | atime_flag); if (diff_handle < 0) { - open_error (current_stat_info.file_name); + open_error (file_name); skip_member (); report_difference (¤t_stat_info, NULL); } @@ -253,18 +240,18 @@ diff_file (void) else read_and_process (¤t_stat_info, process_rawdata); - status = close (diff_handle); - if (status != 0) - close_error (current_stat_info.file_name); - - if (atime_preserve_option) + if (atime_preserve_option == replace_atime_preserve) { struct timespec ts[2]; ts[0] = get_stat_atime (&stat_data); ts[1] = get_stat_mtime (&stat_data); - if (utimens (current_stat_info.file_name, ts) != 0) - utime_error (current_stat_info.file_name); + if (set_file_atime (diff_handle, file_name, ts) != 0) + utime_error (file_name); } + + status = close (diff_handle); + if (status != 0) + close_error (file_name); } } } @@ -341,14 +328,49 @@ diff_special (void) report_difference (¤t_stat_info, _("Mode differs")); } +static int +dumpdir_cmp (const char *a, const char *b) +{ + size_t len; + + while (*a) + switch (*a) + { + case 'Y': + case 'N': + if (!strchr ("YN", *b)) + return 1; + if (strcmp(a + 1, b + 1)) + return 1; + len = strlen (a) + 1; + a += len; + b += len; + break; + + case 'D': + if (strcmp(a, b)) + return 1; + len = strlen (a) + 1; + a += len; + b += len; + break; + + case 'R': + case 'T': + case 'X': + return *b; + } + return *b; +} + static void diff_dumpdir (void) { - char *dumpdir_buffer; + const char *dumpdir_buffer; dev_t dev = 0; - struct stat stat; + struct stat stat_data; - if (deref_stat (true, current_stat_info.file_name, &stat)) + if (deref_stat (true, current_stat_info.file_name, &stat_data)) { if (errno == ENOENT) stat_warn (current_stat_info.file_name); @@ -356,15 +378,14 @@ diff_dumpdir (void) stat_error (current_stat_info.file_name); } else - dev = stat.st_dev; - - dumpdir_buffer = get_directory_contents (current_stat_info.file_name, dev); + dev = stat_data.st_dev; + + dumpdir_buffer = scan_directory (current_stat_info.file_name, dev, false); if (dumpdir_buffer) { - dumpdir_cursor = dumpdir_buffer; - read_and_process (¤t_stat_info, process_dumpdir); - free (dumpdir_buffer); + if (dumpdir_cmp (current_stat_info.dumpdir, dumpdir_buffer)) + report_difference (¤t_stat_info, _("Contents differ")); } else read_and_process (¤t_stat_info, process_noop); @@ -419,7 +440,7 @@ diff_multivol (void) } read_and_process (¤t_stat_info, process_rawdata); - + status = close (fd); if (status != 0) close_error (current_stat_info.file_name); @@ -480,10 +501,9 @@ diff_archive (void) break; case GNUTYPE_DUMPDIR: - diff_dumpdir (); - /* Fall through. */ - case DIRTYPE: + if (is_dumpdir (¤t_stat_info)) + diff_dumpdir (); diff_dir (); break; @@ -577,12 +597,26 @@ verify_volume (void) "VERIFY FAILURE: %d invalid headers detected", counter), counter)); } - if (status == HEADER_ZERO_BLOCK || status == HEADER_END_OF_FILE) + if (status == HEADER_END_OF_FILE) break; + if (status == HEADER_ZERO_BLOCK) + { + set_next_block_after (current_header); + if (!ignore_zeros_option) + { + char buf[UINTMAX_STRSIZE_BOUND]; + status = read_header (false); + if (status == HEADER_ZERO_BLOCK) + break; + WARNOPT (WARN_ALONE_ZERO_BLOCK, + (0, 0, _("A lone zero block at %s"), + STRINGIFY_BIGINT (current_block_ordinal (), buf))); + } + } + diff_archive (); tar_stat_destroy (¤t_stat_info); - xheader_destroy (&extended_header); } access_mode = ACCESS_WRITE;