From: Joerg Sonnenberger Date: Tue, 26 May 2009 19:37:20 +0000 (-0400) Subject: Refactor crc32 into a separate file and provide a version that actually X-Git-Tag: v2.8.0~611 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2578566f773deb372b8ffc1cfc8844ae3cfb68e;p=thirdparty%2Flibarchive.git Refactor crc32 into a separate file and provide a version that actually works. SVN-Revision: 1133 --- diff --git a/libarchive/archive_crc32.h b/libarchive/archive_crc32.h new file mode 100644 index 000000000..60570120a --- /dev/null +++ b/libarchive/archive_crc32.h @@ -0,0 +1,60 @@ +/*- + * Copyright (c) 2009 Joerg Sonnenberger + * 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. + */ + +/* + * When zlib is unavailable, we should still be able to validate + * uncompressed zip archives. That requires us to be able to compute + * the CRC32 check value. This is a drop-in compatible replacement + * for crc32() from zlib. It's slower than the zlib implementation, + * but still pretty fast: This runs about 300MB/s on my 3GHz P4 + * compared to about 800MB/s for the zlib implementation. + */ +static unsigned long +crc32(unsigned long crc, const void *_p, size_t len) +{ + unsigned long crc2, b, i; + const unsigned char *p = _p; + static volatile int crc_tbl_inited = 0; + static unsigned long crc_tbl[256]; + + if (!crc_tbl_inited) { + for (b = 0; b < 256; ++b) { + crc2 = b; + for (i = 8; i > 0; --i) { + if (crc2 & 1) + crc2 = (crc2 >> 1) ^ 0xedb88320UL; + else + crc2 = (crc2 >> 1); + } + crc_tbl[b] = crc2; + } + crc_tbl_inited = 1; + } + + crc = crc ^ 0xffffffffUL; + while (len--) + crc = crc_tbl[(crc ^ *p++) & 0xff] ^ (crc >> 8); + return (crc ^ 0xffffffffUL); +} diff --git a/libarchive/archive_read_support_format_zip.c b/libarchive/archive_read_support_format_zip.c index de5e106e0..3201ba55b 100644 --- a/libarchive/archive_read_support_format_zip.c +++ b/libarchive/archive_read_support_format_zip.c @@ -45,41 +45,7 @@ __FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_zip.c,v 1.28 #include "archive_endian.h" #ifndef HAVE_ZLIB_H -/* - * When zlib is unavailable, we should still be able to validate - * uncompressed zip archives. That requires us to be able to compute - * the CRC32 check value. This is a drop-in compatible replacement - * for crc32() from zlib. It's slower than the zlib implementation, - * but still pretty fast: This runs about 300MB/s on my 3GHz P4 - * compared to about 800MB/s for the zlib implementation. - */ -static unsigned long -crc32(unsigned long c, const void *_p, size_t s) -{ - unsigned b, i; - const unsigned char *p = _p; - static volatile int bytecrc_table_inited = 0; - static unsigned long bytecrc_table[256]; - - if (!bytecrc_table_inited) { - for (b = 0; b < 256; ++b) { - c = b; - for (i = 8; i > 0; --i) { - if (c & 1) c = (c >> 1); - else c = (c >> 1) ^ 0xedb88320; - c ^= 0x80000000; - } - bytecrc_table[b] = c; - } - bytecrc_table_inited = 1; - } - - for (; s > 0; --s) { - c ^= *p++; - c = bytecrc_table[c & 0xff] ^ (c >> 8); - } - return (c); -} +#include "archive_crc32.h" #endif struct zip { diff --git a/libarchive/archive_write_set_format_zip.c b/libarchive/archive_write_set_format_zip.c index 144f368dd..e7ea1b25d 100644 --- a/libarchive/archive_write_set_format_zip.c +++ b/libarchive/archive_write_set_format_zip.c @@ -68,6 +68,10 @@ __FBSDID("$FreeBSD$"); #include "archive_private.h" #include "archive_write_private.h" +#ifndef HAVE_ZLIB_H +#include "archive_crc32.h" +#endif + #define ZIP_SIGNATURE_LOCAL_FILE_HEADER 0x04034b50 #define ZIP_SIGNATURE_DATA_DESCRIPTOR 0x08074b50 #define ZIP_SIGNATURE_FILE_HEADER 0x02014b50 @@ -91,9 +95,6 @@ static int archive_write_zip_finish(struct archive_write *); static int archive_write_zip_destroy(struct archive_write *); static int archive_write_zip_finish_entry(struct archive_write *); static int archive_write_zip_header(struct archive_write *, struct archive_entry *); -#ifndef HAVE_ZLIB_H -static unsigned long crc32(unsigned long, const void *, size_t); -#endif static void zip_encode(uint64_t, void *, size_t); static unsigned int dos_time(const time_t); static size_t path_length(struct archive_entry *); @@ -674,41 +675,3 @@ write_path(struct archive_entry *entry, struct archive_write *archive) return written_bytes; } - -#ifndef HAVE_ZLIB_H -/* - * When zlib is unavailable, we should still be able to write - * uncompressed zip archives. That requires us to be able to compute - * the CRC32 check value. This is a drop-in compatible replacement - * for crc32() from zlib. It's slower than the zlib implementation, - * but still pretty fast: This runs about 300MB/s on my 3GHz P4 - * compared to about 800MB/s for the zlib implementation. - */ -static unsigned long -crc32(unsigned long c, const void *_p, size_t s) -{ - unsigned b, i; - const unsigned char *p = _p; - static volatile int bytecrc_table_inited = 0; - static unsigned bytecrc_table[256]; - - if (!bytecrc_table_inited) { - for (b = 0; b < 256; ++b) { - c = b; - for (i = 8; i > 0; --i) { - if (c & 1) c = (c >> 1); - else c = (c >> 1) ^ 0xedb88320; - c ^= 0x80000000; - } - bytecrc_table[b] = c; - } - bytecrc_table_inited = 1; - } - - for (; s > 0; --s) { - c ^= *p++; - c = bytecrc_table[c & 0xff] ^ (c >> 8); - } - return (c); -} -#endif