Fix --one-file-system: do not descend, but do visit the root of a new filesystem

diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
index 94eb5e7be2db876ca5188ec889a89d71cee9e1c2..71e63ac62864383fabf93f10989e85dbe106fe67 100644 (file)
--- a/libarchive/archive_read_disk_posix.c
+++ b/libarchive/archive_read_disk_posix.c
@@ -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;