Fix --one-file-system to include the directory encountered rather than

excluding it.  This was broken in 3.0.4 (r238856).

Obtained from:	https://github.com/libarchive/libarchive/commit/fa9e61
MFC after:	3 days
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-03-31 00:00:47 +00:00
parent f6d6b5e262
commit eb828e1bb5
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=280870

View File

@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, struct tree *t,
t->initial_filesystem_id = t->current_filesystem_id;
if (!a->traverse_mount_points) {
if (t->initial_filesystem_id != t->current_filesystem_id)
return (ARCHIVE_RETRY);
descend = 0;
}
t->descend = descend;