Deleted Added
full compact
test_compat_zip.c (328828) test_compat_zip.c (358090)
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25#include "test.h"
1/*-
2 * Copyright (c) 2003-2007 Tim Kientzle
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
19 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
20 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
21 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */
25#include "test.h"
26__FBSDID("$FreeBSD: stable/10/contrib/libarchive/libarchive/test/test_compat_zip.c 328828 2018-02-03 02:17:25Z mm $");
26__FBSDID("$FreeBSD: stable/10/contrib/libarchive/libarchive/test/test_compat_zip.c 358090 2020-02-19 01:51:44Z mm $");
27
28/* Copy this function for each test file and adjust it accordingly. */
29DEFINE_TEST(test_compat_zip_1)
30{
31 char name[] = "test_compat_zip_1.zip";
32 struct archive_entry *ae;
33 struct archive *a;
34 int r;

--- 116 unchanged lines hidden (view full) ---

151{
152 const char *refname = "test_compat_zip_4.zip";
153 struct archive_entry *ae;
154 struct archive *a;
155 void *p;
156 size_t s;
157
158 extract_reference_file(refname);
27
28/* Copy this function for each test file and adjust it accordingly. */
29DEFINE_TEST(test_compat_zip_1)
30{
31 char name[] = "test_compat_zip_1.zip";
32 struct archive_entry *ae;
33 struct archive *a;
34 int r;

--- 116 unchanged lines hidden (view full) ---

151{
152 const char *refname = "test_compat_zip_4.zip";
153 struct archive_entry *ae;
154 struct archive *a;
155 void *p;
156 size_t s;
157
158 extract_reference_file(refname);
159 p = slurpfile(&s, refname);
159 p = slurpfile(&s, "%s", refname);
160
161 /* SFX files require seek support. */
162 assert((a = archive_read_new()) != NULL);
163 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
164 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
165 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 18));
166
167 /* First entry. */

--- 41 unchanged lines hidden (view full) ---

209{
210 const char *refname = "test_compat_zip_5.zip";
211 struct archive_entry *ae;
212 struct archive *a;
213 void *p;
214 size_t s;
215
216 extract_reference_file(refname);
160
161 /* SFX files require seek support. */
162 assert((a = archive_read_new()) != NULL);
163 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
164 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
165 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 18));
166
167 /* First entry. */

--- 41 unchanged lines hidden (view full) ---

209{
210 const char *refname = "test_compat_zip_5.zip";
211 struct archive_entry *ae;
212 struct archive *a;
213 void *p;
214 size_t s;
215
216 extract_reference_file(refname);
217 p = slurpfile(&s, refname);
217 p = slurpfile(&s, "%s", refname);
218
219 /* Verify with seek support.
220 * Everything works correctly here. */
221 assert((a = archive_read_new()) != NULL);
222 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
223 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
224 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 18));
225

--- 139 unchanged lines hidden (view full) ---

365DEFINE_TEST(test_compat_zip_6)
366{
367 const char *refname = "test_compat_zip_6.zip";
368 struct archive *a;
369 void *p;
370 size_t s;
371
372 extract_reference_file(refname);
218
219 /* Verify with seek support.
220 * Everything works correctly here. */
221 assert((a = archive_read_new()) != NULL);
222 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
223 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
224 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 18));
225

--- 139 unchanged lines hidden (view full) ---

365DEFINE_TEST(test_compat_zip_6)
366{
367 const char *refname = "test_compat_zip_6.zip";
368 struct archive *a;
369 void *p;
370 size_t s;
371
372 extract_reference_file(refname);
373 p = slurpfile(&s, refname);
373 p = slurpfile(&s, "%s", refname);
374
375 assert((a = archive_read_new()) != NULL);
376 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
377 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
378 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
379 compat_zip_6_verify(a);
380 assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
381

--- 15 unchanged lines hidden (view full) ---

397 const char *refname = "test_compat_zip_7.xps";
398 struct archive *a;
399 struct archive_entry *ae;
400 void *p;
401 size_t s;
402 int i;
403
404 extract_reference_file(refname);
374
375 assert((a = archive_read_new()) != NULL);
376 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a));
377 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a));
378 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7));
379 compat_zip_6_verify(a);
380 assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
381

--- 15 unchanged lines hidden (view full) ---

397 const char *refname = "test_compat_zip_7.xps";
398 struct archive *a;
399 struct archive_entry *ae;
400 void *p;
401 size_t s;
402 int i;
403
404 extract_reference_file(refname);
405 p = slurpfile(&s, refname);
405 p = slurpfile(&s, "%s", refname);
406
407 for (i = 1; i < 1000; ++i) {
408 assert((a = archive_read_new()) != NULL);
409 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
410 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_minimal(a, p, s, i));
411
412 assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
413 assertEqualIntA(a, ARCHIVE_OK, archive_read_data_skip(a));

--- 17 unchanged lines hidden (view full) ---

431{
432 const char *refname = "test_compat_zip_8.zip";
433 struct archive *a;
434 struct archive_entry *ae;
435 void *p;
436 size_t s;
437
438 extract_reference_file(refname);
406
407 for (i = 1; i < 1000; ++i) {
408 assert((a = archive_read_new()) != NULL);
409 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
410 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_minimal(a, p, s, i));
411
412 assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
413 assertEqualIntA(a, ARCHIVE_OK, archive_read_data_skip(a));

--- 17 unchanged lines hidden (view full) ---

431{
432 const char *refname = "test_compat_zip_8.zip";
433 struct archive *a;
434 struct archive_entry *ae;
435 void *p;
436 size_t s;
437
438 extract_reference_file(refname);
439 p = slurpfile(&s, refname);
439 p = slurpfile(&s, "%s", refname);
440
441 assert((a = archive_read_new()) != NULL);
442 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
443 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_minimal(a, p, s, 7));
444
445 assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
446 /* This file is in the archive as arc\test */
447 assertEqualString("arc/test", archive_entry_pathname(ae));
448 assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
449 free(p);
450}
440
441 assert((a = archive_read_new()) != NULL);
442 assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_zip(a));
443 assertEqualIntA(a, ARCHIVE_OK, read_open_memory_minimal(a, p, s, 7));
444
445 assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
446 /* This file is in the archive as arc\test */
447 assertEqualString("arc/test", archive_entry_pathname(ae));
448 assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a));
449 free(p);
450}