From owner-svn-src-all@FreeBSD.ORG  Tue Dec 20 20:36:01 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 47D45106566B;
	Tue, 20 Dec 2011 20:36:01 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 333598FC1A;
	Tue, 20 Dec 2011 20:36:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBKKa1Ip033985;
	Tue, 20 Dec 2011 20:36:01 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKKa0Bn033983;
	Tue, 20 Dec 2011 20:36:00 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112202036.pBKKa0Bn033983@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 20 Dec 2011 20:36:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228749 - head/usr.bin/tar
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Dec 2011 20:36:01 -0000

Author: mm
Date: Tue Dec 20 20:36:00 2011
New Revision: 228749
URL: http://svn.freebsd.org/changeset/base/228749

Log:
  Sync bsdtar with vendor branch release/2.8:
  
  Revision 3769:
  Merge r3744 from trunk:  Correctly return errors when reading
  an archive using @archive extension.
  
  Obtained from:	http://code.google.com/p/libarchive
  MFC after:	2 weeks

Modified:
  head/usr.bin/tar/write.c

Modified: head/usr.bin/tar/write.c
==============================================================================
--- head/usr.bin/tar/write.c	Tue Dec 20 20:34:02 2011	(r228748)
+++ head/usr.bin/tar/write.c	Tue Dec 20 20:36:00 2011	(r228749)
@@ -592,7 +592,7 @@ append_archive(struct bsdtar *bsdtar, st
 	struct archive_entry *in_entry;
 	int e;
 
-	while (0 == archive_read_next_header(ina, &in_entry)) {
+	while (ARCHIVE_OK == (e = archive_read_next_header(ina, &in_entry))) {
 		if (!new_enough(bsdtar, archive_entry_pathname(in_entry),
 			archive_entry_stat(in_entry)))
 			continue;
@@ -630,8 +630,7 @@ append_archive(struct bsdtar *bsdtar, st
 			fprintf(stderr, "\n");
 	}
 
-	/* Note: If we got here, we saw no write errors, so return success. */
-	return (0);
+	return (e == ARCHIVE_EOF ? ARCHIVE_OK : e);
 }
 
 /* Helper function to copy data between archives. */