mirrors/tar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(file_dumpable_p,dump_file0): Fix handling of sparse files to /dev/null with --totals option.

Browse Source
This commit is contained in:
Sergey Poznyakoff
2005-08-01 06:22:21 +00:00
parent 9d23481b5f
commit c9c76e7d56
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/create.c
View File

@@ -350,16 +350,20 @@ string_to_chars (char const *str, char *p, size_t s)
}
/* 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);
}
@@ -1486,7 +1490,7 @@ dump_file0 (struct tar_stat_info *st, char *p,
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)