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)
{
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, chdir_fd, file_name, atime)
}
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 (current_stat_info.file_name, &stat_data) != 0)
+ 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
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. */
case GNUTYPE_DUMPDIR:
case DIRTYPE:
if (is_dumpdir (¤t_stat_info))
- diff_dumpdir ();
+ diff_dumpdir (¤t_stat_info);
diff_dir ();
break;
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 ();
(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);
}