ee8a341ef4
If it's not a regular file, don't return any data, even if the size is unknown. Update the Zip test with a hand-tweaked Zip archive that has a directory (with length-at-end set), a regular file without length-at-end set, and a regular file with length-at-end set and a bad CRC. Update the test code to verify that the file size is unset for the regular file with length-at-end. MFC after: 7 days
83 lines
3.3 KiB
C
83 lines
3.3 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$");
|
|
|
|
/*
|
|
* The reference file for this has been manually tweaked so that:
|
|
* * file2 has length-at-end but file1 does not
|
|
* * file2 has an invalid CRC
|
|
*/
|
|
|
|
DEFINE_TEST(test_read_format_zip)
|
|
{
|
|
const char *refname = "test_read_format_zip.zip";
|
|
struct archive_entry *ae;
|
|
struct archive *a;
|
|
char *buff[128];
|
|
const void *pv;
|
|
size_t s;
|
|
off_t o;
|
|
|
|
extract_reference_file(refname);
|
|
assert((a = archive_read_new()) != NULL);
|
|
assertA(0 == archive_read_support_compression_all(a));
|
|
assertA(0 == archive_read_support_format_all(a));
|
|
assertA(0 == archive_read_open_filename(a, refname, 10240));
|
|
assertA(0 == archive_read_next_header(a, &ae));
|
|
assertEqualString("dir/", archive_entry_pathname(ae));
|
|
assertEqualInt(1179604249, archive_entry_mtime(ae));
|
|
assertEqualInt(0, archive_entry_size(ae));
|
|
assertEqualIntA(a, ARCHIVE_EOF,
|
|
archive_read_data_block(a, &pv, &s, &o));
|
|
assertEqualInt(s, 0);
|
|
assertA(0 == archive_read_next_header(a, &ae));
|
|
assertEqualString("file1", archive_entry_pathname(ae));
|
|
assertEqualInt(1179604289, archive_entry_mtime(ae));
|
|
assertEqualInt(18, archive_entry_size(ae));
|
|
failure("archive_read_data() returns number of bytes read");
|
|
assertEqualInt(18, archive_read_data(a, buff, 19));
|
|
assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
|
|
assertA(0 == archive_read_next_header(a, &ae));
|
|
assertEqualString("file2", archive_entry_pathname(ae));
|
|
assertEqualInt(1179605932, archive_entry_mtime(ae));
|
|
failure("file2 has length-at-end, so we shouldn't see a valid size");
|
|
assertEqualInt(0, archive_entry_size_is_set(ae));
|
|
failure("file2 has a bad CRC, so reading to end should fail");
|
|
assertEqualInt(ARCHIVE_WARN, archive_read_data(a, buff, 19));
|
|
assert(0 == memcmp(buff, "hello\nhello\nhello\n", 18));
|
|
assertA(archive_compression(a) == ARCHIVE_COMPRESSION_NONE);
|
|
assertA(archive_format(a) == ARCHIVE_FORMAT_ZIP);
|
|
assert(0 == archive_read_close(a));
|
|
|
|
#if ARCHIVE_VERSION_NUMBER < 2000000
|
|
archive_read_finish(a);
|
|
#else
|
|
assert(0 == archive_read_finish(a));
|
|
#endif
|
|
}
|
|
|
|
|