system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-15 21:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the cpio bug tested for by r182092 of usr.bin/cpio/test.

Browse source 
Since various 'find' incantations can emit container directories
in various orders, we cannot refuse to update a dir because it's
apparently the same age.

MFC after:	3 days
This commit is contained in:
Tim Kientzle 2008-08-24 05:01:01 +00:00
parent c9c5c49045
commit 8d14bd8cc2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=182093
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/libarchive/archive_write_disk.c
View file

@ -861,7 +861,11 @@ restore_entry(struct archive_write_disk *a)
/* TODO: if it's a symlink... */
if (a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER) {
/*
* NO_OVERWRITE_NEWER doesn't apply to directories.
*/
if ((a->flags & ARCHIVE_EXTRACT_NO_OVERWRITE_NEWER)
&& !S_ISDIR(a->st.st_mode)) {
if (!older(&(a->st), a->entry)) {
archive_set_error(&a->archive, 0,
"File on disk is not older; skipping.");