From owner-svn-src-stable-10@FreeBSD.ORG  Fri Apr  3 18:01:52 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DC7CC946;
 Fri,  3 Apr 2015 18:01:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C62A0D33;
 Fri,  3 Apr 2015 18:01:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t33I1qbs098814;
 Fri, 3 Apr 2015 18:01:52 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t33I1qtm098813;
 Fri, 3 Apr 2015 18:01:52 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201504031801.t33I1qtm098813@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 3 Apr 2015 18:01:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r281044 - stable/10/contrib/libarchive/libarchive
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Apr 2015 18:01:53 -0000

Author: bdrewery
Date: Fri Apr  3 18:01:51 2015
New Revision: 281044
URL: https://svnweb.freebsd.org/changeset/base/281044

Log:
  MFC r280870:
  
    Fix --one-file-system to include the directory encountered rather than
    excluding it.  This was broken in 3.0.4 (r238856).
  
  Relnotes:	yes

Modified:
  stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c
==============================================================================
--- stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c	Fri Apr  3 17:54:48 2015	(r281043)
+++ stable/10/contrib/libarchive/libarchive/archive_read_disk_posix.c	Fri Apr  3 18:01:51 2015	(r281044)
@@ -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;