}
\f
-/* A file is not dumpable if
+/* A file is considered dumpable if it is sparse and both --sparse and --totals
+ are specified.
+ Otherwise, it is dumpable unless any of the following conditions occur:
+
a) it is empty *and* world-readable, or
b) current archive is /dev/null */
bool
file_dumpable_p (struct tar_stat_info *st)
{
- return !(dev_null_output
- || (st->archive_file_size == 0
- && (st->stat.st_mode & MODE_R) == MODE_R));
+ if (dev_null_output)
+ return totals_option && sparse_option && sparse_file_p (st);
+ return !(st->archive_file_size == 0
+ && (st->stat.st_mode & MODE_R) == MODE_R);
}
\f
}
{
- struct timespec mtime = get_stat_mtime (&st->stat);
+ struct timespec mtime = st->mtime;
if (archive_format == POSIX_FORMAT)
{
if (MAX_OCTAL_VAL (header->header.mtime) < mtime.tv_sec
else if (incremental_option)
if (archive_format == OLDGNU_FORMAT || archive_format == GNU_FORMAT)
{
- TIME_TO_CHARS (st->stat.st_atime, header->oldgnu_header.atime);
- TIME_TO_CHARS (st->stat.st_ctime, header->oldgnu_header.ctime);
+ TIME_TO_CHARS (st->atime.tv_sec, header->oldgnu_header.atime);
+ TIME_TO_CHARS (st->ctime.tv_sec, header->oldgnu_header.ctime);
}
header->header.typeflag = archive_format == V7_FORMAT ? AREGTYPE : REGTYPE;
{
stat_diag (st->orig_file_name);
}
- else if (final_stat.st_ctime != original_ctime.tv_sec
- || (get_stat_ctime (&final_stat).tv_nsec
- != original_ctime.tv_nsec))
+ else if (timespec_cmp (get_stat_ctime (&final_stat), original_ctime)
+ != 0)
{
WARN ((0, 0, _("%s: file changed as we read it"),
quotearg_colon (st->orig_file_name)));
return;
}
st->archive_file_size = st->stat.st_size;
- original_ctime = get_stat_ctime (&st->stat);
- restore_times[0] = get_stat_atime (&st->stat);
- restore_times[1] = get_stat_mtime (&st->stat);
+ st->atime = restore_times[0] = get_stat_atime (&st->stat);
+ st->mtime = restore_times[1] = get_stat_mtime (&st->stat);
+ st->ctime = original_ctime = get_stat_ctime (&st->stat);
#ifdef S_ISHIDDEN
if (S_ISHIDDEN (st->stat.st_mode))
if (!(incremental_option && !is_individual_file (p))
&& !S_ISDIR (st->stat.st_mode)
- && OLDER_STAT_TIME (st->stat, m)
- && (!after_date_option || OLDER_STAT_TIME (st->stat, c)))
+ && OLDER_TAR_STAT_TIME (*st, m)
+ && (!after_date_option || OLDER_TAR_STAT_TIME (*st, c)))
{
if (!incremental_option && verbose_option)
WARN ((0, 0, _("%s: file is unchanged; not dumped"),
else
fd = -1;
- if (sparse_option && sparse_file_p (st))
+ if (fd != -1 && sparse_option && sparse_file_p (st))
{
status = sparse_dump_file (fd, st);
if (status == dump_status_not_implemented)