From owner-svn-src-all@FreeBSD.ORG  Tue Dec 20 20:37:18 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 2B7821065670;
	Tue, 20 Dec 2011 20:37:18 +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 16CC18FC13;
	Tue, 20 Dec 2011 20:37:18 +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 pBKKbHl7034061;
	Tue, 20 Dec 2011 20:37:17 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBKKbHEi034059;
	Tue, 20 Dec 2011 20:37:17 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201112202037.pBKKbHEi034059@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Tue, 20 Dec 2011 20:37:17 +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: r228750 - head/usr.bin/cpio/test
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:37:18 -0000

Author: mm
Date: Tue Dec 20 20:37:17 2011
New Revision: 228750
URL: http://svn.freebsd.org/changeset/base/228750

Log:
  Sync bsdcpio with vendor branch release/2.8:
  
  Revision 3770:
  Merge r3768 from trunk: Fix typo in dev/ino verification for cpio formats.
  
  Obtained from:	http://code.google.com/p/libarchive
  MFC after:	2 weeks

Modified:
  head/usr.bin/cpio/test/test_option_c.c

Modified: head/usr.bin/cpio/test/test_option_c.c
==============================================================================
--- head/usr.bin/cpio/test/test_option_c.c	Tue Dec 20 20:36:00 2011	(r228749)
+++ head/usr.bin/cpio/test/test_option_c.c	Tue Dec 20 20:37:17 2011	(r228750)
@@ -176,7 +176,7 @@ DEFINE_TEST(test_option_c)
 	assertEqualInt(dev, from_octal(e + 6, 6));
 	/* Ino must be different from first entry. */
 	assert(is_octal(e + 12, 6)); /* ino */
-	assert(dev != from_octal(e + 12, 6));
+	assert(ino != from_octal(e + 12, 6));
 #if defined(_WIN32) && !defined(__CYGWIN__)
 	/* Group members bits and others bits do not work. */
 	assertEqualMem(e + 18, "040777", 6); /* Mode */