From owner-svn-src-head@FreeBSD.ORG Sat Mar 7 00:25:33 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CB8A71065673; Sat, 7 Mar 2009 00:25:33 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B7EE68FC13; Sat, 7 Mar 2009 00:25:33 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n270PXQT032943; Sat, 7 Mar 2009 00:25:33 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n270PXVD032938; Sat, 7 Mar 2009 00:25:33 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903070025.n270PXVD032938@svn.freebsd.org> From: Tim Kientzle Date: Sat, 7 Mar 2009 00:25:33 +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: r189464 - in head/lib/libarchive: . test X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Mar 2009 00:25:34 -0000 Author: kientzle Date: Sat Mar 7 00:25:33 2009 New Revision: 189464 URL: http://svn.freebsd.org/changeset/base/189464 Log: Merge r659 from libarchive.googlecode.com: Correctly report "none" as the compression name when no other read filter bid. Add some assertions to various tests to verify that read filters are properly setting the textual name as well as the compression code. Modified: head/lib/libarchive/archive_read.c head/lib/libarchive/test/test_compat_bzip2.c head/lib/libarchive/test/test_compat_gzip.c head/lib/libarchive/test/test_read_format_cpio_bin_Z.c head/lib/libarchive/test/test_read_format_tar.c Modified: head/lib/libarchive/archive_read.c ============================================================================== --- head/lib/libarchive/archive_read.c Fri Mar 6 23:32:45 2009 (r189463) +++ head/lib/libarchive/archive_read.c Sat Mar 7 00:25:33 2009 (r189464) @@ -289,12 +289,10 @@ archive_read_open2(struct archive *_a, v filter->read = client_read_proxy; filter->skip = client_skip_proxy; filter->close = client_close_proxy; + filter->name = "none"; + filter->code = ARCHIVE_COMPRESSION_NONE; a->filter = filter; - /* In case there's no filter. */ - a->archive.compression_code = ARCHIVE_COMPRESSION_NONE; - a->archive.compression_name = "none"; - /* Build out the input pipeline. */ e = build_stream(a); if (e == ARCHIVE_OK) Modified: head/lib/libarchive/test/test_compat_bzip2.c ============================================================================== --- head/lib/libarchive/test/test_compat_bzip2.c Fri Mar 6 23:32:45 2009 (r189463) +++ head/lib/libarchive/test/test_compat_bzip2.c Sat Mar 7 00:25:33 2009 (r189464) @@ -69,6 +69,7 @@ compat_bzip2(const char *name) /* Verify that the format detection worked. */ assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_BZIP2); + assertEqualString(archive_compression_name(a), "bzip2"); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); Modified: head/lib/libarchive/test/test_compat_gzip.c ============================================================================== --- head/lib/libarchive/test/test_compat_gzip.c Fri Mar 6 23:32:45 2009 (r189463) +++ head/lib/libarchive/test/test_compat_gzip.c Sat Mar 7 00:25:33 2009 (r189464) @@ -69,6 +69,7 @@ verify(const char *name) /* Verify that the format detection worked. */ assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_GZIP); + assertEqualString(archive_compression_name(a), "gzip"); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR_USTAR); assertEqualInt(ARCHIVE_OK, archive_read_close(a)); Modified: head/lib/libarchive/test/test_read_format_cpio_bin_Z.c ============================================================================== --- head/lib/libarchive/test/test_read_format_cpio_bin_Z.c Fri Mar 6 23:32:45 2009 (r189463) +++ head/lib/libarchive/test/test_read_format_cpio_bin_Z.c Sat Mar 7 00:25:33 2009 (r189464) @@ -46,6 +46,7 @@ DEFINE_TEST(test_read_format_cpio_bin_Z) failure("archive_compression_name(a)=\"%s\"", archive_compression_name(a)); assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_COMPRESS); + assertEqualString(archive_compression_name(a), "compress (.Z)"); failure("archive_format_name(a)=\"%s\"", archive_format_name(a)); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_CPIO_BIN_LE); Modified: head/lib/libarchive/test/test_read_format_tar.c ============================================================================== --- head/lib/libarchive/test/test_read_format_tar.c Fri Mar 6 23:32:45 2009 (r189463) +++ head/lib/libarchive/test/test_read_format_tar.c Sat Mar 7 00:25:33 2009 (r189464) @@ -71,6 +71,7 @@ static void verifyEmpty(void) assertA(0 == archive_read_open_memory(a, archiveEmpty, 512)); assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); assertEqualInt(archive_compression(a), ARCHIVE_COMPRESSION_NONE); + assertEqualString(archive_compression_name(a), "none"); failure("512 zero bytes should be recognized as a tar archive."); assertEqualInt(archive_format(a), ARCHIVE_FORMAT_TAR);