svn commit: r280870 - head/contrib/libarchive/libarchive

[Bryan Drewery]

Author: bdrewery
Date: Tue Mar 31 00:00:47 2015
New Revision: 280870
URL: https://svnweb.freebsd.org/changeset/base/280870

Log:
  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

Modified:
  head/contrib/libarchive/libarchive/archive_read_disk_posix.c

Modified: head/contrib/libarchive/libarchive/archive_read_disk_posix.c
==============================================================================
--- head/contrib/libarchive/libarchive/archive_read_disk_posix.c	Mon Mar 30 22:49:26 2015	(r280869)
+++ head/contrib/libarchive/libarchive/archive_read_disk_posix.c	Tue Mar 31 00:00:47 2015	(r280870)
@@ -974,7 +974,7 @@ next_entry(struct archive_read_disk *a, 
 		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;