ee3cdf6b2e
Upstream revision 3645 (merge of 3642):
Change the mechanism handling a rr_moved directory,
which is Rockridge extension that can exceed the limitation of
a maximum directory depth of ISO 9660.
- Stop reading all entries at a time.
- Connect "CL" entry to "RE" entry dynamically, which "CL" and "RE"
have information to rebuild a full directory tree.
- Tweak some related tests since we use Headsort for re-ordering
entries and it cannot make a steady order when the keies of
the entries are the same.
http://code.google.com/p/libarchive/issues/detail?id=168
Reviewed by: kientzle
Approved by: re (kib)
Obtained from: libarchive (release/2.8, svn rev 3645)
MFC after: 3 days
100 lines
3.5 KiB
C
100 lines
3.5 KiB
C
/*-
|
|
* Copyright (c) 2003-2007 Tim Kientzle
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#include "test.h"
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
static void
|
|
test1(void)
|
|
{
|
|
struct archive_entry *ae;
|
|
struct archive *a;
|
|
const char *name = "test_read_format_iso.iso.Z";
|
|
|
|
extract_reference_file(name);
|
|
|
|
assert((a = archive_read_new()) != NULL);
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_compression_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_format_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_open_filename(a, name, 512));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualInt(archive_compression(a),
|
|
ARCHIVE_COMPRESSION_COMPRESS);
|
|
assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
|
|
assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
|
|
}
|
|
|
|
static
|
|
void test2(void)
|
|
{
|
|
struct archive_entry *ae;
|
|
struct archive *a;
|
|
const char *name = "test_read_format_iso_2.iso.Z";
|
|
|
|
extract_reference_file(name);
|
|
|
|
assert((a = archive_read_new()) != NULL);
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_compression_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_support_format_all(a));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_open_filename(a, name, 512));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualString(".", archive_entry_pathname(ae));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualString("A", archive_entry_pathname(ae));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualString("A/B", archive_entry_pathname(ae));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualString("C", archive_entry_pathname(ae));
|
|
assertEqualIntA(a, ARCHIVE_OK,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualString("C/D", archive_entry_pathname(ae));
|
|
assertEqualIntA(a, ARCHIVE_EOF,
|
|
archive_read_next_header(a, &ae));
|
|
assertEqualInt(archive_compression(a),
|
|
ARCHIVE_COMPRESSION_COMPRESS);
|
|
assertEqualInt(archive_format(a), ARCHIVE_FORMAT_ISO9660);
|
|
assertEqualIntA(a, ARCHIVE_OK, archive_read_close(a));
|
|
assertEqualInt(ARCHIVE_OK, archive_read_finish(a));
|
|
}
|
|
|
|
DEFINE_TEST(test_read_format_iso_gz)
|
|
{
|
|
test1();
|
|
test2();
|
|
}
|
|
|
|
|