X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fcompare.c;h=0e99a7201cadf528bf57f1dc866c68c35091146c;hb=df7b55a8f6354e30e8da62eec7f706df033d0c81;hp=204c5dc16dd38f204bea980e84bc4045e78387c5;hpb=d9458886432a92230e432e8e8492703c7afb8272;p=chaz%2Ftar diff --git a/src/compare.c b/src/compare.c index 204c5dc..0e99a72 100644 --- a/src/compare.c +++ b/src/compare.c @@ -1,7 +1,8 @@ /* Diff files from a tar archive. Copyright (C) 1988, 1992, 1993, 1994, 1996, 1997, 1999, 2000, 2001, - 2003, 2004, 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2012 Free Software + Foundation, Inc. Written by John Gilmore, on 1987-04-30. @@ -80,7 +81,7 @@ process_noop (size_t size __attribute__ ((unused)), static int process_rawdata (size_t bytes, char *buffer) { - size_t status = safe_read (diff_handle, diff_buffer, bytes); + size_t status = blocking_read (diff_handle, diff_buffer, bytes); if (status != bytes) { @@ -151,7 +152,7 @@ read_and_process (struct tar_stat_info *st, int (*processor) (size_t, char *)) static int get_stat_data (char const *file_name, struct stat *stat_data) { - int status = deref_stat (dereference_option, file_name, stat_data); + int status = deref_stat (file_name, stat_data); if (status != 0) { @@ -217,14 +218,7 @@ diff_file (void) } else { - int atime_flag = - (atime_preserve_option == system_atime_preserve - ? O_NOATIME - : 0); - - diff_handle = open (file_name, - (O_RDONLY | O_BINARY | O_CLOEXEC | O_NOCTTY - | O_NONBLOCK | atime_flag)); + diff_handle = openat (chdir_fd, file_name, open_read_flags); if (diff_handle < 0) { @@ -241,11 +235,11 @@ diff_file (void) else read_and_process (¤t_stat_info, process_rawdata); - if (atime_preserve_option == replace_atime_preserve) + if (atime_preserve_option == replace_atime_preserve + && stat_data.st_size != 0) { struct timespec atime = get_stat_atime (&stat_data); - if (set_file_atime (diff_handle, AT_FDCWD, file_name, - atime, 0) + if (set_file_atime (diff_handle, chdir_fd, file_name, atime) != 0) utime_error (file_name); } @@ -279,7 +273,8 @@ diff_symlink (void) size_t len = strlen (current_stat_info.link_name); char *linkbuf = alloca (len + 1); - int status = readlink (current_stat_info.file_name, linkbuf, len + 1); + int status = readlinkat (chdir_fd, current_stat_info.file_name, + linkbuf, len + 1); if (status < 0) { @@ -365,31 +360,35 @@ dumpdir_cmp (const char *a, const char *b) } static void -diff_dumpdir (void) +diff_dumpdir (struct tar_stat_info *dir) { const char *dumpdir_buffer; - dev_t dev = 0; - struct stat stat_data; - if (deref_stat (true, current_stat_info.file_name, &stat_data)) + if (dir->fd == 0) { - if (errno == ENOENT) - stat_warn (current_stat_info.file_name); + void (*diag) (char const *) = NULL; + int fd = subfile_open (dir->parent, dir->orig_file_name, open_read_flags); + if (fd < 0) + diag = open_diag; + else if (fstat (fd, &dir->stat)) + diag = stat_diag; else - stat_error (current_stat_info.file_name); + dir->fd = fd; + if (diag) + { + file_removed_diag (dir->orig_file_name, false, diag); + return; + } } - else - dev = stat_data.st_dev; - - dumpdir_buffer = directory_contents (scan_directory (¤t_stat_info)); + dumpdir_buffer = directory_contents (scan_directory (dir)); if (dumpdir_buffer) { - if (dumpdir_cmp (current_stat_info.dumpdir, dumpdir_buffer)) - report_difference (¤t_stat_info, _("Contents differ")); + if (dumpdir_cmp (dir->dumpdir, dumpdir_buffer)) + report_difference (dir, _("Contents differ")); } else - read_and_process (¤t_stat_info, process_noop); + read_and_process (dir, process_noop); } static void @@ -398,10 +397,6 @@ diff_multivol (void) struct stat stat_data; int fd, status; off_t offset; - int atime_flag = - (atime_preserve_option == system_atime_preserve - ? O_NOATIME - : 0); if (current_stat_info.had_trailing_slash) { @@ -420,7 +415,9 @@ diff_multivol (void) } offset = OFF_FROM_HEADER (current_header->oldgnu_header.offset); - if (stat_data.st_size != current_stat_info.stat.st_size + offset) + if (offset < 0 + || INT_ADD_OVERFLOW (current_stat_info.stat.st_size, offset) + || stat_data.st_size != current_stat_info.stat.st_size + offset) { report_difference (¤t_stat_info, _("Size differs")); skip_member (); @@ -428,9 +425,7 @@ diff_multivol (void) } - fd = open (current_stat_info.file_name, - (O_RDONLY | O_BINARY | O_CLOEXEC | O_NOCTTY | O_NONBLOCK - | atime_flag)); + fd = openat (chdir_fd, current_stat_info.file_name, open_read_flags); if (fd < 0) { @@ -473,7 +468,7 @@ diff_archive (void) switch (current_header->header.typeflag) { default: - ERROR ((0, 0, _("%s: Unknown file type `%c', diffed as normal file"), + ERROR ((0, 0, _("%s: Unknown file type '%c', diffed as normal file"), quotearg_colon (current_stat_info.file_name), current_header->header.typeflag)); /* Fall through. */ @@ -510,7 +505,7 @@ diff_archive (void) case GNUTYPE_DUMPDIR: case DIRTYPE: if (is_dumpdir (¤t_stat_info)) - diff_dumpdir (); + diff_dumpdir (¤t_stat_info); diff_dir (); break; @@ -525,13 +520,24 @@ diff_archive (void) void verify_volume (void) { + int may_fail = 0; if (removed_prefixes_p ()) { WARN((0, 0, _("Archive contains file names with leading prefixes removed."))); + may_fail = 1; + } + if (transform_program_p ()) + { WARN((0, 0, - _("Verification may fail to locate original files."))); + _("Archive contains transformed file names."))); + may_fail = 1; } + if (may_fail) + WARN((0, 0, + _("Verification may fail to locate original files."))); + + clear_directory_table (); if (!diff_buffer) diff_init (); @@ -624,8 +630,10 @@ verify_volume (void) (0, 0, _("A lone zero block at %s"), STRINGIFY_BIGINT (current_block_ordinal (), buf))); } + continue; } + decode_header (current_header, ¤t_stat_info, ¤t_format, 1); diff_archive (); tar_stat_destroy (¤t_stat_info); }