size_t data_size;
off_t size = st->stat.st_size;
- mv_begin (st);
+ mv_begin_read (st);
while (size)
{
data_block = find_next_block ();
}
else
{
- int atime_flag =
- (atime_preserve_option == system_atime_preserve
- ? O_NOATIME
- : 0);
-
- diff_handle = open (file_name, O_RDONLY | O_BINARY | atime_flag);
+ diff_handle = open (file_name, open_read_flags);
if (diff_handle < 0)
{
dumpdir_cmp (const char *a, const char *b)
{
size_t len;
-
+
while (*a)
switch (*a)
{
a += len;
b += len;
break;
-
+
case 'D':
if (strcmp(a, b))
return 1;
a += len;
b += len;
break;
-
+
case 'R':
case 'T':
case 'X':
else
dev = stat_data.st_dev;
- dumpdir_buffer = directory_contents
- (scan_directory (current_stat_info.file_name, dev, false));
+ dumpdir_buffer = directory_contents (scan_directory (¤t_stat_info));
if (dumpdir_buffer)
{
return;
}
- fd = open (current_stat_info.file_name, O_RDONLY | O_BINARY);
+ fd = open (current_stat_info.file_name, open_read_flags);
if (fd < 0)
{
{
set_next_block_after (current_header);
- decode_header (current_header, ¤t_stat_info, ¤t_format, 1);
/* Print the block from current_header and current_stat_info. */
flush_read ();
while (1)
{
- enum read_header status = read_header (¤t_header,
- ¤t_stat_info, false);
+ enum read_header status = read_header (¤t_header,
+ ¤t_stat_info,
+ read_header_auto);
if (status == HEADER_FAILURE)
{
counter++;
set_next_block_after (current_header);
status = read_header (¤t_header, ¤t_stat_info,
- false);
+ read_header_auto);
}
while (status == HEADER_FAILURE);
{
char buf[UINTMAX_STRSIZE_BOUND];
- status = read_header (¤t_header, ¤t_stat_info, false);
+ status = read_header (¤t_header, ¤t_stat_info,
+ read_header_auto);
if (status == HEADER_ZERO_BLOCK)
break;
WARNOPT (WARN_ALONE_ZERO_BLOCK,
STRINGIFY_BIGINT (current_block_ordinal (), buf)));
}
}
-
+
diff_archive ();
tar_stat_destroy (¤t_stat_info);
}