From: Tim Kientzle <kientzle@acm.org>
Date: Fri, 18 Jul 2014 04:03:52 +0000 (-0700)
Subject: Fix --one-file-system: do not descend, but do visit the root of a new filesystem
X-Git-Tag: v3.1.900a~257
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa9e61aa1531153b7748d4e0d8dda8f52a0893d7;p=thirdparty%2Flibarchive.git

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 94eb5e7be..71e63ac62 100644
--- 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;