projects
/
debian
/
tar
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Import upstream version 1.26
[debian/tar]
/
src
/
create.c
diff --git
a/src/create.c
b/src/create.c
index a1e90a33679f12b0119953cbf465d64bd1e21eb5..43b5a4c23ab1140f38180d02e2b140c9886bd031 100644
(file)
--- a/
src/create.c
+++ b/
src/create.c
@@
-1678,9
+1678,9
@@
dump_file0 (struct tar_stat_info *st, char const *name, char const *p)
put in the archive.
This check is omitted if incremental_option is set *and* the
put in the archive.
This check is omitted if incremental_option is set *and* the
- requested file is not explicit
ely listed in the command line.
*/
+ requested file is not explicit
ly listed in the command line.
*/
- if (!
(incremental_option && !is_individual_file (p)
)
+ if (!
(incremental_option && ! top_level
)
&& !S_ISDIR (st->stat.st_mode)
&& OLDER_TAR_STAT_TIME (*st, m)
&& (!after_date_option || OLDER_TAR_STAT_TIME (*st, c)))
&& !S_ISDIR (st->stat.st_mode)
&& OLDER_TAR_STAT_TIME (*st, m)
&& (!after_date_option || OLDER_TAR_STAT_TIME (*st, c)))
@@
-1797,6
+1797,7
@@
dump_file0 (struct tar_stat_info *st, char const *name, char const *p)
set_exit_status (TAREXIT_DIFFERS);
}
else if (atime_preserve_option == replace_atime_preserve
set_exit_status (TAREXIT_DIFFERS);
}
else if (atime_preserve_option == replace_atime_preserve
+ && fd && (is_dir || original_size != 0)
&& set_file_atime (fd, parentfd, name, st->atime) != 0)
utime_error (p);
}
&& set_file_atime (fd, parentfd, name, st->atime) != 0)
utime_error (p);
}