|
Line
Link Here
|
| 0 |
-- a/libarchive/archive_write_set_format_7zip.c |
0 |
++ b/libarchive/archive_write_set_format_7zip.c |
|
Lines 1585-1591
file_init_register_empty(struct _7zip *zip)
Link Here
|
| 1585 |
zip->empty_list.last = &(zip->empty_list.first); |
1585 |
zip->empty_list.last = &(zip->empty_list.first); |
| 1586 |
} |
1586 |
} |
| 1587 |
|
1587 |
|
| 1588 |
#if !defined(HAVE_BZLIB_H) || !defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H) |
1588 |
#if !defined(HAVE_ZLIB_H) || !defined(HAVE_BZLIB_H) ||\ |
|
|
1589 |
!defined(BZ_CONFIG_ERROR) || !defined(HAVE_LZMA_H) |
| 1589 |
static int |
1590 |
static int |
| 1590 |
compression_unsupported_encoder(struct archive *a, |
1591 |
compression_unsupported_encoder(struct archive *a, |
| 1591 |
struct la_zstream *lastrm, const char *name) |
1592 |
struct la_zstream *lastrm, const char *name) |
| 1592 |
-- a/libarchive/test/test_write_compress_program.c |
1593 |
++ b/libarchive/test/test_write_compress_program.c |
|
Lines 40-45
DEFINE_TEST(test_write_compress_program)
Link Here
|
| 40 |
skipping("Cannot run 'gzip'"); |
40 |
skipping("Cannot run 'gzip'"); |
| 41 |
return; |
41 |
return; |
| 42 |
} |
42 |
} |
|
|
43 |
/* NOTE: Setting blocksize=1024 will cause gunzip failure because |
| 44 |
* it add extra bytes that gunzip ignores with its warning and |
| 45 |
* exit code 1. So we should set blocksize=1 in order not to |
| 46 |
* yield the extra bytes when using gunzip. */ |
| 47 |
assert((a = archive_read_new()) != NULL); |
| 48 |
r = archive_read_support_filter_gzip(a); |
| 49 |
if (r != ARCHIVE_OK && canGunzip()) |
| 50 |
blocksize = 1; |
| 51 |
assertEqualInt(ARCHIVE_OK, archive_read_free(a)); |
| 43 |
|
52 |
|
| 44 |
/* Create a new archive in memory. */ |
53 |
/* Create a new archive in memory. */ |
| 45 |
/* Write it through an external "gzip" program. */ |
54 |
/* Write it through an external "gzip" program. */ |
