commit
9e3b33261b
247 changed files with 81159 additions and 0 deletions
@ -0,0 +1,213 @@ |
||||
cmake_minimum_required(VERSION 2.4.4) |
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) |
||||
|
||||
project(zlib C) |
||||
|
||||
set(VERSION "1.2.13") |
||||
|
||||
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") |
||||
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") |
||||
set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers") |
||||
set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages") |
||||
set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_PREFIX}/share/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files") |
||||
|
||||
include(CheckTypeSize) |
||||
include(CheckFunctionExists) |
||||
include(CheckIncludeFile) |
||||
include(CheckCSourceCompiles) |
||||
enable_testing() |
||||
|
||||
check_include_file(sys/types.h HAVE_SYS_TYPES_H) |
||||
check_include_file(stdint.h HAVE_STDINT_H) |
||||
check_include_file(stddef.h HAVE_STDDEF_H) |
||||
|
||||
# |
||||
# Check to see if we have large file support |
||||
# |
||||
set(CMAKE_REQUIRED_DEFINITIONS -D_LARGEFILE64_SOURCE=1) |
||||
# We add these other definitions here because CheckTypeSize.cmake |
||||
# in CMake 2.4.x does not automatically do so and we want |
||||
# compatibility with CMake 2.4.x. |
||||
if(HAVE_SYS_TYPES_H) |
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_SYS_TYPES_H) |
||||
endif() |
||||
if(HAVE_STDINT_H) |
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDINT_H) |
||||
endif() |
||||
if(HAVE_STDDEF_H) |
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS -DHAVE_STDDEF_H) |
||||
endif() |
||||
check_type_size(off64_t OFF64_T) |
||||
if(HAVE_OFF64_T) |
||||
add_definitions(-D_LARGEFILE64_SOURCE=1) |
||||
endif() |
||||
set(CMAKE_REQUIRED_DEFINITIONS) # clear variable |
||||
|
||||
# |
||||
# Check for fseeko |
||||
# |
||||
check_function_exists(fseeko HAVE_FSEEKO) |
||||
if(NOT HAVE_FSEEKO) |
||||
add_definitions(-DNO_FSEEKO) |
||||
endif() |
||||
|
||||
# |
||||
# Check for unistd.h |
||||
# |
||||
check_include_file(unistd.h Z_HAVE_UNISTD_H) |
||||
|
||||
if(MSVC) |
||||
set(CMAKE_DEBUG_POSTFIX "d") |
||||
add_definitions(-D_CRT_SECURE_NO_DEPRECATE) |
||||
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) |
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) |
||||
endif() |
||||
|
||||
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) |
||||
# If we're doing an out of source build and the user has a zconf.h |
||||
# in their source tree... |
||||
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) |
||||
message(STATUS "Renaming") |
||||
message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h") |
||||
message(STATUS "to 'zconf.h.included' because this file is included with zlib") |
||||
message(STATUS "but CMake generates it automatically in the build directory.") |
||||
file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) |
||||
endif() |
||||
endif() |
||||
|
||||
set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) |
||||
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein |
||||
${ZLIB_PC} @ONLY) |
||||
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein |
||||
${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY) |
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) |
||||
|
||||
|
||||
#============================================================================ |
||||
# zlib |
||||
#============================================================================ |
||||
|
||||
set(ZLIB_PUBLIC_HDRS |
||||
${CMAKE_CURRENT_BINARY_DIR}/zconf.h |
||||
zlib.h |
||||
) |
||||
set(ZLIB_PRIVATE_HDRS |
||||
crc32.h |
||||
deflate.h |
||||
gzguts.h |
||||
inffast.h |
||||
inffixed.h |
||||
inflate.h |
||||
inftrees.h |
||||
trees.h |
||||
zutil.h |
||||
) |
||||
set(ZLIB_SRCS |
||||
adler32.c |
||||
compress.c |
||||
crc32.c |
||||
deflate.c |
||||
gzclose.c |
||||
gzlib.c |
||||
gzread.c |
||||
gzwrite.c |
||||
inflate.c |
||||
infback.c |
||||
inftrees.c |
||||
inffast.c |
||||
trees.c |
||||
uncompr.c |
||||
zutil.c |
||||
) |
||||
|
||||
if(NOT MINGW) |
||||
set(ZLIB_DLL_SRCS |
||||
win32/zlib1.rc # If present will override custom build rule below. |
||||
) |
||||
endif() |
||||
|
||||
# parse the full version number from zlib.h and include in ZLIB_FULL_VERSION |
||||
file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) |
||||
string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" |
||||
"\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) |
||||
|
||||
if(MINGW) |
||||
# This gets us DLL resource information when compiling on MinGW. |
||||
if(NOT CMAKE_RC_COMPILER) |
||||
set(CMAKE_RC_COMPILER windres.exe) |
||||
endif() |
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj |
||||
COMMAND ${CMAKE_RC_COMPILER} |
||||
-D GCC_WINDRES |
||||
-I ${CMAKE_CURRENT_SOURCE_DIR} |
||||
-I ${CMAKE_CURRENT_BINARY_DIR} |
||||
-o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj |
||||
-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) |
||||
set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) |
||||
endif(MINGW) |
||||
|
||||
add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) |
||||
add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) |
||||
set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) |
||||
set_target_properties(zlib PROPERTIES SOVERSION 1) |
||||
|
||||
if(NOT CYGWIN) |
||||
# This property causes shared libraries on Linux to have the full version |
||||
# encoded into their final filename. We disable this on Cygwin because |
||||
# it causes cygz-${ZLIB_FULL_VERSION}.dll to be created when cygz.dll |
||||
# seems to be the default. |
||||
# |
||||
# This has no effect with MSVC, on that platform the version info for |
||||
# the DLL comes from the resource file win32/zlib1.rc |
||||
set_target_properties(zlib PROPERTIES VERSION ${ZLIB_FULL_VERSION}) |
||||
endif() |
||||
|
||||
if(UNIX) |
||||
# On unix-like platforms the library is almost always called libz |
||||
set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) |
||||
if(NOT APPLE) |
||||
set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") |
||||
endif() |
||||
elseif(BUILD_SHARED_LIBS AND WIN32) |
||||
# Creates zlib1.dll when building shared library version |
||||
set_target_properties(zlib PROPERTIES SUFFIX "1.dll") |
||||
endif() |
||||
|
||||
if(NOT SKIP_INSTALL_LIBRARIES AND NOT SKIP_INSTALL_ALL ) |
||||
install(TARGETS zlib zlibstatic |
||||
RUNTIME DESTINATION "${INSTALL_BIN_DIR}" |
||||
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" |
||||
LIBRARY DESTINATION "${INSTALL_LIB_DIR}" ) |
||||
endif() |
||||
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) |
||||
install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") |
||||
endif() |
||||
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) |
||||
install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") |
||||
endif() |
||||
if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) |
||||
install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") |
||||
endif() |
||||
|
||||
#============================================================================ |
||||
# Example binaries |
||||
#============================================================================ |
||||
|
||||
add_executable(example test/example.c) |
||||
target_link_libraries(example zlib) |
||||
add_test(example example) |
||||
|
||||
add_executable(minigzip test/minigzip.c) |
||||
target_link_libraries(minigzip zlib) |
||||
|
||||
if(HAVE_OFF64_T) |
||||
add_executable(example64 test/example.c) |
||||
target_link_libraries(example64 zlib) |
||||
set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") |
||||
add_test(example64 example64) |
||||
|
||||
add_executable(minigzip64 test/minigzip.c) |
||||
target_link_libraries(minigzip64 zlib) |
||||
set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") |
||||
endif() |
@ -0,0 +1,368 @@ |
||||
|
||||
Frequently Asked Questions about zlib |
||||
|
||||
|
||||
If your question is not there, please check the zlib home page |
||||
http://zlib.net/ which may have more recent information. |
||||
The lastest zlib FAQ is at http://zlib.net/zlib_faq.html |
||||
|
||||
|
||||
1. Is zlib Y2K-compliant? |
||||
|
||||
Yes. zlib doesn't handle dates. |
||||
|
||||
2. Where can I get a Windows DLL version? |
||||
|
||||
The zlib sources can be compiled without change to produce a DLL. See the |
||||
file win32/DLL_FAQ.txt in the zlib distribution. Pointers to the |
||||
precompiled DLL are found in the zlib web site at http://zlib.net/ . |
||||
|
||||
3. Where can I get a Visual Basic interface to zlib? |
||||
|
||||
See |
||||
* http://marknelson.us/1997/01/01/zlib-engine/ |
||||
* win32/DLL_FAQ.txt in the zlib distribution |
||||
|
||||
4. compress() returns Z_BUF_ERROR. |
||||
|
||||
Make sure that before the call of compress(), the length of the compressed |
||||
buffer is equal to the available size of the compressed buffer and not |
||||
zero. For Visual Basic, check that this parameter is passed by reference |
||||
("as any"), not by value ("as long"). |
||||
|
||||
5. deflate() or inflate() returns Z_BUF_ERROR. |
||||
|
||||
Before making the call, make sure that avail_in and avail_out are not zero. |
||||
When setting the parameter flush equal to Z_FINISH, also make sure that |
||||
avail_out is big enough to allow processing all pending input. Note that a |
||||
Z_BUF_ERROR is not fatal--another call to deflate() or inflate() can be |
||||
made with more input or output space. A Z_BUF_ERROR may in fact be |
||||
unavoidable depending on how the functions are used, since it is not |
||||
possible to tell whether or not there is more output pending when |
||||
strm.avail_out returns with zero. See http://zlib.net/zlib_how.html for a |
||||
heavily annotated example. |
||||
|
||||
6. Where's the zlib documentation (man pages, etc.)? |
||||
|
||||
It's in zlib.h . Examples of zlib usage are in the files test/example.c |
||||
and test/minigzip.c, with more in examples/ . |
||||
|
||||
7. Why don't you use GNU autoconf or libtool or ...? |
||||
|
||||
Because we would like to keep zlib as a very small and simple package. |
||||
zlib is rather portable and doesn't need much configuration. |
||||
|
||||
8. I found a bug in zlib. |
||||
|
||||
Most of the time, such problems are due to an incorrect usage of zlib. |
||||
Please try to reproduce the problem with a small program and send the |
||||
corresponding source to us at zlib@gzip.org . Do not send multi-megabyte |
||||
data files without prior agreement. |
||||
|
||||
9. Why do I get "undefined reference to gzputc"? |
||||
|
||||
If "make test" produces something like |
||||
|
||||
example.o(.text+0x154): undefined reference to `gzputc' |
||||
|
||||
check that you don't have old files libz.* in /usr/lib, /usr/local/lib or |
||||
/usr/X11R6/lib. Remove any old versions, then do "make install". |
||||
|
||||
10. I need a Delphi interface to zlib. |
||||
|
||||
See the contrib/delphi directory in the zlib distribution. |
||||
|
||||
11. Can zlib handle .zip archives? |
||||
|
||||
Not by itself, no. See the directory contrib/minizip in the zlib |
||||
distribution. |
||||
|
||||
12. Can zlib handle .Z files? |
||||
|
||||
No, sorry. You have to spawn an uncompress or gunzip subprocess, or adapt |
||||
the code of uncompress on your own. |
||||
|
||||
13. How can I make a Unix shared library? |
||||
|
||||
By default a shared (and a static) library is built for Unix. So: |
||||
|
||||
make distclean |
||||
./configure |
||||
make |
||||
|
||||
14. How do I install a shared zlib library on Unix? |
||||
|
||||
After the above, then: |
||||
|
||||
make install |
||||
|
||||
However, many flavors of Unix come with a shared zlib already installed. |
||||
Before going to the trouble of compiling a shared version of zlib and |
||||
trying to install it, you may want to check if it's already there! If you |
||||
can #include <zlib.h>, it's there. The -lz option will probably link to |
||||
it. You can check the version at the top of zlib.h or with the |
||||
ZLIB_VERSION symbol defined in zlib.h . |
||||
|
||||
15. I have a question about OttoPDF. |
||||
|
||||
We are not the authors of OttoPDF. The real author is on the OttoPDF web |
||||
site: Joel Hainley, jhainley@myndkryme.com. |
||||
|
||||
16. Can zlib decode Flate data in an Adobe PDF file? |
||||
|
||||
Yes. See http://www.pdflib.com/ . To modify PDF forms, see |
||||
http://sourceforge.net/projects/acroformtool/ . |
||||
|
||||
17. Why am I getting this "register_frame_info not found" error on Solaris? |
||||
|
||||
After installing zlib 1.1.4 on Solaris 2.6, running applications using zlib |
||||
generates an error such as: |
||||
|
||||
ld.so.1: rpm: fatal: relocation error: file /usr/local/lib/libz.so: |
||||
symbol __register_frame_info: referenced symbol not found |
||||
|
||||
The symbol __register_frame_info is not part of zlib, it is generated by |
||||
the C compiler (cc or gcc). You must recompile applications using zlib |
||||
which have this problem. This problem is specific to Solaris. See |
||||
http://www.sunfreeware.com for Solaris versions of zlib and applications |
||||
using zlib. |
||||
|
||||
18. Why does gzip give an error on a file I make with compress/deflate? |
||||
|
||||
The compress and deflate functions produce data in the zlib format, which |
||||
is different and incompatible with the gzip format. The gz* functions in |
||||
zlib on the other hand use the gzip format. Both the zlib and gzip formats |
||||
use the same compressed data format internally, but have different headers |
||||
and trailers around the compressed data. |
||||
|
||||
19. Ok, so why are there two different formats? |
||||
|
||||
The gzip format was designed to retain the directory information about a |
||||
single file, such as the name and last modification date. The zlib format |
||||
on the other hand was designed for in-memory and communication channel |
||||
applications, and has a much more compact header and trailer and uses a |
||||
faster integrity check than gzip. |
||||
|
||||
20. Well that's nice, but how do I make a gzip file in memory? |
||||
|
||||
You can request that deflate write the gzip format instead of the zlib |
||||
format using deflateInit2(). You can also request that inflate decode the |
||||
gzip format using inflateInit2(). Read zlib.h for more details. |
||||
|
||||
21. Is zlib thread-safe? |
||||
|
||||
Yes. However any library routines that zlib uses and any application- |
||||
provided memory allocation routines must also be thread-safe. zlib's gz* |
||||
functions use stdio library routines, and most of zlib's functions use the |
||||
library memory allocation routines by default. zlib's *Init* functions |
||||
allow for the application to provide custom memory allocation routines. |
||||
|
||||
Of course, you should only operate on any given zlib or gzip stream from a |
||||
single thread at a time. |
||||
|
||||
22. Can I use zlib in my commercial application? |
||||
|
||||
Yes. Please read the license in zlib.h. |
||||
|
||||
23. Is zlib under the GNU license? |
||||
|
||||
No. Please read the license in zlib.h. |
||||
|
||||
24. The license says that altered source versions must be "plainly marked". So |
||||
what exactly do I need to do to meet that requirement? |
||||
|
||||
You need to change the ZLIB_VERSION and ZLIB_VERNUM #defines in zlib.h. In |
||||
particular, the final version number needs to be changed to "f", and an |
||||
identification string should be appended to ZLIB_VERSION. Version numbers |
||||
x.x.x.f are reserved for modifications to zlib by others than the zlib |
||||
maintainers. For example, if the version of the base zlib you are altering |
||||
is "1.2.3.4", then in zlib.h you should change ZLIB_VERNUM to 0x123f, and |
||||
ZLIB_VERSION to something like "1.2.3.f-zachary-mods-v3". You can also |
||||
update the version strings in deflate.c and inftrees.c. |
||||
|
||||
For altered source distributions, you should also note the origin and |
||||
nature of the changes in zlib.h, as well as in ChangeLog and README, along |
||||
with the dates of the alterations. The origin should include at least your |
||||
name (or your company's name), and an email address to contact for help or |
||||
issues with the library. |
||||
|
||||
Note that distributing a compiled zlib library along with zlib.h and |
||||
zconf.h is also a source distribution, and so you should change |
||||
ZLIB_VERSION and ZLIB_VERNUM and note the origin and nature of the changes |
||||
in zlib.h as you would for a full source distribution. |
||||
|
||||
25. Will zlib work on a big-endian or little-endian architecture, and can I |
||||
exchange compressed data between them? |
||||
|
||||
Yes and yes. |
||||
|
||||
26. Will zlib work on a 64-bit machine? |
||||
|
||||
Yes. It has been tested on 64-bit machines, and has no dependence on any |
||||
data types being limited to 32-bits in length. If you have any |
||||
difficulties, please provide a complete problem report to zlib@gzip.org |
||||
|
||||
27. Will zlib decompress data from the PKWare Data Compression Library? |
||||
|
||||
No. The PKWare DCL uses a completely different compressed data format than |
||||
does PKZIP and zlib. However, you can look in zlib's contrib/blast |
||||
directory for a possible solution to your problem. |
||||
|
||||
28. Can I access data randomly in a compressed stream? |
||||
|
||||
No, not without some preparation. If when compressing you periodically use |
||||
Z_FULL_FLUSH, carefully write all the pending data at those points, and |
||||
keep an index of those locations, then you can start decompression at those |
||||
points. You have to be careful to not use Z_FULL_FLUSH too often, since it |
||||
can significantly degrade compression. Alternatively, you can scan a |
||||
deflate stream once to generate an index, and then use that index for |
||||
random access. See examples/zran.c . |
||||
|
||||
29. Does zlib work on MVS, OS/390, CICS, etc.? |
||||
|
||||
It has in the past, but we have not heard of any recent evidence. There |
||||
were working ports of zlib 1.1.4 to MVS, but those links no longer work. |
||||
If you know of recent, successful applications of zlib on these operating |
||||
systems, please let us know. Thanks. |
||||
|
||||
30. Is there some simpler, easier to read version of inflate I can look at to |
||||
understand the deflate format? |
||||
|
||||
First off, you should read RFC 1951. Second, yes. Look in zlib's |
||||
contrib/puff directory. |
||||
|
||||
31. Does zlib infringe on any patents? |
||||
|
||||
As far as we know, no. In fact, that was originally the whole point behind |
||||
zlib. Look here for some more information: |
||||
|
||||
http://www.gzip.org/#faq11 |
||||
|
||||
32. Can zlib work with greater than 4 GB of data? |
||||
|
||||
Yes. inflate() and deflate() will process any amount of data correctly. |
||||
Each call of inflate() or deflate() is limited to input and output chunks |
||||
of the maximum value that can be stored in the compiler's "unsigned int" |
||||
type, but there is no limit to the number of chunks. Note however that the |
||||
strm.total_in and strm_total_out counters may be limited to 4 GB. These |
||||
counters are provided as a convenience and are not used internally by |
||||
inflate() or deflate(). The application can easily set up its own counters |
||||
updated after each call of inflate() or deflate() to count beyond 4 GB. |
||||
compress() and uncompress() may be limited to 4 GB, since they operate in a |
||||
single call. gzseek() and gztell() may be limited to 4 GB depending on how |
||||
zlib is compiled. See the zlibCompileFlags() function in zlib.h. |
||||
|
||||
The word "may" appears several times above since there is a 4 GB limit only |
||||
if the compiler's "long" type is 32 bits. If the compiler's "long" type is |
||||
64 bits, then the limit is 16 exabytes. |
||||
|
||||
33. Does zlib have any security vulnerabilities? |
||||
|
||||
The only one that we are aware of is potentially in gzprintf(). If zlib is |
||||
compiled to use sprintf() or vsprintf(), then there is no protection |
||||
against a buffer overflow of an 8K string space (or other value as set by |
||||
gzbuffer()), other than the caller of gzprintf() assuring that the output |
||||
will not exceed 8K. On the other hand, if zlib is compiled to use |
||||
snprintf() or vsnprintf(), which should normally be the case, then there is |
||||
no vulnerability. The ./configure script will display warnings if an |
||||
insecure variation of sprintf() will be used by gzprintf(). Also the |
||||
zlibCompileFlags() function will return information on what variant of |
||||
sprintf() is used by gzprintf(). |
||||
|
||||
If you don't have snprintf() or vsnprintf() and would like one, you can |
||||
find a portable implementation here: |
||||
|
||||
http://www.ijs.si/software/snprintf/ |
||||
|
||||
Note that you should be using the most recent version of zlib. Versions |
||||
1.1.3 and before were subject to a double-free vulnerability, and versions |
||||
1.2.1 and 1.2.2 were subject to an access exception when decompressing |
||||
invalid compressed data. |
||||
|
||||
34. Is there a Java version of zlib? |
||||
|
||||
Probably what you want is to use zlib in Java. zlib is already included |
||||
as part of the Java SDK in the java.util.zip package. If you really want |
||||
a version of zlib written in the Java language, look on the zlib home |
||||
page for links: http://zlib.net/ . |
||||
|
||||
35. I get this or that compiler or source-code scanner warning when I crank it |
||||
up to maximally-pedantic. Can't you guys write proper code? |
||||
|
||||
Many years ago, we gave up attempting to avoid warnings on every compiler |
||||
in the universe. It just got to be a waste of time, and some compilers |
||||
were downright silly as well as contradicted each other. So now, we simply |
||||
make sure that the code always works. |
||||
|
||||
36. Valgrind (or some similar memory access checker) says that deflate is |
||||
performing a conditional jump that depends on an uninitialized value. |
||||
Isn't that a bug? |
||||
|
||||
No. That is intentional for performance reasons, and the output of deflate |
||||
is not affected. This only started showing up recently since zlib 1.2.x |
||||
uses malloc() by default for allocations, whereas earlier versions used |
||||
calloc(), which zeros out the allocated memory. Even though the code was |
||||
correct, versions 1.2.4 and later was changed to not stimulate these |
||||
checkers. |
||||
|
||||
37. Will zlib read the (insert any ancient or arcane format here) compressed |
||||
data format? |
||||
|
||||
Probably not. Look in the comp.compression FAQ for pointers to various |
||||
formats and associated software. |
||||
|
||||
38. How can I encrypt/decrypt zip files with zlib? |
||||
|
||||
zlib doesn't support encryption. The original PKZIP encryption is very |
||||
weak and can be broken with freely available programs. To get strong |
||||
encryption, use GnuPG, http://www.gnupg.org/ , which already includes zlib |
||||
compression. For PKZIP compatible "encryption", look at |
||||
http://www.info-zip.org/ |
||||
|
||||
39. What's the difference between the "gzip" and "deflate" HTTP 1.1 encodings? |
||||
|
||||
"gzip" is the gzip format, and "deflate" is the zlib format. They should |
||||
probably have called the second one "zlib" instead to avoid confusion with |
||||
the raw deflate compressed data format. While the HTTP 1.1 RFC 2616 |
||||
correctly points to the zlib specification in RFC 1950 for the "deflate" |
||||
transfer encoding, there have been reports of servers and browsers that |
||||
incorrectly produce or expect raw deflate data per the deflate |
||||
specification in RFC 1951, most notably Microsoft. So even though the |
||||
"deflate" transfer encoding using the zlib format would be the more |
||||
efficient approach (and in fact exactly what the zlib format was designed |
||||
for), using the "gzip" transfer encoding is probably more reliable due to |
||||
an unfortunate choice of name on the part of the HTTP 1.1 authors. |
||||
|
||||
Bottom line: use the gzip format for HTTP 1.1 encoding. |
||||
|
||||
40. Does zlib support the new "Deflate64" format introduced by PKWare? |
||||
|
||||
No. PKWare has apparently decided to keep that format proprietary, since |
||||
they have not documented it as they have previous compression formats. In |
||||
any case, the compression improvements are so modest compared to other more |
||||
modern approaches, that it's not worth the effort to implement. |
||||
|
||||
41. I'm having a problem with the zip functions in zlib, can you help? |
||||
|
||||
There are no zip functions in zlib. You are probably using minizip by |
||||
Giles Vollant, which is found in the contrib directory of zlib. It is not |
||||
part of zlib. In fact none of the stuff in contrib is part of zlib. The |
||||
files in there are not supported by the zlib authors. You need to contact |
||||
the authors of the respective contribution for help. |
||||
|
||||
42. The match.asm code in contrib is under the GNU General Public License. |
||||
Since it's part of zlib, doesn't that mean that all of zlib falls under the |
||||
GNU GPL? |
||||
|
||||
No. The files in contrib are not part of zlib. They were contributed by |
||||
other authors and are provided as a convenience to the user within the zlib |
||||
distribution. Each item in contrib has its own license. |
||||
|
||||
43. Is zlib subject to export controls? What is its ECCN? |
||||
|
||||
zlib is not subject to export controls, and so is classified as EAR99. |
||||
|
||||
44. Can you please sign these lengthy legal documents and fax them back to us |
||||
so that we can use your software in our product? |
||||
|
||||
No. Go away. Shoo. |
@ -0,0 +1,68 @@ |
||||
CMakeLists.txt cmake build file |
||||
ChangeLog history of changes |
||||
FAQ Frequently Asked Questions about zlib |
||||
INDEX this file |
||||
Makefile dummy Makefile that tells you to ./configure |
||||
Makefile.in template for Unix Makefile |
||||
README guess what |
||||
configure configure script for Unix |
||||
make_vms.com makefile for VMS |
||||
test/example.c zlib usages examples for build testing |
||||
test/minigzip.c minimal gzip-like functionality for build testing |
||||
test/infcover.c inf*.c code coverage for build coverage testing |
||||
treebuild.xml XML description of source file dependencies |
||||
zconf.h.cmakein zconf.h template for cmake |
||||
zconf.h.in zconf.h template for configure |
||||
zlib.3 Man page for zlib |
||||
zlib.3.pdf Man page in PDF format |
||||
zlib.map Linux symbol information |
||||
zlib.pc.in Template for pkg-config descriptor |
||||
zlib.pc.cmakein zlib.pc template for cmake |
||||
zlib2ansi perl script to convert source files for C++ compilation |
||||
|
||||
amiga/ makefiles for Amiga SAS C |
||||
as400/ makefiles for AS/400 |
||||
doc/ documentation for formats and algorithms |
||||
msdos/ makefiles for MSDOS |
||||
nintendods/ makefile for Nintendo DS |
||||
old/ makefiles for various architectures and zlib documentation |
||||
files that have not yet been updated for zlib 1.2.x |
||||
qnx/ makefiles for QNX |
||||
watcom/ makefiles for OpenWatcom |
||||
win32/ makefiles for Windows |
||||
|
||||
zlib public header files (required for library use): |
||||
zconf.h |
||||
zlib.h |
||||
|
||||
private source files used to build the zlib library: |
||||
adler32.c |
||||
compress.c |
||||
crc32.c |
||||
crc32.h |
||||
deflate.c |
||||
deflate.h |
||||
gzclose.c |
||||
gzguts.h |
||||
gzlib.c |
||||
gzread.c |
||||
gzwrite.c |
||||
infback.c |
||||
inffast.c |
||||
inffast.h |
||||
inffixed.h |
||||
inflate.c |
||||
inflate.h |
||||
inftrees.c |
||||
inftrees.h |
||||
trees.c |
||||
trees.h |
||||
uncompr.c |
||||
zutil.c |
||||
zutil.h |
||||
|
||||
source files for sample programs |
||||
See examples/README.examples |
||||
|
||||
unsupported contributions by third parties |
||||
See contrib/README.contrib |
@ -0,0 +1,22 @@ |
||||
Copyright notice: |
||||
|
||||
(C) 1995-2022 Jean-loup Gailly and Mark Adler |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the authors be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
Jean-loup Gailly Mark Adler |
||||
jloup@gzip.org madler@alumni.caltech.edu |
@ -0,0 +1,404 @@ |
||||
# Makefile for zlib
|
||||
# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
|
||||
# For conditions of distribution and use, see copyright notice in zlib.h
|
||||
|
||||
# To compile and test, type:
|
||||
# ./configure; make test
|
||||
# Normally configure builds both a static and a shared library.
|
||||
# If you want to build just a static library, use: ./configure --static
|
||||
|
||||
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
|
||||
# make install
|
||||
# To install in $HOME instead of /usr/local, use:
|
||||
# make install prefix=$HOME
|
||||
|
||||
CC=gcc
|
||||
|
||||
CFLAGS=-O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN
|
||||
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
|
||||
#CFLAGS=-g -DZLIB_DEBUG
|
||||
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
||||
# -Wstrict-prototypes -Wmissing-prototypes
|
||||
|
||||
SFLAGS=-O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN
|
||||
LDFLAGS=
|
||||
TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
|
||||
LDSHARED=gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map
|
||||
CPP=
|
||||
|
||||
STATICLIB=libz.a
|
||||
SHAREDLIB=libz.so
|
||||
SHAREDLIBV=libz.so.1.2.13
|
||||
SHAREDLIBM=libz.so.1
|
||||
LIBS=$(STATICLIB) $(SHAREDLIBV)
|
||||
|
||||
AR=ar
|
||||
ARFLAGS=rc
|
||||
RANLIB=ranlib
|
||||
LDCONFIG=ldconfig
|
||||
LDSHAREDLIBC=-lc
|
||||
TAR=tar
|
||||
SHELL=/bin/sh
|
||||
EXE=
|
||||
|
||||
prefix =/mnt/Storage/Documents/Code/LibraryTest/lib/zlib-1.2.13
|
||||
exec_prefix =${prefix}
|
||||
libdir =${exec_prefix}/lib
|
||||
sharedlibdir =${libdir}
|
||||
includedir =${prefix}/include
|
||||
mandir =${prefix}/share/man
|
||||
man3dir = ${mandir}/man3
|
||||
pkgconfigdir = ${libdir}/pkgconfig
|
||||
SRCDIR=
|
||||
ZINC=
|
||||
ZINCOUT=-I.
|
||||
|
||||
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
|
||||
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
|
||||
OBJC = $(OBJZ) $(OBJG)
|
||||
|
||||
PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
|
||||
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
|
||||
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
|
||||
|
||||
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
|
||||
OBJA =
|
||||
PIC_OBJA =
|
||||
|
||||
OBJS = $(OBJC) $(OBJA)
|
||||
|
||||
PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
|
||||
|
||||
all: static shared all64 |
||||
|
||||
static: example$(EXE) minigzip$(EXE) |
||||
|
||||
shared: examplesh$(EXE) minigzipsh$(EXE) |
||||
|
||||
all64: example64$(EXE) minigzip64$(EXE) |
||||
|
||||
check: test |
||||
|
||||
test: all teststatic testshared test64 |
||||
|
||||
teststatic: static |
||||
@TMPST=tmpst_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
|
||||
echo ' *** zlib test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmpst_$$
|
||||
|
||||
testshared: shared |
||||
@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
|
||||
LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
|
||||
DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
|
||||
SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
|
||||
TMPSH=tmpsh_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
|
||||
echo ' *** zlib shared test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib shared test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmpsh_$$
|
||||
|
||||
test64: all64 |
||||
@TMP64=tmp64_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
|
||||
echo ' *** zlib 64-bit test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib 64-bit test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmp64_$$
|
||||
|
||||
infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
|
||||
|
||||
infcover: infcover.o libz.a |
||||
$(CC) $(CFLAGS) -o $@ infcover.o libz.a
|
||||
|
||||
cover: infcover |
||||
rm -f *.gcda
|
||||
${QEMU_RUN} ./infcover
|
||||
gcov inf*.c
|
||||
|
||||
libz.a: $(OBJS) |
||||
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
||||
|
||||
match.o: match.S |
||||
$(CPP) match.S > _match.s
|
||||
$(CC) -c _match.s
|
||||
mv _match.o match.o
|
||||
rm -f _match.s
|
||||
|
||||
match.lo: match.S |
||||
$(CPP) match.S > _match.s
|
||||
$(CC) -c -fPIC _match.s
|
||||
mv _match.o match.lo
|
||||
rm -f _match.s
|
||||
|
||||
example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
|
||||
|
||||
minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
|
||||
|
||||
example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
|
||||
|
||||
minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
|
||||
|
||||
|
||||
adler32.o: $(SRCDIR)adler32.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
|
||||
|
||||
crc32.o: $(SRCDIR)crc32.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
|
||||
|
||||
deflate.o: $(SRCDIR)deflate.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
|
||||
|
||||
infback.o: $(SRCDIR)infback.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
|
||||
|
||||
inffast.o: $(SRCDIR)inffast.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
|
||||
|
||||
inflate.o: $(SRCDIR)inflate.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
|
||||
|
||||
inftrees.o: $(SRCDIR)inftrees.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
|
||||
|
||||
trees.o: $(SRCDIR)trees.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
|
||||
|
||||
zutil.o: $(SRCDIR)zutil.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
|
||||
|
||||
compress.o: $(SRCDIR)compress.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
|
||||
|
||||
uncompr.o: $(SRCDIR)uncompr.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
|
||||
|
||||
gzclose.o: $(SRCDIR)gzclose.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
|
||||
|
||||
gzlib.o: $(SRCDIR)gzlib.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
|
||||
|
||||
gzread.o: $(SRCDIR)gzread.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
|
||||
|
||||
gzwrite.o: $(SRCDIR)gzwrite.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
|
||||
|
||||
|
||||
adler32.lo: $(SRCDIR)adler32.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
|
||||
-@mv objs/adler32.o $@
|
||||
|
||||
crc32.lo: $(SRCDIR)crc32.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
|
||||
-@mv objs/crc32.o $@
|
||||
|
||||
deflate.lo: $(SRCDIR)deflate.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
|
||||
-@mv objs/deflate.o $@
|
||||
|
||||
infback.lo: $(SRCDIR)infback.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
|
||||
-@mv objs/infback.o $@
|
||||
|
||||
inffast.lo: $(SRCDIR)inffast.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
|
||||
-@mv objs/inffast.o $@
|
||||
|
||||
inflate.lo: $(SRCDIR)inflate.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
|
||||
-@mv objs/inflate.o $@
|
||||
|
||||
inftrees.lo: $(SRCDIR)inftrees.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
|
||||
-@mv objs/inftrees.o $@
|
||||
|
||||
trees.lo: $(SRCDIR)trees.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
|
||||
-@mv objs/trees.o $@
|
||||
|
||||
zutil.lo: $(SRCDIR)zutil.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
|
||||
-@mv objs/zutil.o $@
|
||||
|
||||
compress.lo: $(SRCDIR)compress.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
|
||||
-@mv objs/compress.o $@
|
||||
|
||||
uncompr.lo: $(SRCDIR)uncompr.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
|
||||
-@mv objs/uncompr.o $@
|
||||
|
||||
gzclose.lo: $(SRCDIR)gzclose.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
|
||||
-@mv objs/gzclose.o $@
|
||||
|
||||
gzlib.lo: $(SRCDIR)gzlib.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
|
||||
-@mv objs/gzlib.o $@
|
||||
|
||||
gzread.lo: $(SRCDIR)gzread.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
|
||||
-@mv objs/gzread.o $@
|
||||
|
||||
gzwrite.lo: $(SRCDIR)gzwrite.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
|
||||
-@mv objs/gzwrite.o $@
|
||||
|
||||
|
||||
placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a |
||||
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
|
||||
rm -f $(SHAREDLIB) $(SHAREDLIBM)
|
||||
ln -s $@ $(SHAREDLIB)
|
||||
ln -s $@ $(SHAREDLIBM)
|
||||
-@rmdir objs
|
||||
|
||||
example$(EXE): example.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
|
||||
|
||||
minigzip$(EXE): minigzip.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
|
||||
|
||||
examplesh$(EXE): example.o $(SHAREDLIBV) |
||||
$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
|
||||
|
||||
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) |
||||
$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
|
||||
|
||||
example64$(EXE): example64.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
|
||||
|
||||
minigzip64$(EXE): minigzip64.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
|
||||
|
||||
install-libs: $(LIBS) |
||||
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
|
||||
-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
|
||||
rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
|
||||
cp $(STATICLIB) $(DESTDIR)$(libdir)
|
||||
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
|
||||
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
|
||||
-@if test -n "$(SHAREDLIBV)"; then \
|
||||
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
||||
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
|
||||
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
|
||||
chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
||||
echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
|
||||
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
||||
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
|
||||
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
||||
($(LDCONFIG) || true) >/dev/null 2>&1; \
|
||||
fi
|
||||
rm -f $(DESTDIR)$(man3dir)/zlib.3
|
||||
cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
|
||||
chmod 644 $(DESTDIR)$(man3dir)/zlib.3
|
||||
rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
|
||||
cp zlib.pc $(DESTDIR)$(pkgconfigdir)
|
||||
chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
|
||||
# The ranlib in install is needed on NeXTSTEP which checks file times
|
||||
# ldconfig is for Linux
|
||||
|
||||
install: install-libs |
||||
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
|
||||
rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
|
||||
cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
|
||||
chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
|
||||
|
||||
uninstall: |
||||
cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
|
||||
cd $(DESTDIR)$(libdir) && rm -f libz.a; \
|
||||
if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
|
||||
rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
|
||||
fi
|
||||
cd $(DESTDIR)$(man3dir) && rm -f zlib.3
|
||||
cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
|
||||
|
||||
docs: zlib.3.pdf |
||||
|
||||
zlib.3.pdf: $(SRCDIR)zlib.3 |
||||
groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
|
||||
|
||||
zconf.h.cmakein: $(SRCDIR)zconf.h.in |
||||
-@ TEMPFILE=zconfh_$$; \
|
||||
echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
|
||||
sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
|
||||
touch -r $(SRCDIR)zconf.h.in $@ &&\
|
||||
rm $$TEMPFILE
|
||||
|
||||
zconf: $(SRCDIR)zconf.h.in |
||||
cp -p $(SRCDIR)zconf.h.in zconf.h
|
||||
|
||||
mostlyclean: clean |
||||
clean: |
||||
rm -f *.o *.lo *~ \
|
||||
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
|
||||
example64$(EXE) minigzip64$(EXE) \
|
||||
infcover \
|
||||
libz.* foo.gz so_locations \
|
||||
_match.s maketree contrib/infback9/*.o
|
||||
rm -rf objs
|
||||
rm -f *.gcda *.gcno *.gcov
|
||||
rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
|
||||
|
||||
maintainer-clean: distclean |
||||
distclean: clean zconf zconf.h.cmakein |
||||
rm -f Makefile zlib.pc configure.log
|
||||
-@rm -f .DS_Store
|
||||
@if [ -f Makefile.in ]; then \
|
||||
printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \
|
||||
printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
|
||||
touch -r $(SRCDIR)Makefile.in Makefile ; fi
|
||||
|
||||
tags: |
||||
etags $(SRCDIR)*.[ch]
|
||||
|
||||
adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h |
||||
compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h |
||||
crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h |
||||
deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h |
||||
inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h |
||||
inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h |
||||
trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h |
||||
|
||||
adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h |
||||
compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h |
||||
crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h |
||||
deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h |
||||
inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h |
||||
inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h |
||||
trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h |
@ -0,0 +1,404 @@ |
||||
# Makefile for zlib
|
||||
# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
|
||||
# For conditions of distribution and use, see copyright notice in zlib.h
|
||||
|
||||
# To compile and test, type:
|
||||
# ./configure; make test
|
||||
# Normally configure builds both a static and a shared library.
|
||||
# If you want to build just a static library, use: ./configure --static
|
||||
|
||||
# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
|
||||
# make install
|
||||
# To install in $HOME instead of /usr/local, use:
|
||||
# make install prefix=$HOME
|
||||
|
||||
CC=cc
|
||||
|
||||
CFLAGS=-O
|
||||
#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
|
||||
#CFLAGS=-g -DZLIB_DEBUG
|
||||
#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
|
||||
# -Wstrict-prototypes -Wmissing-prototypes
|
||||
|
||||
SFLAGS=-O
|
||||
LDFLAGS=
|
||||
TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
|
||||
LDSHARED=$(CC)
|
||||
CPP=$(CC) -E
|
||||
|
||||
STATICLIB=libz.a
|
||||
SHAREDLIB=libz.so
|
||||
SHAREDLIBV=libz.so.1.2.13
|
||||
SHAREDLIBM=libz.so.1
|
||||
LIBS=$(STATICLIB) $(SHAREDLIBV)
|
||||
|
||||
AR=ar
|
||||
ARFLAGS=rc
|
||||
RANLIB=ranlib
|
||||
LDCONFIG=ldconfig
|
||||
LDSHAREDLIBC=-lc
|
||||
TAR=tar
|
||||
SHELL=/bin/sh
|
||||
EXE=
|
||||
|
||||
prefix = /usr/local
|
||||
exec_prefix = ${prefix}
|
||||
libdir = ${exec_prefix}/lib
|
||||
sharedlibdir = ${libdir}
|
||||
includedir = ${prefix}/include
|
||||
mandir = ${prefix}/share/man
|
||||
man3dir = ${mandir}/man3
|
||||
pkgconfigdir = ${libdir}/pkgconfig
|
||||
SRCDIR=
|
||||
ZINC=
|
||||
ZINCOUT=-I.
|
||||
|
||||
OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
|
||||
OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
|
||||
OBJC = $(OBJZ) $(OBJG)
|
||||
|
||||
PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
|
||||
PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
|
||||
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG)
|
||||
|
||||
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
|
||||
OBJA =
|
||||
PIC_OBJA =
|
||||
|
||||
OBJS = $(OBJC) $(OBJA)
|
||||
|
||||
PIC_OBJS = $(PIC_OBJC) $(PIC_OBJA)
|
||||
|
||||
all: static shared |
||||
|
||||
static: example$(EXE) minigzip$(EXE) |
||||
|
||||
shared: examplesh$(EXE) minigzipsh$(EXE) |
||||
|
||||
all64: example64$(EXE) minigzip64$(EXE) |
||||
|
||||
check: test |
||||
|
||||
test: all teststatic testshared |
||||
|
||||
teststatic: static |
||||
@TMPST=tmpst_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzip | ${QEMU_RUN} ./minigzip -d && ${QEMU_RUN} ./example $$TMPST ; then \
|
||||
echo ' *** zlib test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmpst_$$
|
||||
|
||||
testshared: shared |
||||
@LD_LIBRARY_PATH=`pwd`:$(LD_LIBRARY_PATH) ; export LD_LIBRARY_PATH; \
|
||||
LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \
|
||||
DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \
|
||||
SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \
|
||||
TMPSH=tmpsh_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzipsh | ${QEMU_RUN} ./minigzipsh -d && ${QEMU_RUN} ./examplesh $$TMPSH; then \
|
||||
echo ' *** zlib shared test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib shared test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmpsh_$$
|
||||
|
||||
test64: all64 |
||||
@TMP64=tmp64_$$; \
|
||||
if echo hello world | ${QEMU_RUN} ./minigzip64 | ${QEMU_RUN} ./minigzip64 -d && ${QEMU_RUN} ./example64 $$TMP64; then \
|
||||
echo ' *** zlib 64-bit test OK ***'; \
|
||||
else \
|
||||
echo ' *** zlib 64-bit test FAILED ***'; false; \
|
||||
fi
|
||||
@rm -f tmp64_$$
|
||||
|
||||
infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
|
||||
|
||||
infcover: infcover.o libz.a |
||||
$(CC) $(CFLAGS) -o $@ infcover.o libz.a
|
||||
|
||||
cover: infcover |
||||
rm -f *.gcda
|
||||
${QEMU_RUN} ./infcover
|
||||
gcov inf*.c
|
||||
|
||||
libz.a: $(OBJS) |
||||
$(AR) $(ARFLAGS) $@ $(OBJS)
|
||||
-@ ($(RANLIB) $@ || true) >/dev/null 2>&1
|
||||
|
||||
match.o: match.S |
||||
$(CPP) match.S > _match.s
|
||||
$(CC) -c _match.s
|
||||
mv _match.o match.o
|
||||
rm -f _match.s
|
||||
|
||||
match.lo: match.S |
||||
$(CPP) match.S > _match.s
|
||||
$(CC) -c -fPIC _match.s
|
||||
mv _match.o match.lo
|
||||
rm -f _match.s
|
||||
|
||||
example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
|
||||
|
||||
minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
|
||||
|
||||
example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
|
||||
|
||||
minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h |
||||
$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
|
||||
|
||||
|
||||
adler32.o: $(SRCDIR)adler32.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
|
||||
|
||||
crc32.o: $(SRCDIR)crc32.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
|
||||
|
||||
deflate.o: $(SRCDIR)deflate.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
|
||||
|
||||
infback.o: $(SRCDIR)infback.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
|
||||
|
||||
inffast.o: $(SRCDIR)inffast.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
|
||||
|
||||
inflate.o: $(SRCDIR)inflate.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
|
||||
|
||||
inftrees.o: $(SRCDIR)inftrees.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
|
||||
|
||||
trees.o: $(SRCDIR)trees.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
|
||||
|
||||
zutil.o: $(SRCDIR)zutil.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
|
||||
|
||||
compress.o: $(SRCDIR)compress.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
|
||||
|
||||
uncompr.o: $(SRCDIR)uncompr.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
|
||||
|
||||
gzclose.o: $(SRCDIR)gzclose.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
|
||||
|
||||
gzlib.o: $(SRCDIR)gzlib.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
|
||||
|
||||
gzread.o: $(SRCDIR)gzread.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
|
||||
|
||||
gzwrite.o: $(SRCDIR)gzwrite.c |
||||
$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
|
||||
|
||||
|
||||
adler32.lo: $(SRCDIR)adler32.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
|
||||
-@mv objs/adler32.o $@
|
||||
|
||||
crc32.lo: $(SRCDIR)crc32.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
|
||||
-@mv objs/crc32.o $@
|
||||
|
||||
deflate.lo: $(SRCDIR)deflate.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
|
||||
-@mv objs/deflate.o $@
|
||||
|
||||
infback.lo: $(SRCDIR)infback.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
|
||||
-@mv objs/infback.o $@
|
||||
|
||||
inffast.lo: $(SRCDIR)inffast.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
|
||||
-@mv objs/inffast.o $@
|
||||
|
||||
inflate.lo: $(SRCDIR)inflate.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
|
||||
-@mv objs/inflate.o $@
|
||||
|
||||
inftrees.lo: $(SRCDIR)inftrees.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
|
||||
-@mv objs/inftrees.o $@
|
||||
|
||||
trees.lo: $(SRCDIR)trees.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
|
||||
-@mv objs/trees.o $@
|
||||
|
||||
zutil.lo: $(SRCDIR)zutil.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
|
||||
-@mv objs/zutil.o $@
|
||||
|
||||
compress.lo: $(SRCDIR)compress.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
|
||||
-@mv objs/compress.o $@
|
||||
|
||||
uncompr.lo: $(SRCDIR)uncompr.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
|
||||
-@mv objs/uncompr.o $@
|
||||
|
||||
gzclose.lo: $(SRCDIR)gzclose.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
|
||||
-@mv objs/gzclose.o $@
|
||||
|
||||
gzlib.lo: $(SRCDIR)gzlib.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
|
||||
-@mv objs/gzlib.o $@
|
||||
|
||||
gzread.lo: $(SRCDIR)gzread.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
|
||||
-@mv objs/gzread.o $@
|
||||
|
||||
gzwrite.lo: $(SRCDIR)gzwrite.c |
||||
-@mkdir objs 2>/dev/null || test -d objs
|
||||
$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
|
||||
-@mv objs/gzwrite.o $@
|
||||
|
||||
|
||||
placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a |
||||
$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
|
||||
rm -f $(SHAREDLIB) $(SHAREDLIBM)
|
||||
ln -s $@ $(SHAREDLIB)
|
||||
ln -s $@ $(SHAREDLIBM)
|
||||
-@rmdir objs
|
||||
|
||||
example$(EXE): example.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
|
||||
|
||||
minigzip$(EXE): minigzip.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
|
||||
|
||||
examplesh$(EXE): example.o $(SHAREDLIBV) |
||||
$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
|
||||
|
||||
minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) |
||||
$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
|
||||
|
||||
example64$(EXE): example64.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
|
||||
|
||||
minigzip64$(EXE): minigzip64.o $(STATICLIB) |
||||
$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
|
||||
|
||||
install-libs: $(LIBS) |
||||
-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
|
||||
-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(man3dir) ]; then mkdir -p $(DESTDIR)$(man3dir); fi
|
||||
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
|
||||
rm -f $(DESTDIR)$(libdir)/$(STATICLIB)
|
||||
cp $(STATICLIB) $(DESTDIR)$(libdir)
|
||||
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
|
||||
-@($(RANLIB) $(DESTDIR)$(libdir)/libz.a || true) >/dev/null 2>&1
|
||||
-@if test -n "$(SHAREDLIBV)"; then \
|
||||
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
||||
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
|
||||
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
|
||||
chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
|
||||
echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
|
||||
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
||||
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
|
||||
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
|
||||
($(LDCONFIG) || true) >/dev/null 2>&1; \
|
||||
fi
|
||||
rm -f $(DESTDIR)$(man3dir)/zlib.3
|
||||
cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
|
||||
chmod 644 $(DESTDIR)$(man3dir)/zlib.3
|
||||
rm -f $(DESTDIR)$(pkgconfigdir)/zlib.pc
|
||||
cp zlib.pc $(DESTDIR)$(pkgconfigdir)
|
||||
chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
|
||||
# The ranlib in install is needed on NeXTSTEP which checks file times
|
||||
# ldconfig is for Linux
|
||||
|
||||
install: install-libs |
||||
-@if [ ! -d $(DESTDIR)$(includedir) ]; then mkdir -p $(DESTDIR)$(includedir); fi
|
||||
rm -f $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
|
||||
cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
|
||||
chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
|
||||
|
||||
uninstall: |
||||
cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
|
||||
cd $(DESTDIR)$(libdir) && rm -f libz.a; \
|
||||
if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
|
||||
rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
|
||||
fi
|
||||
cd $(DESTDIR)$(man3dir) && rm -f zlib.3
|
||||
cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
|
||||
|
||||
docs: zlib.3.pdf |
||||
|
||||
zlib.3.pdf: $(SRCDIR)zlib.3 |
||||
groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
|
||||
|
||||
zconf.h.cmakein: $(SRCDIR)zconf.h.in |
||||
-@ TEMPFILE=zconfh_$$; \
|
||||
echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
|
||||
sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
|
||||
touch -r $(SRCDIR)zconf.h.in $@ &&\
|
||||
rm $$TEMPFILE
|
||||
|
||||
zconf: $(SRCDIR)zconf.h.in |
||||
cp -p $(SRCDIR)zconf.h.in zconf.h
|
||||
|
||||
mostlyclean: clean |
||||
clean: |
||||
rm -f *.o *.lo *~ \
|
||||
example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
|
||||
example64$(EXE) minigzip64$(EXE) \
|
||||
infcover \
|
||||
libz.* foo.gz so_locations \
|
||||
_match.s maketree contrib/infback9/*.o
|
||||
rm -rf objs
|
||||
rm -f *.gcda *.gcno *.gcov
|
||||
rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
|
||||
|
||||
maintainer-clean: distclean |
||||
distclean: clean zconf zconf.h.cmakein |
||||
rm -f Makefile zlib.pc configure.log
|
||||
-@rm -f .DS_Store
|
||||
@if [ -f Makefile.in ]; then \
|
||||
printf 'all:\n\t-@echo "Please use ./configure first. Thank you."\n' > Makefile ; \
|
||||
printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
|
||||
touch -r $(SRCDIR)Makefile.in Makefile ; fi
|
||||
|
||||
tags: |
||||
etags $(SRCDIR)*.[ch]
|
||||
|
||||
adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h |
||||
compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h |
||||
crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h |
||||
deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h |
||||
inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h |
||||
inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h |
||||
trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h |
||||
|
||||
adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h |
||||
compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h |
||||
crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h |
||||
deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h |
||||
infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h |
||||
inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h |
||||
inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h |
||||
trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h |
@ -0,0 +1,118 @@ |
||||
ZLIB DATA COMPRESSION LIBRARY |
||||
|
||||
zlib 1.2.13 is a general purpose data compression library. All the code is |
||||
thread safe. The data format used by the zlib library is described by RFCs |
||||
(Request for Comments) 1950 to 1952 in the files |
||||
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and |
||||
rfc1952 (gzip format). |
||||
|
||||
All functions of the compression library are documented in the file zlib.h |
||||
(volunteer to write man pages welcome, contact zlib@gzip.org). A usage example |
||||
of the library is given in the file test/example.c which also tests that |
||||
the library is working correctly. Another example is given in the file |
||||
test/minigzip.c. The compression library itself is composed of all source |
||||
files in the root directory. |
||||
|
||||
To compile all files and run the test program, follow the instructions given at |
||||
the top of Makefile.in. In short "./configure; make test", and if that goes |
||||
well, "make install" should work for most flavors of Unix. For Windows, use |
||||
one of the special makefiles in win32/ or contrib/vstudio/ . For VMS, use |
||||
make_vms.com. |
||||
|
||||
Questions about zlib should be sent to <zlib@gzip.org>, or to Gilles Vollant |
||||
<info@winimage.com> for the Windows DLL version. The zlib home page is |
||||
http://zlib.net/ . Before reporting a problem, please check this site to |
||||
verify that you have the latest version of zlib; otherwise get the latest |
||||
version and check whether the problem still exists or not. |
||||
|
||||
PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help. |
||||
|
||||
Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997 |
||||
issue of Dr. Dobb's Journal; a copy of the article is available at |
||||
http://marknelson.us/1997/01/01/zlib-engine/ . |
||||
|
||||
The changes made in version 1.2.13 are documented in the file ChangeLog. |
||||
|
||||
Unsupported third party contributions are provided in directory contrib/ . |
||||
|
||||
zlib is available in Java using the java.util.zip package, documented at |
||||
http://java.sun.com/developer/technicalArticles/Programming/compression/ . |
||||
|
||||
A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available |
||||
at CPAN (Comprehensive Perl Archive Network) sites, including |
||||
http://search.cpan.org/~pmqs/IO-Compress-Zlib/ . |
||||
|
||||
A Python interface to zlib written by A.M. Kuchling <amk@amk.ca> is |
||||
available in Python 1.5 and later versions, see |
||||
http://docs.python.org/library/zlib.html . |
||||
|
||||
zlib is built into tcl: http://wiki.tcl.tk/4610 . |
||||
|
||||
An experimental package to read and write files in .zip format, written on top |
||||
of zlib by Gilles Vollant <info@winimage.com>, is available in the |
||||
contrib/minizip directory of zlib. |
||||
|
||||
|
||||
Notes for some targets: |
||||
|
||||
- For Windows DLL versions, please see win32/DLL_FAQ.txt |
||||
|
||||
- For 64-bit Irix, deflate.c must be compiled without any optimization. With |
||||
-O, one libpng test fails. The test works in 32 bit mode (with the -n32 |
||||
compiler flag). The compiler bug has been reported to SGI. |
||||
|
||||
- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1 it works |
||||
when compiled with cc. |
||||
|
||||
- On Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1 is |
||||
necessary to get gzprintf working correctly. This is done by configure. |
||||
|
||||
- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works with |
||||
other compilers. Use "make test" to check your compiler. |
||||
|
||||
- gzdopen is not supported on RISCOS or BEOS. |
||||
|
||||
- For PalmOs, see http://palmzlib.sourceforge.net/ |
||||
|
||||
|
||||
Acknowledgments: |
||||
|
||||
The deflate format used by zlib was defined by Phil Katz. The deflate and |
||||
zlib specifications were written by L. Peter Deutsch. Thanks to all the |
||||
people who reported problems and suggested various improvements in zlib; they |
||||
are too numerous to cite here. |
||||
|
||||
Copyright notice: |
||||
|
||||
(C) 1995-2022 Jean-loup Gailly and Mark Adler |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the authors be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
Jean-loup Gailly Mark Adler |
||||
jloup@gzip.org madler@alumni.caltech.edu |
||||
|
||||
If you use the zlib library in a product, we would appreciate *not* receiving |
||||
lengthy legal documents to sign. The sources are provided for free but without |
||||
warranty of any kind. The library has been entirely written by Jean-loup |
||||
Gailly and Mark Adler; it does not include third-party code. We make all |
||||
contributions to and distributions of this project solely in our personal |
||||
capacity, and are not conveying any rights to any intellectual property of |
||||
any third parties. |
||||
|
||||
If you redistribute modified sources, we would appreciate that you include in |
||||
the file ChangeLog history information documenting your changes. Please read |
||||
the FAQ for more information on the distribution of modified source versions. |
@ -0,0 +1,13 @@ |
||||
#!/usr/bin/env bash |
||||
|
||||
if [ -z "$1" ] |
||||
then |
||||
printf "Usage: setup.sh install_directory [dependencies].\n" |
||||
exit |
||||
fi |
||||
|
||||
cd $(dirname $0) |
||||
libname=$(basename $(pwd)) |
||||
./configure --prefix="$1" |
||||
make check -j8 |
||||
make install |
@ -0,0 +1,186 @@ |
||||
/* adler32.c -- compute the Adler-32 checksum of a data stream
|
||||
* Copyright (C) 1995-2011, 2016 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
/* @(#) $Id$ */ |
||||
|
||||
#include "zutil.h" |
||||
|
||||
local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); |
||||
|
||||
#define BASE 65521U /* largest prime smaller than 65536 */ |
||||
#define NMAX 5552 |
||||
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ |
||||
|
||||
#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} |
||||
#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); |
||||
#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); |
||||
#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); |
||||
#define DO16(buf) DO8(buf,0); DO8(buf,8); |
||||
|
||||
/* use NO_DIVIDE if your processor does not do division in hardware --
|
||||
try it both ways to see which is faster */ |
||||
#ifdef NO_DIVIDE |
||||
/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
|
||||
(thank you to John Reiser for pointing this out) */ |
||||
# define CHOP(a) \ |
||||
do { \
|
||||
unsigned long tmp = a >> 16; \
|
||||
a &= 0xffffUL; \
|
||||
a += (tmp << 4) - tmp; \
|
||||
} while (0) |
||||
# define MOD28(a) \ |
||||
do { \
|
||||
CHOP(a); \
|
||||
if (a >= BASE) a -= BASE; \
|
||||
} while (0) |
||||
# define MOD(a) \ |
||||
do { \
|
||||
CHOP(a); \
|
||||
MOD28(a); \
|
||||
} while (0) |
||||
# define MOD63(a) \ |
||||
do { /* this assumes a is not negative */ \
|
||||
z_off64_t tmp = a >> 32; \
|
||||
a &= 0xffffffffL; \
|
||||
a += (tmp << 8) - (tmp << 5) + tmp; \
|
||||
tmp = a >> 16; \
|
||||
a &= 0xffffL; \
|
||||
a += (tmp << 4) - tmp; \
|
||||
tmp = a >> 16; \
|
||||
a &= 0xffffL; \
|
||||
a += (tmp << 4) - tmp; \
|
||||
if (a >= BASE) a -= BASE; \
|
||||
} while (0) |
||||
#else |
||||
# define MOD(a) a %= BASE |
||||
# define MOD28(a) a %= BASE |
||||
# define MOD63(a) a %= BASE |
||||
#endif |
||||
|
||||
/* ========================================================================= */ |
||||
uLong ZEXPORT adler32_z(adler, buf, len) |
||||
uLong adler; |
||||
const Bytef *buf; |
||||
z_size_t len; |
||||
{ |
||||
unsigned long sum2; |
||||
unsigned n; |
||||
|
||||
/* split Adler-32 into component sums */ |
||||
sum2 = (adler >> 16) & 0xffff; |
||||
adler &= 0xffff; |
||||
|
||||
/* in case user likes doing a byte at a time, keep it fast */ |
||||
if (len == 1) { |
||||
adler += buf[0]; |
||||
if (adler >= BASE) |
||||
adler -= BASE; |
||||
sum2 += adler; |
||||
if (sum2 >= BASE) |
||||
sum2 -= BASE; |
||||
return adler | (sum2 << 16); |
||||
} |
||||
|
||||
/* initial Adler-32 value (deferred check for len == 1 speed) */ |
||||
if (buf == Z_NULL) |
||||
return 1L; |
||||
|
||||
/* in case short lengths are provided, keep it somewhat fast */ |
||||
if (len < 16) { |
||||
while (len--) { |
||||
adler += *buf++; |
||||
sum2 += adler; |
||||
} |
||||
if (adler >= BASE) |
||||
adler -= BASE; |
||||
MOD28(sum2); /* only added so many BASE's */ |
||||
return adler | (sum2 << 16); |
||||
} |
||||
|
||||
/* do length NMAX blocks -- requires just one modulo operation */ |
||||
while (len >= NMAX) { |
||||
len -= NMAX; |
||||
n = NMAX / 16; /* NMAX is divisible by 16 */ |
||||
do { |
||||
DO16(buf); /* 16 sums unrolled */ |
||||
buf += 16; |
||||
} while (--n); |
||||
MOD(adler); |
||||
MOD(sum2); |
||||
} |
||||
|
||||
/* do remaining bytes (less than NMAX, still just one modulo) */ |
||||
if (len) { /* avoid modulos if none remaining */ |
||||
while (len >= 16) { |
||||
len -= 16; |
||||
DO16(buf); |
||||
buf += 16; |
||||
} |
||||
while (len--) { |
||||
adler += *buf++; |
||||
sum2 += adler; |
||||
} |
||||
MOD(adler); |
||||
MOD(sum2); |
||||
} |
||||
|
||||
/* return recombined sums */ |
||||
return adler | (sum2 << 16); |
||||
} |
||||
|
||||
/* ========================================================================= */ |
||||
uLong ZEXPORT adler32(adler, buf, len) |
||||
uLong adler; |
||||
const Bytef *buf; |
||||
uInt len; |
||||
{ |
||||
return adler32_z(adler, buf, len); |
||||
} |
||||
|
||||
/* ========================================================================= */ |
||||
local uLong adler32_combine_(adler1, adler2, len2) |
||||
uLong adler1; |
||||
uLong adler2; |
||||
z_off64_t len2; |
||||
{ |
||||
unsigned long sum1; |
||||
unsigned long sum2; |
||||
unsigned rem; |
||||
|
||||
/* for negative len, return invalid adler32 as a clue for debugging */ |
||||
if (len2 < 0) |
||||
return 0xffffffffUL; |
||||
|
||||
/* the derivation of this formula is left as an exercise for the reader */ |
||||
MOD63(len2); /* assumes len2 >= 0 */ |
||||
rem = (unsigned)len2; |
||||
sum1 = adler1 & 0xffff; |
||||
sum2 = rem * sum1; |
||||
MOD(sum2); |
||||
sum1 += (adler2 & 0xffff) + BASE - 1; |
||||
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; |
||||
if (sum1 >= BASE) sum1 -= BASE; |
||||
if (sum1 >= BASE) sum1 -= BASE; |
||||
if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); |
||||
if (sum2 >= BASE) sum2 -= BASE; |
||||
return sum1 | (sum2 << 16); |
||||
} |
||||
|
||||
/* ========================================================================= */ |
||||
uLong ZEXPORT adler32_combine(adler1, adler2, len2) |
||||
uLong adler1; |
||||
uLong adler2; |
||||
z_off_t len2; |
||||
{ |
||||
return adler32_combine_(adler1, adler2, len2); |
||||
} |
||||
|
||||
uLong ZEXPORT adler32_combine64(adler1, adler2, len2) |
||||
uLong adler1; |
||||
uLong adler2; |
||||
z_off64_t len2; |
||||
{ |
||||
return adler32_combine_(adler1, adler2, len2); |
||||
} |
@ -0,0 +1,69 @@ |
||||
# Amiga powerUP (TM) Makefile
|
||||
# makefile for libpng and SAS C V6.58/7.00 PPC compiler
|
||||
# Copyright (C) 1998 by Andreas R. Kleinert
|
||||
|
||||
LIBNAME = libzip.a
|
||||
|
||||
CC = scppc
|
||||
CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL \
|
||||
OPTLOOP OPTRDEP=8 OPTDEP=8 OPTCOMP=8 NOVER
|
||||
AR = ppc-amigaos-ar cr
|
||||
RANLIB = ppc-amigaos-ranlib
|
||||
LD = ppc-amigaos-ld -r
|
||||
LDFLAGS = -o
|
||||
LDLIBS = LIB:scppc.a LIB:end.o
|
||||
RM = delete quiet
|
||||
|
||||
OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
|
||||
uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
|
||||
|
||||
TEST_OBJS = example.o minigzip.o
|
||||
|
||||
all: example minigzip |
||||
|
||||
check: test |
||||
test: all |
||||
example
|
||||
echo hello world | minigzip | minigzip -d
|
||||
|
||||
$(LIBNAME): $(OBJS) |
||||
$(AR) $@ $(OBJS)
|
||||
-$(RANLIB) $@
|
||||
|
||||
example: example.o $(LIBNAME) |
||||
$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
|
||||
|
||||
minigzip: minigzip.o $(LIBNAME) |
||||
$(LD) $(LDFLAGS) $@ LIB:c_ppc.o $@.o $(LIBNAME) $(LDLIBS)
|
||||
|
||||
mostlyclean: clean |
||||
clean: |
||||
$(RM) *.o example minigzip $(LIBNAME) foo.gz
|
||||
|
||||
zip: |
||||
zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
|
||||
descrip.mms *.[ch]
|
||||
|
||||
tgz: |
||||
cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
|
||||
zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
|
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
adler32.o: zlib.h zconf.h |
||||
compress.o: zlib.h zconf.h |
||||
crc32.o: crc32.h zlib.h zconf.h |
||||
deflate.o: deflate.h zutil.h zlib.h zconf.h |
||||
example.o: zlib.h zconf.h |
||||
gzclose.o: zlib.h zconf.h gzguts.h |
||||
gzlib.o: zlib.h zconf.h gzguts.h |
||||
gzread.o: zlib.h zconf.h gzguts.h |
||||
gzwrite.o: zlib.h zconf.h gzguts.h |
||||
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
inftrees.o: zutil.h zlib.h zconf.h inftrees.h |
||||
minigzip.o: zlib.h zconf.h |
||||
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h |
||||
uncompr.o: zlib.h zconf.h |
||||
zutil.o: zutil.h zlib.h zconf.h |
@ -0,0 +1,68 @@ |
||||
# SMakefile for zlib
|
||||
# Modified from the standard UNIX Makefile Copyright Jean-loup Gailly
|
||||
# Osma Ahvenlampi <Osma.Ahvenlampi@hut.fi>
|
||||
# Amiga, SAS/C 6.56 & Smake
|
||||
|
||||
CC=sc
|
||||
CFLAGS=OPT
|
||||
#CFLAGS=OPT CPU=68030
|
||||
#CFLAGS=DEBUG=LINE
|
||||
LDFLAGS=LIB z.lib
|
||||
|
||||
SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
|
||||
NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
|
||||
DEF=POSTINC
|
||||
|
||||
OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
|
||||
uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
|
||||
|
||||
TEST_OBJS = example.o minigzip.o
|
||||
|
||||
all: SCOPTIONS example minigzip |
||||
|
||||
check: test |
||||
test: all |
||||
example
|
||||
echo hello world | minigzip | minigzip -d
|
||||
|
||||
install: z.lib |
||||
copy clone zlib.h zconf.h INCLUDE:
|
||||
copy clone z.lib LIB:
|
||||
|
||||
z.lib: $(OBJS) |
||||
oml z.lib r $(OBJS)
|
||||
|
||||
example: example.o z.lib |
||||
$(CC) $(CFLAGS) LINK TO $@ example.o $(LDFLAGS)
|
||||
|
||||
minigzip: minigzip.o z.lib |
||||
$(CC) $(CFLAGS) LINK TO $@ minigzip.o $(LDFLAGS)
|
||||
|
||||
mostlyclean: clean |
||||
clean: |
||||
-delete force quiet example minigzip *.o z.lib foo.gz *.lnk SCOPTIONS
|
||||
|
||||
SCOPTIONS: Makefile.sas |
||||
copy to $@ <from <
|
||||
$(SCOPTIONS) |
||||
< |
||||
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
adler32.o: zlib.h zconf.h |
||||
compress.o: zlib.h zconf.h |
||||
crc32.o: crc32.h zlib.h zconf.h |
||||
deflate.o: deflate.h zutil.h zlib.h zconf.h |
||||
example.o: zlib.h zconf.h |
||||
gzclose.o: zlib.h zconf.h gzguts.h |
||||
gzlib.o: zlib.h zconf.h gzguts.h |
||||
gzread.o: zlib.h zconf.h gzguts.h |
||||
gzwrite.o: zlib.h zconf.h gzguts.h |
||||
inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
||||
inftrees.o: zutil.h zlib.h zconf.h inftrees.h |
||||
minigzip.o: zlib.h zconf.h |
||||
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h |
||||
uncompr.o: zlib.h zconf.h |
||||
zutil.o: zutil.h zlib.h zconf.h |
@ -0,0 +1,86 @@ |
||||
/* compress.c -- compress a memory buffer
|
||||
* Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
/* @(#) $Id$ */ |
||||
|
||||
#define ZLIB_INTERNAL |
||||
#include "zlib.h" |
||||
|
||||
/* ===========================================================================
|
||||
Compresses the source buffer into the destination buffer. The level |
||||
parameter has the same meaning as in deflateInit. sourceLen is the byte |
||||
length of the source buffer. Upon entry, destLen is the total size of the |
||||
destination buffer, which must be at least 0.1% larger than sourceLen plus |
||||
12 bytes. Upon exit, destLen is the actual size of the compressed buffer. |
||||
|
||||
compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough |
||||
memory, Z_BUF_ERROR if there was not enough room in the output buffer, |
||||
Z_STREAM_ERROR if the level parameter is invalid. |
||||
*/ |
||||
int ZEXPORT compress2(dest, destLen, source, sourceLen, level) |
||||
Bytef *dest; |
||||
uLongf *destLen; |
||||
const Bytef *source; |
||||
uLong sourceLen; |
||||
int level; |
||||
{ |
||||
z_stream stream; |
||||
int err; |
||||
const uInt max = (uInt)-1; |
||||
uLong left; |
||||
|
||||
left = *destLen; |
||||
*destLen = 0; |
||||
|
||||
stream.zalloc = (alloc_func)0; |
||||
stream.zfree = (free_func)0; |
||||
stream.opaque = (voidpf)0; |
||||
|
||||
err = deflateInit(&stream, level); |
||||
if (err != Z_OK) return err; |
||||
|
||||
stream.next_out = dest; |
||||
stream.avail_out = 0; |
||||
stream.next_in = (z_const Bytef *)source; |
||||
stream.avail_in = 0; |
||||
|
||||
do { |
||||
if (stream.avail_out == 0) { |
||||
stream.avail_out = left > (uLong)max ? max : (uInt)left; |
||||
left -= stream.avail_out; |
||||
} |
||||
if (stream.avail_in == 0) { |
||||
stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen; |
||||
sourceLen -= stream.avail_in; |
||||
} |
||||
err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH); |
||||
} while (err == Z_OK); |
||||
|
||||
*destLen = stream.total_out; |
||||
deflateEnd(&stream); |
||||
return err == Z_STREAM_END ? Z_OK : err; |
||||
} |
||||
|
||||
/* ===========================================================================
|
||||
*/ |
||||
int ZEXPORT compress(dest, destLen, source, sourceLen) |
||||
Bytef *dest; |
||||
uLongf *destLen; |
||||
const Bytef *source; |
||||
uLong sourceLen; |
||||
{ |
||||
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); |
||||
} |
||||
|
||||
/* ===========================================================================
|
||||
If the default memLevel or windowBits for deflateInit() is changed, then |
||||
this function needs to be updated. |
||||
*/ |
||||
uLong ZEXPORT compressBound(sourceLen) |
||||
uLong sourceLen; |
||||
{ |
||||
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + |
||||
(sourceLen >> 25) + 13; |
||||
} |
@ -0,0 +1,922 @@ |
||||
#!/bin/sh |
||||
# configure script for zlib. |
||||
# |
||||
# Normally configure builds both a static and a shared library. |
||||
# If you want to build just a static library, use: ./configure --static |
||||
# |
||||
# To impose specific compiler or flags or install directory, use for example: |
||||
# prefix=$HOME CC=cc CFLAGS="-O4" ./configure |
||||
# or for csh/tcsh users: |
||||
# (setenv prefix $HOME; setenv CC cc; setenv CFLAGS "-O4"; ./configure) |
||||
|
||||
# Incorrect settings of CC or CFLAGS may prevent creating a shared library. |
||||
# If you have problems, try without defining CC and CFLAGS before reporting |
||||
# an error. |
||||
|
||||
# start off configure.log |
||||
echo -------------------- >> configure.log |
||||
echo $0 $* >> configure.log |
||||
date >> configure.log |
||||
|
||||
# get source directory |
||||
SRCDIR=`dirname $0` |
||||
if test $SRCDIR = "."; then |
||||
ZINC="" |
||||
ZINCOUT="-I." |
||||
SRCDIR="" |
||||
else |
||||
ZINC='-include zconf.h' |
||||
ZINCOUT='-I. -I$(SRCDIR)' |
||||
SRCDIR="$SRCDIR/" |
||||
fi |
||||
|
||||
# set command prefix for cross-compilation |
||||
if [ -n "${CHOST}" ]; then |
||||
uname=${CHOST} |
||||
mname=${CHOST} |
||||
CROSS_PREFIX="${CHOST}-" |
||||
else |
||||
mname=`(uname -a || echo unknown) 2>/dev/null` |
||||
fi |
||||
|
||||
# destination name for static library |
||||
STATICLIB=libz.a |
||||
|
||||
# extract zlib version numbers from zlib.h |
||||
VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h` |
||||
VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h` |
||||
VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` |
||||
VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h` |
||||
|
||||
# establish commands for library building |
||||
if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
||||
AR=${AR-"${CROSS_PREFIX}ar"} |
||||
test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
||||
else |
||||
AR=${AR-"ar"} |
||||
test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log |
||||
fi |
||||
ARFLAGS=${ARFLAGS-"rc"} |
||||
if "${CROSS_PREFIX}ranlib" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
||||
RANLIB=${RANLIB-"${CROSS_PREFIX}ranlib"} |
||||
test -n "${CROSS_PREFIX}" && echo Using ${RANLIB} | tee -a configure.log |
||||
else |
||||
RANLIB=${RANLIB-"ranlib"} |
||||
fi |
||||
if "${CROSS_PREFIX}nm" --version >/dev/null 2>/dev/null || test $? -lt 126; then |
||||
NM=${NM-"${CROSS_PREFIX}nm"} |
||||
test -n "${CROSS_PREFIX}" && echo Using ${NM} | tee -a configure.log |
||||
else |
||||
NM=${NM-"nm"} |
||||
fi |
||||
|
||||
# set defaults before processing command line options |
||||
LDCONFIG=${LDCONFIG-"ldconfig"} |
||||
LDSHAREDLIBC="${LDSHAREDLIBC--lc}" |
||||
ARCHS= |
||||
prefix=${prefix-/usr/local} |
||||
exec_prefix=${exec_prefix-'${prefix}'} |
||||
libdir=${libdir-'${exec_prefix}/lib'} |
||||
sharedlibdir=${sharedlibdir-'${libdir}'} |
||||
includedir=${includedir-'${prefix}/include'} |
||||
mandir=${mandir-'${prefix}/share/man'} |
||||
shared_ext='.so' |
||||
shared=1 |
||||
solo=0 |
||||
cover=0 |
||||
zprefix=0 |
||||
zconst=0 |
||||
build64=0 |
||||
gcc=0 |
||||
warn=0 |
||||
debug=0 |
||||
sanitize=0 |
||||
old_cc="$CC" |
||||
old_cflags="$CFLAGS" |
||||
OBJC='$(OBJZ) $(OBJG)' |
||||
PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)' |
||||
|
||||
# leave this script, optionally in a bad way |
||||
leave() |
||||
{ |
||||
if test "$*" != "0"; then |
||||
echo "** $0 aborting." | tee -a configure.log |
||||
fi |
||||
rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version |
||||
echo -------------------- >> configure.log |
||||
echo >> configure.log |
||||
echo >> configure.log |
||||
exit $1 |
||||
} |
||||
|
||||
# process command line options |
||||
while test $# -ge 1 |
||||
do |
||||
case "$1" in |
||||
-h* | --help) |
||||
echo 'usage:' | tee -a configure.log |
||||
echo ' configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log |
||||
echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log |
||||
echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log |
||||
exit 0 ;; |
||||
-p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;; |
||||
-e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;; |
||||
-l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;; |
||||
--sharedlibdir=*) sharedlibdir=`echo $1 | sed 's/.*=//'`; shift ;; |
||||
-i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;; |
||||
-u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;; |
||||
-p* | --prefix) prefix="$2"; shift; shift ;; |
||||
-e* | --eprefix) exec_prefix="$2"; shift; shift ;; |
||||
-l* | --libdir) libdir="$2"; shift; shift ;; |
||||
-i* | --includedir) includedir="$2"; shift; shift ;; |
||||
-s* | --shared | --enable-shared) shared=1; shift ;; |
||||
-t | --static) shared=0; shift ;; |
||||
--solo) solo=1; shift ;; |
||||
--cover) cover=1; shift ;; |
||||
-z* | --zprefix) zprefix=1; shift ;; |
||||
-6* | --64) build64=1; shift ;; |
||||
-a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;; |
||||
--sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;; |
||||
--localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;; |
||||
-c* | --const) zconst=1; shift ;; |
||||
-w* | --warn) warn=1; shift ;; |
||||
-d* | --debug) debug=1; shift ;; |
||||
--sanitize) sanitize=1; shift ;; |
||||
*) |
||||
echo "unknown option: $1" | tee -a configure.log |
||||
echo "$0 --help for help" | tee -a configure.log |
||||
leave 1;; |
||||
esac |
||||
done |
||||
|
||||
# temporary file name |
||||
test=ztest$$ |
||||
|
||||
# put arguments in log, also put test file in log if used in arguments |
||||
show() |
||||
{ |
||||
case "$*" in |
||||
*$test.c*) |
||||
echo === $test.c === >> configure.log |
||||
cat $test.c >> configure.log |
||||
echo === >> configure.log;; |
||||
esac |
||||
echo $* >> configure.log |
||||
} |
||||
|
||||
# check for gcc vs. cc and set compile and link flags based on the system identified by uname |
||||
cat > $test.c <<EOF |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
EOF |
||||
|
||||
if test -z "$CC"; then |
||||
echo Checking for ${CROSS_PREFIX}gcc... | tee -a configure.log |
||||
if ${CROSS_PREFIX}gcc -v >/dev/null 2>&1; then |
||||
cc=${CROSS_PREFIX}gcc |
||||
else |
||||
cc=${CROSS_PREFIX}cc |
||||
fi |
||||
else |
||||
cc=${CC} |
||||
fi |
||||
|
||||
case "$cc" in |
||||
*gcc*) gcc=1 ;; |
||||
*clang*) gcc=1 ;; |
||||
esac |
||||
case `$cc -v 2>&1` in |
||||
*gcc*) gcc=1 ;; |
||||
*clang*) gcc=1 ;; |
||||
esac |
||||
|
||||
show $cc -c $test.c |
||||
if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then |
||||
echo ... using gcc >> configure.log |
||||
CC="$cc" |
||||
CFLAGS="${CFLAGS--O3}" |
||||
SFLAGS="${CFLAGS--O3} -fPIC" |
||||
if test "$ARCHS"; then |
||||
CFLAGS="${CFLAGS} ${ARCHS}" |
||||
LDFLAGS="${LDFLAGS} ${ARCHS}" |
||||
fi |
||||
if test $build64 -eq 1; then |
||||
CFLAGS="${CFLAGS} -m64" |
||||
SFLAGS="${SFLAGS} -m64" |
||||
fi |
||||
if test "$warn" -eq 1; then |
||||
if test "$zconst" -eq 1; then |
||||
CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -DZLIB_CONST" |
||||
else |
||||
CFLAGS="${CFLAGS} -Wall -Wextra" |
||||
fi |
||||
fi |
||||
if test $sanitize -eq 1; then |
||||
CFLAGS="${CFLAGS} -g -fsanitize=address" |
||||
fi |
||||
if test $debug -eq 1; then |
||||
CFLAGS="${CFLAGS} -DZLIB_DEBUG" |
||||
SFLAGS="${SFLAGS} -DZLIB_DEBUG" |
||||
fi |
||||
if test -z "$uname"; then |
||||
uname=`(uname -s || echo unknown) 2>/dev/null` |
||||
fi |
||||
case "$uname" in |
||||
Linux* | linux* | *-linux* | GNU | GNU/* | solaris*) |
||||
case "$mname" in |
||||
*sparc*) |
||||
LDFLAGS="${LDFLAGS} -Wl,--no-warn-rwx-segments" ;; |
||||
esac |
||||
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;; |
||||
*BSD | *bsd* | DragonFly) |
||||
LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} |
||||
LDCONFIG="ldconfig -m" ;; |
||||
CYGWIN* | Cygwin* | cygwin* | *-cygwin* | OS/2*) |
||||
EXE='.exe' ;; |
||||
MINGW* | mingw* | *-mingw*) |
||||
rm -f $test.[co] $test $test$shared_ext |
||||
echo "If this doesn't work for you, try win32/Makefile.gcc." | tee -a configure.log |
||||
LDSHARED=${LDSHARED-"$cc -shared"} |
||||
LDSHAREDLIBC="" |
||||
EXE='.exe' ;; |
||||
QNX*) # This is for QNX6. I suppose that the QNX rule below is for QNX2,QNX4 |
||||
# (alain.bonnefoy@icbt.com) |
||||
LDSHARED=${LDSHARED-"$cc -shared -Wl,-hlibz.so.1"} ;; |
||||
HP-UX*) |
||||
LDSHARED=${LDSHARED-"$cc -shared $SFLAGS"} |
||||
case `(uname -m || echo unknown) 2>/dev/null` in |
||||
ia64) |
||||
shared_ext='.so' |
||||
SHAREDLIB='libz.so' ;; |
||||
*) |
||||
shared_ext='.sl' |
||||
SHAREDLIB='libz.sl' ;; |
||||
esac ;; |
||||
AIX*) |
||||
LDFLAGS="${LDFLAGS} -Wl,-brtl" ;; |
||||
Darwin* | darwin* | *-darwin*) |
||||
shared_ext='.dylib' |
||||
SHAREDLIB=libz$shared_ext |
||||
SHAREDLIBV=libz.$VER$shared_ext |
||||
SHAREDLIBM=libz.$VER1$shared_ext |
||||
LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} |
||||
if libtool -V 2>&1 | grep Apple > /dev/null; then |
||||
AR="libtool" |
||||
else |
||||
AR="/usr/bin/libtool" |
||||
fi |
||||
ARFLAGS="-o" ;; |
||||
*) |
||||
LDSHARED=${LDSHARED-"$cc -shared"} ;; |
||||
esac |
||||
else |
||||
# find system name and corresponding cc options |
||||
CC=${CC-cc} |
||||
gcc=0 |
||||
echo ... using $CC >> configure.log |
||||
if test -z "$uname"; then |
||||
uname=`(uname -sr || echo unknown) 2>/dev/null` |
||||
fi |
||||
case "$uname" in |
||||
HP-UX*) SFLAGS=${CFLAGS-"-O +z"} |
||||
CFLAGS=${CFLAGS-"-O"} |
||||
# LDSHARED=${LDSHARED-"ld -b +vnocompatwarnings"} |
||||
LDSHARED=${LDSHARED-"ld -b"} |
||||
case `(uname -m || echo unknown) 2>/dev/null` in |
||||
ia64) |
||||
shared_ext='.so' |
||||
SHAREDLIB='libz.so' ;; |
||||
*) |
||||
shared_ext='.sl' |
||||
SHAREDLIB='libz.sl' ;; |
||||
esac ;; |
||||
IRIX*) SFLAGS=${CFLAGS-"-ansi -O2 -rpath ."} |
||||
CFLAGS=${CFLAGS-"-ansi -O2"} |
||||
LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;; |
||||
OSF1\ V4*) SFLAGS=${CFLAGS-"-O -std1"} |
||||
CFLAGS=${CFLAGS-"-O -std1"} |
||||
LDFLAGS="${LDFLAGS} -Wl,-rpath,." |
||||
LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so -Wl,-msym -Wl,-rpath,$(libdir) -Wl,-set_version,${VER}:1.0"} ;; |
||||
OSF1*) SFLAGS=${CFLAGS-"-O -std1"} |
||||
CFLAGS=${CFLAGS-"-O -std1"} |
||||
LDSHARED=${LDSHARED-"cc -shared -Wl,-soname,libz.so.1"} ;; |
||||
QNX*) SFLAGS=${CFLAGS-"-4 -O"} |
||||
CFLAGS=${CFLAGS-"-4 -O"} |
||||
LDSHARED=${LDSHARED-"cc"} |
||||
RANLIB=${RANLIB-"true"} |
||||
AR="cc" |
||||
ARFLAGS="-A" ;; |
||||
SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} |
||||
CFLAGS=${CFLAGS-"-O3"} |
||||
LDSHARED=${LDSHARED-"cc -dy -KPIC -G"} ;; |
||||
SunOS\ 5* | solaris*) |
||||
LDSHARED=${LDSHARED-"cc -G -h libz$shared_ext.$VER1"} |
||||
SFLAGS=${CFLAGS-"-fast -KPIC"} |
||||
CFLAGS=${CFLAGS-"-fast"} |
||||
if test $build64 -eq 1; then |
||||
# old versions of SunPRO/Workshop/Studio don't support -m64, |
||||
# but newer ones do. Check for it. |
||||
flag64=`$CC -flags | egrep -- '^-m64'` |
||||
if test x"$flag64" != x"" ; then |
||||
CFLAGS="${CFLAGS} -m64" |
||||
SFLAGS="${SFLAGS} -m64" |
||||
else |
||||
case `(uname -m || echo unknown) 2>/dev/null` in |
||||
i86*) |
||||
SFLAGS="$SFLAGS -xarch=amd64" |
||||
CFLAGS="$CFLAGS -xarch=amd64" ;; |
||||
*) |
||||
SFLAGS="$SFLAGS -xarch=v9" |
||||
CFLAGS="$CFLAGS -xarch=v9" ;; |
||||
esac |
||||
fi |
||||
fi |
||||
if test -n "$ZINC"; then |
||||
ZINC='-I- -I. -I$(SRCDIR)' |
||||
fi |
||||
;; |
||||
SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} |
||||
CFLAGS=${CFLAGS-"-O2"} |
||||
LDSHARED=${LDSHARED-"ld"} ;; |
||||
SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"} |
||||
CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"} |
||||
LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;; |
||||
UNIX_System_V\ 4.2.0) |
||||
SFLAGS=${CFLAGS-"-KPIC -O"} |
||||
CFLAGS=${CFLAGS-"-O"} |
||||
LDSHARED=${LDSHARED-"cc -G"} ;; |
||||
UNIX_SV\ 4.2MP) |
||||
SFLAGS=${CFLAGS-"-Kconform_pic -O"} |
||||
CFLAGS=${CFLAGS-"-O"} |
||||
LDSHARED=${LDSHARED-"cc -G"} ;; |
||||
OpenUNIX\ 5) |
||||
SFLAGS=${CFLAGS-"-KPIC -O"} |
||||
CFLAGS=${CFLAGS-"-O"} |
||||
LDSHARED=${LDSHARED-"cc -G"} ;; |
||||
AIX*) # Courtesy of dbakker@arrayasolutions.com |
||||
SFLAGS=${CFLAGS-"-O -qmaxmem=8192"} |
||||
CFLAGS=${CFLAGS-"-O -qmaxmem=8192"} |
||||
LDSHARED=${LDSHARED-"xlc -G"} ;; |
||||
# send working options for other systems to zlib@gzip.org |
||||
*) SFLAGS=${CFLAGS-"-O"} |
||||
CFLAGS=${CFLAGS-"-O"} |
||||
LDSHARED=${LDSHARED-"cc -shared"} ;; |
||||
esac |
||||
fi |
||||
|
||||
# destination names for shared library if not defined above |
||||
SHAREDLIB=${SHAREDLIB-"libz$shared_ext"} |
||||
SHAREDLIBV=${SHAREDLIBV-"libz$shared_ext.$VER"} |
||||
SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} |
||||
|
||||
echo >> configure.log |
||||
|
||||
# define functions for testing compiler and library characteristics and logging the results |
||||
|
||||
cat > $test.c <<EOF |
||||
#error error |
||||
EOF |
||||
if ($CC -c $CFLAGS $test.c) 2>/dev/null; then |
||||
try() |
||||
{ |
||||
show $* |
||||
test "`( $* ) 2>&1 | tee -a configure.log`" = "" |
||||
} |
||||
echo - using any output from compiler to indicate an error >> configure.log |
||||
else |
||||
try() |
||||
{ |
||||
show $* |
||||
got=`( $* ) 2>&1` |
||||
ret=$? |
||||
if test "$got" != ""; then |
||||
printf "%s\n" "$got" >> configure.log |
||||
fi |
||||
if test $ret -ne 0; then |
||||
echo "(exit code "$ret")" >> configure.log |
||||
fi |
||||
return $ret |
||||
} |
||||
fi |
||||
|
||||
tryboth() |
||||
{ |
||||
show $* |
||||
got=`( $* ) 2>&1` |
||||
ret=$? |
||||
if test "$got" != ""; then |
||||
printf "%s\n" "$got" >> configure.log |
||||
fi |
||||
if test $ret -ne 0; then |
||||
echo "(exit code "$ret")" >> configure.log |
||||
return $ret |
||||
fi |
||||
test "$got" = "" |
||||
} |
||||
|
||||
cat > $test.c << EOF |
||||
int foo() { return 0; } |
||||
EOF |
||||
echo "Checking for obsessive-compulsive compiler options..." >> configure.log |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
: |
||||
else |
||||
echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log |
||||
leave 1 |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# see if shared library build supported |
||||
cat > $test.c <<EOF |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
EOF |
||||
if test $shared -eq 1; then |
||||
echo Checking for shared library support... | tee -a configure.log |
||||
# we must test in two steps (cc then ld), required at least on SunOS 4.x |
||||
if try $CC -w -c $SFLAGS $test.c && |
||||
try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then |
||||
echo Building shared library $SHAREDLIBV with $CC. | tee -a configure.log |
||||
elif test -z "$old_cc" -a -z "$old_cflags"; then |
||||
echo No shared library support. | tee -a configure.log |
||||
shared=0; |
||||
else |
||||
echo 'No shared library support; try without defining CC and CFLAGS' | tee -a configure.log |
||||
shared=0; |
||||
fi |
||||
fi |
||||
if test $shared -eq 0; then |
||||
LDSHARED="$CC" |
||||
ALL="static" |
||||
TEST="all teststatic" |
||||
SHAREDLIB="" |
||||
SHAREDLIBV="" |
||||
SHAREDLIBM="" |
||||
echo Building static library $STATICLIB version $VER with $CC. | tee -a configure.log |
||||
else |
||||
ALL="static shared" |
||||
TEST="all teststatic testshared" |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# check for size_t |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
size_t dummy = 0; |
||||
EOF |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for size_t... Yes." | tee -a configure.log |
||||
else |
||||
echo "Checking for size_t... No." | tee -a configure.log |
||||
# find a size_t integer type |
||||
# check for long long |
||||
cat > $test.c << EOF |
||||
long long dummy = 0; |
||||
EOF |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for long long... Yes." | tee -a configure.log |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
int main(void) { |
||||
if (sizeof(void *) <= sizeof(int)) puts("int"); |
||||
else if (sizeof(void *) <= sizeof(long)) puts("long"); |
||||
else puts("z_longlong"); |
||||
return 0; |
||||
} |
||||
EOF |
||||
else |
||||
echo "Checking for long long... No." | tee -a configure.log |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
int main(void) { |
||||
if (sizeof(void *) <= sizeof(int)) puts("int"); |
||||
else puts("long"); |
||||
return 0; |
||||
} |
||||
EOF |
||||
fi |
||||
if try $CC $CFLAGS -o $test $test.c; then |
||||
sizet=`./$test` |
||||
echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log |
||||
CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}" |
||||
SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}" |
||||
else |
||||
echo "Checking for a pointer-size integer type... not found." | tee -a configure.log |
||||
fi |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# check for large file support, and if none, check for fseeko() |
||||
cat > $test.c <<EOF |
||||
#include <sys/types.h> |
||||
off64_t dummy = 0; |
||||
EOF |
||||
if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then |
||||
CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1" |
||||
SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1" |
||||
ALL="${ALL} all64" |
||||
TEST="${TEST} test64" |
||||
echo "Checking for off64_t... Yes." | tee -a configure.log |
||||
echo "Checking for fseeko... Yes." | tee -a configure.log |
||||
else |
||||
echo "Checking for off64_t... No." | tee -a configure.log |
||||
echo >> configure.log |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
int main(void) { |
||||
fseeko(NULL, 0, 0); |
||||
return 0; |
||||
} |
||||
EOF |
||||
if try $CC $CFLAGS -o $test $test.c; then |
||||
echo "Checking for fseeko... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="${CFLAGS} -DNO_FSEEKO" |
||||
SFLAGS="${SFLAGS} -DNO_FSEEKO" |
||||
echo "Checking for fseeko... No." | tee -a configure.log |
||||
fi |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# check for strerror() for use by gz* functions |
||||
cat > $test.c <<EOF |
||||
#include <string.h> |
||||
#include <errno.h> |
||||
int main() { return strlen(strerror(errno)); } |
||||
EOF |
||||
if try $CC $CFLAGS -o $test $test.c; then |
||||
echo "Checking for strerror... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="${CFLAGS} -DNO_STRERROR" |
||||
SFLAGS="${SFLAGS} -DNO_STRERROR" |
||||
echo "Checking for strerror... No." | tee -a configure.log |
||||
fi |
||||
|
||||
# copy clean zconf.h for subsequent edits |
||||
cp -p ${SRCDIR}zconf.h.in zconf.h |
||||
|
||||
echo >> configure.log |
||||
|
||||
# check for unistd.h and save result in zconf.h |
||||
cat > $test.c <<EOF |
||||
#include <unistd.h> |
||||
int main() { return 0; } |
||||
EOF |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h |
||||
mv zconf.temp.h zconf.h |
||||
echo "Checking for unistd.h... Yes." | tee -a configure.log |
||||
else |
||||
echo "Checking for unistd.h... No." | tee -a configure.log |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# check for stdarg.h and save result in zconf.h |
||||
cat > $test.c <<EOF |
||||
#include <stdarg.h> |
||||
int main() { return 0; } |
||||
EOF |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
sed < zconf.h "/^#ifdef HAVE_STDARG_H.* may be/s/def HAVE_STDARG_H\(.*\) may be/ 1\1 was/" > zconf.temp.h |
||||
mv zconf.temp.h zconf.h |
||||
echo "Checking for stdarg.h... Yes." | tee -a configure.log |
||||
else |
||||
echo "Checking for stdarg.h... No." | tee -a configure.log |
||||
fi |
||||
|
||||
# if the z_ prefix was requested, save that in zconf.h |
||||
if test $zprefix -eq 1; then |
||||
sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h |
||||
mv zconf.temp.h zconf.h |
||||
echo >> configure.log |
||||
echo "Using z_ prefix on all symbols." | tee -a configure.log |
||||
fi |
||||
|
||||
# if --solo compilation was requested, save that in zconf.h and remove gz stuff from object lists |
||||
if test $solo -eq 1; then |
||||
sed '/#define ZCONF_H/a\ |
||||
#define Z_SOLO |
||||
|
||||
' < zconf.h > zconf.temp.h |
||||
mv zconf.temp.h zconf.h |
||||
OBJC='$(OBJZ)' |
||||
PIC_OBJC='$(PIC_OBJZ)' |
||||
fi |
||||
|
||||
# if code coverage testing was requested, use older gcc if defined, e.g. "gcc-4.2" on Mac OS X |
||||
if test $cover -eq 1; then |
||||
CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage" |
||||
if test -n "$GCC_CLASSIC"; then |
||||
CC=$GCC_CLASSIC |
||||
fi |
||||
fi |
||||
|
||||
echo >> configure.log |
||||
|
||||
# conduct a series of tests to resolve eight possible cases of using "vs" or "s" printf functions |
||||
# (using stdarg or not), with or without "n" (proving size of buffer), and with or without a |
||||
# return value. The most secure result is vsnprintf() with a return value. snprintf() with a |
||||
# return value is secure as well, but then gzprintf() will be limited to 20 arguments. |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
#include "zconf.h" |
||||
int main() |
||||
{ |
||||
#ifndef STDC |
||||
choke me |
||||
#endif |
||||
return 0; |
||||
} |
||||
EOF |
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf()." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat > $test.c <<EOF |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return 0; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
EOF |
||||
if try $CC $CFLAGS -o $test $test.c; then |
||||
echo "Checking for vsnprintf() in stdio.h... Yes." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat >$test.c <<EOF |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
int n; |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return n; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
EOF |
||||
|
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for return value of vsnprintf()... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="$CFLAGS -DHAS_vsnprintf_void" |
||||
SFLAGS="$SFLAGS -DHAS_vsnprintf_void" |
||||
echo "Checking for return value of vsnprintf()... No." | tee -a configure.log |
||||
echo " WARNING: apparently vsnprintf() does not return a value. zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible string-format security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
fi |
||||
else |
||||
CFLAGS="$CFLAGS -DNO_vsnprintf" |
||||
SFLAGS="$SFLAGS -DNO_vsnprintf" |
||||
echo "Checking for vsnprintf() in stdio.h... No." | tee -a configure.log |
||||
echo " WARNING: vsnprintf() not found, falling back to vsprintf(). zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat >$test.c <<EOF |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
int n; |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
n = vsprintf(buf, fmt, ap); |
||||
va_end(ap); |
||||
return n; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
EOF |
||||
|
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for return value of vsprintf()... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="$CFLAGS -DHAS_vsprintf_void" |
||||
SFLAGS="$SFLAGS -DHAS_vsprintf_void" |
||||
echo "Checking for return value of vsprintf()... No." | tee -a configure.log |
||||
echo " WARNING: apparently vsprintf() does not return a value. zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible string-format security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
fi |
||||
fi |
||||
else |
||||
echo "Checking whether to use vs[n]printf() or s[n]printf()... using s[n]printf()." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat >$test.c <<EOF |
||||
#include <stdio.h> |
||||
int mytest() |
||||
{ |
||||
char buf[20]; |
||||
snprintf(buf, sizeof(buf), "%s", "foo"); |
||||
return 0; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest()); |
||||
} |
||||
EOF |
||||
|
||||
if try $CC $CFLAGS -o $test $test.c; then |
||||
echo "Checking for snprintf() in stdio.h... Yes." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat >$test.c <<EOF |
||||
#include <stdio.h> |
||||
int mytest() |
||||
{ |
||||
char buf[20]; |
||||
return snprintf(buf, sizeof(buf), "%s", "foo"); |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest()); |
||||
} |
||||
EOF |
||||
|
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for return value of snprintf()... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="$CFLAGS -DHAS_snprintf_void" |
||||
SFLAGS="$SFLAGS -DHAS_snprintf_void" |
||||
echo "Checking for return value of snprintf()... No." | tee -a configure.log |
||||
echo " WARNING: apparently snprintf() does not return a value. zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible string-format security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
fi |
||||
else |
||||
CFLAGS="$CFLAGS -DNO_snprintf" |
||||
SFLAGS="$SFLAGS -DNO_snprintf" |
||||
echo "Checking for snprintf() in stdio.h... No." | tee -a configure.log |
||||
echo " WARNING: snprintf() not found, falling back to sprintf(). zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible buffer-overflow security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
|
||||
echo >> configure.log |
||||
cat >$test.c <<EOF |
||||
#include <stdio.h> |
||||
int mytest() |
||||
{ |
||||
char buf[20]; |
||||
return sprintf(buf, "%s", "foo"); |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest()); |
||||
} |
||||
EOF |
||||
|
||||
if try $CC -c $CFLAGS $test.c; then |
||||
echo "Checking for return value of sprintf()... Yes." | tee -a configure.log |
||||
else |
||||
CFLAGS="$CFLAGS -DHAS_sprintf_void" |
||||
SFLAGS="$SFLAGS -DHAS_sprintf_void" |
||||
echo "Checking for return value of sprintf()... No." | tee -a configure.log |
||||
echo " WARNING: apparently sprintf() does not return a value. zlib" | tee -a configure.log |
||||
echo " can build but will be open to possible string-format security" | tee -a configure.log |
||||
echo " vulnerabilities." | tee -a configure.log |
||||
fi |
||||
fi |
||||
fi |
||||
|
||||
# see if we can hide zlib internal symbols that are linked between separate source files |
||||
if test "$gcc" -eq 1; then |
||||
echo >> configure.log |
||||
cat > $test.c <<EOF |
||||
#define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) |
||||
int ZLIB_INTERNAL foo; |
||||
int main() |
||||
{ |
||||
return 0; |
||||
} |
||||
EOF |
||||
if tryboth $CC -c $CFLAGS $test.c; then |
||||
CFLAGS="$CFLAGS -DHAVE_HIDDEN" |
||||
SFLAGS="$SFLAGS -DHAVE_HIDDEN" |
||||
echo "Checking for attribute(visibility) support... Yes." | tee -a configure.log |
||||
else |
||||
echo "Checking for attribute(visibility) support... No." | tee -a configure.log |
||||
fi |
||||
fi |
||||
|
||||
# show the results in the log |
||||
echo >> configure.log |
||||
echo ALL = $ALL >> configure.log |
||||
echo AR = $AR >> configure.log |
||||
echo ARFLAGS = $ARFLAGS >> configure.log |
||||
echo CC = $CC >> configure.log |
||||
echo CFLAGS = $CFLAGS >> configure.log |
||||
echo CPP = $CPP >> configure.log |
||||
echo EXE = $EXE >> configure.log |
||||
echo LDCONFIG = $LDCONFIG >> configure.log |
||||
echo LDFLAGS = $LDFLAGS >> configure.log |
||||
echo LDSHARED = $LDSHARED >> configure.log |
||||
echo LDSHAREDLIBC = $LDSHAREDLIBC >> configure.log |
||||
echo OBJC = $OBJC >> configure.log |
||||
echo PIC_OBJC = $PIC_OBJC >> configure.log |
||||
echo RANLIB = $RANLIB >> configure.log |
||||
echo SFLAGS = $SFLAGS >> configure.log |
||||
echo SHAREDLIB = $SHAREDLIB >> configure.log |
||||
echo SHAREDLIBM = $SHAREDLIBM >> configure.log |
||||
echo SHAREDLIBV = $SHAREDLIBV >> configure.log |
||||
echo STATICLIB = $STATICLIB >> configure.log |
||||
echo TEST = $TEST >> configure.log |
||||
echo VER = $VER >> configure.log |
||||
echo SRCDIR = $SRCDIR >> configure.log |
||||
echo exec_prefix = $exec_prefix >> configure.log |
||||
echo includedir = $includedir >> configure.log |
||||
echo libdir = $libdir >> configure.log |
||||
echo mandir = $mandir >> configure.log |
||||
echo prefix = $prefix >> configure.log |
||||
echo sharedlibdir = $sharedlibdir >> configure.log |
||||
echo uname = $uname >> configure.log |
||||
|
||||
# udpate Makefile with the configure results |
||||
sed < ${SRCDIR}Makefile.in " |
||||
/^CC *=/s#=.*#=$CC# |
||||
/^CFLAGS *=/s#=.*#=$CFLAGS# |
||||
/^SFLAGS *=/s#=.*#=$SFLAGS# |
||||
/^LDFLAGS *=/s#=.*#=$LDFLAGS# |
||||
/^LDSHARED *=/s#=.*#=$LDSHARED# |
||||
/^CPP *=/s#=.*#=$CPP# |
||||
/^STATICLIB *=/s#=.*#=$STATICLIB# |
||||
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# |
||||
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# |
||||
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# |
||||
/^AR *=/s#=.*#=$AR# |
||||
/^ARFLAGS *=/s#=.*#=$ARFLAGS# |
||||
/^RANLIB *=/s#=.*#=$RANLIB# |
||||
/^LDCONFIG *=/s#=.*#=$LDCONFIG# |
||||
/^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC# |
||||
/^EXE *=/s#=.*#=$EXE# |
||||
/^SRCDIR *=/s#=.*#=$SRCDIR# |
||||
/^ZINC *=/s#=.*#=$ZINC# |
||||
/^ZINCOUT *=/s#=.*#=$ZINCOUT# |
||||
/^prefix *=/s#=.*#=$prefix# |
||||
/^exec_prefix *=/s#=.*#=$exec_prefix# |
||||
/^libdir *=/s#=.*#=$libdir# |
||||
/^sharedlibdir *=/s#=.*#=$sharedlibdir# |
||||
/^includedir *=/s#=.*#=$includedir# |
||||
/^mandir *=/s#=.*#=$mandir# |
||||
/^OBJC *=/s#=.*#= $OBJC# |
||||
/^PIC_OBJC *=/s#=.*#= $PIC_OBJC# |
||||
/^all: */s#:.*#: $ALL# |
||||
/^test: */s#:.*#: $TEST# |
||||
" > Makefile |
||||
|
||||
# create zlib.pc with the configure results |
||||
sed < ${SRCDIR}zlib.pc.in " |
||||
/^CC *=/s#=.*#=$CC# |
||||
/^CFLAGS *=/s#=.*#=$CFLAGS# |
||||
/^CPP *=/s#=.*#=$CPP# |
||||
/^LDSHARED *=/s#=.*#=$LDSHARED# |
||||
/^STATICLIB *=/s#=.*#=$STATICLIB# |
||||
/^SHAREDLIB *=/s#=.*#=$SHAREDLIB# |
||||
/^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV# |
||||
/^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM# |
||||
/^AR *=/s#=.*#=$AR# |
||||
/^ARFLAGS *=/s#=.*#=$ARFLAGS# |
||||
/^RANLIB *=/s#=.*#=$RANLIB# |
||||
/^EXE *=/s#=.*#=$EXE# |
||||
/^prefix *=/s#=.*#=$prefix# |
||||
/^exec_prefix *=/s#=.*#=$exec_prefix# |
||||
/^libdir *=/s#=.*#=$libdir# |
||||
/^sharedlibdir *=/s#=.*#=$sharedlibdir# |
||||
/^includedir *=/s#=.*#=$includedir# |
||||
/^mandir *=/s#=.*#=$mandir# |
||||
/^LDFLAGS *=/s#=.*#=$LDFLAGS# |
||||
" | sed -e " |
||||
s/\@VERSION\@/$VER/g; |
||||
" > zlib.pc |
||||
|
||||
# done |
||||
leave 0 |
@ -0,0 +1,489 @@ |
||||
-------------------- |
||||
./configure --prefix=lib |
||||
Wed 14 Jun 2023 09:59:37 PM CDT |
||||
Checking for gcc... |
||||
=== ztest232834.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -c ztest232834.c |
||||
... using gcc |
||||
|
||||
Checking for obsessive-compulsive compiler options... |
||||
=== ztest232834.c === |
||||
int foo() { return 0; } |
||||
=== |
||||
gcc -c -O3 ztest232834.c |
||||
|
||||
Checking for shared library support... |
||||
=== ztest232834.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -w -c -O3 -fPIC ztest232834.c |
||||
gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map -O3 -fPIC -o ztest232834.so ztest232834.o |
||||
Building shared library libz.so.1.2.13 with gcc. |
||||
|
||||
=== ztest232834.c === |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
size_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 ztest232834.c |
||||
Checking for size_t... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <sys/types.h> |
||||
off64_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking for off64_t... Yes. |
||||
Checking for fseeko... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <string.h> |
||||
#include <errno.h> |
||||
int main() { return strlen(strerror(errno)); } |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest232834 ztest232834.c |
||||
Checking for strerror... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <unistd.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking for unistd.h... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <stdarg.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking for stdarg.h... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
#include "zconf.h" |
||||
int main() |
||||
{ |
||||
#ifndef STDC |
||||
choke me |
||||
#endif |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf(). |
||||
|
||||
=== ztest232834.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return 0; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest232834 ztest232834.c |
||||
Checking for vsnprintf() in stdio.h... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
int n; |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return n; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking for return value of vsnprintf()... Yes. |
||||
|
||||
=== ztest232834.c === |
||||
#define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) |
||||
int ZLIB_INTERNAL foo; |
||||
int main() |
||||
{ |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest232834.c |
||||
Checking for attribute(visibility) support... Yes. |
||||
|
||||
ALL = static shared all64 |
||||
AR = ar |
||||
ARFLAGS = rc |
||||
CC = gcc |
||||
CFLAGS = -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
CPP = |
||||
EXE = |
||||
LDCONFIG = ldconfig |
||||
LDFLAGS = |
||||
LDSHARED = gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map |
||||
LDSHAREDLIBC = -lc |
||||
OBJC = $(OBJZ) $(OBJG) |
||||
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG) |
||||
RANLIB = ranlib |
||||
SFLAGS = -O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
SHAREDLIB = libz.so |
||||
SHAREDLIBM = libz.so.1 |
||||
SHAREDLIBV = libz.so.1.2.13 |
||||
STATICLIB = libz.a |
||||
TEST = all teststatic testshared test64 |
||||
VER = 1.2.13 |
||||
SRCDIR = |
||||
exec_prefix = ${prefix} |
||||
includedir = ${prefix}/include |
||||
libdir = ${exec_prefix}/lib |
||||
mandir = ${prefix}/share/man |
||||
prefix = lib |
||||
sharedlibdir = ${libdir} |
||||
uname = Linux |
||||
-------------------- |
||||
|
||||
|
||||
-------------------- |
||||
./configure --prefix=/mnt/Storage/Documents/Code/LibraryTest/lib |
||||
Wed 14 Jun 2023 10:04:47 PM CDT |
||||
Checking for gcc... |
||||
=== ztest233472.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -c ztest233472.c |
||||
... using gcc |
||||
|
||||
Checking for obsessive-compulsive compiler options... |
||||
=== ztest233472.c === |
||||
int foo() { return 0; } |
||||
=== |
||||
gcc -c -O3 ztest233472.c |
||||
|
||||
Checking for shared library support... |
||||
=== ztest233472.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -w -c -O3 -fPIC ztest233472.c |
||||
gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map -O3 -fPIC -o ztest233472.so ztest233472.o |
||||
Building shared library libz.so.1.2.13 with gcc. |
||||
|
||||
=== ztest233472.c === |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
size_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 ztest233472.c |
||||
Checking for size_t... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <sys/types.h> |
||||
off64_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking for off64_t... Yes. |
||||
Checking for fseeko... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <string.h> |
||||
#include <errno.h> |
||||
int main() { return strlen(strerror(errno)); } |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest233472 ztest233472.c |
||||
Checking for strerror... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <unistd.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking for unistd.h... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <stdarg.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking for stdarg.h... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
#include "zconf.h" |
||||
int main() |
||||
{ |
||||
#ifndef STDC |
||||
choke me |
||||
#endif |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf(). |
||||
|
||||
=== ztest233472.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return 0; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest233472 ztest233472.c |
||||
Checking for vsnprintf() in stdio.h... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
int n; |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return n; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking for return value of vsnprintf()... Yes. |
||||
|
||||
=== ztest233472.c === |
||||
#define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) |
||||
int ZLIB_INTERNAL foo; |
||||
int main() |
||||
{ |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233472.c |
||||
Checking for attribute(visibility) support... Yes. |
||||
|
||||
ALL = static shared all64 |
||||
AR = ar |
||||
ARFLAGS = rc |
||||
CC = gcc |
||||
CFLAGS = -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
CPP = |
||||
EXE = |
||||
LDCONFIG = ldconfig |
||||
LDFLAGS = |
||||
LDSHARED = gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map |
||||
LDSHAREDLIBC = -lc |
||||
OBJC = $(OBJZ) $(OBJG) |
||||
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG) |
||||
RANLIB = ranlib |
||||
SFLAGS = -O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
SHAREDLIB = libz.so |
||||
SHAREDLIBM = libz.so.1 |
||||
SHAREDLIBV = libz.so.1.2.13 |
||||
STATICLIB = libz.a |
||||
TEST = all teststatic testshared test64 |
||||
VER = 1.2.13 |
||||
SRCDIR = |
||||
exec_prefix = ${prefix} |
||||
includedir = ${prefix}/include |
||||
libdir = ${exec_prefix}/lib |
||||
mandir = ${prefix}/share/man |
||||
prefix = /mnt/Storage/Documents/Code/LibraryTest/lib |
||||
sharedlibdir = ${libdir} |
||||
uname = Linux |
||||
-------------------- |
||||
|
||||
|
||||
-------------------- |
||||
./configure --prefix=/mnt/Storage/Documents/Code/LibraryTest/lib/zlib-1.2.13 |
||||
Wed 14 Jun 2023 10:05:17 PM CDT |
||||
Checking for gcc... |
||||
=== ztest233872.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -c ztest233872.c |
||||
... using gcc |
||||
|
||||
Checking for obsessive-compulsive compiler options... |
||||
=== ztest233872.c === |
||||
int foo() { return 0; } |
||||
=== |
||||
gcc -c -O3 ztest233872.c |
||||
|
||||
Checking for shared library support... |
||||
=== ztest233872.c === |
||||
extern int getchar(); |
||||
int hello() {return getchar();} |
||||
=== |
||||
gcc -w -c -O3 -fPIC ztest233872.c |
||||
gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map -O3 -fPIC -o ztest233872.so ztest233872.o |
||||
Building shared library libz.so.1.2.13 with gcc. |
||||
|
||||
=== ztest233872.c === |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
size_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 ztest233872.c |
||||
Checking for size_t... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <sys/types.h> |
||||
off64_t dummy = 0; |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking for off64_t... Yes. |
||||
Checking for fseeko... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <string.h> |
||||
#include <errno.h> |
||||
int main() { return strlen(strerror(errno)); } |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest233872 ztest233872.c |
||||
Checking for strerror... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <unistd.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking for unistd.h... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <stdarg.h> |
||||
int main() { return 0; } |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking for stdarg.h... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
#include "zconf.h" |
||||
int main() |
||||
{ |
||||
#ifndef STDC |
||||
choke me |
||||
#endif |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking whether to use vs[n]printf() or s[n]printf()... using vs[n]printf(). |
||||
|
||||
=== ztest233872.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return 0; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -O3 -D_LARGEFILE64_SOURCE=1 -o ztest233872 ztest233872.c |
||||
Checking for vsnprintf() in stdio.h... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#include <stdio.h> |
||||
#include <stdarg.h> |
||||
int mytest(const char *fmt, ...) |
||||
{ |
||||
int n; |
||||
char buf[20]; |
||||
va_list ap; |
||||
va_start(ap, fmt); |
||||
n = vsnprintf(buf, sizeof(buf), fmt, ap); |
||||
va_end(ap); |
||||
return n; |
||||
} |
||||
int main() |
||||
{ |
||||
return (mytest("Hello%d\n", 1)); |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking for return value of vsnprintf()... Yes. |
||||
|
||||
=== ztest233872.c === |
||||
#define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) |
||||
int ZLIB_INTERNAL foo; |
||||
int main() |
||||
{ |
||||
return 0; |
||||
} |
||||
=== |
||||
gcc -c -O3 -D_LARGEFILE64_SOURCE=1 ztest233872.c |
||||
Checking for attribute(visibility) support... Yes. |
||||
|
||||
ALL = static shared all64 |
||||
AR = ar |
||||
ARFLAGS = rc |
||||
CC = gcc |
||||
CFLAGS = -O3 -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
CPP = |
||||
EXE = |
||||
LDCONFIG = ldconfig |
||||
LDFLAGS = |
||||
LDSHARED = gcc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map |
||||
LDSHAREDLIBC = -lc |
||||
OBJC = $(OBJZ) $(OBJG) |
||||
PIC_OBJC = $(PIC_OBJZ) $(PIC_OBJG) |
||||
RANLIB = ranlib |
||||
SFLAGS = -O3 -fPIC -D_LARGEFILE64_SOURCE=1 -DHAVE_HIDDEN |
||||
SHAREDLIB = libz.so |
||||
SHAREDLIBM = libz.so.1 |
||||
SHAREDLIBV = libz.so.1.2.13 |
||||
STATICLIB = libz.a |
||||
TEST = all teststatic testshared test64 |
||||
VER = 1.2.13 |
||||
SRCDIR = |
||||
exec_prefix = ${prefix} |
||||
includedir = ${prefix}/include |
||||
libdir = ${exec_prefix}/lib |
||||
mandir = ${prefix}/share/man |
||||
prefix = /mnt/Storage/Documents/Code/LibraryTest/lib/zlib-1.2.13 |
||||
sharedlibdir = ${libdir} |
||||
uname = Linux |
||||
-------------------- |
||||
|
||||
|
@ -0,0 +1,57 @@ |
||||
All files under this contrib directory are UNSUPPORTED. They were |
||||
provided by users of zlib and were not tested by the authors of zlib. |
||||
Use at your own risk. Please contact the authors of the contributions |
||||
for help about these, not the zlib authors. Thanks. |
||||
|
||||
|
||||
ada/ by Dmitriy Anisimkov <anisimkov@yahoo.com> |
||||
Support for Ada |
||||
See http://zlib-ada.sourceforge.net/ |
||||
|
||||
blast/ by Mark Adler <madler@alumni.caltech.edu> |
||||
Decompressor for output of PKWare Data Compression Library (DCL) |
||||
|
||||
delphi/ by Cosmin Truta <cosmint@cs.ubbcluj.ro> |
||||
Support for Delphi and C++ Builder |
||||
|
||||
dotzlib/ by Henrik Ravn <henrik@ravn.com> |
||||
Support for Microsoft .Net and Visual C++ .Net |
||||
|
||||
gcc_gvmat64/by Gilles Vollant <info@winimage.com> |
||||
GCC Version of x86 64-bit (AMD64 and Intel EM64t) code for x64 |
||||
assembler to replace longest_match() and inflate_fast() |
||||
|
||||
infback9/ by Mark Adler <madler@alumni.caltech.edu> |
||||
Unsupported diffs to infback to decode the deflate64 format |
||||
|
||||
iostream/ by Kevin Ruland <kevin@rodin.wustl.edu> |
||||
A C++ I/O streams interface to the zlib gz* functions |
||||
|
||||
iostream2/ by Tyge Løvset <Tyge.Lovset@cmr.no> |
||||
Another C++ I/O streams interface |
||||
|
||||
iostream3/ by Ludwig Schwardt <schwardt@sun.ac.za> |
||||
and Kevin Ruland <kevin@rodin.wustl.edu> |
||||
Yet another C++ I/O streams interface |
||||
|
||||
minizip/ by Gilles Vollant <info@winimage.com> |
||||
Mini zip and unzip based on zlib |
||||
Includes Zip64 support by Mathias Svensson <mathias@result42.com> |
||||
See http://www.winimage.com/zLibDll/minizip.html |
||||
|
||||
pascal/ by Bob Dellaca <bobdl@xtra.co.nz> et al. |
||||
Support for Pascal |
||||
|
||||
puff/ by Mark Adler <madler@alumni.caltech.edu> |
||||
Small, low memory usage inflate. Also serves to provide an |
||||
unambiguous description of the deflate format. |
||||
|
||||
testzlib/ by Gilles Vollant <info@winimage.com> |
||||
Example of the use of zlib |
||||
|
||||
untgz/ by Pedro A. Aranda Gutierrez <paag@tid.es> |
||||
A very simple tar.gz file extractor using zlib |
||||
|
||||
vstudio/ by Gilles Vollant <info@winimage.com> |
||||
Building a minizip-enhanced zlib with Microsoft Visual Studio |
||||
Includes vc11 from kreuzerkrieg and vc12 from davispuh |
@ -0,0 +1,106 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2004 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
-- |
||||
-- $Id: buffer_demo.adb,v 1.3 2004/09/06 06:55:35 vagul Exp $ |
||||
|
||||
-- This demo program provided by Dr Steve Sangwine <sjs@essex.ac.uk> |
||||
-- |
||||
-- Demonstration of a problem with Zlib-Ada (already fixed) when a buffer |
||||
-- of exactly the correct size is used for decompressed data, and the last |
||||
-- few bytes passed in to Zlib are checksum bytes. |
||||
|
||||
-- This program compresses a string of text, and then decompresses the |
||||
-- compressed text into a buffer of the same size as the original text. |
||||
|
||||
with Ada.Streams; use Ada.Streams; |
||||
with Ada.Text_IO; |
||||
|
||||
with ZLib; use ZLib; |
||||
|
||||
procedure Buffer_Demo is |
||||
EOL : Character renames ASCII.LF; |
||||
Text : constant String |
||||
:= "Four score and seven years ago our fathers brought forth," & EOL & |
||||
"upon this continent, a new nation, conceived in liberty," & EOL & |
||||
"and dedicated to the proposition that `all men are created equal'."; |
||||
|
||||
Source : Stream_Element_Array (1 .. Text'Length); |
||||
for Source'Address use Text'Address; |
||||
|
||||
begin |
||||
Ada.Text_IO.Put (Text); |
||||
Ada.Text_IO.New_Line; |
||||
Ada.Text_IO.Put_Line |
||||
("Uncompressed size : " & Positive'Image (Text'Length) & " bytes"); |
||||
|
||||
declare |
||||
Compressed_Data : Stream_Element_Array (1 .. Text'Length); |
||||
L : Stream_Element_Offset; |
||||
begin |
||||
Compress : declare |
||||
Compressor : Filter_Type; |
||||
I : Stream_Element_Offset; |
||||
begin |
||||
Deflate_Init (Compressor); |
||||
|
||||
-- Compress the whole of T at once. |
||||
|
||||
Translate (Compressor, Source, I, Compressed_Data, L, Finish); |
||||
pragma Assert (I = Source'Last); |
||||
|
||||
Close (Compressor); |
||||
|
||||
Ada.Text_IO.Put_Line |
||||
("Compressed size : " |
||||
& Stream_Element_Offset'Image (L) & " bytes"); |
||||
end Compress; |
||||
|
||||
-- Now we decompress the data, passing short blocks of data to Zlib |
||||
-- (because this demonstrates the problem - the last block passed will |
||||
-- contain checksum information and there will be no output, only a |
||||
-- check inside Zlib that the checksum is correct). |
||||
|
||||
Decompress : declare |
||||
Decompressor : Filter_Type; |
||||
|
||||
Uncompressed_Data : Stream_Element_Array (1 .. Text'Length); |
||||
|
||||
Block_Size : constant := 4; |
||||
-- This makes sure that the last block contains |
||||
-- only Adler checksum data. |
||||
|
||||
P : Stream_Element_Offset := Compressed_Data'First - 1; |
||||
O : Stream_Element_Offset; |
||||
begin |
||||
Inflate_Init (Decompressor); |
||||
|
||||
loop |
||||
Translate |
||||
(Decompressor, |
||||
Compressed_Data |
||||
(P + 1 .. Stream_Element_Offset'Min (P + Block_Size, L)), |
||||
P, |
||||
Uncompressed_Data |
||||
(Total_Out (Decompressor) + 1 .. Uncompressed_Data'Last), |
||||
O, |
||||
No_Flush); |
||||
|
||||
Ada.Text_IO.Put_Line |
||||
("Total in : " & Count'Image (Total_In (Decompressor)) & |
||||
", out : " & Count'Image (Total_Out (Decompressor))); |
||||
|
||||
exit when P = L; |
||||
end loop; |
||||
|
||||
Ada.Text_IO.New_Line; |
||||
Ada.Text_IO.Put_Line |
||||
("Decompressed text matches original text : " |
||||
& Boolean'Image (Uncompressed_Data = Source)); |
||||
end Decompress; |
||||
end; |
||||
end Buffer_Demo; |
@ -0,0 +1,156 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
-- Continuous test for ZLib multithreading. If the test would fail |
||||
-- we should provide thread safe allocation routines for the Z_Stream. |
||||
-- |
||||
-- $Id: mtest.adb,v 1.4 2004/07/23 07:49:54 vagul Exp $ |
||||
|
||||
with ZLib; |
||||
with Ada.Streams; |
||||
with Ada.Numerics.Discrete_Random; |
||||
with Ada.Text_IO; |
||||
with Ada.Exceptions; |
||||
with Ada.Task_Identification; |
||||
|
||||
procedure MTest is |
||||
use Ada.Streams; |
||||
use ZLib; |
||||
|
||||
Stop : Boolean := False; |
||||
|
||||
pragma Atomic (Stop); |
||||
|
||||
subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#; |
||||
|
||||
package Random_Elements is |
||||
new Ada.Numerics.Discrete_Random (Visible_Symbols); |
||||
|
||||
task type Test_Task; |
||||
|
||||
task body Test_Task is |
||||
Buffer : Stream_Element_Array (1 .. 100_000); |
||||
Gen : Random_Elements.Generator; |
||||
|
||||
Buffer_First : Stream_Element_Offset; |
||||
Compare_First : Stream_Element_Offset; |
||||
|
||||
Deflate : Filter_Type; |
||||
Inflate : Filter_Type; |
||||
|
||||
procedure Further (Item : in Stream_Element_Array); |
||||
|
||||
procedure Read_Buffer |
||||
(Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset); |
||||
|
||||
------------- |
||||
-- Further -- |
||||
------------- |
||||
|
||||
procedure Further (Item : in Stream_Element_Array) is |
||||
|
||||
procedure Compare (Item : in Stream_Element_Array); |
||||
|
||||
------------- |
||||
-- Compare -- |
||||
------------- |
||||
|
||||
procedure Compare (Item : in Stream_Element_Array) is |
||||
Next_First : Stream_Element_Offset := Compare_First + Item'Length; |
||||
begin |
||||
if Buffer (Compare_First .. Next_First - 1) /= Item then |
||||
raise Program_Error; |
||||
end if; |
||||
|
||||
Compare_First := Next_First; |
||||
end Compare; |
||||
|
||||
procedure Compare_Write is new ZLib.Write (Write => Compare); |
||||
begin |
||||
Compare_Write (Inflate, Item, No_Flush); |
||||
end Further; |
||||
|
||||
----------------- |
||||
-- Read_Buffer -- |
||||
----------------- |
||||
|
||||
procedure Read_Buffer |
||||
(Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset) |
||||
is |
||||
Buff_Diff : Stream_Element_Offset := Buffer'Last - Buffer_First; |
||||
Next_First : Stream_Element_Offset; |
||||
begin |
||||
if Item'Length <= Buff_Diff then |
||||
Last := Item'Last; |
||||
|
||||
Next_First := Buffer_First + Item'Length; |
||||
|
||||
Item := Buffer (Buffer_First .. Next_First - 1); |
||||
|
||||
Buffer_First := Next_First; |
||||
else |
||||
Last := Item'First + Buff_Diff; |
||||
Item (Item'First .. Last) := Buffer (Buffer_First .. Buffer'Last); |
||||
Buffer_First := Buffer'Last + 1; |
||||
end if; |
||||
end Read_Buffer; |
||||
|
||||
procedure Translate is new Generic_Translate |
||||
(Data_In => Read_Buffer, |
||||
Data_Out => Further); |
||||
|
||||
begin |
||||
Random_Elements.Reset (Gen); |
||||
|
||||
Buffer := (others => 20); |
||||
|
||||
Main : loop |
||||
for J in Buffer'Range loop |
||||
Buffer (J) := Random_Elements.Random (Gen); |
||||
|
||||
Deflate_Init (Deflate); |
||||
Inflate_Init (Inflate); |
||||
|
||||
Buffer_First := Buffer'First; |
||||
Compare_First := Buffer'First; |
||||
|
||||
Translate (Deflate); |
||||
|
||||
if Compare_First /= Buffer'Last + 1 then |
||||
raise Program_Error; |
||||
end if; |
||||
|
||||
Ada.Text_IO.Put_Line |
||||
(Ada.Task_Identification.Image |
||||
(Ada.Task_Identification.Current_Task) |
||||
& Stream_Element_Offset'Image (J) |
||||
& ZLib.Count'Image (Total_Out (Deflate))); |
||||
|
||||
Close (Deflate); |
||||
Close (Inflate); |
||||
|
||||
exit Main when Stop; |
||||
end loop; |
||||
end loop Main; |
||||
exception |
||||
when E : others => |
||||
Ada.Text_IO.Put_Line (Ada.Exceptions.Exception_Information (E)); |
||||
Stop := True; |
||||
end Test_Task; |
||||
|
||||
Test : array (1 .. 4) of Test_Task; |
||||
|
||||
pragma Unreferenced (Test); |
||||
|
||||
Dummy : Character; |
||||
|
||||
begin |
||||
Ada.Text_IO.Get_Immediate (Dummy); |
||||
Stop := True; |
||||
end MTest; |
@ -0,0 +1,156 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: read.adb,v 1.8 2004/05/31 10:53:40 vagul Exp $ |
||||
|
||||
-- Test/demo program for the generic read interface. |
||||
|
||||
with Ada.Numerics.Discrete_Random; |
||||
with Ada.Streams; |
||||
with Ada.Text_IO; |
||||
|
||||
with ZLib; |
||||
|
||||
procedure Read is |
||||
|
||||
use Ada.Streams; |
||||
|
||||
------------------------------------ |
||||
-- Test configuration parameters -- |
||||
------------------------------------ |
||||
|
||||
File_Size : Stream_Element_Offset := 100_000; |
||||
|
||||
Continuous : constant Boolean := False; |
||||
-- If this constant is True, the test would be repeated again and again, |
||||
-- with increment File_Size for every iteration. |
||||
|
||||
Header : constant ZLib.Header_Type := ZLib.Default; |
||||
-- Do not use Header other than Default in ZLib versions 1.1.4 and older. |
||||
|
||||
Init_Random : constant := 8; |
||||
-- We are using the same random sequence, in case of we catch bug, |
||||
-- so we would be able to reproduce it. |
||||
|
||||
-- End -- |
||||
|
||||
Pack_Size : Stream_Element_Offset; |
||||
Offset : Stream_Element_Offset; |
||||
|
||||
Filter : ZLib.Filter_Type; |
||||
|
||||
subtype Visible_Symbols |
||||
is Stream_Element range 16#20# .. 16#7E#; |
||||
|
||||
package Random_Elements is new |
||||
Ada.Numerics.Discrete_Random (Visible_Symbols); |
||||
|
||||
Gen : Random_Elements.Generator; |
||||
Period : constant Stream_Element_Offset := 200; |
||||
-- Period constant variable for random generator not to be very random. |
||||
-- Bigger period, harder random. |
||||
|
||||
Read_Buffer : Stream_Element_Array (1 .. 2048); |
||||
Read_First : Stream_Element_Offset; |
||||
Read_Last : Stream_Element_Offset; |
||||
|
||||
procedure Reset; |
||||
|
||||
procedure Read |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset); |
||||
-- this procedure is for generic instantiation of |
||||
-- ZLib.Read |
||||
-- reading data from the File_In. |
||||
|
||||
procedure Read is new ZLib.Read |
||||
(Read, |
||||
Read_Buffer, |
||||
Rest_First => Read_First, |
||||
Rest_Last => Read_Last); |
||||
|
||||
---------- |
||||
-- Read -- |
||||
---------- |
||||
|
||||
procedure Read |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset) is |
||||
begin |
||||
Last := Stream_Element_Offset'Min |
||||
(Item'Last, |
||||
Item'First + File_Size - Offset); |
||||
|
||||
for J in Item'First .. Last loop |
||||
if J < Item'First + Period then |
||||
Item (J) := Random_Elements.Random (Gen); |
||||
else |
||||
Item (J) := Item (J - Period); |
||||
end if; |
||||
|
||||
Offset := Offset + 1; |
||||
end loop; |
||||
end Read; |
||||
|
||||
----------- |
||||
-- Reset -- |
||||
----------- |
||||
|
||||
procedure Reset is |
||||
begin |
||||
Random_Elements.Reset (Gen, Init_Random); |
||||
Pack_Size := 0; |
||||
Offset := 1; |
||||
Read_First := Read_Buffer'Last + 1; |
||||
Read_Last := Read_Buffer'Last; |
||||
end Reset; |
||||
|
||||
begin |
||||
Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version); |
||||
|
||||
loop |
||||
for Level in ZLib.Compression_Level'Range loop |
||||
|
||||
Ada.Text_IO.Put ("Level =" |
||||
& ZLib.Compression_Level'Image (Level)); |
||||
|
||||
-- Deflate using generic instantiation. |
||||
|
||||
ZLib.Deflate_Init |
||||
(Filter, |
||||
Level, |
||||
Header => Header); |
||||
|
||||
Reset; |
||||
|
||||
Ada.Text_IO.Put |
||||
(Stream_Element_Offset'Image (File_Size) & " ->"); |
||||
|
||||
loop |
||||
declare |
||||
Buffer : Stream_Element_Array (1 .. 1024); |
||||
Last : Stream_Element_Offset; |
||||
begin |
||||
Read (Filter, Buffer, Last); |
||||
|
||||
Pack_Size := Pack_Size + Last - Buffer'First + 1; |
||||
|
||||
exit when Last < Buffer'Last; |
||||
end; |
||||
end loop; |
||||
|
||||
Ada.Text_IO.Put_Line (Stream_Element_Offset'Image (Pack_Size)); |
||||
|
||||
ZLib.Close (Filter); |
||||
end loop; |
||||
|
||||
exit when not Continuous; |
||||
|
||||
File_Size := File_Size + 1; |
||||
end loop; |
||||
end Read; |
@ -0,0 +1,65 @@ |
||||
ZLib for Ada thick binding (ZLib.Ada) |
||||
Release 1.3 |
||||
|
||||
ZLib.Ada is a thick binding interface to the popular ZLib data |
||||
compression library, available at http://www.gzip.org/zlib/. |
||||
It provides Ada-style access to the ZLib C library. |
||||
|
||||
|
||||
Here are the main changes since ZLib.Ada 1.2: |
||||
|
||||
- Attension: ZLib.Read generic routine have a initialization requirement |
||||
for Read_Last parameter now. It is a bit incompartible with previous version, |
||||
but extends functionality, we could use new parameters Allow_Read_Some and |
||||
Flush now. |
||||
|
||||
- Added Is_Open routines to ZLib and ZLib.Streams packages. |
||||
|
||||
- Add pragma Assert to check Stream_Element is 8 bit. |
||||
|
||||
- Fix extraction to buffer with exact known decompressed size. Error reported by |
||||
Steve Sangwine. |
||||
|
||||
- Fix definition of ULong (changed to unsigned_long), fix regression on 64 bits |
||||
computers. Patch provided by Pascal Obry. |
||||
|
||||
- Add Status_Error exception definition. |
||||
|
||||
- Add pragma Assertion that Ada.Streams.Stream_Element size is 8 bit. |
||||
|
||||
|
||||
How to build ZLib.Ada under GNAT |
||||
|
||||
You should have the ZLib library already build on your computer, before |
||||
building ZLib.Ada. Make the directory of ZLib.Ada sources current and |
||||
issue the command: |
||||
|
||||
gnatmake test -largs -L<directory where libz.a is> -lz |
||||
|
||||
Or use the GNAT project file build for GNAT 3.15 or later: |
||||
|
||||
gnatmake -Pzlib.gpr -L<directory where libz.a is> |
||||
|
||||
|
||||
How to build ZLib.Ada under Aonix ObjectAda for Win32 7.2.2 |
||||
|
||||
1. Make a project with all *.ads and *.adb files from the distribution. |
||||
2. Build the libz.a library from the ZLib C sources. |
||||
3. Rename libz.a to z.lib. |
||||
4. Add the library z.lib to the project. |
||||
5. Add the libc.lib library from the ObjectAda distribution to the project. |
||||
6. Build the executable using test.adb as a main procedure. |
||||
|
||||
|
||||
How to use ZLib.Ada |
||||
|
||||
The source files test.adb and read.adb are small demo programs that show |
||||
the main functionality of ZLib.Ada. |
||||
|
||||
The routines from the package specifications are commented. |
||||
|
||||
|
||||
Homepage: http://zlib-ada.sourceforge.net/ |
||||
Author: Dmitriy Anisimkov <anisimkov@yahoo.com> |
||||
|
||||
Contributors: Pascal Obry <pascal@obry.org>, Steve Sangwine <sjs@essex.ac.uk> |
@ -0,0 +1,463 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: test.adb,v 1.17 2003/08/12 12:13:30 vagul Exp $ |
||||
|
||||
-- The program has a few aims. |
||||
-- 1. Test ZLib.Ada95 thick binding functionality. |
||||
-- 2. Show the example of use main functionality of the ZLib.Ada95 binding. |
||||
-- 3. Build this program automatically compile all ZLib.Ada95 packages under |
||||
-- GNAT Ada95 compiler. |
||||
|
||||
with ZLib.Streams; |
||||
with Ada.Streams.Stream_IO; |
||||
with Ada.Numerics.Discrete_Random; |
||||
|
||||
with Ada.Text_IO; |
||||
|
||||
with Ada.Calendar; |
||||
|
||||
procedure Test is |
||||
|
||||
use Ada.Streams; |
||||
use Stream_IO; |
||||
|
||||
------------------------------------ |
||||
-- Test configuration parameters -- |
||||
------------------------------------ |
||||
|
||||
File_Size : Count := 100_000; |
||||
Continuous : constant Boolean := False; |
||||
|
||||
Header : constant ZLib.Header_Type := ZLib.Default; |
||||
-- ZLib.None; |
||||
-- ZLib.Auto; |
||||
-- ZLib.GZip; |
||||
-- Do not use Header other then Default in ZLib versions 1.1.4 |
||||
-- and older. |
||||
|
||||
Strategy : constant ZLib.Strategy_Type := ZLib.Default_Strategy; |
||||
Init_Random : constant := 10; |
||||
|
||||
-- End -- |
||||
|
||||
In_File_Name : constant String := "testzlib.in"; |
||||
-- Name of the input file |
||||
|
||||
Z_File_Name : constant String := "testzlib.zlb"; |
||||
-- Name of the compressed file. |
||||
|
||||
Out_File_Name : constant String := "testzlib.out"; |
||||
-- Name of the decompressed file. |
||||
|
||||
File_In : File_Type; |
||||
File_Out : File_Type; |
||||
File_Back : File_Type; |
||||
File_Z : ZLib.Streams.Stream_Type; |
||||
|
||||
Filter : ZLib.Filter_Type; |
||||
|
||||
Time_Stamp : Ada.Calendar.Time; |
||||
|
||||
procedure Generate_File; |
||||
-- Generate file of spetsified size with some random data. |
||||
-- The random data is repeatable, for the good compression. |
||||
|
||||
procedure Compare_Streams |
||||
(Left, Right : in out Root_Stream_Type'Class); |
||||
-- The procedure compearing data in 2 streams. |
||||
-- It is for compare data before and after compression/decompression. |
||||
|
||||
procedure Compare_Files (Left, Right : String); |
||||
-- Compare files. Based on the Compare_Streams. |
||||
|
||||
procedure Copy_Streams |
||||
(Source, Target : in out Root_Stream_Type'Class; |
||||
Buffer_Size : in Stream_Element_Offset := 1024); |
||||
-- Copying data from one stream to another. It is for test stream |
||||
-- interface of the library. |
||||
|
||||
procedure Data_In |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset); |
||||
-- this procedure is for generic instantiation of |
||||
-- ZLib.Generic_Translate. |
||||
-- reading data from the File_In. |
||||
|
||||
procedure Data_Out (Item : in Stream_Element_Array); |
||||
-- this procedure is for generic instantiation of |
||||
-- ZLib.Generic_Translate. |
||||
-- writing data to the File_Out. |
||||
|
||||
procedure Stamp; |
||||
-- Store the timestamp to the local variable. |
||||
|
||||
procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count); |
||||
-- Print the time statistic with the message. |
||||
|
||||
procedure Translate is new ZLib.Generic_Translate |
||||
(Data_In => Data_In, |
||||
Data_Out => Data_Out); |
||||
-- This procedure is moving data from File_In to File_Out |
||||
-- with compression or decompression, depend on initialization of |
||||
-- Filter parameter. |
||||
|
||||
------------------- |
||||
-- Compare_Files -- |
||||
------------------- |
||||
|
||||
procedure Compare_Files (Left, Right : String) is |
||||
Left_File, Right_File : File_Type; |
||||
begin |
||||
Open (Left_File, In_File, Left); |
||||
Open (Right_File, In_File, Right); |
||||
Compare_Streams (Stream (Left_File).all, Stream (Right_File).all); |
||||
Close (Left_File); |
||||
Close (Right_File); |
||||
end Compare_Files; |
||||
|
||||
--------------------- |
||||
-- Compare_Streams -- |
||||
--------------------- |
||||
|
||||
procedure Compare_Streams |
||||
(Left, Right : in out Ada.Streams.Root_Stream_Type'Class) |
||||
is |
||||
Left_Buffer, Right_Buffer : Stream_Element_Array (0 .. 16#FFF#); |
||||
Left_Last, Right_Last : Stream_Element_Offset; |
||||
begin |
||||
loop |
||||
Read (Left, Left_Buffer, Left_Last); |
||||
Read (Right, Right_Buffer, Right_Last); |
||||
|
||||
if Left_Last /= Right_Last then |
||||
Ada.Text_IO.Put_Line ("Compare error :" |
||||
& Stream_Element_Offset'Image (Left_Last) |
||||
& " /= " |
||||
& Stream_Element_Offset'Image (Right_Last)); |
||||
|
||||
raise Constraint_Error; |
||||
|
||||
elsif Left_Buffer (0 .. Left_Last) |
||||
/= Right_Buffer (0 .. Right_Last) |
||||
then |
||||
Ada.Text_IO.Put_Line ("ERROR: IN and OUT files is not equal."); |
||||
raise Constraint_Error; |
||||
|
||||
end if; |
||||
|
||||
exit when Left_Last < Left_Buffer'Last; |
||||
end loop; |
||||
end Compare_Streams; |
||||
|
||||
------------------ |
||||
-- Copy_Streams -- |
||||
------------------ |
||||
|
||||
procedure Copy_Streams |
||||
(Source, Target : in out Ada.Streams.Root_Stream_Type'Class; |
||||
Buffer_Size : in Stream_Element_Offset := 1024) |
||||
is |
||||
Buffer : Stream_Element_Array (1 .. Buffer_Size); |
||||
Last : Stream_Element_Offset; |
||||
begin |
||||
loop |
||||
Read (Source, Buffer, Last); |
||||
Write (Target, Buffer (1 .. Last)); |
||||
|
||||
exit when Last < Buffer'Last; |
||||
end loop; |
||||
end Copy_Streams; |
||||
|
||||
------------- |
||||
-- Data_In -- |
||||
------------- |
||||
|
||||
procedure Data_In |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset) is |
||||
begin |
||||
Read (File_In, Item, Last); |
||||
end Data_In; |
||||
|
||||
-------------- |
||||
-- Data_Out -- |
||||
-------------- |
||||
|
||||
procedure Data_Out (Item : in Stream_Element_Array) is |
||||
begin |
||||
Write (File_Out, Item); |
||||
end Data_Out; |
||||
|
||||
------------------- |
||||
-- Generate_File -- |
||||
------------------- |
||||
|
||||
procedure Generate_File is |
||||
subtype Visible_Symbols is Stream_Element range 16#20# .. 16#7E#; |
||||
|
||||
package Random_Elements is |
||||
new Ada.Numerics.Discrete_Random (Visible_Symbols); |
||||
|
||||
Gen : Random_Elements.Generator; |
||||
Buffer : Stream_Element_Array := (1 .. 77 => 16#20#) & 10; |
||||
|
||||
Buffer_Count : constant Count := File_Size / Buffer'Length; |
||||
-- Number of same buffers in the packet. |
||||
|
||||
Density : constant Count := 30; -- from 0 to Buffer'Length - 2; |
||||
|
||||
procedure Fill_Buffer (J, D : in Count); |
||||
-- Change the part of the buffer. |
||||
|
||||
----------------- |
||||
-- Fill_Buffer -- |
||||
----------------- |
||||
|
||||
procedure Fill_Buffer (J, D : in Count) is |
||||
begin |
||||
for K in 0 .. D loop |
||||
Buffer |
||||
(Stream_Element_Offset ((J + K) mod (Buffer'Length - 1) + 1)) |
||||
:= Random_Elements.Random (Gen); |
||||
|
||||
end loop; |
||||
end Fill_Buffer; |
||||
|
||||
begin |
||||
Random_Elements.Reset (Gen, Init_Random); |
||||
|
||||
Create (File_In, Out_File, In_File_Name); |
||||
|
||||
Fill_Buffer (1, Buffer'Length - 2); |
||||
|
||||
for J in 1 .. Buffer_Count loop |
||||
Write (File_In, Buffer); |
||||
|
||||
Fill_Buffer (J, Density); |
||||
end loop; |
||||
|
||||
-- fill remain size. |
||||
|
||||
Write |
||||
(File_In, |
||||
Buffer |
||||
(1 .. Stream_Element_Offset |
||||
(File_Size - Buffer'Length * Buffer_Count))); |
||||
|
||||
Flush (File_In); |
||||
Close (File_In); |
||||
end Generate_File; |
||||
|
||||
--------------------- |
||||
-- Print_Statistic -- |
||||
--------------------- |
||||
|
||||
procedure Print_Statistic (Msg : String; Data_Size : ZLib.Count) is |
||||
use Ada.Calendar; |
||||
use Ada.Text_IO; |
||||
|
||||
package Count_IO is new Integer_IO (ZLib.Count); |
||||
|
||||
Curr_Dur : Duration := Clock - Time_Stamp; |
||||
begin |
||||
Put (Msg); |
||||
|
||||
Set_Col (20); |
||||
Ada.Text_IO.Put ("size ="); |
||||
|
||||
Count_IO.Put |
||||
(Data_Size, |
||||
Width => Stream_IO.Count'Image (File_Size)'Length); |
||||
|
||||
Put_Line (" duration =" & Duration'Image (Curr_Dur)); |
||||
end Print_Statistic; |
||||
|
||||
----------- |
||||
-- Stamp -- |
||||
----------- |
||||
|
||||
procedure Stamp is |
||||
begin |
||||
Time_Stamp := Ada.Calendar.Clock; |
||||
end Stamp; |
||||
|
||||
begin |
||||
Ada.Text_IO.Put_Line ("ZLib " & ZLib.Version); |
||||
|
||||
loop |
||||
Generate_File; |
||||
|
||||
for Level in ZLib.Compression_Level'Range loop |
||||
|
||||
Ada.Text_IO.Put_Line ("Level =" |
||||
& ZLib.Compression_Level'Image (Level)); |
||||
|
||||
-- Test generic interface. |
||||
Open (File_In, In_File, In_File_Name); |
||||
Create (File_Out, Out_File, Z_File_Name); |
||||
|
||||
Stamp; |
||||
|
||||
-- Deflate using generic instantiation. |
||||
|
||||
ZLib.Deflate_Init |
||||
(Filter => Filter, |
||||
Level => Level, |
||||
Strategy => Strategy, |
||||
Header => Header); |
||||
|
||||
Translate (Filter); |
||||
Print_Statistic ("Generic compress", ZLib.Total_Out (Filter)); |
||||
ZLib.Close (Filter); |
||||
|
||||
Close (File_In); |
||||
Close (File_Out); |
||||
|
||||
Open (File_In, In_File, Z_File_Name); |
||||
Create (File_Out, Out_File, Out_File_Name); |
||||
|
||||
Stamp; |
||||
|
||||
-- Inflate using generic instantiation. |
||||
|
||||
ZLib.Inflate_Init (Filter, Header => Header); |
||||
|
||||
Translate (Filter); |
||||
Print_Statistic ("Generic decompress", ZLib.Total_Out (Filter)); |
||||
|
||||
ZLib.Close (Filter); |
||||
|
||||
Close (File_In); |
||||
Close (File_Out); |
||||
|
||||
Compare_Files (In_File_Name, Out_File_Name); |
||||
|
||||
-- Test stream interface. |
||||
|
||||
-- Compress to the back stream. |
||||
|
||||
Open (File_In, In_File, In_File_Name); |
||||
Create (File_Back, Out_File, Z_File_Name); |
||||
|
||||
Stamp; |
||||
|
||||
ZLib.Streams.Create |
||||
(Stream => File_Z, |
||||
Mode => ZLib.Streams.Out_Stream, |
||||
Back => ZLib.Streams.Stream_Access |
||||
(Stream (File_Back)), |
||||
Back_Compressed => True, |
||||
Level => Level, |
||||
Strategy => Strategy, |
||||
Header => Header); |
||||
|
||||
Copy_Streams |
||||
(Source => Stream (File_In).all, |
||||
Target => File_Z); |
||||
|
||||
-- Flushing internal buffers to the back stream. |
||||
|
||||
ZLib.Streams.Flush (File_Z, ZLib.Finish); |
||||
|
||||
Print_Statistic ("Write compress", |
||||
ZLib.Streams.Write_Total_Out (File_Z)); |
||||
|
||||
ZLib.Streams.Close (File_Z); |
||||
|
||||
Close (File_In); |
||||
Close (File_Back); |
||||
|
||||
-- Compare reading from original file and from |
||||
-- decompression stream. |
||||
|
||||
Open (File_In, In_File, In_File_Name); |
||||
Open (File_Back, In_File, Z_File_Name); |
||||
|
||||
ZLib.Streams.Create |
||||
(Stream => File_Z, |
||||
Mode => ZLib.Streams.In_Stream, |
||||
Back => ZLib.Streams.Stream_Access |
||||
(Stream (File_Back)), |
||||
Back_Compressed => True, |
||||
Header => Header); |
||||
|
||||
Stamp; |
||||
Compare_Streams (Stream (File_In).all, File_Z); |
||||
|
||||
Print_Statistic ("Read decompress", |
||||
ZLib.Streams.Read_Total_Out (File_Z)); |
||||
|
||||
ZLib.Streams.Close (File_Z); |
||||
Close (File_In); |
||||
Close (File_Back); |
||||
|
||||
-- Compress by reading from compression stream. |
||||
|
||||
Open (File_Back, In_File, In_File_Name); |
||||
Create (File_Out, Out_File, Z_File_Name); |
||||
|
||||
ZLib.Streams.Create |
||||
(Stream => File_Z, |
||||
Mode => ZLib.Streams.In_Stream, |
||||
Back => ZLib.Streams.Stream_Access |
||||
(Stream (File_Back)), |
||||
Back_Compressed => False, |
||||
Level => Level, |
||||
Strategy => Strategy, |
||||
Header => Header); |
||||
|
||||
Stamp; |
||||
Copy_Streams |
||||
(Source => File_Z, |
||||
Target => Stream (File_Out).all); |
||||
|
||||
Print_Statistic ("Read compress", |
||||
ZLib.Streams.Read_Total_Out (File_Z)); |
||||
|
||||
ZLib.Streams.Close (File_Z); |
||||
|
||||
Close (File_Out); |
||||
Close (File_Back); |
||||
|
||||
-- Decompress to decompression stream. |
||||
|
||||
Open (File_In, In_File, Z_File_Name); |
||||
Create (File_Back, Out_File, Out_File_Name); |
||||
|
||||
ZLib.Streams.Create |
||||
(Stream => File_Z, |
||||
Mode => ZLib.Streams.Out_Stream, |
||||
Back => ZLib.Streams.Stream_Access |
||||
(Stream (File_Back)), |
||||
Back_Compressed => False, |
||||
Header => Header); |
||||
|
||||
Stamp; |
||||
|
||||
Copy_Streams |
||||
(Source => Stream (File_In).all, |
||||
Target => File_Z); |
||||
|
||||
Print_Statistic ("Write decompress", |
||||
ZLib.Streams.Write_Total_Out (File_Z)); |
||||
|
||||
ZLib.Streams.Close (File_Z); |
||||
Close (File_In); |
||||
Close (File_Back); |
||||
|
||||
Compare_Files (In_File_Name, Out_File_Name); |
||||
end loop; |
||||
|
||||
Ada.Text_IO.Put_Line (Count'Image (File_Size) & " Ok."); |
||||
|
||||
exit when not Continuous; |
||||
|
||||
File_Size := File_Size + 1; |
||||
end loop; |
||||
end Test; |
@ -0,0 +1,225 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: zlib-streams.adb,v 1.10 2004/05/31 10:53:40 vagul Exp $ |
||||
|
||||
with Ada.Unchecked_Deallocation; |
||||
|
||||
package body ZLib.Streams is |
||||
|
||||
----------- |
||||
-- Close -- |
||||
----------- |
||||
|
||||
procedure Close (Stream : in out Stream_Type) is |
||||
procedure Free is new Ada.Unchecked_Deallocation |
||||
(Stream_Element_Array, Buffer_Access); |
||||
begin |
||||
if Stream.Mode = Out_Stream or Stream.Mode = Duplex then |
||||
-- We should flush the data written by the writer. |
||||
|
||||
Flush (Stream, Finish); |
||||
|
||||
Close (Stream.Writer); |
||||
end if; |
||||
|
||||
if Stream.Mode = In_Stream or Stream.Mode = Duplex then |
||||
Close (Stream.Reader); |
||||
Free (Stream.Buffer); |
||||
end if; |
||||
end Close; |
||||
|
||||
------------ |
||||
-- Create -- |
||||
------------ |
||||
|
||||
procedure Create |
||||
(Stream : out Stream_Type; |
||||
Mode : in Stream_Mode; |
||||
Back : in Stream_Access; |
||||
Back_Compressed : in Boolean; |
||||
Level : in Compression_Level := Default_Compression; |
||||
Strategy : in Strategy_Type := Default_Strategy; |
||||
Header : in Header_Type := Default; |
||||
Read_Buffer_Size : in Ada.Streams.Stream_Element_Offset |
||||
:= Default_Buffer_Size; |
||||
Write_Buffer_Size : in Ada.Streams.Stream_Element_Offset |
||||
:= Default_Buffer_Size) |
||||
is |
||||
|
||||
subtype Buffer_Subtype is Stream_Element_Array (1 .. Read_Buffer_Size); |
||||
|
||||
procedure Init_Filter |
||||
(Filter : in out Filter_Type; |
||||
Compress : in Boolean); |
||||
|
||||
----------------- |
||||
-- Init_Filter -- |
||||
----------------- |
||||
|
||||
procedure Init_Filter |
||||
(Filter : in out Filter_Type; |
||||
Compress : in Boolean) is |
||||
begin |
||||
if Compress then |
||||
Deflate_Init |
||||
(Filter, Level, Strategy, Header => Header); |
||||
else |
||||
Inflate_Init (Filter, Header => Header); |
||||
end if; |
||||
end Init_Filter; |
||||
|
||||
begin |
||||
Stream.Back := Back; |
||||
Stream.Mode := Mode; |
||||
|
||||
if Mode = Out_Stream or Mode = Duplex then |
||||
Init_Filter (Stream.Writer, Back_Compressed); |
||||
Stream.Buffer_Size := Write_Buffer_Size; |
||||
else |
||||
Stream.Buffer_Size := 0; |
||||
end if; |
||||
|
||||
if Mode = In_Stream or Mode = Duplex then |
||||
Init_Filter (Stream.Reader, not Back_Compressed); |
||||
|
||||
Stream.Buffer := new Buffer_Subtype; |
||||
Stream.Rest_First := Stream.Buffer'Last + 1; |
||||
Stream.Rest_Last := Stream.Buffer'Last; |
||||
end if; |
||||
end Create; |
||||
|
||||
----------- |
||||
-- Flush -- |
||||
----------- |
||||
|
||||
procedure Flush |
||||
(Stream : in out Stream_Type; |
||||
Mode : in Flush_Mode := Sync_Flush) |
||||
is |
||||
Buffer : Stream_Element_Array (1 .. Stream.Buffer_Size); |
||||
Last : Stream_Element_Offset; |
||||
begin |
||||
loop |
||||
Flush (Stream.Writer, Buffer, Last, Mode); |
||||
|
||||
Ada.Streams.Write (Stream.Back.all, Buffer (1 .. Last)); |
||||
|
||||
exit when Last < Buffer'Last; |
||||
end loop; |
||||
end Flush; |
||||
|
||||
------------- |
||||
-- Is_Open -- |
||||
------------- |
||||
|
||||
function Is_Open (Stream : Stream_Type) return Boolean is |
||||
begin |
||||
return Is_Open (Stream.Reader) or else Is_Open (Stream.Writer); |
||||
end Is_Open; |
||||
|
||||
---------- |
||||
-- Read -- |
||||
---------- |
||||
|
||||
procedure Read |
||||
(Stream : in out Stream_Type; |
||||
Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset) |
||||
is |
||||
|
||||
procedure Read |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset); |
||||
|
||||
---------- |
||||
-- Read -- |
||||
---------- |
||||
|
||||
procedure Read |
||||
(Item : out Stream_Element_Array; |
||||
Last : out Stream_Element_Offset) is |
||||
begin |
||||
Ada.Streams.Read (Stream.Back.all, Item, Last); |
||||
end Read; |
||||
|
||||
procedure Read is new ZLib.Read |
||||
(Read => Read, |
||||
Buffer => Stream.Buffer.all, |
||||
Rest_First => Stream.Rest_First, |
||||
Rest_Last => Stream.Rest_Last); |
||||
|
||||
begin |
||||
Read (Stream.Reader, Item, Last); |
||||
end Read; |
||||
|
||||
------------------- |
||||
-- Read_Total_In -- |
||||
------------------- |
||||
|
||||
function Read_Total_In (Stream : in Stream_Type) return Count is |
||||
begin |
||||
return Total_In (Stream.Reader); |
||||
end Read_Total_In; |
||||
|
||||
-------------------- |
||||
-- Read_Total_Out -- |
||||
-------------------- |
||||
|
||||
function Read_Total_Out (Stream : in Stream_Type) return Count is |
||||
begin |
||||
return Total_Out (Stream.Reader); |
||||
end Read_Total_Out; |
||||
|
||||
----------- |
||||
-- Write -- |
||||
----------- |
||||
|
||||
procedure Write |
||||
(Stream : in out Stream_Type; |
||||
Item : in Stream_Element_Array) |
||||
is |
||||
|
||||
procedure Write (Item : in Stream_Element_Array); |
||||
|
||||
----------- |
||||
-- Write -- |
||||
----------- |
||||
|
||||
procedure Write (Item : in Stream_Element_Array) is |
||||
begin |
||||
Ada.Streams.Write (Stream.Back.all, Item); |
||||
end Write; |
||||
|
||||
procedure Write is new ZLib.Write |
||||
(Write => Write, |
||||
Buffer_Size => Stream.Buffer_Size); |
||||
|
||||
begin |
||||
Write (Stream.Writer, Item, No_Flush); |
||||
end Write; |
||||
|
||||
-------------------- |
||||
-- Write_Total_In -- |
||||
-------------------- |
||||
|
||||
function Write_Total_In (Stream : in Stream_Type) return Count is |
||||
begin |
||||
return Total_In (Stream.Writer); |
||||
end Write_Total_In; |
||||
|
||||
--------------------- |
||||
-- Write_Total_Out -- |
||||
--------------------- |
||||
|
||||
function Write_Total_Out (Stream : in Stream_Type) return Count is |
||||
begin |
||||
return Total_Out (Stream.Writer); |
||||
end Write_Total_Out; |
||||
|
||||
end ZLib.Streams; |
@ -0,0 +1,114 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: zlib-streams.ads,v 1.12 2004/05/31 10:53:40 vagul Exp $ |
||||
|
||||
package ZLib.Streams is |
||||
|
||||
type Stream_Mode is (In_Stream, Out_Stream, Duplex); |
||||
|
||||
type Stream_Access is access all Ada.Streams.Root_Stream_Type'Class; |
||||
|
||||
type Stream_Type is |
||||
new Ada.Streams.Root_Stream_Type with private; |
||||
|
||||
procedure Read |
||||
(Stream : in out Stream_Type; |
||||
Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset); |
||||
|
||||
procedure Write |
||||
(Stream : in out Stream_Type; |
||||
Item : in Ada.Streams.Stream_Element_Array); |
||||
|
||||
procedure Flush |
||||
(Stream : in out Stream_Type; |
||||
Mode : in Flush_Mode := Sync_Flush); |
||||
-- Flush the written data to the back stream, |
||||
-- all data placed to the compressor is flushing to the Back stream. |
||||
-- Should not be used until necessary, because it is decreasing |
||||
-- compression. |
||||
|
||||
function Read_Total_In (Stream : in Stream_Type) return Count; |
||||
pragma Inline (Read_Total_In); |
||||
-- Return total number of bytes read from back stream so far. |
||||
|
||||
function Read_Total_Out (Stream : in Stream_Type) return Count; |
||||
pragma Inline (Read_Total_Out); |
||||
-- Return total number of bytes read so far. |
||||
|
||||
function Write_Total_In (Stream : in Stream_Type) return Count; |
||||
pragma Inline (Write_Total_In); |
||||
-- Return total number of bytes written so far. |
||||
|
||||
function Write_Total_Out (Stream : in Stream_Type) return Count; |
||||
pragma Inline (Write_Total_Out); |
||||
-- Return total number of bytes written to the back stream. |
||||
|
||||
procedure Create |
||||
(Stream : out Stream_Type; |
||||
Mode : in Stream_Mode; |
||||
Back : in Stream_Access; |
||||
Back_Compressed : in Boolean; |
||||
Level : in Compression_Level := Default_Compression; |
||||
Strategy : in Strategy_Type := Default_Strategy; |
||||
Header : in Header_Type := Default; |
||||
Read_Buffer_Size : in Ada.Streams.Stream_Element_Offset |
||||
:= Default_Buffer_Size; |
||||
Write_Buffer_Size : in Ada.Streams.Stream_Element_Offset |
||||
:= Default_Buffer_Size); |
||||
-- Create the Comression/Decompression stream. |
||||
-- If mode is In_Stream then Write operation is disabled. |
||||
-- If mode is Out_Stream then Read operation is disabled. |
||||
|
||||
-- If Back_Compressed is true then |
||||
-- Data written to the Stream is compressing to the Back stream |
||||
-- and data read from the Stream is decompressed data from the Back stream. |
||||
|
||||
-- If Back_Compressed is false then |
||||
-- Data written to the Stream is decompressing to the Back stream |
||||
-- and data read from the Stream is compressed data from the Back stream. |
||||
|
||||
-- !!! When the Need_Header is False ZLib-Ada is using undocumented |
||||
-- ZLib 1.1.4 functionality to do not create/wait for ZLib headers. |
||||
|
||||
function Is_Open (Stream : Stream_Type) return Boolean; |
||||
|
||||
procedure Close (Stream : in out Stream_Type); |
||||
|
||||
private |
||||
|
||||
use Ada.Streams; |
||||
|
||||
type Buffer_Access is access all Stream_Element_Array; |
||||
|
||||
type Stream_Type |
||||
is new Root_Stream_Type with |
||||
record |
||||
Mode : Stream_Mode; |
||||
|
||||
Buffer : Buffer_Access; |
||||
Rest_First : Stream_Element_Offset; |
||||
Rest_Last : Stream_Element_Offset; |
||||
-- Buffer for Read operation. |
||||
-- We need to have this buffer in the record |
||||
-- because not all read data from back stream |
||||
-- could be processed during the read operation. |
||||
|
||||
Buffer_Size : Stream_Element_Offset; |
||||
-- Buffer size for write operation. |
||||
-- We do not need to have this buffer |
||||
-- in the record because all data could be |
||||
-- processed in the write operation. |
||||
|
||||
Back : Stream_Access; |
||||
Reader : Filter_Type; |
||||
Writer : Filter_Type; |
||||
end record; |
||||
|
||||
end ZLib.Streams; |
@ -0,0 +1,141 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: zlib-thin.adb,v 1.8 2003/12/14 18:27:31 vagul Exp $ |
||||
|
||||
package body ZLib.Thin is |
||||
|
||||
ZLIB_VERSION : constant Chars_Ptr := zlibVersion; |
||||
|
||||
Z_Stream_Size : constant Int := Z_Stream'Size / System.Storage_Unit; |
||||
|
||||
-------------- |
||||
-- Avail_In -- |
||||
-------------- |
||||
|
||||
function Avail_In (Strm : in Z_Stream) return UInt is |
||||
begin |
||||
return Strm.Avail_In; |
||||
end Avail_In; |
||||
|
||||
--------------- |
||||
-- Avail_Out -- |
||||
--------------- |
||||
|
||||
function Avail_Out (Strm : in Z_Stream) return UInt is |
||||
begin |
||||
return Strm.Avail_Out; |
||||
end Avail_Out; |
||||
|
||||
------------------ |
||||
-- Deflate_Init -- |
||||
------------------ |
||||
|
||||
function Deflate_Init |
||||
(strm : Z_Streamp; |
||||
level : Int; |
||||
method : Int; |
||||
windowBits : Int; |
||||
memLevel : Int; |
||||
strategy : Int) |
||||
return Int is |
||||
begin |
||||
return deflateInit2 |
||||
(strm, |
||||
level, |
||||
method, |
||||
windowBits, |
||||
memLevel, |
||||
strategy, |
||||
ZLIB_VERSION, |
||||
Z_Stream_Size); |
||||
end Deflate_Init; |
||||
|
||||
------------------ |
||||
-- Inflate_Init -- |
||||
------------------ |
||||
|
||||
function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int is |
||||
begin |
||||
return inflateInit2 (strm, windowBits, ZLIB_VERSION, Z_Stream_Size); |
||||
end Inflate_Init; |
||||
|
||||
------------------------ |
||||
-- Last_Error_Message -- |
||||
------------------------ |
||||
|
||||
function Last_Error_Message (Strm : in Z_Stream) return String is |
||||
use Interfaces.C.Strings; |
||||
begin |
||||
if Strm.msg = Null_Ptr then |
||||
return ""; |
||||
else |
||||
return Value (Strm.msg); |
||||
end if; |
||||
end Last_Error_Message; |
||||
|
||||
------------ |
||||
-- Set_In -- |
||||
------------ |
||||
|
||||
procedure Set_In |
||||
(Strm : in out Z_Stream; |
||||
Buffer : in Voidp; |
||||
Size : in UInt) is |
||||
begin |
||||
Strm.Next_In := Buffer; |
||||
Strm.Avail_In := Size; |
||||
end Set_In; |
||||
|
||||
------------------ |
||||
-- Set_Mem_Func -- |
||||
------------------ |
||||
|
||||
procedure Set_Mem_Func |
||||
(Strm : in out Z_Stream; |
||||
Opaque : in Voidp; |
||||
Alloc : in alloc_func; |
||||
Free : in free_func) is |
||||
begin |
||||
Strm.opaque := Opaque; |
||||
Strm.zalloc := Alloc; |
||||
Strm.zfree := Free; |
||||
end Set_Mem_Func; |
||||
|
||||
------------- |
||||
-- Set_Out -- |
||||
------------- |
||||
|
||||
procedure Set_Out |
||||
(Strm : in out Z_Stream; |
||||
Buffer : in Voidp; |
||||
Size : in UInt) is |
||||
begin |
||||
Strm.Next_Out := Buffer; |
||||
Strm.Avail_Out := Size; |
||||
end Set_Out; |
||||
|
||||
-------------- |
||||
-- Total_In -- |
||||
-------------- |
||||
|
||||
function Total_In (Strm : in Z_Stream) return ULong is |
||||
begin |
||||
return Strm.Total_In; |
||||
end Total_In; |
||||
|
||||
--------------- |
||||
-- Total_Out -- |
||||
--------------- |
||||
|
||||
function Total_Out (Strm : in Z_Stream) return ULong is |
||||
begin |
||||
return Strm.Total_Out; |
||||
end Total_Out; |
||||
|
||||
end ZLib.Thin; |
@ -0,0 +1,450 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2003 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: zlib-thin.ads,v 1.11 2004/07/23 06:33:11 vagul Exp $ |
||||
|
||||
with Interfaces.C.Strings; |
||||
|
||||
with System; |
||||
|
||||
private package ZLib.Thin is |
||||
|
||||
-- From zconf.h |
||||
|
||||
MAX_MEM_LEVEL : constant := 9; -- zconf.h:105 |
||||
-- zconf.h:105 |
||||
MAX_WBITS : constant := 15; -- zconf.h:115 |
||||
-- 32K LZ77 window |
||||
-- zconf.h:115 |
||||
SEEK_SET : constant := 8#0000#; -- zconf.h:244 |
||||
-- Seek from beginning of file. |
||||
-- zconf.h:244 |
||||
SEEK_CUR : constant := 1; -- zconf.h:245 |
||||
-- Seek from current position. |
||||
-- zconf.h:245 |
||||
SEEK_END : constant := 2; -- zconf.h:246 |
||||
-- Set file pointer to EOF plus "offset" |
||||
-- zconf.h:246 |
||||
|
||||
type Byte is new Interfaces.C.unsigned_char; -- 8 bits |
||||
-- zconf.h:214 |
||||
type UInt is new Interfaces.C.unsigned; -- 16 bits or more |
||||
-- zconf.h:216 |
||||
type Int is new Interfaces.C.int; |
||||
|
||||
type ULong is new Interfaces.C.unsigned_long; -- 32 bits or more |
||||
-- zconf.h:217 |
||||
subtype Chars_Ptr is Interfaces.C.Strings.chars_ptr; |
||||
|
||||
type ULong_Access is access ULong; |
||||
type Int_Access is access Int; |
||||
|
||||
subtype Voidp is System.Address; -- zconf.h:232 |
||||
|
||||
subtype Byte_Access is Voidp; |
||||
|
||||
Nul : constant Voidp := System.Null_Address; |
||||
-- end from zconf |
||||
|
||||
Z_NO_FLUSH : constant := 8#0000#; -- zlib.h:125 |
||||
-- zlib.h:125 |
||||
Z_PARTIAL_FLUSH : constant := 1; -- zlib.h:126 |
||||
-- will be removed, use |
||||
-- Z_SYNC_FLUSH instead |
||||
-- zlib.h:126 |
||||
Z_SYNC_FLUSH : constant := 2; -- zlib.h:127 |
||||
-- zlib.h:127 |
||||
Z_FULL_FLUSH : constant := 3; -- zlib.h:128 |
||||
-- zlib.h:128 |
||||
Z_FINISH : constant := 4; -- zlib.h:129 |
||||
-- zlib.h:129 |
||||
Z_OK : constant := 8#0000#; -- zlib.h:132 |
||||
-- zlib.h:132 |
||||
Z_STREAM_END : constant := 1; -- zlib.h:133 |
||||
-- zlib.h:133 |
||||
Z_NEED_DICT : constant := 2; -- zlib.h:134 |
||||
-- zlib.h:134 |
||||
Z_ERRNO : constant := -1; -- zlib.h:135 |
||||
-- zlib.h:135 |
||||
Z_STREAM_ERROR : constant := -2; -- zlib.h:136 |
||||
-- zlib.h:136 |
||||
Z_DATA_ERROR : constant := -3; -- zlib.h:137 |
||||
-- zlib.h:137 |
||||
Z_MEM_ERROR : constant := -4; -- zlib.h:138 |
||||
-- zlib.h:138 |
||||
Z_BUF_ERROR : constant := -5; -- zlib.h:139 |
||||
-- zlib.h:139 |
||||
Z_VERSION_ERROR : constant := -6; -- zlib.h:140 |
||||
-- zlib.h:140 |
||||
Z_NO_COMPRESSION : constant := 8#0000#; -- zlib.h:145 |
||||
-- zlib.h:145 |
||||
Z_BEST_SPEED : constant := 1; -- zlib.h:146 |
||||
-- zlib.h:146 |
||||
Z_BEST_COMPRESSION : constant := 9; -- zlib.h:147 |
||||
-- zlib.h:147 |
||||
Z_DEFAULT_COMPRESSION : constant := -1; -- zlib.h:148 |
||||
-- zlib.h:148 |
||||
Z_FILTERED : constant := 1; -- zlib.h:151 |
||||
-- zlib.h:151 |
||||
Z_HUFFMAN_ONLY : constant := 2; -- zlib.h:152 |
||||
-- zlib.h:152 |
||||
Z_DEFAULT_STRATEGY : constant := 8#0000#; -- zlib.h:153 |
||||
-- zlib.h:153 |
||||
Z_BINARY : constant := 8#0000#; -- zlib.h:156 |
||||
-- zlib.h:156 |
||||
Z_ASCII : constant := 1; -- zlib.h:157 |
||||
-- zlib.h:157 |
||||
Z_UNKNOWN : constant := 2; -- zlib.h:158 |
||||
-- zlib.h:158 |
||||
Z_DEFLATED : constant := 8; -- zlib.h:161 |
||||
-- zlib.h:161 |
||||
Z_NULL : constant := 8#0000#; -- zlib.h:164 |
||||
-- for initializing zalloc, zfree, opaque |
||||
-- zlib.h:164 |
||||
type gzFile is new Voidp; -- zlib.h:646 |
||||
|
||||
type Z_Stream is private; |
||||
|
||||
type Z_Streamp is access all Z_Stream; -- zlib.h:89 |
||||
|
||||
type alloc_func is access function |
||||
(Opaque : Voidp; |
||||
Items : UInt; |
||||
Size : UInt) |
||||
return Voidp; -- zlib.h:63 |
||||
|
||||
type free_func is access procedure (opaque : Voidp; address : Voidp); |
||||
|
||||
function zlibVersion return Chars_Ptr; |
||||
|
||||
function Deflate (strm : Z_Streamp; flush : Int) return Int; |
||||
|
||||
function DeflateEnd (strm : Z_Streamp) return Int; |
||||
|
||||
function Inflate (strm : Z_Streamp; flush : Int) return Int; |
||||
|
||||
function InflateEnd (strm : Z_Streamp) return Int; |
||||
|
||||
function deflateSetDictionary |
||||
(strm : Z_Streamp; |
||||
dictionary : Byte_Access; |
||||
dictLength : UInt) |
||||
return Int; |
||||
|
||||
function deflateCopy (dest : Z_Streamp; source : Z_Streamp) return Int; |
||||
-- zlib.h:478 |
||||
|
||||
function deflateReset (strm : Z_Streamp) return Int; -- zlib.h:495 |
||||
|
||||
function deflateParams |
||||
(strm : Z_Streamp; |
||||
level : Int; |
||||
strategy : Int) |
||||
return Int; -- zlib.h:506 |
||||
|
||||
function inflateSetDictionary |
||||
(strm : Z_Streamp; |
||||
dictionary : Byte_Access; |
||||
dictLength : UInt) |
||||
return Int; -- zlib.h:548 |
||||
|
||||
function inflateSync (strm : Z_Streamp) return Int; -- zlib.h:565 |
||||
|
||||
function inflateReset (strm : Z_Streamp) return Int; -- zlib.h:580 |
||||
|
||||
function compress |
||||
(dest : Byte_Access; |
||||
destLen : ULong_Access; |
||||
source : Byte_Access; |
||||
sourceLen : ULong) |
||||
return Int; -- zlib.h:601 |
||||
|
||||
function compress2 |
||||
(dest : Byte_Access; |
||||
destLen : ULong_Access; |
||||
source : Byte_Access; |
||||
sourceLen : ULong; |
||||
level : Int) |
||||
return Int; -- zlib.h:615 |
||||
|
||||
function uncompress |
||||
(dest : Byte_Access; |
||||
destLen : ULong_Access; |
||||
source : Byte_Access; |
||||
sourceLen : ULong) |
||||
return Int; |
||||
|
||||
function gzopen (path : Chars_Ptr; mode : Chars_Ptr) return gzFile; |
||||
|
||||
function gzdopen (fd : Int; mode : Chars_Ptr) return gzFile; |
||||
|
||||
function gzsetparams |
||||
(file : gzFile; |
||||
level : Int; |
||||
strategy : Int) |
||||
return Int; |
||||
|
||||
function gzread |
||||
(file : gzFile; |
||||
buf : Voidp; |
||||
len : UInt) |
||||
return Int; |
||||
|
||||
function gzwrite |
||||
(file : in gzFile; |
||||
buf : in Voidp; |
||||
len : in UInt) |
||||
return Int; |
||||
|
||||
function gzprintf (file : in gzFile; format : in Chars_Ptr) return Int; |
||||
|
||||
function gzputs (file : in gzFile; s : in Chars_Ptr) return Int; |
||||
|
||||
function gzgets |
||||
(file : gzFile; |
||||
buf : Chars_Ptr; |
||||
len : Int) |
||||
return Chars_Ptr; |
||||
|
||||
function gzputc (file : gzFile; char : Int) return Int; |
||||
|
||||
function gzgetc (file : gzFile) return Int; |
||||
|
||||
function gzflush (file : gzFile; flush : Int) return Int; |
||||
|
||||
function gzseek |
||||
(file : gzFile; |
||||
offset : Int; |
||||
whence : Int) |
||||
return Int; |
||||
|
||||
function gzrewind (file : gzFile) return Int; |
||||
|
||||
function gztell (file : gzFile) return Int; |
||||
|
||||
function gzeof (file : gzFile) return Int; |
||||
|
||||
function gzclose (file : gzFile) return Int; |
||||
|
||||
function gzerror (file : gzFile; errnum : Int_Access) return Chars_Ptr; |
||||
|
||||
function adler32 |
||||
(adler : ULong; |
||||
buf : Byte_Access; |
||||
len : UInt) |
||||
return ULong; |
||||
|
||||
function crc32 |
||||
(crc : ULong; |
||||
buf : Byte_Access; |
||||
len : UInt) |
||||
return ULong; |
||||
|
||||
function deflateInit |
||||
(strm : Z_Streamp; |
||||
level : Int; |
||||
version : Chars_Ptr; |
||||
stream_size : Int) |
||||
return Int; |
||||
|
||||
function deflateInit2 |
||||
(strm : Z_Streamp; |
||||
level : Int; |
||||
method : Int; |
||||
windowBits : Int; |
||||
memLevel : Int; |
||||
strategy : Int; |
||||
version : Chars_Ptr; |
||||
stream_size : Int) |
||||
return Int; |
||||
|
||||
function Deflate_Init |
||||
(strm : Z_Streamp; |
||||
level : Int; |
||||
method : Int; |
||||
windowBits : Int; |
||||
memLevel : Int; |
||||
strategy : Int) |
||||
return Int; |
||||
pragma Inline (Deflate_Init); |
||||
|
||||
function inflateInit |
||||
(strm : Z_Streamp; |
||||
version : Chars_Ptr; |
||||
stream_size : Int) |
||||
return Int; |
||||
|
||||
function inflateInit2 |
||||
(strm : in Z_Streamp; |
||||
windowBits : in Int; |
||||
version : in Chars_Ptr; |
||||
stream_size : in Int) |
||||
return Int; |
||||
|
||||
function inflateBackInit |
||||
(strm : in Z_Streamp; |
||||
windowBits : in Int; |
||||
window : in Byte_Access; |
||||
version : in Chars_Ptr; |
||||
stream_size : in Int) |
||||
return Int; |
||||
-- Size of window have to be 2**windowBits. |
||||
|
||||
function Inflate_Init (strm : Z_Streamp; windowBits : Int) return Int; |
||||
pragma Inline (Inflate_Init); |
||||
|
||||
function zError (err : Int) return Chars_Ptr; |
||||
|
||||
function inflateSyncPoint (z : Z_Streamp) return Int; |
||||
|
||||
function get_crc_table return ULong_Access; |
||||
|
||||
-- Interface to the available fields of the z_stream structure. |
||||
-- The application must update next_in and avail_in when avail_in has |
||||
-- dropped to zero. It must update next_out and avail_out when avail_out |
||||
-- has dropped to zero. The application must initialize zalloc, zfree and |
||||
-- opaque before calling the init function. |
||||
|
||||
procedure Set_In |
||||
(Strm : in out Z_Stream; |
||||
Buffer : in Voidp; |
||||
Size : in UInt); |
||||
pragma Inline (Set_In); |
||||
|
||||
procedure Set_Out |
||||
(Strm : in out Z_Stream; |
||||
Buffer : in Voidp; |
||||
Size : in UInt); |
||||
pragma Inline (Set_Out); |
||||
|
||||
procedure Set_Mem_Func |
||||
(Strm : in out Z_Stream; |
||||
Opaque : in Voidp; |
||||
Alloc : in alloc_func; |
||||
Free : in free_func); |
||||
pragma Inline (Set_Mem_Func); |
||||
|
||||
function Last_Error_Message (Strm : in Z_Stream) return String; |
||||
pragma Inline (Last_Error_Message); |
||||
|
||||
function Avail_Out (Strm : in Z_Stream) return UInt; |
||||
pragma Inline (Avail_Out); |
||||
|
||||
function Avail_In (Strm : in Z_Stream) return UInt; |
||||
pragma Inline (Avail_In); |
||||
|
||||
function Total_In (Strm : in Z_Stream) return ULong; |
||||
pragma Inline (Total_In); |
||||
|
||||
function Total_Out (Strm : in Z_Stream) return ULong; |
||||
pragma Inline (Total_Out); |
||||
|
||||
function inflateCopy |
||||
(dest : in Z_Streamp; |
||||
Source : in Z_Streamp) |
||||
return Int; |
||||
|
||||
function compressBound (Source_Len : in ULong) return ULong; |
||||
|
||||
function deflateBound |
||||
(Strm : in Z_Streamp; |
||||
Source_Len : in ULong) |
||||
return ULong; |
||||
|
||||
function gzungetc (C : in Int; File : in gzFile) return Int; |
||||
|
||||
function zlibCompileFlags return ULong; |
||||
|
||||
private |
||||
|
||||
type Z_Stream is record -- zlib.h:68 |
||||
Next_In : Voidp := Nul; -- next input byte |
||||
Avail_In : UInt := 0; -- number of bytes available at next_in |
||||
Total_In : ULong := 0; -- total nb of input bytes read so far |
||||
Next_Out : Voidp := Nul; -- next output byte should be put there |
||||
Avail_Out : UInt := 0; -- remaining free space at next_out |
||||
Total_Out : ULong := 0; -- total nb of bytes output so far |
||||
msg : Chars_Ptr; -- last error message, NULL if no error |
||||
state : Voidp; -- not visible by applications |
||||
zalloc : alloc_func := null; -- used to allocate the internal state |
||||
zfree : free_func := null; -- used to free the internal state |
||||
opaque : Voidp; -- private data object passed to |
||||
-- zalloc and zfree |
||||
data_type : Int; -- best guess about the data type: |
||||
-- ascii or binary |
||||
adler : ULong; -- adler32 value of the uncompressed |
||||
-- data |
||||
reserved : ULong; -- reserved for future use |
||||
end record; |
||||
|
||||
pragma Convention (C, Z_Stream); |
||||
|
||||
pragma Import (C, zlibVersion, "zlibVersion"); |
||||
pragma Import (C, Deflate, "deflate"); |
||||
pragma Import (C, DeflateEnd, "deflateEnd"); |
||||
pragma Import (C, Inflate, "inflate"); |
||||
pragma Import (C, InflateEnd, "inflateEnd"); |
||||
pragma Import (C, deflateSetDictionary, "deflateSetDictionary"); |
||||
pragma Import (C, deflateCopy, "deflateCopy"); |
||||
pragma Import (C, deflateReset, "deflateReset"); |
||||
pragma Import (C, deflateParams, "deflateParams"); |
||||
pragma Import (C, inflateSetDictionary, "inflateSetDictionary"); |
||||
pragma Import (C, inflateSync, "inflateSync"); |
||||
pragma Import (C, inflateReset, "inflateReset"); |
||||
pragma Import (C, compress, "compress"); |
||||
pragma Import (C, compress2, "compress2"); |
||||
pragma Import (C, uncompress, "uncompress"); |
||||
pragma Import (C, gzopen, "gzopen"); |
||||
pragma Import (C, gzdopen, "gzdopen"); |
||||
pragma Import (C, gzsetparams, "gzsetparams"); |
||||
pragma Import (C, gzread, "gzread"); |
||||
pragma Import (C, gzwrite, "gzwrite"); |
||||
pragma Import (C, gzprintf, "gzprintf"); |
||||
pragma Import (C, gzputs, "gzputs"); |
||||
pragma Import (C, gzgets, "gzgets"); |
||||
pragma Import (C, gzputc, "gzputc"); |
||||
pragma Import (C, gzgetc, "gzgetc"); |
||||
pragma Import (C, gzflush, "gzflush"); |
||||
pragma Import (C, gzseek, "gzseek"); |
||||
pragma Import (C, gzrewind, "gzrewind"); |
||||
pragma Import (C, gztell, "gztell"); |
||||
pragma Import (C, gzeof, "gzeof"); |
||||
pragma Import (C, gzclose, "gzclose"); |
||||
pragma Import (C, gzerror, "gzerror"); |
||||
pragma Import (C, adler32, "adler32"); |
||||
pragma Import (C, crc32, "crc32"); |
||||
pragma Import (C, deflateInit, "deflateInit_"); |
||||
pragma Import (C, inflateInit, "inflateInit_"); |
||||
pragma Import (C, deflateInit2, "deflateInit2_"); |
||||
pragma Import (C, inflateInit2, "inflateInit2_"); |
||||
pragma Import (C, zError, "zError"); |
||||
pragma Import (C, inflateSyncPoint, "inflateSyncPoint"); |
||||
pragma Import (C, get_crc_table, "get_crc_table"); |
||||
|
||||
-- since zlib 1.2.0: |
||||
|
||||
pragma Import (C, inflateCopy, "inflateCopy"); |
||||
pragma Import (C, compressBound, "compressBound"); |
||||
pragma Import (C, deflateBound, "deflateBound"); |
||||
pragma Import (C, gzungetc, "gzungetc"); |
||||
pragma Import (C, zlibCompileFlags, "zlibCompileFlags"); |
||||
|
||||
pragma Import (C, inflateBackInit, "inflateBackInit_"); |
||||
|
||||
-- I stopped binding the inflateBack routines, because realize that |
||||
-- it does not support zlib and gzip headers for now, and have no |
||||
-- symmetric deflateBack routines. |
||||
-- ZLib-Ada is symmetric regarding deflate/inflate data transformation |
||||
-- and has a similar generic callback interface for the |
||||
-- deflate/inflate transformation based on the regular Deflate/Inflate |
||||
-- routines. |
||||
|
||||
-- pragma Import (C, inflateBack, "inflateBack"); |
||||
-- pragma Import (C, inflateBackEnd, "inflateBackEnd"); |
||||
|
||||
end ZLib.Thin; |
@ -0,0 +1,701 @@ |
||||
---------------------------------------------------------------- |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2004 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- Open source license information is in the zlib.ads file. -- |
||||
---------------------------------------------------------------- |
||||
|
||||
-- $Id: zlib.adb,v 1.31 2004/09/06 06:53:19 vagul Exp $ |
||||
|
||||
with Ada.Exceptions; |
||||
with Ada.Unchecked_Conversion; |
||||
with Ada.Unchecked_Deallocation; |
||||
|
||||
with Interfaces.C.Strings; |
||||
|
||||
with ZLib.Thin; |
||||
|
||||
package body ZLib is |
||||
|
||||
use type Thin.Int; |
||||
|
||||
type Z_Stream is new Thin.Z_Stream; |
||||
|
||||
type Return_Code_Enum is |
||||
(OK, |
||||
STREAM_END, |
||||
NEED_DICT, |
||||
ERRNO, |
||||
STREAM_ERROR, |
||||
DATA_ERROR, |
||||
MEM_ERROR, |
||||
BUF_ERROR, |
||||
VERSION_ERROR); |
||||
|
||||
type Flate_Step_Function is access |
||||
function (Strm : in Thin.Z_Streamp; Flush : in Thin.Int) return Thin.Int; |
||||
pragma Convention (C, Flate_Step_Function); |
||||
|
||||
type Flate_End_Function is access |
||||
function (Ctrm : in Thin.Z_Streamp) return Thin.Int; |
||||
pragma Convention (C, Flate_End_Function); |
||||
|
||||
type Flate_Type is record |
||||
Step : Flate_Step_Function; |
||||
Done : Flate_End_Function; |
||||
end record; |
||||
|
||||
subtype Footer_Array is Stream_Element_Array (1 .. 8); |
||||
|
||||
Simple_GZip_Header : constant Stream_Element_Array (1 .. 10) |
||||
:= (16#1f#, 16#8b#, -- Magic header |
||||
16#08#, -- Z_DEFLATED |
||||
16#00#, -- Flags |
||||
16#00#, 16#00#, 16#00#, 16#00#, -- Time |
||||
16#00#, -- XFlags |
||||
16#03# -- OS code |
||||
); |
||||
-- The simplest gzip header is not for informational, but just for |
||||
-- gzip format compatibility. |
||||
-- Note that some code below is using assumption |
||||
-- Simple_GZip_Header'Last > Footer_Array'Last, so do not make |
||||
-- Simple_GZip_Header'Last <= Footer_Array'Last. |
||||
|
||||
Return_Code : constant array (Thin.Int range <>) of Return_Code_Enum |
||||
:= (0 => OK, |
||||
1 => STREAM_END, |
||||
2 => NEED_DICT, |
||||
-1 => ERRNO, |
||||
-2 => STREAM_ERROR, |
||||
-3 => DATA_ERROR, |
||||
-4 => MEM_ERROR, |
||||
-5 => BUF_ERROR, |
||||
-6 => VERSION_ERROR); |
||||
|
||||
Flate : constant array (Boolean) of Flate_Type |
||||
:= (True => (Step => Thin.Deflate'Access, |
||||
Done => Thin.DeflateEnd'Access), |
||||
False => (Step => Thin.Inflate'Access, |
||||
Done => Thin.InflateEnd'Access)); |
||||
|
||||
Flush_Finish : constant array (Boolean) of Flush_Mode |
||||
:= (True => Finish, False => No_Flush); |
||||
|
||||
procedure Raise_Error (Stream : in Z_Stream); |
||||
pragma Inline (Raise_Error); |
||||
|
||||
procedure Raise_Error (Message : in String); |
||||
pragma Inline (Raise_Error); |
||||
|
||||
procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int); |
||||
|
||||
procedure Free is new Ada.Unchecked_Deallocation |
||||
(Z_Stream, Z_Stream_Access); |
||||
|
||||
function To_Thin_Access is new Ada.Unchecked_Conversion |
||||
(Z_Stream_Access, Thin.Z_Streamp); |
||||
|
||||
procedure Translate_GZip |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode); |
||||
-- Separate translate routine for make gzip header. |
||||
|
||||
procedure Translate_Auto |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode); |
||||
-- translate routine without additional headers. |
||||
|
||||
----------------- |
||||
-- Check_Error -- |
||||
----------------- |
||||
|
||||
procedure Check_Error (Stream : in Z_Stream; Code : in Thin.Int) is |
||||
use type Thin.Int; |
||||
begin |
||||
if Code /= Thin.Z_OK then |
||||
Raise_Error |
||||
(Return_Code_Enum'Image (Return_Code (Code)) |
||||
& ": " & Last_Error_Message (Stream)); |
||||
end if; |
||||
end Check_Error; |
||||
|
||||
----------- |
||||
-- Close -- |
||||
----------- |
||||
|
||||
procedure Close |
||||
(Filter : in out Filter_Type; |
||||
Ignore_Error : in Boolean := False) |
||||
is |
||||
Code : Thin.Int; |
||||
begin |
||||
if not Ignore_Error and then not Is_Open (Filter) then |
||||
raise Status_Error; |
||||
end if; |
||||
|
||||
Code := Flate (Filter.Compression).Done (To_Thin_Access (Filter.Strm)); |
||||
|
||||
if Ignore_Error or else Code = Thin.Z_OK then |
||||
Free (Filter.Strm); |
||||
else |
||||
declare |
||||
Error_Message : constant String |
||||
:= Last_Error_Message (Filter.Strm.all); |
||||
begin |
||||
Free (Filter.Strm); |
||||
Ada.Exceptions.Raise_Exception |
||||
(ZLib_Error'Identity, |
||||
Return_Code_Enum'Image (Return_Code (Code)) |
||||
& ": " & Error_Message); |
||||
end; |
||||
end if; |
||||
end Close; |
||||
|
||||
----------- |
||||
-- CRC32 -- |
||||
----------- |
||||
|
||||
function CRC32 |
||||
(CRC : in Unsigned_32; |
||||
Data : in Ada.Streams.Stream_Element_Array) |
||||
return Unsigned_32 |
||||
is |
||||
use Thin; |
||||
begin |
||||
return Unsigned_32 (crc32 (ULong (CRC), |
||||
Data'Address, |
||||
Data'Length)); |
||||
end CRC32; |
||||
|
||||
procedure CRC32 |
||||
(CRC : in out Unsigned_32; |
||||
Data : in Ada.Streams.Stream_Element_Array) is |
||||
begin |
||||
CRC := CRC32 (CRC, Data); |
||||
end CRC32; |
||||
|
||||
------------------ |
||||
-- Deflate_Init -- |
||||
------------------ |
||||
|
||||
procedure Deflate_Init |
||||
(Filter : in out Filter_Type; |
||||
Level : in Compression_Level := Default_Compression; |
||||
Strategy : in Strategy_Type := Default_Strategy; |
||||
Method : in Compression_Method := Deflated; |
||||
Window_Bits : in Window_Bits_Type := Default_Window_Bits; |
||||
Memory_Level : in Memory_Level_Type := Default_Memory_Level; |
||||
Header : in Header_Type := Default) |
||||
is |
||||
use type Thin.Int; |
||||
Win_Bits : Thin.Int := Thin.Int (Window_Bits); |
||||
begin |
||||
if Is_Open (Filter) then |
||||
raise Status_Error; |
||||
end if; |
||||
|
||||
-- We allow ZLib to make header only in case of default header type. |
||||
-- Otherwise we would either do header by ourselfs, or do not do |
||||
-- header at all. |
||||
|
||||
if Header = None or else Header = GZip then |
||||
Win_Bits := -Win_Bits; |
||||
end if; |
||||
|
||||
-- For the GZip CRC calculation and make headers. |
||||
|
||||
if Header = GZip then |
||||
Filter.CRC := 0; |
||||
Filter.Offset := Simple_GZip_Header'First; |
||||
else |
||||
Filter.Offset := Simple_GZip_Header'Last + 1; |
||||
end if; |
||||
|
||||
Filter.Strm := new Z_Stream; |
||||
Filter.Compression := True; |
||||
Filter.Stream_End := False; |
||||
Filter.Header := Header; |
||||
|
||||
if Thin.Deflate_Init |
||||
(To_Thin_Access (Filter.Strm), |
||||
Level => Thin.Int (Level), |
||||
method => Thin.Int (Method), |
||||
windowBits => Win_Bits, |
||||
memLevel => Thin.Int (Memory_Level), |
||||
strategy => Thin.Int (Strategy)) /= Thin.Z_OK |
||||
then |
||||
Raise_Error (Filter.Strm.all); |
||||
end if; |
||||
end Deflate_Init; |
||||
|
||||
----------- |
||||
-- Flush -- |
||||
----------- |
||||
|
||||
procedure Flush |
||||
(Filter : in out Filter_Type; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode) |
||||
is |
||||
No_Data : Stream_Element_Array := (1 .. 0 => 0); |
||||
Last : Stream_Element_Offset; |
||||
begin |
||||
Translate (Filter, No_Data, Last, Out_Data, Out_Last, Flush); |
||||
end Flush; |
||||
|
||||
----------------------- |
||||
-- Generic_Translate -- |
||||
----------------------- |
||||
|
||||
procedure Generic_Translate |
||||
(Filter : in out ZLib.Filter_Type; |
||||
In_Buffer_Size : in Integer := Default_Buffer_Size; |
||||
Out_Buffer_Size : in Integer := Default_Buffer_Size) |
||||
is |
||||
In_Buffer : Stream_Element_Array |
||||
(1 .. Stream_Element_Offset (In_Buffer_Size)); |
||||
Out_Buffer : Stream_Element_Array |
||||
(1 .. Stream_Element_Offset (Out_Buffer_Size)); |
||||
Last : Stream_Element_Offset; |
||||
In_Last : Stream_Element_Offset; |
||||
In_First : Stream_Element_Offset; |
||||
Out_Last : Stream_Element_Offset; |
||||
begin |
||||
Main : loop |
||||
Data_In (In_Buffer, Last); |
||||
|
||||
In_First := In_Buffer'First; |
||||
|
||||
loop |
||||
Translate |
||||
(Filter => Filter, |
||||
In_Data => In_Buffer (In_First .. Last), |
||||
In_Last => In_Last, |
||||
Out_Data => Out_Buffer, |
||||
Out_Last => Out_Last, |
||||
Flush => Flush_Finish (Last < In_Buffer'First)); |
||||
|
||||
if Out_Buffer'First <= Out_Last then |
||||
Data_Out (Out_Buffer (Out_Buffer'First .. Out_Last)); |
||||
end if; |
||||
|
||||
exit Main when Stream_End (Filter); |
||||
|
||||
-- The end of in buffer. |
||||
|
||||
exit when In_Last = Last; |
||||
|
||||
In_First := In_Last + 1; |
||||
end loop; |
||||
end loop Main; |
||||
|
||||
end Generic_Translate; |
||||
|
||||
------------------ |
||||
-- Inflate_Init -- |
||||
------------------ |
||||
|
||||
procedure Inflate_Init |
||||
(Filter : in out Filter_Type; |
||||
Window_Bits : in Window_Bits_Type := Default_Window_Bits; |
||||
Header : in Header_Type := Default) |
||||
is |
||||
use type Thin.Int; |
||||
Win_Bits : Thin.Int := Thin.Int (Window_Bits); |
||||
|
||||
procedure Check_Version; |
||||
-- Check the latest header types compatibility. |
||||
|
||||
procedure Check_Version is |
||||
begin |
||||
if Version <= "1.1.4" then |
||||
Raise_Error |
||||
("Inflate header type " & Header_Type'Image (Header) |
||||
& " incompatible with ZLib version " & Version); |
||||
end if; |
||||
end Check_Version; |
||||
|
||||
begin |
||||
if Is_Open (Filter) then |
||||
raise Status_Error; |
||||
end if; |
||||
|
||||
case Header is |
||||
when None => |
||||
Check_Version; |
||||
|
||||
-- Inflate data without headers determined |
||||
-- by negative Win_Bits. |
||||
|
||||
Win_Bits := -Win_Bits; |
||||
when GZip => |
||||
Check_Version; |
||||
|
||||
-- Inflate gzip data defined by flag 16. |
||||
|
||||
Win_Bits := Win_Bits + 16; |
||||
when Auto => |
||||
Check_Version; |
||||
|
||||
-- Inflate with automatic detection |
||||
-- of gzip or native header defined by flag 32. |
||||
|
||||
Win_Bits := Win_Bits + 32; |
||||
when Default => null; |
||||
end case; |
||||
|
||||
Filter.Strm := new Z_Stream; |
||||
Filter.Compression := False; |
||||
Filter.Stream_End := False; |
||||
Filter.Header := Header; |
||||
|
||||
if Thin.Inflate_Init |
||||
(To_Thin_Access (Filter.Strm), Win_Bits) /= Thin.Z_OK |
||||
then |
||||
Raise_Error (Filter.Strm.all); |
||||
end if; |
||||
end Inflate_Init; |
||||
|
||||
------------- |
||||
-- Is_Open -- |
||||
------------- |
||||
|
||||
function Is_Open (Filter : in Filter_Type) return Boolean is |
||||
begin |
||||
return Filter.Strm /= null; |
||||
end Is_Open; |
||||
|
||||
----------------- |
||||
-- Raise_Error -- |
||||
----------------- |
||||
|
||||
procedure Raise_Error (Message : in String) is |
||||
begin |
||||
Ada.Exceptions.Raise_Exception (ZLib_Error'Identity, Message); |
||||
end Raise_Error; |
||||
|
||||
procedure Raise_Error (Stream : in Z_Stream) is |
||||
begin |
||||
Raise_Error (Last_Error_Message (Stream)); |
||||
end Raise_Error; |
||||
|
||||
---------- |
||||
-- Read -- |
||||
---------- |
||||
|
||||
procedure Read |
||||
(Filter : in out Filter_Type; |
||||
Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode := No_Flush) |
||||
is |
||||
In_Last : Stream_Element_Offset; |
||||
Item_First : Ada.Streams.Stream_Element_Offset := Item'First; |
||||
V_Flush : Flush_Mode := Flush; |
||||
|
||||
begin |
||||
pragma Assert (Rest_First in Buffer'First .. Buffer'Last + 1); |
||||
pragma Assert (Rest_Last in Buffer'First - 1 .. Buffer'Last); |
||||
|
||||
loop |
||||
if Rest_Last = Buffer'First - 1 then |
||||
V_Flush := Finish; |
||||
|
||||
elsif Rest_First > Rest_Last then |
||||
Read (Buffer, Rest_Last); |
||||
Rest_First := Buffer'First; |
||||
|
||||
if Rest_Last < Buffer'First then |
||||
V_Flush := Finish; |
||||
end if; |
||||
end if; |
||||
|
||||
Translate |
||||
(Filter => Filter, |
||||
In_Data => Buffer (Rest_First .. Rest_Last), |
||||
In_Last => In_Last, |
||||
Out_Data => Item (Item_First .. Item'Last), |
||||
Out_Last => Last, |
||||
Flush => V_Flush); |
||||
|
||||
Rest_First := In_Last + 1; |
||||
|
||||
exit when Stream_End (Filter) |
||||
or else Last = Item'Last |
||||
or else (Last >= Item'First and then Allow_Read_Some); |
||||
|
||||
Item_First := Last + 1; |
||||
end loop; |
||||
end Read; |
||||
|
||||
---------------- |
||||
-- Stream_End -- |
||||
---------------- |
||||
|
||||
function Stream_End (Filter : in Filter_Type) return Boolean is |
||||
begin |
||||
if Filter.Header = GZip and Filter.Compression then |
||||
return Filter.Stream_End |
||||
and then Filter.Offset = Footer_Array'Last + 1; |
||||
else |
||||
return Filter.Stream_End; |
||||
end if; |
||||
end Stream_End; |
||||
|
||||
-------------- |
||||
-- Total_In -- |
||||
-------------- |
||||
|
||||
function Total_In (Filter : in Filter_Type) return Count is |
||||
begin |
||||
return Count (Thin.Total_In (To_Thin_Access (Filter.Strm).all)); |
||||
end Total_In; |
||||
|
||||
--------------- |
||||
-- Total_Out -- |
||||
--------------- |
||||
|
||||
function Total_Out (Filter : in Filter_Type) return Count is |
||||
begin |
||||
return Count (Thin.Total_Out (To_Thin_Access (Filter.Strm).all)); |
||||
end Total_Out; |
||||
|
||||
--------------- |
||||
-- Translate -- |
||||
--------------- |
||||
|
||||
procedure Translate |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode) is |
||||
begin |
||||
if Filter.Header = GZip and then Filter.Compression then |
||||
Translate_GZip |
||||
(Filter => Filter, |
||||
In_Data => In_Data, |
||||
In_Last => In_Last, |
||||
Out_Data => Out_Data, |
||||
Out_Last => Out_Last, |
||||
Flush => Flush); |
||||
else |
||||
Translate_Auto |
||||
(Filter => Filter, |
||||
In_Data => In_Data, |
||||
In_Last => In_Last, |
||||
Out_Data => Out_Data, |
||||
Out_Last => Out_Last, |
||||
Flush => Flush); |
||||
end if; |
||||
end Translate; |
||||
|
||||
-------------------- |
||||
-- Translate_Auto -- |
||||
-------------------- |
||||
|
||||
procedure Translate_Auto |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode) |
||||
is |
||||
use type Thin.Int; |
||||
Code : Thin.Int; |
||||
|
||||
begin |
||||
if not Is_Open (Filter) then |
||||
raise Status_Error; |
||||
end if; |
||||
|
||||
if Out_Data'Length = 0 and then In_Data'Length = 0 then |
||||
raise Constraint_Error; |
||||
end if; |
||||
|
||||
Set_Out (Filter.Strm.all, Out_Data'Address, Out_Data'Length); |
||||
Set_In (Filter.Strm.all, In_Data'Address, In_Data'Length); |
||||
|
||||
Code := Flate (Filter.Compression).Step |
||||
(To_Thin_Access (Filter.Strm), |
||||
Thin.Int (Flush)); |
||||
|
||||
if Code = Thin.Z_STREAM_END then |
||||
Filter.Stream_End := True; |
||||
else |
||||
Check_Error (Filter.Strm.all, Code); |
||||
end if; |
||||
|
||||
In_Last := In_Data'Last |
||||
- Stream_Element_Offset (Avail_In (Filter.Strm.all)); |
||||
Out_Last := Out_Data'Last |
||||
- Stream_Element_Offset (Avail_Out (Filter.Strm.all)); |
||||
end Translate_Auto; |
||||
|
||||
-------------------- |
||||
-- Translate_GZip -- |
||||
-------------------- |
||||
|
||||
procedure Translate_GZip |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode) |
||||
is |
||||
Out_First : Stream_Element_Offset; |
||||
|
||||
procedure Add_Data (Data : in Stream_Element_Array); |
||||
-- Add data to stream from the Filter.Offset till necessary, |
||||
-- used for add gzip headr/footer. |
||||
|
||||
procedure Put_32 |
||||
(Item : in out Stream_Element_Array; |
||||
Data : in Unsigned_32); |
||||
pragma Inline (Put_32); |
||||
|
||||
-------------- |
||||
-- Add_Data -- |
||||
-------------- |
||||
|
||||
procedure Add_Data (Data : in Stream_Element_Array) is |
||||
Data_First : Stream_Element_Offset renames Filter.Offset; |
||||
Data_Last : Stream_Element_Offset; |
||||
Data_Len : Stream_Element_Offset; -- -1 |
||||
Out_Len : Stream_Element_Offset; -- -1 |
||||
begin |
||||
Out_First := Out_Last + 1; |
||||
|
||||
if Data_First > Data'Last then |
||||
return; |
||||
end if; |
||||
|
||||
Data_Len := Data'Last - Data_First; |
||||
Out_Len := Out_Data'Last - Out_First; |
||||
|
||||
if Data_Len <= Out_Len then |
||||
Out_Last := Out_First + Data_Len; |
||||
Data_Last := Data'Last; |
||||
else |
||||
Out_Last := Out_Data'Last; |
||||
Data_Last := Data_First + Out_Len; |
||||
end if; |
||||
|
||||
Out_Data (Out_First .. Out_Last) := Data (Data_First .. Data_Last); |
||||
|
||||
Data_First := Data_Last + 1; |
||||
Out_First := Out_Last + 1; |
||||
end Add_Data; |
||||
|
||||
------------ |
||||
-- Put_32 -- |
||||
------------ |
||||
|
||||
procedure Put_32 |
||||
(Item : in out Stream_Element_Array; |
||||
Data : in Unsigned_32) |
||||
is |
||||
D : Unsigned_32 := Data; |
||||
begin |
||||
for J in Item'First .. Item'First + 3 loop |
||||
Item (J) := Stream_Element (D and 16#FF#); |
||||
D := Shift_Right (D, 8); |
||||
end loop; |
||||
end Put_32; |
||||
|
||||
begin |
||||
Out_Last := Out_Data'First - 1; |
||||
|
||||
if not Filter.Stream_End then |
||||
Add_Data (Simple_GZip_Header); |
||||
|
||||
Translate_Auto |
||||
(Filter => Filter, |
||||
In_Data => In_Data, |
||||
In_Last => In_Last, |
||||
Out_Data => Out_Data (Out_First .. Out_Data'Last), |
||||
Out_Last => Out_Last, |
||||
Flush => Flush); |
||||
|
||||
CRC32 (Filter.CRC, In_Data (In_Data'First .. In_Last)); |
||||
end if; |
||||
|
||||
if Filter.Stream_End and then Out_Last <= Out_Data'Last then |
||||
-- This detection method would work only when |
||||
-- Simple_GZip_Header'Last > Footer_Array'Last |
||||
|
||||
if Filter.Offset = Simple_GZip_Header'Last + 1 then |
||||
Filter.Offset := Footer_Array'First; |
||||
end if; |
||||
|
||||
declare |
||||
Footer : Footer_Array; |
||||
begin |
||||
Put_32 (Footer, Filter.CRC); |
||||
Put_32 (Footer (Footer'First + 4 .. Footer'Last), |
||||
Unsigned_32 (Total_In (Filter))); |
||||
Add_Data (Footer); |
||||
end; |
||||
end if; |
||||
end Translate_GZip; |
||||
|
||||
------------- |
||||
-- Version -- |
||||
------------- |
||||
|
||||
function Version return String is |
||||
begin |
||||
return Interfaces.C.Strings.Value (Thin.zlibVersion); |
||||
end Version; |
||||
|
||||
----------- |
||||
-- Write -- |
||||
----------- |
||||
|
||||
procedure Write |
||||
(Filter : in out Filter_Type; |
||||
Item : in Ada.Streams.Stream_Element_Array; |
||||
Flush : in Flush_Mode := No_Flush) |
||||
is |
||||
Buffer : Stream_Element_Array (1 .. Buffer_Size); |
||||
In_Last : Stream_Element_Offset; |
||||
Out_Last : Stream_Element_Offset; |
||||
In_First : Stream_Element_Offset := Item'First; |
||||
begin |
||||
if Item'Length = 0 and Flush = No_Flush then |
||||
return; |
||||
end if; |
||||
|
||||
loop |
||||
Translate |
||||
(Filter => Filter, |
||||
In_Data => Item (In_First .. Item'Last), |
||||
In_Last => In_Last, |
||||
Out_Data => Buffer, |
||||
Out_Last => Out_Last, |
||||
Flush => Flush); |
||||
|
||||
if Out_Last >= Buffer'First then |
||||
Write (Buffer (1 .. Out_Last)); |
||||
end if; |
||||
|
||||
exit when In_Last = Item'Last or Stream_End (Filter); |
||||
|
||||
In_First := In_Last + 1; |
||||
end loop; |
||||
end Write; |
||||
|
||||
end ZLib; |
@ -0,0 +1,328 @@ |
||||
------------------------------------------------------------------------------ |
||||
-- ZLib for Ada thick binding. -- |
||||
-- -- |
||||
-- Copyright (C) 2002-2004 Dmitriy Anisimkov -- |
||||
-- -- |
||||
-- This library is free software; you can redistribute it and/or modify -- |
||||
-- it under the terms of the GNU General Public License as published by -- |
||||
-- the Free Software Foundation; either version 2 of the License, or (at -- |
||||
-- your option) any later version. -- |
||||
-- -- |
||||
-- This library is distributed in the hope that it will be useful, but -- |
||||
-- WITHOUT ANY WARRANTY; without even the implied warranty of -- |
||||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- |
||||
-- General Public License for more details. -- |
||||
-- -- |
||||
-- You should have received a copy of the GNU General Public License -- |
||||
-- along with this library; if not, write to the Free Software Foundation, -- |
||||
-- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- |
||||
-- -- |
||||
-- As a special exception, if other files instantiate generics from this -- |
||||
-- unit, or you link this unit with other files to produce an executable, -- |
||||
-- this unit does not by itself cause the resulting executable to be -- |
||||
-- covered by the GNU General Public License. This exception does not -- |
||||
-- however invalidate any other reasons why the executable file might be -- |
||||
-- covered by the GNU Public License. -- |
||||
------------------------------------------------------------------------------ |
||||
|
||||
-- $Id: zlib.ads,v 1.26 2004/09/06 06:53:19 vagul Exp $ |
||||
|
||||
with Ada.Streams; |
||||
|
||||
with Interfaces; |
||||
|
||||
package ZLib is |
||||
|
||||
ZLib_Error : exception; |
||||
Status_Error : exception; |
||||
|
||||
type Compression_Level is new Integer range -1 .. 9; |
||||
|
||||
type Flush_Mode is private; |
||||
|
||||
type Compression_Method is private; |
||||
|
||||
type Window_Bits_Type is new Integer range 8 .. 15; |
||||
|
||||
type Memory_Level_Type is new Integer range 1 .. 9; |
||||
|
||||
type Unsigned_32 is new Interfaces.Unsigned_32; |
||||
|
||||
type Strategy_Type is private; |
||||
|
||||
type Header_Type is (None, Auto, Default, GZip); |
||||
-- Header type usage have a some limitation for inflate. |
||||
-- See comment for Inflate_Init. |
||||
|
||||
subtype Count is Ada.Streams.Stream_Element_Count; |
||||
|
||||
Default_Memory_Level : constant Memory_Level_Type := 8; |
||||
Default_Window_Bits : constant Window_Bits_Type := 15; |
||||
|
||||
---------------------------------- |
||||
-- Compression method constants -- |
||||
---------------------------------- |
||||
|
||||
Deflated : constant Compression_Method; |
||||
-- Only one method allowed in this ZLib version |
||||
|
||||
--------------------------------- |
||||
-- Compression level constants -- |
||||
--------------------------------- |
||||
|
||||
No_Compression : constant Compression_Level := 0; |
||||
Best_Speed : constant Compression_Level := 1; |
||||
Best_Compression : constant Compression_Level := 9; |
||||
Default_Compression : constant Compression_Level := -1; |
||||
|
||||
-------------------------- |
||||
-- Flush mode constants -- |
||||
-------------------------- |
||||
|
||||
No_Flush : constant Flush_Mode; |
||||
-- Regular way for compression, no flush |
||||
|
||||
Partial_Flush : constant Flush_Mode; |
||||
-- Will be removed, use Z_SYNC_FLUSH instead |
||||
|
||||
Sync_Flush : constant Flush_Mode; |
||||
-- All pending output is flushed to the output buffer and the output |
||||
-- is aligned on a byte boundary, so that the decompressor can get all |
||||
-- input data available so far. (In particular avail_in is zero after the |
||||
-- call if enough output space has been provided before the call.) |
||||
-- Flushing may degrade compression for some compression algorithms and so |
||||
-- it should be used only when necessary. |
||||
|
||||
Block_Flush : constant Flush_Mode; |
||||
-- Z_BLOCK requests that inflate() stop |
||||
-- if and when it get to the next deflate block boundary. When decoding the |
||||
-- zlib or gzip format, this will cause inflate() to return immediately |
||||
-- after the header and before the first block. When doing a raw inflate, |
||||
-- inflate() will go ahead and process the first block, and will return |
||||
-- when it gets to the end of that block, or when it runs out of data. |
||||
|
||||
Full_Flush : constant Flush_Mode; |
||||
-- All output is flushed as with SYNC_FLUSH, and the compression state |
||||
-- is reset so that decompression can restart from this point if previous |
||||
-- compressed data has been damaged or if random access is desired. Using |
||||
-- Full_Flush too often can seriously degrade the compression. |
||||
|
||||
Finish : constant Flush_Mode; |
||||
-- Just for tell the compressor that input data is complete. |
||||
|
||||
------------------------------------ |
||||
-- Compression strategy constants -- |
||||
------------------------------------ |
||||
|
||||
-- RLE stategy could be used only in version 1.2.0 and later. |
||||
|
||||
Filtered : constant Strategy_Type; |
||||
Huffman_Only : constant Strategy_Type; |
||||
RLE : constant Strategy_Type; |
||||
Default_Strategy : constant Strategy_Type; |
||||
|
||||
Default_Buffer_Size : constant := 4096; |
||||
|
||||
type Filter_Type is tagged limited private; |
||||
-- The filter is for compression and for decompression. |
||||
-- The usage of the type is depend of its initialization. |
||||
|
||||
function Version return String; |
||||
pragma Inline (Version); |
||||
-- Return string representation of the ZLib version. |
||||
|
||||
procedure Deflate_Init |
||||
(Filter : in out Filter_Type; |
||||
Level : in Compression_Level := Default_Compression; |
||||
Strategy : in Strategy_Type := Default_Strategy; |
||||
Method : in Compression_Method := Deflated; |
||||
Window_Bits : in Window_Bits_Type := Default_Window_Bits; |
||||
Memory_Level : in Memory_Level_Type := Default_Memory_Level; |
||||
Header : in Header_Type := Default); |
||||
-- Compressor initialization. |
||||
-- When Header parameter is Auto or Default, then default zlib header |
||||
-- would be provided for compressed data. |
||||
-- When Header is GZip, then gzip header would be set instead of |
||||
-- default header. |
||||
-- When Header is None, no header would be set for compressed data. |
||||
|
||||
procedure Inflate_Init |
||||
(Filter : in out Filter_Type; |
||||
Window_Bits : in Window_Bits_Type := Default_Window_Bits; |
||||
Header : in Header_Type := Default); |
||||
-- Decompressor initialization. |
||||
-- Default header type mean that ZLib default header is expecting in the |
||||
-- input compressed stream. |
||||
-- Header type None mean that no header is expecting in the input stream. |
||||
-- GZip header type mean that GZip header is expecting in the |
||||
-- input compressed stream. |
||||
-- Auto header type mean that header type (GZip or Native) would be |
||||
-- detected automatically in the input stream. |
||||
-- Note that header types parameter values None, GZip and Auto are |
||||
-- supported for inflate routine only in ZLib versions 1.2.0.2 and later. |
||||
-- Deflate_Init is supporting all header types. |
||||
|
||||
function Is_Open (Filter : in Filter_Type) return Boolean; |
||||
pragma Inline (Is_Open); |
||||
-- Is the filter opened for compression or decompression. |
||||
|
||||
procedure Close |
||||
(Filter : in out Filter_Type; |
||||
Ignore_Error : in Boolean := False); |
||||
-- Closing the compression or decompressor. |
||||
-- If stream is closing before the complete and Ignore_Error is False, |
||||
-- The exception would be raised. |
||||
|
||||
generic |
||||
with procedure Data_In |
||||
(Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset); |
||||
with procedure Data_Out |
||||
(Item : in Ada.Streams.Stream_Element_Array); |
||||
procedure Generic_Translate |
||||
(Filter : in out Filter_Type; |
||||
In_Buffer_Size : in Integer := Default_Buffer_Size; |
||||
Out_Buffer_Size : in Integer := Default_Buffer_Size); |
||||
-- Compress/decompress data fetch from Data_In routine and pass the result |
||||
-- to the Data_Out routine. User should provide Data_In and Data_Out |
||||
-- for compression/decompression data flow. |
||||
-- Compression or decompression depend on Filter initialization. |
||||
|
||||
function Total_In (Filter : in Filter_Type) return Count; |
||||
pragma Inline (Total_In); |
||||
-- Returns total number of input bytes read so far |
||||
|
||||
function Total_Out (Filter : in Filter_Type) return Count; |
||||
pragma Inline (Total_Out); |
||||
-- Returns total number of bytes output so far |
||||
|
||||
function CRC32 |
||||
(CRC : in Unsigned_32; |
||||
Data : in Ada.Streams.Stream_Element_Array) |
||||
return Unsigned_32; |
||||
pragma Inline (CRC32); |
||||
-- Compute CRC32, it could be necessary for make gzip format |
||||
|
||||
procedure CRC32 |
||||
(CRC : in out Unsigned_32; |
||||
Data : in Ada.Streams.Stream_Element_Array); |
||||
pragma Inline (CRC32); |
||||
-- Compute CRC32, it could be necessary for make gzip format |
||||
|
||||
------------------------------------------------- |
||||
-- Below is more complex low level routines. -- |
||||
------------------------------------------------- |
||||
|
||||
procedure Translate |
||||
(Filter : in out Filter_Type; |
||||
In_Data : in Ada.Streams.Stream_Element_Array; |
||||
In_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode); |
||||
-- Compress/decompress the In_Data buffer and place the result into |
||||
-- Out_Data. In_Last is the index of last element from In_Data accepted by |
||||
-- the Filter. Out_Last is the last element of the received data from |
||||
-- Filter. To tell the filter that incoming data are complete put the |
||||
-- Flush parameter to Finish. |
||||
|
||||
function Stream_End (Filter : in Filter_Type) return Boolean; |
||||
pragma Inline (Stream_End); |
||||
-- Return the true when the stream is complete. |
||||
|
||||
procedure Flush |
||||
(Filter : in out Filter_Type; |
||||
Out_Data : out Ada.Streams.Stream_Element_Array; |
||||
Out_Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode); |
||||
pragma Inline (Flush); |
||||
-- Flushing the data from the compressor. |
||||
|
||||
generic |
||||
with procedure Write |
||||
(Item : in Ada.Streams.Stream_Element_Array); |
||||
-- User should provide this routine for accept |
||||
-- compressed/decompressed data. |
||||
|
||||
Buffer_Size : in Ada.Streams.Stream_Element_Offset |
||||
:= Default_Buffer_Size; |
||||
-- Buffer size for Write user routine. |
||||
|
||||
procedure Write |
||||
(Filter : in out Filter_Type; |
||||
Item : in Ada.Streams.Stream_Element_Array; |
||||
Flush : in Flush_Mode := No_Flush); |
||||
-- Compress/Decompress data from Item to the generic parameter procedure |
||||
-- Write. Output buffer size could be set in Buffer_Size generic parameter. |
||||
|
||||
generic |
||||
with procedure Read |
||||
(Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset); |
||||
-- User should provide data for compression/decompression |
||||
-- thru this routine. |
||||
|
||||
Buffer : in out Ada.Streams.Stream_Element_Array; |
||||
-- Buffer for keep remaining data from the previous |
||||
-- back read. |
||||
|
||||
Rest_First, Rest_Last : in out Ada.Streams.Stream_Element_Offset; |
||||
-- Rest_First have to be initialized to Buffer'Last + 1 |
||||
-- Rest_Last have to be initialized to Buffer'Last |
||||
-- before usage. |
||||
|
||||
Allow_Read_Some : in Boolean := False; |
||||
-- Is it allowed to return Last < Item'Last before end of data. |
||||
|
||||
procedure Read |
||||
(Filter : in out Filter_Type; |
||||
Item : out Ada.Streams.Stream_Element_Array; |
||||
Last : out Ada.Streams.Stream_Element_Offset; |
||||
Flush : in Flush_Mode := No_Flush); |
||||
-- Compress/Decompress data from generic parameter procedure Read to the |
||||
-- Item. User should provide Buffer and initialized Rest_First, Rest_Last |
||||
-- indicators. If Allow_Read_Some is True, Read routines could return |
||||
-- Last < Item'Last only at end of stream. |
||||
|
||||
private |
||||
|
||||
use Ada.Streams; |
||||
|
||||
pragma Assert (Ada.Streams.Stream_Element'Size = 8); |
||||
pragma Assert (Ada.Streams.Stream_Element'Modulus = 2**8); |
||||
|
||||
type Flush_Mode is new Integer range 0 .. 5; |
||||
|
||||
type Compression_Method is new Integer range 8 .. 8; |
||||
|
||||
type Strategy_Type is new Integer range 0 .. 3; |
||||
|
||||
No_Flush : constant Flush_Mode := 0; |
||||
Partial_Flush : constant Flush_Mode := 1; |
||||
Sync_Flush : constant Flush_Mode := 2; |
||||
Full_Flush : constant Flush_Mode := 3; |
||||
Finish : constant Flush_Mode := 4; |
||||
Block_Flush : constant Flush_Mode := 5; |
||||
|
||||
Filtered : constant Strategy_Type := 1; |
||||
Huffman_Only : constant Strategy_Type := 2; |
||||
RLE : constant Strategy_Type := 3; |
||||
Default_Strategy : constant Strategy_Type := 0; |
||||
|
||||
Deflated : constant Compression_Method := 8; |
||||
|
||||
type Z_Stream; |
||||
|
||||
type Z_Stream_Access is access all Z_Stream; |
||||
|
||||
type Filter_Type is tagged limited record |
||||
Strm : Z_Stream_Access; |
||||
Compression : Boolean; |
||||
Stream_End : Boolean; |
||||
Header : Header_Type; |
||||
CRC : Unsigned_32; |
||||
Offset : Stream_Element_Offset; |
||||
-- Offset for gzip header/footer output. |
||||
end record; |
||||
|
||||
end ZLib; |
@ -0,0 +1,20 @@ |
||||
project Zlib is |
||||
|
||||
for Languages use ("Ada"); |
||||
for Source_Dirs use ("."); |
||||
for Object_Dir use "."; |
||||
for Main use ("test.adb", "mtest.adb", "read.adb", "buffer_demo"); |
||||
|
||||
package Compiler is |
||||
for Default_Switches ("ada") use ("-gnatwcfilopru", "-gnatVcdfimorst", "-gnatyabcefhiklmnoprst"); |
||||
end Compiler; |
||||
|
||||
package Linker is |
||||
for Default_Switches ("ada") use ("-lz"); |
||||
end Linker; |
||||
|
||||
package Builder is |
||||
for Default_Switches ("ada") use ("-s", "-gnatQ"); |
||||
end Builder; |
||||
|
||||
end Zlib; |
@ -0,0 +1,8 @@ |
||||
blast: blast.c blast.h |
||||
cc -DTEST -o blast blast.c
|
||||
|
||||
test: blast |
||||
blast < test.pk | cmp - test.txt
|
||||
|
||||
clean: |
||||
rm -f blast blast.o
|
@ -0,0 +1,4 @@ |
||||
Read blast.h for purpose and usage. |
||||
|
||||
Mark Adler |
||||
madler@alumni.caltech.edu |
@ -0,0 +1,466 @@ |
||||
/* blast.c
|
||||
* Copyright (C) 2003, 2012, 2013 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in blast.h |
||||
* version 1.3, 24 Aug 2013 |
||||
* |
||||
* blast.c decompresses data compressed by the PKWare Compression Library. |
||||
* This function provides functionality similar to the explode() function of |
||||
* the PKWare library, hence the name "blast". |
||||
* |
||||
* This decompressor is based on the excellent format description provided by |
||||
* Ben Rudiak-Gould in comp.compression on August 13, 2001. Interestingly, the |
||||
* example Ben provided in the post is incorrect. The distance 110001 should |
||||
* instead be 111000. When corrected, the example byte stream becomes: |
||||
* |
||||
* 00 04 82 24 25 8f 80 7f |
||||
* |
||||
* which decompresses to "AIAIAIAIAIAIA" (without the quotes). |
||||
*/ |
||||
|
||||
/*
|
||||
* Change history: |
||||
* |
||||
* 1.0 12 Feb 2003 - First version |
||||
* 1.1 16 Feb 2003 - Fixed distance check for > 4 GB uncompressed data |
||||
* 1.2 24 Oct 2012 - Add note about using binary mode in stdio |
||||
* - Fix comparisons of differently signed integers |
||||
* 1.3 24 Aug 2013 - Return unused input from blast() |
||||
* - Fix test code to correctly report unused input |
||||
* - Enable the provision of initial input to blast() |
||||
*/ |
||||
|
||||
#include <stddef.h> /* for NULL */ |
||||
#include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ |
||||
#include "blast.h" /* prototype for blast() */ |
||||
|
||||
#define local static /* for local function definitions */ |
||||
#define MAXBITS 13 /* maximum code length */ |
||||
#define MAXWIN 4096 /* maximum window size */ |
||||
|
||||
/* input and output state */ |
||||
struct state { |
||||
/* input state */ |
||||
blast_in infun; /* input function provided by user */ |
||||
void *inhow; /* opaque information passed to infun() */ |
||||
unsigned char *in; /* next input location */ |
||||
unsigned left; /* available input at in */ |
||||
int bitbuf; /* bit buffer */ |
||||
int bitcnt; /* number of bits in bit buffer */ |
||||
|
||||
/* input limit error return state for bits() and decode() */ |
||||
jmp_buf env; |
||||
|
||||
/* output state */ |
||||
blast_out outfun; /* output function provided by user */ |
||||
void *outhow; /* opaque information passed to outfun() */ |
||||
unsigned next; /* index of next write location in out[] */ |
||||
int first; /* true to check distances (for first 4K) */ |
||||
unsigned char out[MAXWIN]; /* output buffer and sliding window */ |
||||
}; |
||||
|
||||
/*
|
||||
* Return need bits from the input stream. This always leaves less than |
||||
* eight bits in the buffer. bits() works properly for need == 0. |
||||
* |
||||
* Format notes: |
||||
* |
||||
* - Bits are stored in bytes from the least significant bit to the most |
||||
* significant bit. Therefore bits are dropped from the bottom of the bit |
||||
* buffer, using shift right, and new bytes are appended to the top of the |
||||
* bit buffer, using shift left. |
||||
*/ |
||||
local int bits(struct state *s, int need) |
||||
{ |
||||
int val; /* bit accumulator */ |
||||
|
||||
/* load at least need bits into val */ |
||||
val = s->bitbuf; |
||||
while (s->bitcnt < need) { |
||||
if (s->left == 0) { |
||||
s->left = s->infun(s->inhow, &(s->in)); |
||||
if (s->left == 0) longjmp(s->env, 1); /* out of input */ |
||||
} |
||||
val |= (int)(*(s->in)++) << s->bitcnt; /* load eight bits */ |
||||
s->left--; |
||||
s->bitcnt += 8; |
||||
} |
||||
|
||||
/* drop need bits and update buffer, always zero to seven bits left */ |
||||
s->bitbuf = val >> need; |
||||
s->bitcnt -= need; |
||||
|
||||
/* return need bits, zeroing the bits above that */ |
||||
return val & ((1 << need) - 1); |
||||
} |
||||
|
||||
/*
|
||||
* Huffman code decoding tables. count[1..MAXBITS] is the number of symbols of |
||||
* each length, which for a canonical code are stepped through in order. |
||||
* symbol[] are the symbol values in canonical order, where the number of |
||||
* entries is the sum of the counts in count[]. The decoding process can be |
||||
* seen in the function decode() below. |
||||
*/ |
||||
struct huffman { |
||||
short *count; /* number of symbols of each length */ |
||||
short *symbol; /* canonically ordered symbols */ |
||||
}; |
||||
|
||||
/*
|
||||
* Decode a code from the stream s using huffman table h. Return the symbol or |
||||
* a negative value if there is an error. If all of the lengths are zero, i.e. |
||||
* an empty code, or if the code is incomplete and an invalid code is received, |
||||
* then -9 is returned after reading MAXBITS bits. |
||||
* |
||||
* Format notes: |
||||
* |
||||
* - The codes as stored in the compressed data are bit-reversed relative to |
||||
* a simple integer ordering of codes of the same lengths. Hence below the |
||||
* bits are pulled from the compressed data one at a time and used to |
||||
* build the code value reversed from what is in the stream in order to |
||||
* permit simple integer comparisons for decoding. |
||||
* |
||||
* - The first code for the shortest length is all ones. Subsequent codes of |
||||
* the same length are simply integer decrements of the previous code. When |
||||
* moving up a length, a one bit is appended to the code. For a complete |
||||
* code, the last code of the longest length will be all zeros. To support |
||||
* this ordering, the bits pulled during decoding are inverted to apply the |
||||
* more "natural" ordering starting with all zeros and incrementing. |
||||
*/ |
||||
local int decode(struct state *s, struct huffman *h) |
||||
{ |
||||
int len; /* current number of bits in code */ |
||||
int code; /* len bits being decoded */ |
||||
int first; /* first code of length len */ |
||||
int count; /* number of codes of length len */ |
||||
int index; /* index of first code of length len in symbol table */ |
||||
int bitbuf; /* bits from stream */ |
||||
int left; /* bits left in next or left to process */ |
||||
short *next; /* next number of codes */ |
||||
|
||||
bitbuf = s->bitbuf; |
||||
left = s->bitcnt; |
||||
code = first = index = 0; |
||||
len = 1; |
||||
next = h->count + 1; |
||||
while (1) { |
||||
while (left--) { |
||||
code |= (bitbuf & 1) ^ 1; /* invert code */ |
||||
bitbuf >>= 1; |
||||
count = *next++; |
||||
if (code < first + count) { /* if length len, return symbol */ |
||||
s->bitbuf = bitbuf; |
||||
s->bitcnt = (s->bitcnt - len) & 7; |
||||
return h->symbol[index + (code - first)]; |
||||
} |
||||
index += count; /* else update for next length */ |
||||
first += count; |
||||
first <<= 1; |
||||
code <<= 1; |
||||
len++; |
||||
} |
||||
left = (MAXBITS+1) - len; |
||||
if (left == 0) break; |
||||
if (s->left == 0) { |
||||
s->left = s->infun(s->inhow, &(s->in)); |
||||
if (s->left == 0) longjmp(s->env, 1); /* out of input */ |
||||
} |
||||
bitbuf = *(s->in)++; |
||||
s->left--; |
||||
if (left > 8) left = 8; |
||||
} |
||||
return -9; /* ran out of codes */ |
||||
} |
||||
|
||||
/*
|
||||
* Given a list of repeated code lengths rep[0..n-1], where each byte is a |
||||
* count (high four bits + 1) and a code length (low four bits), generate the |
||||
* list of code lengths. This compaction reduces the size of the object code. |
||||
* Then given the list of code lengths length[0..n-1] representing a canonical |
||||
* Huffman code for n symbols, construct the tables required to decode those |
||||
* codes. Those tables are the number of codes of each length, and the symbols |
||||
* sorted by length, retaining their original order within each length. The |
||||
* return value is zero for a complete code set, negative for an over- |
||||
* subscribed code set, and positive for an incomplete code set. The tables |
||||
* can be used if the return value is zero or positive, but they cannot be used |
||||
* if the return value is negative. If the return value is zero, it is not |
||||
* possible for decode() using that table to return an error--any stream of |
||||
* enough bits will resolve to a symbol. If the return value is positive, then |
||||
* it is possible for decode() using that table to return an error for received |
||||
* codes past the end of the incomplete lengths. |
||||
*/ |
||||
local int construct(struct huffman *h, const unsigned char *rep, int n) |
||||
{ |
||||
int symbol; /* current symbol when stepping through length[] */ |
||||
int len; /* current length when stepping through h->count[] */ |
||||
int left; /* number of possible codes left of current length */ |
||||
short offs[MAXBITS+1]; /* offsets in symbol table for each length */ |
||||
short length[256]; /* code lengths */ |
||||
|
||||
/* convert compact repeat counts into symbol bit length list */ |
||||
symbol = 0; |
||||
do { |
||||
len = *rep++; |
||||
left = (len >> 4) + 1; |
||||
len &= 15; |
||||
do { |
||||
length[symbol++] = len; |
||||
} while (--left); |
||||
} while (--n); |
||||
n = symbol; |
||||
|
||||
/* count number of codes of each length */ |
||||
for (len = 0; len <= MAXBITS; len++) |
||||
h->count[len] = 0; |
||||
for (symbol = 0; symbol < n; symbol++) |
||||
(h->count[length[symbol]])++; /* assumes lengths are within bounds */ |
||||
if (h->count[0] == n) /* no codes! */ |
||||
return 0; /* complete, but decode() will fail */ |
||||
|
||||
/* check for an over-subscribed or incomplete set of lengths */ |
||||
left = 1; /* one possible code of zero length */ |
||||
for (len = 1; len <= MAXBITS; len++) { |
||||
left <<= 1; /* one more bit, double codes left */ |
||||
left -= h->count[len]; /* deduct count from possible codes */ |
||||
if (left < 0) return left; /* over-subscribed--return negative */ |
||||
} /* left > 0 means incomplete */ |
||||
|
||||
/* generate offsets into symbol table for each length for sorting */ |
||||
offs[1] = 0; |
||||
for (len = 1; len < MAXBITS; len++) |
||||
offs[len + 1] = offs[len] + h->count[len]; |
||||
|
||||
/*
|
||||
* put symbols in table sorted by length, by symbol order within each |
||||
* length |
||||
*/ |
||||
for (symbol = 0; symbol < n; symbol++) |
||||
if (length[symbol] != 0) |
||||
h->symbol[offs[length[symbol]]++] = symbol; |
||||
|
||||
/* return zero for complete set, positive for incomplete set */ |
||||
return left; |
||||
} |
||||
|
||||
/*
|
||||
* Decode PKWare Compression Library stream. |
||||
* |
||||
* Format notes: |
||||
* |
||||
* - First byte is 0 if literals are uncoded or 1 if they are coded. Second |
||||
* byte is 4, 5, or 6 for the number of extra bits in the distance code. |
||||
* This is the base-2 logarithm of the dictionary size minus six. |
||||
* |
||||
* - Compressed data is a combination of literals and length/distance pairs |
||||
* terminated by an end code. Literals are either Huffman coded or |
||||
* uncoded bytes. A length/distance pair is a coded length followed by a |
||||
* coded distance to represent a string that occurs earlier in the |
||||
* uncompressed data that occurs again at the current location. |
||||
* |
||||
* - A bit preceding a literal or length/distance pair indicates which comes |
||||
* next, 0 for literals, 1 for length/distance. |
||||
* |
||||
* - If literals are uncoded, then the next eight bits are the literal, in the |
||||
* normal bit order in the stream, i.e. no bit-reversal is needed. Similarly, |
||||
* no bit reversal is needed for either the length extra bits or the distance |
||||
* extra bits. |
||||
* |
||||
* - Literal bytes are simply written to the output. A length/distance pair is |
||||
* an instruction to copy previously uncompressed bytes to the output. The |
||||
* copy is from distance bytes back in the output stream, copying for length |
||||
* bytes. |
||||
* |
||||
* - Distances pointing before the beginning of the output data are not |
||||
* permitted. |
||||
* |
||||
* - Overlapped copies, where the length is greater than the distance, are |
||||
* allowed and common. For example, a distance of one and a length of 518 |
||||
* simply copies the last byte 518 times. A distance of four and a length of |
||||
* twelve copies the last four bytes three times. A simple forward copy |
||||
* ignoring whether the length is greater than the distance or not implements |
||||
* this correctly. |
||||
*/ |
||||
local int decomp(struct state *s) |
||||
{ |
||||
int lit; /* true if literals are coded */ |
||||
int dict; /* log2(dictionary size) - 6 */ |
||||
int symbol; /* decoded symbol, extra bits for distance */ |
||||
int len; /* length for copy */ |
||||
unsigned dist; /* distance for copy */ |
||||
int copy; /* copy counter */ |
||||
unsigned char *from, *to; /* copy pointers */ |
||||
static int virgin = 1; /* build tables once */ |
||||
static short litcnt[MAXBITS+1], litsym[256]; /* litcode memory */ |
||||
static short lencnt[MAXBITS+1], lensym[16]; /* lencode memory */ |
||||
static short distcnt[MAXBITS+1], distsym[64]; /* distcode memory */ |
||||
static struct huffman litcode = {litcnt, litsym}; /* length code */ |
||||
static struct huffman lencode = {lencnt, lensym}; /* length code */ |
||||
static struct huffman distcode = {distcnt, distsym};/* distance code */ |
||||
/* bit lengths of literal codes */ |
||||
static const unsigned char litlen[] = { |
||||
11, 124, 8, 7, 28, 7, 188, 13, 76, 4, 10, 8, 12, 10, 12, 10, 8, 23, 8, |
||||
9, 7, 6, 7, 8, 7, 6, 55, 8, 23, 24, 12, 11, 7, 9, 11, 12, 6, 7, 22, 5, |
||||
7, 24, 6, 11, 9, 6, 7, 22, 7, 11, 38, 7, 9, 8, 25, 11, 8, 11, 9, 12, |
||||
8, 12, 5, 38, 5, 38, 5, 11, 7, 5, 6, 21, 6, 10, 53, 8, 7, 24, 10, 27, |
||||
44, 253, 253, 253, 252, 252, 252, 13, 12, 45, 12, 45, 12, 61, 12, 45, |
||||
44, 173}; |
||||
/* bit lengths of length codes 0..15 */ |
||||
static const unsigned char lenlen[] = {2, 35, 36, 53, 38, 23}; |
||||
/* bit lengths of distance codes 0..63 */ |
||||
static const unsigned char distlen[] = {2, 20, 53, 230, 247, 151, 248}; |
||||
static const short base[16] = { /* base for length codes */ |
||||
3, 2, 4, 5, 6, 7, 8, 9, 10, 12, 16, 24, 40, 72, 136, 264}; |
||||
static const char extra[16] = { /* extra bits for length codes */ |
||||
0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8}; |
||||
|
||||
/* set up decoding tables (once--might not be thread-safe) */ |
||||
if (virgin) { |
||||
construct(&litcode, litlen, sizeof(litlen)); |
||||
construct(&lencode, lenlen, sizeof(lenlen)); |
||||
construct(&distcode, distlen, sizeof(distlen)); |
||||
virgin = 0; |
||||
} |
||||
|
||||
/* read header */ |
||||
lit = bits(s, 8); |
||||
if (lit > 1) return -1; |
||||
dict = bits(s, 8); |
||||
if (dict < 4 || dict > 6) return -2; |
||||
|
||||
/* decode literals and length/distance pairs */ |
||||
do { |
||||
if (bits(s, 1)) { |
||||
/* get length */ |
||||
symbol = decode(s, &lencode); |
||||
len = base[symbol] + bits(s, extra[symbol]); |
||||
if (len == 519) break; /* end code */ |
||||
|
||||
/* get distance */ |
||||
symbol = len == 2 ? 2 : dict; |
||||
dist = decode(s, &distcode) << symbol; |
||||
dist += bits(s, symbol); |
||||
dist++; |
||||
if (s->first && dist > s->next) |
||||
return -3; /* distance too far back */ |
||||
|
||||
/* copy length bytes from distance bytes back */ |
||||
do { |
||||
to = s->out + s->next; |
||||
from = to - dist; |
||||
copy = MAXWIN; |
||||
if (s->next < dist) { |
||||
from += copy; |
||||
copy = dist; |
||||
} |
||||
copy -= s->next; |
||||
if (copy > len) copy = len; |
||||
len -= copy; |
||||
s->next += copy; |
||||
do { |
||||
*to++ = *from++; |
||||
} while (--copy); |
||||
if (s->next == MAXWIN) { |
||||
if (s->outfun(s->outhow, s->out, s->next)) return 1; |
||||
s->next = 0; |
||||
s->first = 0; |
||||
} |
||||
} while (len != 0); |
||||
} |
||||
else { |
||||
/* get literal and write it */ |
||||
symbol = lit ? decode(s, &litcode) : bits(s, 8); |
||||
s->out[s->next++] = symbol; |
||||
if (s->next == MAXWIN) { |
||||
if (s->outfun(s->outhow, s->out, s->next)) return 1; |
||||
s->next = 0; |
||||
s->first = 0; |
||||
} |
||||
} |
||||
} while (1); |
||||
return 0; |
||||
} |
||||
|
||||
/* See comments in blast.h */ |
||||
int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow, |
||||
unsigned *left, unsigned char **in) |
||||
{ |
||||
struct state s; /* input/output state */ |
||||
int err; /* return value */ |
||||
|
||||
/* initialize input state */ |
||||
s.infun = infun; |
||||
s.inhow = inhow; |
||||
if (left != NULL && *left) { |
||||
s.left = *left; |
||||
s.in = *in; |
||||
} |
||||
else |
||||
s.left = 0; |
||||
s.bitbuf = 0; |
||||
s.bitcnt = 0; |
||||
|
||||
/* initialize output state */ |
||||
s.outfun = outfun; |
||||
s.outhow = outhow; |
||||
s.next = 0; |
||||
s.first = 1; |
||||
|
||||
/* return if bits() or decode() tries to read past available input */ |
||||
if (setjmp(s.env) != 0) /* if came back here via longjmp(), */ |
||||
err = 2; /* then skip decomp(), return error */ |
||||
else |
||||
err = decomp(&s); /* decompress */ |
||||
|
||||
/* return unused input */ |
||||
if (left != NULL) |
||||
*left = s.left; |
||||
if (in != NULL) |
||||
*in = s.left ? s.in : NULL; |
||||
|
||||
/* write any leftover output and update the error code if needed */ |
||||
if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0) |
||||
err = 1; |
||||
return err; |
||||
} |
||||
|
||||
#ifdef TEST |
||||
/* Example of how to use blast() */ |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
|
||||
#define CHUNK 16384 |
||||
|
||||
local unsigned inf(void *how, unsigned char **buf) |
||||
{ |
||||
static unsigned char hold[CHUNK]; |
||||
|
||||
*buf = hold; |
||||
return fread(hold, 1, CHUNK, (FILE *)how); |
||||
} |
||||
|
||||
local int outf(void *how, unsigned char *buf, unsigned len) |
||||
{ |
||||
return fwrite(buf, 1, len, (FILE *)how) != len; |
||||
} |
||||
|
||||
/* Decompress a PKWare Compression Library stream from stdin to stdout */ |
||||
int main(void) |
||||
{ |
||||
int ret; |
||||
unsigned left; |
||||
|
||||
/* decompress to stdout */ |
||||
left = 0; |
||||
ret = blast(inf, stdin, outf, stdout, &left, NULL); |
||||
if (ret != 0) |
||||
fprintf(stderr, "blast error: %d\n", ret); |
||||
|
||||
/* count any leftover bytes */ |
||||
while (getchar() != EOF) |
||||
left++; |
||||
if (left) |
||||
fprintf(stderr, "blast warning: %u unused bytes of input\n", left); |
||||
|
||||
/* return blast() error code */ |
||||
return ret; |
||||
} |
||||
#endif |
@ -0,0 +1,83 @@ |
||||
/* blast.h -- interface for blast.c
|
||||
Copyright (C) 2003, 2012, 2013 Mark Adler |
||||
version 1.3, 24 Aug 2013 |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the author be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
Mark Adler madler@alumni.caltech.edu |
||||
*/ |
||||
|
||||
|
||||
/*
|
||||
* blast() decompresses the PKWare Data Compression Library (DCL) compressed |
||||
* format. It provides the same functionality as the explode() function in |
||||
* that library. (Note: PKWare overused the "implode" verb, and the format |
||||
* used by their library implode() function is completely different and |
||||
* incompatible with the implode compression method supported by PKZIP.) |
||||
* |
||||
* The binary mode for stdio functions should be used to assure that the |
||||
* compressed data is not corrupted when read or written. For example: |
||||
* fopen(..., "rb") and fopen(..., "wb"). |
||||
*/ |
||||
|
||||
|
||||
typedef unsigned (*blast_in)(void *how, unsigned char **buf); |
||||
typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len); |
||||
/* Definitions for input/output functions passed to blast(). See below for
|
||||
* what the provided functions need to do. |
||||
*/ |
||||
|
||||
|
||||
int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow, |
||||
unsigned *left, unsigned char **in); |
||||
/* Decompress input to output using the provided infun() and outfun() calls.
|
||||
* On success, the return value of blast() is zero. If there is an error in |
||||
* the source data, i.e. it is not in the proper format, then a negative value |
||||
* is returned. If there is not enough input available or there is not enough |
||||
* output space, then a positive error is returned. |
||||
* |
||||
* The input function is invoked: len = infun(how, &buf), where buf is set by |
||||
* infun() to point to the input buffer, and infun() returns the number of |
||||
* available bytes there. If infun() returns zero, then blast() returns with |
||||
* an input error. (blast() only asks for input if it needs it.) inhow is for |
||||
* use by the application to pass an input descriptor to infun(), if desired. |
||||
* |
||||
* If left and in are not NULL and *left is not zero when blast() is called, |
||||
* then the *left bytes at *in are consumed for input before infun() is used. |
||||
* |
||||
* The output function is invoked: err = outfun(how, buf, len), where the bytes |
||||
* to be written are buf[0..len-1]. If err is not zero, then blast() returns |
||||
* with an output error. outfun() is always called with len <= 4096. outhow |
||||
* is for use by the application to pass an output descriptor to outfun(), if |
||||
* desired. |
||||
* |
||||
* If there is any unused input, *left is set to the number of bytes that were |
||||
* read and *in points to them. Otherwise *left is set to zero and *in is set |
||||
* to NULL. If left or in are NULL, then they are not set. |
||||
* |
||||
* The return codes are: |
||||
* |
||||
* 2: ran out of input before completing decompression |
||||
* 1: output error before completing decompression |
||||
* 0: successful decompression |
||||
* -1: literal flag not zero or one |
||||
* -2: dictionary size not in 4..6 |
||||
* -3: distance is too far back |
||||
* |
||||
* At the bottom of blast.c is an example program that uses blast() that can be |
||||
* compiled to produce a command-line decompression filter by defining TEST. |
||||
*/ |
Binary file not shown.
@ -0,0 +1 @@ |
||||
AIAIAIAIAIAIA |
@ -0,0 +1,557 @@ |
||||
{*******************************************************} |
||||
{ } |
||||
{ Borland Delphi Supplemental Components } |
||||
{ ZLIB Data Compression Interface Unit } |
||||
{ } |
||||
{ Copyright (c) 1997,99 Borland Corporation } |
||||
{ } |
||||
{*******************************************************} |
||||
|
||||
{ Updated for zlib 1.2.x by Cosmin Truta <cosmint@cs.ubbcluj.ro> } |
||||
|
||||
unit ZLib; |
||||
|
||||
interface |
||||
|
||||
uses SysUtils, Classes; |
||||
|
||||
type |
||||
TAlloc = function (AppData: Pointer; Items, Size: Integer): Pointer; cdecl; |
||||
TFree = procedure (AppData, Block: Pointer); cdecl; |
||||
|
||||
// Internal structure. Ignore. |
||||
TZStreamRec = packed record |
||||
next_in: PChar; // next input byte |
||||
avail_in: Integer; // number of bytes available at next_in |
||||
total_in: Longint; // total nb of input bytes read so far |
||||
|
||||
next_out: PChar; // next output byte should be put here |
||||
avail_out: Integer; // remaining free space at next_out |
||||
total_out: Longint; // total nb of bytes output so far |
||||
|
||||
msg: PChar; // last error message, NULL if no error |
||||
internal: Pointer; // not visible by applications |
||||
|
||||
zalloc: TAlloc; // used to allocate the internal state |
||||
zfree: TFree; // used to free the internal state |
||||
AppData: Pointer; // private data object passed to zalloc and zfree |
||||
|
||||
data_type: Integer; // best guess about the data type: ascii or binary |
||||
adler: Longint; // adler32 value of the uncompressed data |
||||
reserved: Longint; // reserved for future use |
||||
end; |
||||
|
||||
// Abstract ancestor class |
||||
TCustomZlibStream = class(TStream) |
||||
private |
||||
FStrm: TStream; |
||||
FStrmPos: Integer; |
||||
FOnProgress: TNotifyEvent; |
||||
FZRec: TZStreamRec; |
||||
FBuffer: array [Word] of Char; |
||||
protected |
||||
procedure Progress(Sender: TObject); dynamic; |
||||
property OnProgress: TNotifyEvent read FOnProgress write FOnProgress; |
||||
constructor Create(Strm: TStream); |
||||
end; |
||||
|
||||
{ TCompressionStream compresses data on the fly as data is written to it, and |
||||
stores the compressed data to another stream. |
||||
|
||||
TCompressionStream is write-only and strictly sequential. Reading from the |
||||
stream will raise an exception. Using Seek to move the stream pointer |
||||
will raise an exception. |
||||
|
||||
Output data is cached internally, written to the output stream only when |
||||
the internal output buffer is full. All pending output data is flushed |
||||
when the stream is destroyed. |
||||
|
||||
The Position property returns the number of uncompressed bytes of |
||||
data that have been written to the stream so far. |
||||
|
||||
CompressionRate returns the on-the-fly percentage by which the original |
||||
data has been compressed: (1 - (CompressedBytes / UncompressedBytes)) * 100 |
||||
If raw data size = 100 and compressed data size = 25, the CompressionRate |
||||
is 75% |
||||
|
||||
The OnProgress event is called each time the output buffer is filled and |
||||
written to the output stream. This is useful for updating a progress |
||||
indicator when you are writing a large chunk of data to the compression |
||||
stream in a single call.} |
||||
|
||||
|
||||
TCompressionLevel = (clNone, clFastest, clDefault, clMax); |
||||
|
||||
TCompressionStream = class(TCustomZlibStream) |
||||
private |
||||
function GetCompressionRate: Single; |
||||
public |
||||
constructor Create(CompressionLevel: TCompressionLevel; Dest: TStream); |
||||
destructor Destroy; override; |
||||
function Read(var Buffer; Count: Longint): Longint; override; |
||||
function Write(const Buffer; Count: Longint): Longint; override; |
||||
function Seek(Offset: Longint; Origin: Word): Longint; override; |
||||
property CompressionRate: Single read GetCompressionRate; |
||||
property OnProgress; |
||||
end; |
||||
|
||||
{ TDecompressionStream decompresses data on the fly as data is read from it. |
||||
|
||||
Compressed data comes from a separate source stream. TDecompressionStream |
||||
is read-only and unidirectional; you can seek forward in the stream, but not |
||||
backwards. The special case of setting the stream position to zero is |
||||
allowed. Seeking forward decompresses data until the requested position in |
||||
the uncompressed data has been reached. Seeking backwards, seeking relative |
||||
to the end of the stream, requesting the size of the stream, and writing to |
||||
the stream will raise an exception. |
||||
|
||||
The Position property returns the number of bytes of uncompressed data that |
||||
have been read from the stream so far. |
||||
|
||||
The OnProgress event is called each time the internal input buffer of |
||||
compressed data is exhausted and the next block is read from the input stream. |
||||
This is useful for updating a progress indicator when you are reading a |
||||
large chunk of data from the decompression stream in a single call.} |
||||
|
||||
TDecompressionStream = class(TCustomZlibStream) |
||||
public |
||||
constructor Create(Source: TStream); |
||||
destructor Destroy; override; |
||||
function Read(var Buffer; Count: Longint): Longint; override; |
||||
function Write(const Buffer; Count: Longint): Longint; override; |
||||
function Seek(Offset: Longint; Origin: Word): Longint; override; |
||||
property OnProgress; |
||||
end; |
||||
|
||||
|
||||
|
||||
{ CompressBuf compresses data, buffer to buffer, in one call. |
||||
In: InBuf = ptr to compressed data |
||||
InBytes = number of bytes in InBuf |
||||
Out: OutBuf = ptr to newly allocated buffer containing decompressed data |
||||
OutBytes = number of bytes in OutBuf } |
||||
procedure CompressBuf(const InBuf: Pointer; InBytes: Integer; |
||||
out OutBuf: Pointer; out OutBytes: Integer); |
||||
|
||||
|
||||
{ DecompressBuf decompresses data, buffer to buffer, in one call. |
||||
In: InBuf = ptr to compressed data |
||||
InBytes = number of bytes in InBuf |
||||
OutEstimate = zero, or est. size of the decompressed data |
||||
Out: OutBuf = ptr to newly allocated buffer containing decompressed data |
||||
OutBytes = number of bytes in OutBuf } |
||||
procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer; |
||||
OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer); |
||||
|
||||
{ DecompressToUserBuf decompresses data, buffer to buffer, in one call. |
||||
In: InBuf = ptr to compressed data |
||||
InBytes = number of bytes in InBuf |
||||
Out: OutBuf = ptr to user-allocated buffer to contain decompressed data |
||||
BufSize = number of bytes in OutBuf } |
||||
procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; |
||||
const OutBuf: Pointer; BufSize: Integer); |
||||
|
||||
const |
||||
zlib_version = '1.2.13'; |
||||
|
||||
type |
||||
EZlibError = class(Exception); |
||||
ECompressionError = class(EZlibError); |
||||
EDecompressionError = class(EZlibError); |
||||
|
||||
implementation |
||||
|
||||
uses ZLibConst; |
||||
|
||||
const |
||||
Z_NO_FLUSH = 0; |
||||
Z_PARTIAL_FLUSH = 1; |
||||
Z_SYNC_FLUSH = 2; |
||||
Z_FULL_FLUSH = 3; |
||||
Z_FINISH = 4; |
||||
|
||||
Z_OK = 0; |
||||
Z_STREAM_END = 1; |
||||
Z_NEED_DICT = 2; |
||||
Z_ERRNO = (-1); |
||||
Z_STREAM_ERROR = (-2); |
||||
Z_DATA_ERROR = (-3); |
||||
Z_MEM_ERROR = (-4); |
||||
Z_BUF_ERROR = (-5); |
||||
Z_VERSION_ERROR = (-6); |
||||
|
||||
Z_NO_COMPRESSION = 0; |
||||
Z_BEST_SPEED = 1; |
||||
Z_BEST_COMPRESSION = 9; |
||||
Z_DEFAULT_COMPRESSION = (-1); |
||||
|
||||
Z_FILTERED = 1; |
||||
Z_HUFFMAN_ONLY = 2; |
||||
Z_RLE = 3; |
||||
Z_DEFAULT_STRATEGY = 0; |
||||
|
||||
Z_BINARY = 0; |
||||
Z_ASCII = 1; |
||||
Z_UNKNOWN = 2; |
||||
|
||||
Z_DEFLATED = 8; |
||||
|
||||
|
||||
{$L adler32.obj} |
||||
{$L compress.obj} |
||||
{$L crc32.obj} |
||||
{$L deflate.obj} |
||||
{$L infback.obj} |
||||
{$L inffast.obj} |
||||
{$L inflate.obj} |
||||
{$L inftrees.obj} |
||||
{$L trees.obj} |
||||
{$L uncompr.obj} |
||||
{$L zutil.obj} |
||||
|
||||
procedure adler32; external; |
||||
procedure compressBound; external; |
||||
procedure crc32; external; |
||||
procedure deflateInit2_; external; |
||||
procedure deflateParams; external; |
||||
|
||||
function _malloc(Size: Integer): Pointer; cdecl; |
||||
begin |
||||
Result := AllocMem(Size); |
||||
end; |
||||
|
||||
procedure _free(Block: Pointer); cdecl; |
||||
begin |
||||
FreeMem(Block); |
||||
end; |
||||
|
||||
procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl; |
||||
begin |
||||
FillChar(P^, count, B); |
||||
end; |
||||
|
||||
procedure _memcpy(dest, source: Pointer; count: Integer); cdecl; |
||||
begin |
||||
Move(source^, dest^, count); |
||||
end; |
||||
|
||||
|
||||
|
||||
// deflate compresses data |
||||
function deflateInit_(var strm: TZStreamRec; level: Integer; version: PChar; |
||||
recsize: Integer): Integer; external; |
||||
function deflate(var strm: TZStreamRec; flush: Integer): Integer; external; |
||||
function deflateEnd(var strm: TZStreamRec): Integer; external; |
||||
|
||||
// inflate decompresses data |
||||
function inflateInit_(var strm: TZStreamRec; version: PChar; |
||||
recsize: Integer): Integer; external; |
||||
function inflate(var strm: TZStreamRec; flush: Integer): Integer; external; |
||||
function inflateEnd(var strm: TZStreamRec): Integer; external; |
||||
function inflateReset(var strm: TZStreamRec): Integer; external; |
||||
|
||||
|
||||
function zlibAllocMem(AppData: Pointer; Items, Size: Integer): Pointer; cdecl; |
||||
begin |
||||
// GetMem(Result, Items*Size); |
||||
Result := AllocMem(Items * Size); |
||||
end; |
||||
|
||||
procedure zlibFreeMem(AppData, Block: Pointer); cdecl; |
||||
begin |
||||
FreeMem(Block); |
||||
end; |
||||
|
||||
{function zlibCheck(code: Integer): Integer; |
||||
begin |
||||
Result := code; |
||||
if code < 0 then |
||||
raise EZlibError.Create('error'); //!! |
||||
end;} |
||||
|
||||
function CCheck(code: Integer): Integer; |
||||
begin |
||||
Result := code; |
||||
if code < 0 then |
||||
raise ECompressionError.Create('error'); //!! |
||||
end; |
||||
|
||||
function DCheck(code: Integer): Integer; |
||||
begin |
||||
Result := code; |
||||
if code < 0 then |
||||
raise EDecompressionError.Create('error'); //!! |
||||
end; |
||||
|
||||
procedure CompressBuf(const InBuf: Pointer; InBytes: Integer; |
||||
out OutBuf: Pointer; out OutBytes: Integer); |
||||
var |
||||
strm: TZStreamRec; |
||||
P: Pointer; |
||||
begin |
||||
FillChar(strm, sizeof(strm), 0); |
||||
strm.zalloc := zlibAllocMem; |
||||
strm.zfree := zlibFreeMem; |
||||
OutBytes := ((InBytes + (InBytes div 10) + 12) + 255) and not 255; |
||||
GetMem(OutBuf, OutBytes); |
||||
try |
||||
strm.next_in := InBuf; |
||||
strm.avail_in := InBytes; |
||||
strm.next_out := OutBuf; |
||||
strm.avail_out := OutBytes; |
||||
CCheck(deflateInit_(strm, Z_BEST_COMPRESSION, zlib_version, sizeof(strm))); |
||||
try |
||||
while CCheck(deflate(strm, Z_FINISH)) <> Z_STREAM_END do |
||||
begin |
||||
P := OutBuf; |
||||
Inc(OutBytes, 256); |
||||
ReallocMem(OutBuf, OutBytes); |
||||
strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P))); |
||||
strm.avail_out := 256; |
||||
end; |
||||
finally |
||||
CCheck(deflateEnd(strm)); |
||||
end; |
||||
ReallocMem(OutBuf, strm.total_out); |
||||
OutBytes := strm.total_out; |
||||
except |
||||
FreeMem(OutBuf); |
||||
raise |
||||
end; |
||||
end; |
||||
|
||||
|
||||
procedure DecompressBuf(const InBuf: Pointer; InBytes: Integer; |
||||
OutEstimate: Integer; out OutBuf: Pointer; out OutBytes: Integer); |
||||
var |
||||
strm: TZStreamRec; |
||||
P: Pointer; |
||||
BufInc: Integer; |
||||
begin |
||||
FillChar(strm, sizeof(strm), 0); |
||||
strm.zalloc := zlibAllocMem; |
||||
strm.zfree := zlibFreeMem; |
||||
BufInc := (InBytes + 255) and not 255; |
||||
if OutEstimate = 0 then |
||||
OutBytes := BufInc |
||||
else |
||||
OutBytes := OutEstimate; |
||||
GetMem(OutBuf, OutBytes); |
||||
try |
||||
strm.next_in := InBuf; |
||||
strm.avail_in := InBytes; |
||||
strm.next_out := OutBuf; |
||||
strm.avail_out := OutBytes; |
||||
DCheck(inflateInit_(strm, zlib_version, sizeof(strm))); |
||||
try |
||||
while DCheck(inflate(strm, Z_NO_FLUSH)) <> Z_STREAM_END do |
||||
begin |
||||
P := OutBuf; |
||||
Inc(OutBytes, BufInc); |
||||
ReallocMem(OutBuf, OutBytes); |
||||
strm.next_out := PChar(Integer(OutBuf) + (Integer(strm.next_out) - Integer(P))); |
||||
strm.avail_out := BufInc; |
||||
end; |
||||
finally |
||||
DCheck(inflateEnd(strm)); |
||||
end; |
||||
ReallocMem(OutBuf, strm.total_out); |
||||
OutBytes := strm.total_out; |
||||
except |
||||
FreeMem(OutBuf); |
||||
raise |
||||
end; |
||||
end; |
||||
|
||||
procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; |
||||
const OutBuf: Pointer; BufSize: Integer); |
||||
var |
||||
strm: TZStreamRec; |
||||
begin |
||||
FillChar(strm, sizeof(strm), 0); |
||||
strm.zalloc := zlibAllocMem; |
||||
strm.zfree := zlibFreeMem; |
||||
strm.next_in := InBuf; |
||||
strm.avail_in := InBytes; |
||||
strm.next_out := OutBuf; |
||||
strm.avail_out := BufSize; |
||||
DCheck(inflateInit_(strm, zlib_version, sizeof(strm))); |
||||
try |
||||
if DCheck(inflate(strm, Z_FINISH)) <> Z_STREAM_END then |
||||
raise EZlibError.CreateRes(@sTargetBufferTooSmall); |
||||
finally |
||||
DCheck(inflateEnd(strm)); |
||||
end; |
||||
end; |
||||
|
||||
// TCustomZlibStream |
||||
|
||||
constructor TCustomZLibStream.Create(Strm: TStream); |
||||
begin |
||||
inherited Create; |
||||
FStrm := Strm; |
||||
FStrmPos := Strm.Position; |
||||
FZRec.zalloc := zlibAllocMem; |
||||
FZRec.zfree := zlibFreeMem; |
||||
end; |
||||
|
||||
procedure TCustomZLibStream.Progress(Sender: TObject); |
||||
begin |
||||
if Assigned(FOnProgress) then FOnProgress(Sender); |
||||
end; |
||||
|
||||
|
||||
// TCompressionStream |
||||
|
||||
constructor TCompressionStream.Create(CompressionLevel: TCompressionLevel; |
||||
Dest: TStream); |
||||
const |
||||
Levels: array [TCompressionLevel] of ShortInt = |
||||
(Z_NO_COMPRESSION, Z_BEST_SPEED, Z_DEFAULT_COMPRESSION, Z_BEST_COMPRESSION); |
||||
begin |
||||
inherited Create(Dest); |
||||
FZRec.next_out := FBuffer; |
||||
FZRec.avail_out := sizeof(FBuffer); |
||||
CCheck(deflateInit_(FZRec, Levels[CompressionLevel], zlib_version, sizeof(FZRec))); |
||||
end; |
||||
|
||||
destructor TCompressionStream.Destroy; |
||||
begin |
||||
FZRec.next_in := nil; |
||||
FZRec.avail_in := 0; |
||||
try |
||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; |
||||
while (CCheck(deflate(FZRec, Z_FINISH)) <> Z_STREAM_END) |
||||
and (FZRec.avail_out = 0) do |
||||
begin |
||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer)); |
||||
FZRec.next_out := FBuffer; |
||||
FZRec.avail_out := sizeof(FBuffer); |
||||
end; |
||||
if FZRec.avail_out < sizeof(FBuffer) then |
||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer) - FZRec.avail_out); |
||||
finally |
||||
deflateEnd(FZRec); |
||||
end; |
||||
inherited Destroy; |
||||
end; |
||||
|
||||
function TCompressionStream.Read(var Buffer; Count: Longint): Longint; |
||||
begin |
||||
raise ECompressionError.CreateRes(@sInvalidStreamOp); |
||||
end; |
||||
|
||||
function TCompressionStream.Write(const Buffer; Count: Longint): Longint; |
||||
begin |
||||
FZRec.next_in := @Buffer; |
||||
FZRec.avail_in := Count; |
||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; |
||||
while (FZRec.avail_in > 0) do |
||||
begin |
||||
CCheck(deflate(FZRec, 0)); |
||||
if FZRec.avail_out = 0 then |
||||
begin |
||||
FStrm.WriteBuffer(FBuffer, sizeof(FBuffer)); |
||||
FZRec.next_out := FBuffer; |
||||
FZRec.avail_out := sizeof(FBuffer); |
||||
FStrmPos := FStrm.Position; |
||||
Progress(Self); |
||||
end; |
||||
end; |
||||
Result := Count; |
||||
end; |
||||
|
||||
function TCompressionStream.Seek(Offset: Longint; Origin: Word): Longint; |
||||
begin |
||||
if (Offset = 0) and (Origin = soFromCurrent) then |
||||
Result := FZRec.total_in |
||||
else |
||||
raise ECompressionError.CreateRes(@sInvalidStreamOp); |
||||
end; |
||||
|
||||
function TCompressionStream.GetCompressionRate: Single; |
||||
begin |
||||
if FZRec.total_in = 0 then |
||||
Result := 0 |
||||
else |
||||
Result := (1.0 - (FZRec.total_out / FZRec.total_in)) * 100.0; |
||||
end; |
||||
|
||||
|
||||
// TDecompressionStream |
||||
|
||||
constructor TDecompressionStream.Create(Source: TStream); |
||||
begin |
||||
inherited Create(Source); |
||||
FZRec.next_in := FBuffer; |
||||
FZRec.avail_in := 0; |
||||
DCheck(inflateInit_(FZRec, zlib_version, sizeof(FZRec))); |
||||
end; |
||||
|
||||
destructor TDecompressionStream.Destroy; |
||||
begin |
||||
FStrm.Seek(-FZRec.avail_in, 1); |
||||
inflateEnd(FZRec); |
||||
inherited Destroy; |
||||
end; |
||||
|
||||
function TDecompressionStream.Read(var Buffer; Count: Longint): Longint; |
||||
begin |
||||
FZRec.next_out := @Buffer; |
||||
FZRec.avail_out := Count; |
||||
if FStrm.Position <> FStrmPos then FStrm.Position := FStrmPos; |
||||
while (FZRec.avail_out > 0) do |
||||
begin |
||||
if FZRec.avail_in = 0 then |
||||
begin |
||||
FZRec.avail_in := FStrm.Read(FBuffer, sizeof(FBuffer)); |
||||
if FZRec.avail_in = 0 then |
||||
begin |
||||
Result := Count - FZRec.avail_out; |
||||
Exit; |
||||
end; |
||||
FZRec.next_in := FBuffer; |
||||
FStrmPos := FStrm.Position; |
||||
Progress(Self); |
||||
end; |
||||
CCheck(inflate(FZRec, 0)); |
||||
end; |
||||
Result := Count; |
||||
end; |
||||
|
||||
function TDecompressionStream.Write(const Buffer; Count: Longint): Longint; |
||||
begin |
||||
raise EDecompressionError.CreateRes(@sInvalidStreamOp); |
||||
end; |
||||
|
||||
function TDecompressionStream.Seek(Offset: Longint; Origin: Word): Longint; |
||||
var |
||||
I: Integer; |
||||
Buf: array [0..4095] of Char; |
||||
begin |
||||
if (Offset = 0) and (Origin = soFromBeginning) then |
||||
begin |
||||
DCheck(inflateReset(FZRec)); |
||||
FZRec.next_in := FBuffer; |
||||
FZRec.avail_in := 0; |
||||
FStrm.Position := 0; |
||||
FStrmPos := 0; |
||||
end |
||||
else if ( (Offset >= 0) and (Origin = soFromCurrent)) or |
||||
( ((Offset - FZRec.total_out) > 0) and (Origin = soFromBeginning)) then |
||||
begin |
||||
if Origin = soFromBeginning then Dec(Offset, FZRec.total_out); |
||||
if Offset > 0 then |
||||
begin |
||||
for I := 1 to Offset div sizeof(Buf) do |
||||
ReadBuffer(Buf, sizeof(Buf)); |
||||
ReadBuffer(Buf, Offset mod sizeof(Buf)); |
||||
end; |
||||
end |
||||
else |
||||
raise EDecompressionError.CreateRes(@sInvalidStreamOp); |
||||
Result := FZRec.total_out; |
||||
end; |
||||
|
||||
|
||||
end. |
@ -0,0 +1,11 @@ |
||||
unit ZLibConst; |
||||
|
||||
interface |
||||
|
||||
resourcestring |
||||
sTargetBufferTooSmall = 'ZLib error: target buffer may be too small'; |
||||
sInvalidStreamOp = 'Invalid stream operation'; |
||||
|
||||
implementation |
||||
|
||||
end. |
@ -0,0 +1,76 @@ |
||||
|
||||
Overview |
||||
======== |
||||
|
||||
This directory contains an update to the ZLib interface unit, |
||||
distributed by Borland as a Delphi supplemental component. |
||||
|
||||
The original ZLib unit is Copyright (c) 1997,99 Borland Corp., |
||||
and is based on zlib version 1.0.4. There are a series of bugs |
||||
and security problems associated with that old zlib version, and |
||||
we recommend the users to update their ZLib unit. |
||||
|
||||
|
||||
Summary of modifications |
||||
======================== |
||||
|
||||
- Improved makefile, adapted to zlib version 1.2.1. |
||||
|
||||
- Some field types from TZStreamRec are changed from Integer to |
||||
Longint, for consistency with the zlib.h header, and for 64-bit |
||||
readiness. |
||||
|
||||
- The zlib_version constant is updated. |
||||
|
||||
- The new Z_RLE strategy has its corresponding symbolic constant. |
||||
|
||||
- The allocation and deallocation functions and function types |
||||
(TAlloc, TFree, zlibAllocMem and zlibFreeMem) are now cdecl, |
||||
and _malloc and _free are added as C RTL stubs. As a result, |
||||
the original C sources of zlib can be compiled out of the box, |
||||
and linked to the ZLib unit. |
||||
|
||||
|
||||
Suggestions for improvements |
||||
============================ |
||||
|
||||
Currently, the ZLib unit provides only a limited wrapper around |
||||
the zlib library, and much of the original zlib functionality is |
||||
missing. Handling compressed file formats like ZIP/GZIP or PNG |
||||
cannot be implemented without having this functionality. |
||||
Applications that handle these formats are either using their own, |
||||
duplicated code, or not using the ZLib unit at all. |
||||
|
||||
Here are a few suggestions: |
||||
|
||||
- Checksum class wrappers around adler32() and crc32(), similar |
||||
to the Java classes that implement the java.util.zip.Checksum |
||||
interface. |
||||
|
||||
- The ability to read and write raw deflate streams, without the |
||||
zlib stream header and trailer. Raw deflate streams are used |
||||
in the ZIP file format. |
||||
|
||||
- The ability to read and write gzip streams, used in the GZIP |
||||
file format, and normally produced by the gzip program. |
||||
|
||||
- The ability to select a different compression strategy, useful |
||||
to PNG and MNG image compression, and to multimedia compression |
||||
in general. Besides the compression level |
||||
|
||||
TCompressionLevel = (clNone, clFastest, clDefault, clMax); |
||||
|
||||
which, in fact, could have used the 'z' prefix and avoided |
||||
TColor-like symbols |
||||
|
||||
TCompressionLevel = (zcNone, zcFastest, zcDefault, zcMax); |
||||
|
||||
there could be a compression strategy |
||||
|
||||
TCompressionStrategy = (zsDefault, zsFiltered, zsHuffmanOnly, zsRle); |
||||
|
||||
- ZIP and GZIP stream handling via TStreams. |
||||
|
||||
|
||||
-- |
||||
Cosmin Truta <cosmint@cs.ubbcluj.ro> |
@ -0,0 +1,99 @@ |
||||
# Makefile for zlib
|
||||
# For use with Delphi and C++ Builder under Win32
|
||||
# Updated for zlib 1.2.x by Cosmin Truta
|
||||
|
||||
# ------------ Borland C++ ------------
|
||||
|
||||
# This project uses the Delphi (fastcall/register) calling convention:
|
||||
LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
|
||||
|
||||
CC = bcc32
|
||||
LD = bcc32
|
||||
AR = tlib
|
||||
# do not use "-pr" in CFLAGS
|
||||
CFLAGS = -a -d -k- -O2 $(LOC)
|
||||
LDFLAGS =
|
||||
|
||||
|
||||
# variables
|
||||
ZLIB_LIB = zlib.lib
|
||||
|
||||
OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
|
||||
OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
|
||||
OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
|
||||
OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
|
||||
|
||||
|
||||
# targets
|
||||
all: $(ZLIB_LIB) example.exe minigzip.exe |
||||
|
||||
.c.obj: |
||||
$(CC) -c $(CFLAGS) $*.c
|
||||
|
||||
adler32.obj: adler32.c zlib.h zconf.h |
||||
|
||||
compress.obj: compress.c zlib.h zconf.h |
||||
|
||||
crc32.obj: crc32.c zlib.h zconf.h crc32.h |
||||
|
||||
deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h |
||||
|
||||
gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h |
||||
|
||||
infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h
|
||||
|
||||
inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h |
||||
|
||||
trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h |
||||
|
||||
uncompr.obj: uncompr.c zlib.h zconf.h |
||||
|
||||
zutil.obj: zutil.c zutil.h zlib.h zconf.h |
||||
|
||||
example.obj: test/example.c zlib.h zconf.h |
||||
|
||||
minigzip.obj: test/minigzip.c zlib.h zconf.h |
||||
|
||||
|
||||
# For the sake of the old Borland make,
|
||||
# the command line is cut to fit in the MS-DOS 128 byte limit:
|
||||
$(ZLIB_LIB): $(OBJ1) $(OBJ2) |
||||
-del $(ZLIB_LIB)
|
||||
$(AR) $(ZLIB_LIB) $(OBJP1)
|
||||
$(AR) $(ZLIB_LIB) $(OBJP2)
|
||||
|
||||
|
||||
# testing
|
||||
test: example.exe minigzip.exe |
||||
example
|
||||
echo hello world | minigzip | minigzip -d
|
||||
|
||||
example.exe: example.obj $(ZLIB_LIB) |
||||
$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
|
||||
|
||||
minigzip.exe: minigzip.obj $(ZLIB_LIB) |
||||
$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
|
||||
|
||||
|
||||
# cleanup
|
||||
clean: |
||||
-del *.obj
|
||||
-del *.exe
|
||||
-del *.lib
|
||||
-del *.tds
|
||||
-del zlib.bak
|
||||
-del foo.gz
|
||||
|
Binary file not shown.
@ -0,0 +1,21 @@ |
||||
Microsoft Visual Studio Solution File, Format Version 8.00 |
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotZLib", "DotZLib\DotZLib.csproj", "{BB1EE0B1-1808-46CB-B786-949D91117FC5}" |
||||
ProjectSection(ProjectDependencies) = postProject |
||||
EndProjectSection |
||||
EndProject |
||||
Global |
||||
GlobalSection(SolutionConfiguration) = preSolution |
||||
Debug = Debug |
||||
Release = Release |
||||
EndGlobalSection |
||||
GlobalSection(ProjectConfiguration) = postSolution |
||||
{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.ActiveCfg = Debug|.NET |
||||
{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Debug.Build.0 = Debug|.NET |
||||
{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.ActiveCfg = Release|.NET |
||||
{BB1EE0B1-1808-46CB-B786-949D91117FC5}.Release.Build.0 = Release|.NET |
||||
EndGlobalSection |
||||
GlobalSection(ExtensibilityGlobals) = postSolution |
||||
EndGlobalSection |
||||
GlobalSection(ExtensibilityAddIns) = postSolution |
||||
EndGlobalSection |
||||
EndGlobal |
@ -0,0 +1,58 @@ |
||||
using System.Reflection; |
||||
using System.Runtime.CompilerServices; |
||||
|
||||
// |
||||
// General Information about an assembly is controlled through the following |
||||
// set of attributes. Change these attribute values to modify the information |
||||
// associated with an assembly. |
||||
// |
||||
[assembly: AssemblyTitle("DotZLib")] |
||||
[assembly: AssemblyDescription(".Net bindings for ZLib compression dll 1.2.x")] |
||||
[assembly: AssemblyConfiguration("")] |
||||
[assembly: AssemblyCompany("Henrik Ravn")] |
||||
[assembly: AssemblyProduct("")] |
||||
[assembly: AssemblyCopyright("(c) 2004 by Henrik Ravn")] |
||||
[assembly: AssemblyTrademark("")] |
||||
[assembly: AssemblyCulture("")] |
||||
|
||||
// |
||||
// Version information for an assembly consists of the following four values: |
||||
// |
||||
// Major Version |
||||
// Minor Version |
||||
// Build Number |
||||
// Revision |
||||
// |
||||
// You can specify all the values or you can default the Revision and Build Numbers |
||||
// by using the '*' as shown below: |
||||
|
||||
[assembly: AssemblyVersion("1.0.*")] |
||||
|
||||
// |
||||
// In order to sign your assembly you must specify a key to use. Refer to the |
||||
// Microsoft .NET Framework documentation for more information on assembly signing. |
||||
// |
||||
// Use the attributes below to control which key is used for signing. |
||||
// |
||||
// Notes: |
||||
// (*) If no key is specified, the assembly is not signed. |
||||
// (*) KeyName refers to a key that has been installed in the Crypto Service |
||||
// Provider (CSP) on your machine. KeyFile refers to a file which contains |
||||
// a key. |
||||
// (*) If the KeyFile and the KeyName values are both specified, the |
||||
// following processing occurs: |
||||
// (1) If the KeyName can be found in the CSP, that key is used. |
||||
// (2) If the KeyName does not exist and the KeyFile does exist, the key |
||||
// in the KeyFile is installed into the CSP and used. |
||||
// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. |
||||
// When specifying the KeyFile, the location of the KeyFile should be |
||||
// relative to the project output directory which is |
||||
// %Project Directory%\obj\<configuration>. For example, if your KeyFile is |
||||
// located in the project directory, you would specify the AssemblyKeyFile |
||||
// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] |
||||
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework |
||||
// documentation for more information on this. |
||||
// |
||||
[assembly: AssemblyDelaySign(false)] |
||||
[assembly: AssemblyKeyFile("")] |
||||
[assembly: AssemblyKeyName("")] |
@ -0,0 +1,202 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Runtime.InteropServices; |
||||
using System.Text; |
||||
|
||||
|
||||
namespace DotZLib |
||||
{ |
||||
#region ChecksumGeneratorBase |
||||
/// <summary> |
||||
/// Implements the common functionality needed for all <see cref="ChecksumGenerator"/>s |
||||
/// </summary> |
||||
/// <example></example> |
||||
public abstract class ChecksumGeneratorBase : ChecksumGenerator |
||||
{ |
||||
/// <summary> |
||||
/// The value of the current checksum |
||||
/// </summary> |
||||
protected uint _current; |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the checksum generator base - the current checksum is |
||||
/// set to zero |
||||
/// </summary> |
||||
public ChecksumGeneratorBase() |
||||
{ |
||||
_current = 0; |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the checksum generator basewith a specified value |
||||
/// </summary> |
||||
/// <param name="initialValue">The value to set the current checksum to</param> |
||||
public ChecksumGeneratorBase(uint initialValue) |
||||
{ |
||||
_current = initialValue; |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Resets the current checksum to zero |
||||
/// </summary> |
||||
public void Reset() { _current = 0; } |
||||
|
||||
/// <summary> |
||||
/// Gets the current checksum value |
||||
/// </summary> |
||||
public uint Value { get { return _current; } } |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with part of an array of bytes |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
/// <param name="offset">Where in <c>data</c> to start updating</param> |
||||
/// <param name="count">The number of bytes from <c>data</c> to use</param> |
||||
/// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception> |
||||
/// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception> |
||||
/// <remarks>All the other <c>Update</c> methods are implmeneted in terms of this one. |
||||
/// This is therefore the only method a derived class has to implement</remarks> |
||||
public abstract void Update(byte[] data, int offset, int count); |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with an array of bytes. |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
public void Update(byte[] data) |
||||
{ |
||||
Update(data, 0, data.Length); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with the data from a string |
||||
/// </summary> |
||||
/// <param name="data">The string to update the checksum with</param> |
||||
/// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks> |
||||
public void Update(string data) |
||||
{ |
||||
Update(Encoding.UTF8.GetBytes(data)); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with the data from a string, using a specific encoding |
||||
/// </summary> |
||||
/// <param name="data">The string to update the checksum with</param> |
||||
/// <param name="encoding">The encoding to use</param> |
||||
public void Update(string data, Encoding encoding) |
||||
{ |
||||
Update(encoding.GetBytes(data)); |
||||
} |
||||
|
||||
} |
||||
#endregion |
||||
|
||||
#region CRC32 |
||||
/// <summary> |
||||
/// Implements a CRC32 checksum generator |
||||
/// </summary> |
||||
public sealed class CRC32Checksum : ChecksumGeneratorBase |
||||
{ |
||||
#region DLL imports |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern uint crc32(uint crc, int data, uint length); |
||||
|
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the CRC32 checksum generator |
||||
/// </summary> |
||||
public CRC32Checksum() : base() {} |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the CRC32 checksum generator with a specified value |
||||
/// </summary> |
||||
/// <param name="initialValue">The value to set the current checksum to</param> |
||||
public CRC32Checksum(uint initialValue) : base(initialValue) {} |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with part of an array of bytes |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
/// <param name="offset">Where in <c>data</c> to start updating</param> |
||||
/// <param name="count">The number of bytes from <c>data</c> to use</param> |
||||
/// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception> |
||||
/// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception> |
||||
public override void Update(byte[] data, int offset, int count) |
||||
{ |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > data.Length) throw new ArgumentException(); |
||||
GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned); |
||||
try |
||||
{ |
||||
_current = crc32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count); |
||||
} |
||||
finally |
||||
{ |
||||
hData.Free(); |
||||
} |
||||
} |
||||
|
||||
} |
||||
#endregion |
||||
|
||||
#region Adler |
||||
/// <summary> |
||||
/// Implements a checksum generator that computes the Adler checksum on data |
||||
/// </summary> |
||||
public sealed class AdlerChecksum : ChecksumGeneratorBase |
||||
{ |
||||
#region DLL imports |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern uint adler32(uint adler, int data, uint length); |
||||
|
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the Adler checksum generator |
||||
/// </summary> |
||||
public AdlerChecksum() : base() {} |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the Adler checksum generator with a specified value |
||||
/// </summary> |
||||
/// <param name="initialValue">The value to set the current checksum to</param> |
||||
public AdlerChecksum(uint initialValue) : base(initialValue) {} |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with part of an array of bytes |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
/// <param name="offset">Where in <c>data</c> to start updating</param> |
||||
/// <param name="count">The number of bytes from <c>data</c> to use</param> |
||||
/// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception> |
||||
/// <exception cref="NullReferenceException"><c>data</c> is a null reference</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception> |
||||
public override void Update(byte[] data, int offset, int count) |
||||
{ |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > data.Length) throw new ArgumentException(); |
||||
GCHandle hData = GCHandle.Alloc(data, GCHandleType.Pinned); |
||||
try |
||||
{ |
||||
_current = adler32(_current, hData.AddrOfPinnedObject().ToInt32()+offset, (uint)count); |
||||
} |
||||
finally |
||||
{ |
||||
hData.Free(); |
||||
} |
||||
} |
||||
|
||||
} |
||||
#endregion |
||||
|
||||
} |
@ -0,0 +1,83 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Diagnostics; |
||||
|
||||
namespace DotZLib |
||||
{ |
||||
|
||||
/// <summary> |
||||
/// This class implements a circular buffer |
||||
/// </summary> |
||||
internal class CircularBuffer |
||||
{ |
||||
#region Private data |
||||
private int _capacity; |
||||
private int _head; |
||||
private int _tail; |
||||
private int _size; |
||||
private byte[] _buffer; |
||||
#endregion |
||||
|
||||
public CircularBuffer(int capacity) |
||||
{ |
||||
Debug.Assert( capacity > 0 ); |
||||
_buffer = new byte[capacity]; |
||||
_capacity = capacity; |
||||
_head = 0; |
||||
_tail = 0; |
||||
_size = 0; |
||||
} |
||||
|
||||
public int Size { get { return _size; } } |
||||
|
||||
public int Put(byte[] source, int offset, int count) |
||||
{ |
||||
Debug.Assert( count > 0 ); |
||||
int trueCount = Math.Min(count, _capacity - Size); |
||||
for (int i = 0; i < trueCount; ++i) |
||||
_buffer[(_tail+i) % _capacity] = source[offset+i]; |
||||
_tail += trueCount; |
||||
_tail %= _capacity; |
||||
_size += trueCount; |
||||
return trueCount; |
||||
} |
||||
|
||||
public bool Put(byte b) |
||||
{ |
||||
if (Size == _capacity) // no room |
||||
return false; |
||||
_buffer[_tail++] = b; |
||||
_tail %= _capacity; |
||||
++_size; |
||||
return true; |
||||
} |
||||
|
||||
public int Get(byte[] destination, int offset, int count) |
||||
{ |
||||
int trueCount = Math.Min(count,Size); |
||||
for (int i = 0; i < trueCount; ++i) |
||||
destination[offset + i] = _buffer[(_head+i) % _capacity]; |
||||
_head += trueCount; |
||||
_head %= _capacity; |
||||
_size -= trueCount; |
||||
return trueCount; |
||||
} |
||||
|
||||
public int Get() |
||||
{ |
||||
if (Size == 0) |
||||
return -1; |
||||
|
||||
int result = (int)_buffer[_head++ % _capacity]; |
||||
--_size; |
||||
return result; |
||||
} |
||||
|
||||
} |
||||
} |
@ -0,0 +1,198 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Runtime.InteropServices; |
||||
|
||||
namespace DotZLib |
||||
{ |
||||
/// <summary> |
||||
/// Implements the common functionality needed for all <see cref="Codec"/>s |
||||
/// </summary> |
||||
public abstract class CodecBase : Codec, IDisposable |
||||
{ |
||||
|
||||
#region Data members |
||||
|
||||
/// <summary> |
||||
/// Instance of the internal zlib buffer structure that is |
||||
/// passed to all functions in the zlib dll |
||||
/// </summary> |
||||
internal ZStream _ztream = new ZStream(); |
||||
|
||||
/// <summary> |
||||
/// True if the object instance has been disposed, false otherwise |
||||
/// </summary> |
||||
protected bool _isDisposed = false; |
||||
|
||||
/// <summary> |
||||
/// The size of the internal buffers |
||||
/// </summary> |
||||
protected const int kBufferSize = 16384; |
||||
|
||||
private byte[] _outBuffer = new byte[kBufferSize]; |
||||
private byte[] _inBuffer = new byte[kBufferSize]; |
||||
|
||||
private GCHandle _hInput; |
||||
private GCHandle _hOutput; |
||||
|
||||
private uint _checksum = 0; |
||||
|
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the <c>CodeBase</c> class. |
||||
/// </summary> |
||||
public CodecBase() |
||||
{ |
||||
try |
||||
{ |
||||
_hInput = GCHandle.Alloc(_inBuffer, GCHandleType.Pinned); |
||||
_hOutput = GCHandle.Alloc(_outBuffer, GCHandleType.Pinned); |
||||
} |
||||
catch (Exception) |
||||
{ |
||||
CleanUp(false); |
||||
throw; |
||||
} |
||||
} |
||||
|
||||
|
||||
#region Codec Members |
||||
|
||||
/// <summary> |
||||
/// Occurs when more processed data are available. |
||||
/// </summary> |
||||
public event DataAvailableHandler DataAvailable; |
||||
|
||||
/// <summary> |
||||
/// Fires the <see cref="DataAvailable"/> event |
||||
/// </summary> |
||||
protected void OnDataAvailable() |
||||
{ |
||||
if (_ztream.total_out > 0) |
||||
{ |
||||
if (DataAvailable != null) |
||||
DataAvailable( _outBuffer, 0, (int)_ztream.total_out); |
||||
resetOutput(); |
||||
} |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
public void Add(byte[] data) |
||||
{ |
||||
Add(data,0,data.Length); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <param name="offset">The index of the first byte to add from <c>data</c></param> |
||||
/// <param name="count">The number of bytes to add</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
/// <remarks>This must be implemented by a derived class</remarks> |
||||
public abstract void Add(byte[] data, int offset, int count); |
||||
|
||||
/// <summary> |
||||
/// Finishes up any pending data that needs to be processed and handled. |
||||
/// </summary> |
||||
/// <remarks>This must be implemented by a derived class</remarks> |
||||
public abstract void Finish(); |
||||
|
||||
/// <summary> |
||||
/// Gets the checksum of the data that has been added so far |
||||
/// </summary> |
||||
public uint Checksum { get { return _checksum; } } |
||||
|
||||
#endregion |
||||
|
||||
#region Destructor & IDisposable stuff |
||||
|
||||
/// <summary> |
||||
/// Destroys this instance |
||||
/// </summary> |
||||
~CodecBase() |
||||
{ |
||||
CleanUp(false); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Releases any unmanaged resources and calls the <see cref="CleanUp()"/> method of the derived class |
||||
/// </summary> |
||||
public void Dispose() |
||||
{ |
||||
CleanUp(true); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Performs any codec specific cleanup |
||||
/// </summary> |
||||
/// <remarks>This must be implemented by a derived class</remarks> |
||||
protected abstract void CleanUp(); |
||||
|
||||
// performs the release of the handles and calls the dereived CleanUp() |
||||
private void CleanUp(bool isDisposing) |
||||
{ |
||||
if (!_isDisposed) |
||||
{ |
||||
CleanUp(); |
||||
if (_hInput.IsAllocated) |
||||
_hInput.Free(); |
||||
if (_hOutput.IsAllocated) |
||||
_hOutput.Free(); |
||||
|
||||
_isDisposed = true; |
||||
} |
||||
} |
||||
|
||||
|
||||
#endregion |
||||
|
||||
#region Helper methods |
||||
|
||||
/// <summary> |
||||
/// Copies a number of bytes to the internal codec buffer - ready for proccesing |
||||
/// </summary> |
||||
/// <param name="data">The byte array that contains the data to copy</param> |
||||
/// <param name="startIndex">The index of the first byte to copy</param> |
||||
/// <param name="count">The number of bytes to copy from <c>data</c></param> |
||||
protected void copyInput(byte[] data, int startIndex, int count) |
||||
{ |
||||
Array.Copy(data, startIndex, _inBuffer,0, count); |
||||
_ztream.next_in = _hInput.AddrOfPinnedObject(); |
||||
_ztream.total_in = 0; |
||||
_ztream.avail_in = (uint)count; |
||||
|
||||
} |
||||
|
||||
/// <summary> |
||||
/// Resets the internal output buffers to a known state - ready for processing |
||||
/// </summary> |
||||
protected void resetOutput() |
||||
{ |
||||
_ztream.total_out = 0; |
||||
_ztream.avail_out = kBufferSize; |
||||
_ztream.next_out = _hOutput.AddrOfPinnedObject(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Updates the running checksum property |
||||
/// </summary> |
||||
/// <param name="newSum">The new checksum value</param> |
||||
protected void setChecksum(uint newSum) |
||||
{ |
||||
_checksum = newSum; |
||||
} |
||||
#endregion |
||||
|
||||
} |
||||
} |
@ -0,0 +1,106 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Diagnostics; |
||||
using System.Runtime.InteropServices; |
||||
|
||||
namespace DotZLib |
||||
{ |
||||
|
||||
/// <summary> |
||||
/// Implements a data compressor, using the deflate algorithm in the ZLib dll |
||||
/// </summary> |
||||
public sealed class Deflater : CodecBase |
||||
{ |
||||
#region Dll imports |
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] |
||||
private static extern int deflateInit_(ref ZStream sz, int level, string vs, int size); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int deflate(ref ZStream sz, int flush); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int deflateReset(ref ZStream sz); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int deflateEnd(ref ZStream sz); |
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Constructs an new instance of the <c>Deflater</c> |
||||
/// </summary> |
||||
/// <param name="level">The compression level to use for this <c>Deflater</c></param> |
||||
public Deflater(CompressLevel level) : base() |
||||
{ |
||||
int retval = deflateInit_(ref _ztream, (int)level, Info.Version, Marshal.SizeOf(_ztream)); |
||||
if (retval != 0) |
||||
throw new ZLibException(retval, "Could not initialize deflater"); |
||||
|
||||
resetOutput(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <param name="offset">The index of the first byte to add from <c>data</c></param> |
||||
/// <param name="count">The number of bytes to add</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
public override void Add(byte[] data, int offset, int count) |
||||
{ |
||||
if (data == null) throw new ArgumentNullException(); |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > data.Length) throw new ArgumentException(); |
||||
|
||||
int total = count; |
||||
int inputIndex = offset; |
||||
int err = 0; |
||||
|
||||
while (err >= 0 && inputIndex < total) |
||||
{ |
||||
copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize)); |
||||
while (err >= 0 && _ztream.avail_in > 0) |
||||
{ |
||||
err = deflate(ref _ztream, (int)FlushTypes.None); |
||||
if (err == 0) |
||||
while (_ztream.avail_out == 0) |
||||
{ |
||||
OnDataAvailable(); |
||||
err = deflate(ref _ztream, (int)FlushTypes.None); |
||||
} |
||||
inputIndex += (int)_ztream.total_in; |
||||
} |
||||
} |
||||
setChecksum( _ztream.adler ); |
||||
} |
||||
|
||||
|
||||
/// <summary> |
||||
/// Finishes up any pending data that needs to be processed and handled. |
||||
/// </summary> |
||||
public override void Finish() |
||||
{ |
||||
int err; |
||||
do |
||||
{ |
||||
err = deflate(ref _ztream, (int)FlushTypes.Finish); |
||||
OnDataAvailable(); |
||||
} |
||||
while (err == 0); |
||||
setChecksum( _ztream.adler ); |
||||
deflateReset(ref _ztream); |
||||
resetOutput(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Closes the internal zlib deflate stream |
||||
/// </summary> |
||||
protected override void CleanUp() { deflateEnd(ref _ztream); } |
||||
|
||||
} |
||||
} |
@ -0,0 +1,288 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.IO; |
||||
using System.Runtime.InteropServices; |
||||
using System.Text; |
||||
|
||||
|
||||
namespace DotZLib |
||||
{ |
||||
|
||||
#region Internal types |
||||
|
||||
/// <summary> |
||||
/// Defines constants for the various flush types used with zlib |
||||
/// </summary> |
||||
internal enum FlushTypes |
||||
{ |
||||
None, Partial, Sync, Full, Finish, Block |
||||
} |
||||
|
||||
#region ZStream structure |
||||
// internal mapping of the zlib zstream structure for marshalling |
||||
[StructLayoutAttribute(LayoutKind.Sequential, Pack=4, Size=0, CharSet=CharSet.Ansi)] |
||||
internal struct ZStream |
||||
{ |
||||
public IntPtr next_in; |
||||
public uint avail_in; |
||||
public uint total_in; |
||||
|
||||
public IntPtr next_out; |
||||
public uint avail_out; |
||||
public uint total_out; |
||||
|
||||
[MarshalAs(UnmanagedType.LPStr)] |
||||
string msg; |
||||
uint state; |
||||
|
||||
uint zalloc; |
||||
uint zfree; |
||||
uint opaque; |
||||
|
||||
int data_type; |
||||
public uint adler; |
||||
uint reserved; |
||||
} |
||||
|
||||
#endregion |
||||
|
||||
#endregion |
||||
|
||||
#region Public enums |
||||
/// <summary> |
||||
/// Defines constants for the available compression levels in zlib |
||||
/// </summary> |
||||
public enum CompressLevel : int |
||||
{ |
||||
/// <summary> |
||||
/// The default compression level with a reasonable compromise between compression and speed |
||||
/// </summary> |
||||
Default = -1, |
||||
/// <summary> |
||||
/// No compression at all. The data are passed straight through. |
||||
/// </summary> |
||||
None = 0, |
||||
/// <summary> |
||||
/// The maximum compression rate available. |
||||
/// </summary> |
||||
Best = 9, |
||||
/// <summary> |
||||
/// The fastest available compression level. |
||||
/// </summary> |
||||
Fastest = 1 |
||||
} |
||||
#endregion |
||||
|
||||
#region Exception classes |
||||
/// <summary> |
||||
/// The exception that is thrown when an error occurs on the zlib dll |
||||
/// </summary> |
||||
public class ZLibException : ApplicationException |
||||
{ |
||||
/// <summary> |
||||
/// Initializes a new instance of the <see cref="ZLibException"/> class with a specified |
||||
/// error message and error code |
||||
/// </summary> |
||||
/// <param name="errorCode">The zlib error code that caused the exception</param> |
||||
/// <param name="msg">A message that (hopefully) describes the error</param> |
||||
public ZLibException(int errorCode, string msg) : base(String.Format("ZLib error {0} {1}", errorCode, msg)) |
||||
{ |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Initializes a new instance of the <see cref="ZLibException"/> class with a specified |
||||
/// error code |
||||
/// </summary> |
||||
/// <param name="errorCode">The zlib error code that caused the exception</param> |
||||
public ZLibException(int errorCode) : base(String.Format("ZLib error {0}", errorCode)) |
||||
{ |
||||
} |
||||
} |
||||
#endregion |
||||
|
||||
#region Interfaces |
||||
|
||||
/// <summary> |
||||
/// Declares methods and properties that enables a running checksum to be calculated |
||||
/// </summary> |
||||
public interface ChecksumGenerator |
||||
{ |
||||
/// <summary> |
||||
/// Gets the current value of the checksum |
||||
/// </summary> |
||||
uint Value { get; } |
||||
|
||||
/// <summary> |
||||
/// Clears the current checksum to 0 |
||||
/// </summary> |
||||
void Reset(); |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with an array of bytes |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
void Update(byte[] data); |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with part of an array of bytes |
||||
/// </summary> |
||||
/// <param name="data">The data to update the checksum with</param> |
||||
/// <param name="offset">Where in <c>data</c> to start updating</param> |
||||
/// <param name="count">The number of bytes from <c>data</c> to use</param> |
||||
/// <exception cref="ArgumentException">The sum of offset and count is larger than the length of <c>data</c></exception> |
||||
/// <exception cref="ArgumentNullException"><c>data</c> is a null reference</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">Offset or count is negative.</exception> |
||||
void Update(byte[] data, int offset, int count); |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with the data from a string |
||||
/// </summary> |
||||
/// <param name="data">The string to update the checksum with</param> |
||||
/// <remarks>The characters in the string are converted by the UTF-8 encoding</remarks> |
||||
void Update(string data); |
||||
|
||||
/// <summary> |
||||
/// Updates the current checksum with the data from a string, using a specific encoding |
||||
/// </summary> |
||||
/// <param name="data">The string to update the checksum with</param> |
||||
/// <param name="encoding">The encoding to use</param> |
||||
void Update(string data, Encoding encoding); |
||||
} |
||||
|
||||
|
||||
/// <summary> |
||||
/// Represents the method that will be called from a codec when new data |
||||
/// are available. |
||||
/// </summary> |
||||
/// <paramref name="data">The byte array containing the processed data</paramref> |
||||
/// <paramref name="startIndex">The index of the first processed byte in <c>data</c></paramref> |
||||
/// <paramref name="count">The number of processed bytes available</paramref> |
||||
/// <remarks>On return from this method, the data may be overwritten, so grab it while you can. |
||||
/// You cannot assume that startIndex will be zero. |
||||
/// </remarks> |
||||
public delegate void DataAvailableHandler(byte[] data, int startIndex, int count); |
||||
|
||||
/// <summary> |
||||
/// Declares methods and events for implementing compressors/decompressors |
||||
/// </summary> |
||||
public interface Codec |
||||
{ |
||||
/// <summary> |
||||
/// Occurs when more processed data are available. |
||||
/// </summary> |
||||
event DataAvailableHandler DataAvailable; |
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
void Add(byte[] data); |
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <param name="offset">The index of the first byte to add from <c>data</c></param> |
||||
/// <param name="count">The number of bytes to add</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
void Add(byte[] data, int offset, int count); |
||||
|
||||
/// <summary> |
||||
/// Finishes up any pending data that needs to be processed and handled. |
||||
/// </summary> |
||||
void Finish(); |
||||
|
||||
/// <summary> |
||||
/// Gets the checksum of the data that has been added so far |
||||
/// </summary> |
||||
uint Checksum { get; } |
||||
|
||||
|
||||
} |
||||
|
||||
#endregion |
||||
|
||||
#region Classes |
||||
/// <summary> |
||||
/// Encapsulates general information about the ZLib library |
||||
/// </summary> |
||||
public class Info |
||||
{ |
||||
#region DLL imports |
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern uint zlibCompileFlags(); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern string zlibVersion(); |
||||
#endregion |
||||
|
||||
#region Private stuff |
||||
private uint _flags; |
||||
|
||||
// helper function that unpacks a bitsize mask |
||||
private static int bitSize(uint bits) |
||||
{ |
||||
switch (bits) |
||||
{ |
||||
case 0: return 16; |
||||
case 1: return 32; |
||||
case 2: return 64; |
||||
} |
||||
return -1; |
||||
} |
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Constructs an instance of the <c>Info</c> class. |
||||
/// </summary> |
||||
public Info() |
||||
{ |
||||
_flags = zlibCompileFlags(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// True if the library is compiled with debug info |
||||
/// </summary> |
||||
public bool HasDebugInfo { get { return 0 != (_flags & 0x100); } } |
||||
|
||||
/// <summary> |
||||
/// True if the library is compiled with assembly optimizations |
||||
/// </summary> |
||||
public bool UsesAssemblyCode { get { return 0 != (_flags & 0x200); } } |
||||
|
||||
/// <summary> |
||||
/// Gets the size of the unsigned int that was compiled into Zlib |
||||
/// </summary> |
||||
public int SizeOfUInt { get { return bitSize(_flags & 3); } } |
||||
|
||||
/// <summary> |
||||
/// Gets the size of the unsigned long that was compiled into Zlib |
||||
/// </summary> |
||||
public int SizeOfULong { get { return bitSize((_flags >> 2) & 3); } } |
||||
|
||||
/// <summary> |
||||
/// Gets the size of the pointers that were compiled into Zlib |
||||
/// </summary> |
||||
public int SizeOfPointer { get { return bitSize((_flags >> 4) & 3); } } |
||||
|
||||
/// <summary> |
||||
/// Gets the size of the z_off_t type that was compiled into Zlib |
||||
/// </summary> |
||||
public int SizeOfOffset { get { return bitSize((_flags >> 6) & 3); } } |
||||
|
||||
/// <summary> |
||||
/// Gets the version of ZLib as a string, e.g. "1.2.1" |
||||
/// </summary> |
||||
public static string Version { get { return zlibVersion(); } } |
||||
} |
||||
|
||||
#endregion |
||||
|
||||
} |
@ -0,0 +1,141 @@ |
||||
<VisualStudioProject> |
||||
<CSHARP |
||||
ProjectType = "Local" |
||||
ProductVersion = "7.10.3077" |
||||
SchemaVersion = "2.0" |
||||
ProjectGuid = "{BB1EE0B1-1808-46CB-B786-949D91117FC5}" |
||||
> |
||||
<Build> |
||||
<Settings |
||||
ApplicationIcon = "" |
||||
AssemblyKeyContainerName = "" |
||||
AssemblyName = "DotZLib" |
||||
AssemblyOriginatorKeyFile = "" |
||||
DefaultClientScript = "JScript" |
||||
DefaultHTMLPageLayout = "Grid" |
||||
DefaultTargetSchema = "IE50" |
||||
DelaySign = "false" |
||||
OutputType = "Library" |
||||
PreBuildEvent = "" |
||||
PostBuildEvent = "" |
||||
RootNamespace = "DotZLib" |
||||
RunPostBuildEvent = "OnBuildSuccess" |
||||
StartupObject = "" |
||||
> |
||||
<Config |
||||
Name = "Debug" |
||||
AllowUnsafeBlocks = "false" |
||||
BaseAddress = "285212672" |
||||
CheckForOverflowUnderflow = "false" |
||||
ConfigurationOverrideFile = "" |
||||
DefineConstants = "DEBUG;TRACE" |
||||
DocumentationFile = "docs\DotZLib.xml" |
||||
DebugSymbols = "true" |
||||
FileAlignment = "4096" |
||||
IncrementalBuild = "false" |
||||
NoStdLib = "false" |
||||
NoWarn = "1591" |
||||
Optimize = "false" |
||||
OutputPath = "bin\Debug\" |
||||
RegisterForComInterop = "false" |
||||
RemoveIntegerChecks = "false" |
||||
TreatWarningsAsErrors = "false" |
||||
WarningLevel = "4" |
||||
/> |
||||
<Config |
||||
Name = "Release" |
||||
AllowUnsafeBlocks = "false" |
||||
BaseAddress = "285212672" |
||||
CheckForOverflowUnderflow = "false" |
||||
ConfigurationOverrideFile = "" |
||||
DefineConstants = "TRACE" |
||||
DocumentationFile = "docs\DotZLib.xml" |
||||
DebugSymbols = "false" |
||||
FileAlignment = "4096" |
||||
IncrementalBuild = "false" |
||||
NoStdLib = "false" |
||||
NoWarn = "" |
||||
Optimize = "true" |
||||
OutputPath = "bin\Release\" |
||||
RegisterForComInterop = "false" |
||||
RemoveIntegerChecks = "false" |
||||
TreatWarningsAsErrors = "false" |
||||
WarningLevel = "4" |
||||
/> |
||||
</Settings> |
||||
<References> |
||||
<Reference |
||||
Name = "System" |
||||
AssemblyName = "System" |
||||
HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll" |
||||
/> |
||||
<Reference |
||||
Name = "System.Data" |
||||
AssemblyName = "System.Data" |
||||
HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" |
||||
/> |
||||
<Reference |
||||
Name = "System.XML" |
||||
AssemblyName = "System.Xml" |
||||
HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" |
||||
/> |
||||
<Reference |
||||
Name = "nunit.framework" |
||||
AssemblyName = "nunit.framework" |
||||
HintPath = "E:\apps\NUnit V2.1\\bin\nunit.framework.dll" |
||||
AssemblyFolderKey = "hklm\dn\nunit.framework" |
||||
/> |
||||
</References> |
||||
</Build> |
||||
<Files> |
||||
<Include> |
||||
<File |
||||
RelPath = "AssemblyInfo.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "ChecksumImpl.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "CircularBuffer.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "CodecBase.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "Deflater.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "DotZLib.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "GZipStream.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "Inflater.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
<File |
||||
RelPath = "UnitTests.cs" |
||||
SubType = "Code" |
||||
BuildAction = "Compile" |
||||
/> |
||||
</Include> |
||||
</Files> |
||||
</CSHARP> |
||||
</VisualStudioProject> |
||||
|
@ -0,0 +1,301 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.IO; |
||||
using System.Runtime.InteropServices; |
||||
|
||||
namespace DotZLib |
||||
{ |
||||
/// <summary> |
||||
/// Implements a compressed <see cref="Stream"/>, in GZip (.gz) format. |
||||
/// </summary> |
||||
public class GZipStream : Stream, IDisposable |
||||
{ |
||||
#region Dll Imports |
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] |
||||
private static extern IntPtr gzopen(string name, string mode); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int gzclose(IntPtr gzFile); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int gzwrite(IntPtr gzFile, int data, int length); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int gzread(IntPtr gzFile, int data, int length); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int gzgetc(IntPtr gzFile); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int gzputc(IntPtr gzFile, int c); |
||||
|
||||
#endregion |
||||
|
||||
#region Private data |
||||
private IntPtr _gzFile; |
||||
private bool _isDisposed = false; |
||||
private bool _isWriting; |
||||
#endregion |
||||
|
||||
#region Constructors |
||||
/// <summary> |
||||
/// Creates a new file as a writeable GZipStream |
||||
/// </summary> |
||||
/// <param name="fileName">The name of the compressed file to create</param> |
||||
/// <param name="level">The compression level to use when adding data</param> |
||||
/// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception> |
||||
public GZipStream(string fileName, CompressLevel level) |
||||
{ |
||||
_isWriting = true; |
||||
_gzFile = gzopen(fileName, String.Format("wb{0}", (int)level)); |
||||
if (_gzFile == IntPtr.Zero) |
||||
throw new ZLibException(-1, "Could not open " + fileName); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Opens an existing file as a readable GZipStream |
||||
/// </summary> |
||||
/// <param name="fileName">The name of the file to open</param> |
||||
/// <exception cref="ZLibException">If an error occurred in the internal zlib function</exception> |
||||
public GZipStream(string fileName) |
||||
{ |
||||
_isWriting = false; |
||||
_gzFile = gzopen(fileName, "rb"); |
||||
if (_gzFile == IntPtr.Zero) |
||||
throw new ZLibException(-1, "Could not open " + fileName); |
||||
|
||||
} |
||||
#endregion |
||||
|
||||
#region Access properties |
||||
/// <summary> |
||||
/// Returns true of this stream can be read from, false otherwise |
||||
/// </summary> |
||||
public override bool CanRead |
||||
{ |
||||
get |
||||
{ |
||||
return !_isWriting; |
||||
} |
||||
} |
||||
|
||||
|
||||
/// <summary> |
||||
/// Returns false. |
||||
/// </summary> |
||||
public override bool CanSeek |
||||
{ |
||||
get |
||||
{ |
||||
return false; |
||||
} |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Returns true if this tsream is writeable, false otherwise |
||||
/// </summary> |
||||
public override bool CanWrite |
||||
{ |
||||
get |
||||
{ |
||||
return _isWriting; |
||||
} |
||||
} |
||||
#endregion |
||||
|
||||
#region Destructor & IDispose stuff |
||||
|
||||
/// <summary> |
||||
/// Destroys this instance |
||||
/// </summary> |
||||
~GZipStream() |
||||
{ |
||||
cleanUp(false); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Closes the external file handle |
||||
/// </summary> |
||||
public void Dispose() |
||||
{ |
||||
cleanUp(true); |
||||
} |
||||
|
||||
// Does the actual closing of the file handle. |
||||
private void cleanUp(bool isDisposing) |
||||
{ |
||||
if (!_isDisposed) |
||||
{ |
||||
gzclose(_gzFile); |
||||
_isDisposed = true; |
||||
} |
||||
} |
||||
#endregion |
||||
|
||||
#region Basic reading and writing |
||||
/// <summary> |
||||
/// Attempts to read a number of bytes from the stream. |
||||
/// </summary> |
||||
/// <param name="buffer">The destination data buffer</param> |
||||
/// <param name="offset">The index of the first destination byte in <c>buffer</c></param> |
||||
/// <param name="count">The number of bytes requested</param> |
||||
/// <returns>The number of bytes read</returns> |
||||
/// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception> |
||||
/// <exception cref="ArgumentException">If <c>offset</c> + <c>count</c> is > buffer.Length</exception> |
||||
/// <exception cref="NotSupportedException">If this stream is not readable.</exception> |
||||
/// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception> |
||||
public override int Read(byte[] buffer, int offset, int count) |
||||
{ |
||||
if (!CanRead) throw new NotSupportedException(); |
||||
if (buffer == null) throw new ArgumentNullException(); |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > buffer.Length) throw new ArgumentException(); |
||||
if (_isDisposed) throw new ObjectDisposedException("GZipStream"); |
||||
|
||||
GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned); |
||||
int result; |
||||
try |
||||
{ |
||||
result = gzread(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count); |
||||
if (result < 0) |
||||
throw new IOException(); |
||||
} |
||||
finally |
||||
{ |
||||
h.Free(); |
||||
} |
||||
return result; |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Attempts to read a single byte from the stream. |
||||
/// </summary> |
||||
/// <returns>The byte that was read, or -1 in case of error or End-Of-File</returns> |
||||
public override int ReadByte() |
||||
{ |
||||
if (!CanRead) throw new NotSupportedException(); |
||||
if (_isDisposed) throw new ObjectDisposedException("GZipStream"); |
||||
return gzgetc(_gzFile); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Writes a number of bytes to the stream |
||||
/// </summary> |
||||
/// <param name="buffer"></param> |
||||
/// <param name="offset"></param> |
||||
/// <param name="count"></param> |
||||
/// <exception cref="ArgumentNullException">If <c>buffer</c> is null</exception> |
||||
/// <exception cref="ArgumentOutOfRangeException">If <c>count</c> or <c>offset</c> are negative</exception> |
||||
/// <exception cref="ArgumentException">If <c>offset</c> + <c>count</c> is > buffer.Length</exception> |
||||
/// <exception cref="NotSupportedException">If this stream is not writeable.</exception> |
||||
/// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception> |
||||
public override void Write(byte[] buffer, int offset, int count) |
||||
{ |
||||
if (!CanWrite) throw new NotSupportedException(); |
||||
if (buffer == null) throw new ArgumentNullException(); |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > buffer.Length) throw new ArgumentException(); |
||||
if (_isDisposed) throw new ObjectDisposedException("GZipStream"); |
||||
|
||||
GCHandle h = GCHandle.Alloc(buffer, GCHandleType.Pinned); |
||||
try |
||||
{ |
||||
int result = gzwrite(_gzFile, h.AddrOfPinnedObject().ToInt32() + offset, count); |
||||
if (result < 0) |
||||
throw new IOException(); |
||||
} |
||||
finally |
||||
{ |
||||
h.Free(); |
||||
} |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Writes a single byte to the stream |
||||
/// </summary> |
||||
/// <param name="value">The byte to add to the stream.</param> |
||||
/// <exception cref="NotSupportedException">If this stream is not writeable.</exception> |
||||
/// <exception cref="ObjectDisposedException">If this stream has been disposed.</exception> |
||||
public override void WriteByte(byte value) |
||||
{ |
||||
if (!CanWrite) throw new NotSupportedException(); |
||||
if (_isDisposed) throw new ObjectDisposedException("GZipStream"); |
||||
|
||||
int result = gzputc(_gzFile, (int)value); |
||||
if (result < 0) |
||||
throw new IOException(); |
||||
} |
||||
#endregion |
||||
|
||||
#region Position & length stuff |
||||
/// <summary> |
||||
/// Not supported. |
||||
/// </summary> |
||||
/// <param name="value"></param> |
||||
/// <exception cref="NotSupportedException">Always thrown</exception> |
||||
public override void SetLength(long value) |
||||
{ |
||||
throw new NotSupportedException(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Not suppported. |
||||
/// </summary> |
||||
/// <param name="offset"></param> |
||||
/// <param name="origin"></param> |
||||
/// <returns></returns> |
||||
/// <exception cref="NotSupportedException">Always thrown</exception> |
||||
public override long Seek(long offset, SeekOrigin origin) |
||||
{ |
||||
throw new NotSupportedException(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Flushes the <c>GZipStream</c>. |
||||
/// </summary> |
||||
/// <remarks>In this implementation, this method does nothing. This is because excessive |
||||
/// flushing may degrade the achievable compression rates.</remarks> |
||||
public override void Flush() |
||||
{ |
||||
// left empty on purpose |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Gets/sets the current position in the <c>GZipStream</c>. Not suppported. |
||||
/// </summary> |
||||
/// <remarks>In this implementation this property is not supported</remarks> |
||||
/// <exception cref="NotSupportedException">Always thrown</exception> |
||||
public override long Position |
||||
{ |
||||
get |
||||
{ |
||||
throw new NotSupportedException(); |
||||
} |
||||
set |
||||
{ |
||||
throw new NotSupportedException(); |
||||
} |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Gets the size of the stream. Not suppported. |
||||
/// </summary> |
||||
/// <remarks>In this implementation this property is not supported</remarks> |
||||
/// <exception cref="NotSupportedException">Always thrown</exception> |
||||
public override long Length |
||||
{ |
||||
get |
||||
{ |
||||
throw new NotSupportedException(); |
||||
} |
||||
} |
||||
#endregion |
||||
} |
||||
} |
@ -0,0 +1,105 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Diagnostics; |
||||
using System.Runtime.InteropServices; |
||||
|
||||
namespace DotZLib |
||||
{ |
||||
|
||||
/// <summary> |
||||
/// Implements a data decompressor, using the inflate algorithm in the ZLib dll |
||||
/// </summary> |
||||
public class Inflater : CodecBase |
||||
{ |
||||
#region Dll imports |
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Ansi)] |
||||
private static extern int inflateInit_(ref ZStream sz, string vs, int size); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int inflate(ref ZStream sz, int flush); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int inflateReset(ref ZStream sz); |
||||
|
||||
[DllImport("ZLIB1.dll", CallingConvention=CallingConvention.Cdecl)] |
||||
private static extern int inflateEnd(ref ZStream sz); |
||||
#endregion |
||||
|
||||
/// <summary> |
||||
/// Constructs an new instance of the <c>Inflater</c> |
||||
/// </summary> |
||||
public Inflater() : base() |
||||
{ |
||||
int retval = inflateInit_(ref _ztream, Info.Version, Marshal.SizeOf(_ztream)); |
||||
if (retval != 0) |
||||
throw new ZLibException(retval, "Could not initialize inflater"); |
||||
|
||||
resetOutput(); |
||||
} |
||||
|
||||
|
||||
/// <summary> |
||||
/// Adds more data to the codec to be processed. |
||||
/// </summary> |
||||
/// <param name="data">Byte array containing the data to be added to the codec</param> |
||||
/// <param name="offset">The index of the first byte to add from <c>data</c></param> |
||||
/// <param name="count">The number of bytes to add</param> |
||||
/// <remarks>Adding data may, or may not, raise the <c>DataAvailable</c> event</remarks> |
||||
public override void Add(byte[] data, int offset, int count) |
||||
{ |
||||
if (data == null) throw new ArgumentNullException(); |
||||
if (offset < 0 || count < 0) throw new ArgumentOutOfRangeException(); |
||||
if ((offset+count) > data.Length) throw new ArgumentException(); |
||||
|
||||
int total = count; |
||||
int inputIndex = offset; |
||||
int err = 0; |
||||
|
||||
while (err >= 0 && inputIndex < total) |
||||
{ |
||||
copyInput(data, inputIndex, Math.Min(total - inputIndex, kBufferSize)); |
||||
err = inflate(ref _ztream, (int)FlushTypes.None); |
||||
if (err == 0) |
||||
while (_ztream.avail_out == 0) |
||||
{ |
||||
OnDataAvailable(); |
||||
err = inflate(ref _ztream, (int)FlushTypes.None); |
||||
} |
||||
|
||||
inputIndex += (int)_ztream.total_in; |
||||
} |
||||
setChecksum( _ztream.adler ); |
||||
} |
||||
|
||||
|
||||
/// <summary> |
||||
/// Finishes up any pending data that needs to be processed and handled. |
||||
/// </summary> |
||||
public override void Finish() |
||||
{ |
||||
int err; |
||||
do |
||||
{ |
||||
err = inflate(ref _ztream, (int)FlushTypes.Finish); |
||||
OnDataAvailable(); |
||||
} |
||||
while (err == 0); |
||||
setChecksum( _ztream.adler ); |
||||
inflateReset(ref _ztream); |
||||
resetOutput(); |
||||
} |
||||
|
||||
/// <summary> |
||||
/// Closes the internal zlib inflate stream |
||||
/// </summary> |
||||
protected override void CleanUp() { inflateEnd(ref _ztream); } |
||||
|
||||
|
||||
} |
||||
} |
@ -0,0 +1,274 @@ |
||||
// |
||||
// © Copyright Henrik Ravn 2004 |
||||
// |
||||
// Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
||||
// |
||||
|
||||
using System; |
||||
using System.Collections; |
||||
using System.IO; |
||||
|
||||
// uncomment the define below to include unit tests |
||||
//#define nunit |
||||
#if nunit |
||||
using NUnit.Framework; |
||||
|
||||
// Unit tests for the DotZLib class library |
||||
// ---------------------------------------- |
||||
// |
||||
// Use this with NUnit 2 from http://www.nunit.org |
||||
// |
||||
|
||||
namespace DotZLibTests |
||||
{ |
||||
using DotZLib; |
||||
|
||||
// helper methods |
||||
internal class Utils |
||||
{ |
||||
public static bool byteArrEqual( byte[] lhs, byte[] rhs ) |
||||
{ |
||||
if (lhs.Length != rhs.Length) |
||||
return false; |
||||
for (int i = lhs.Length-1; i >= 0; --i) |
||||
if (lhs[i] != rhs[i]) |
||||
return false; |
||||
return true; |
||||
} |
||||
|
||||
} |
||||
|
||||
|
||||
[TestFixture] |
||||
public class CircBufferTests |
||||
{ |
||||
#region Circular buffer tests |
||||
[Test] |
||||
public void SinglePutGet() |
||||
{ |
||||
CircularBuffer buf = new CircularBuffer(10); |
||||
Assert.AreEqual( 0, buf.Size ); |
||||
Assert.AreEqual( -1, buf.Get() ); |
||||
|
||||
Assert.IsTrue(buf.Put( 1 )); |
||||
Assert.AreEqual( 1, buf.Size ); |
||||
Assert.AreEqual( 1, buf.Get() ); |
||||
Assert.AreEqual( 0, buf.Size ); |
||||
Assert.AreEqual( -1, buf.Get() ); |
||||
} |
||||
|
||||
[Test] |
||||
public void BlockPutGet() |
||||
{ |
||||
CircularBuffer buf = new CircularBuffer(10); |
||||
byte[] arr = {1,2,3,4,5,6,7,8,9,10}; |
||||
Assert.AreEqual( 10, buf.Put(arr,0,10) ); |
||||
Assert.AreEqual( 10, buf.Size ); |
||||
Assert.IsFalse( buf.Put(11) ); |
||||
Assert.AreEqual( 1, buf.Get() ); |
||||
Assert.IsTrue( buf.Put(11) ); |
||||
|
||||
byte[] arr2 = (byte[])arr.Clone(); |
||||
Assert.AreEqual( 9, buf.Get(arr2,1,9) ); |
||||
Assert.IsTrue( Utils.byteArrEqual(arr,arr2) ); |
||||
} |
||||
|
||||
#endregion |
||||
} |
||||
|
||||
[TestFixture] |
||||
public class ChecksumTests |
||||
{ |
||||
#region CRC32 Tests |
||||
[Test] |
||||
public void CRC32_Null() |
||||
{ |
||||
CRC32Checksum crc32 = new CRC32Checksum(); |
||||
Assert.AreEqual( 0, crc32.Value ); |
||||
|
||||
crc32 = new CRC32Checksum(1); |
||||
Assert.AreEqual( 1, crc32.Value ); |
||||
|
||||
crc32 = new CRC32Checksum(556); |
||||
Assert.AreEqual( 556, crc32.Value ); |
||||
} |
||||
|
||||
[Test] |
||||
public void CRC32_Data() |
||||
{ |
||||
CRC32Checksum crc32 = new CRC32Checksum(); |
||||
byte[] data = { 1,2,3,4,5,6,7 }; |
||||
crc32.Update(data); |
||||
Assert.AreEqual( 0x70e46888, crc32.Value ); |
||||
|
||||
crc32 = new CRC32Checksum(); |
||||
crc32.Update("penguin"); |
||||
Assert.AreEqual( 0x0e5c1a120, crc32.Value ); |
||||
|
||||
crc32 = new CRC32Checksum(1); |
||||
crc32.Update("penguin"); |
||||
Assert.AreEqual(0x43b6aa94, crc32.Value); |
||||
|
||||
} |
||||
#endregion |
||||
|
||||
#region Adler tests |
||||
|
||||
[Test] |
||||
public void Adler_Null() |
||||
{ |
||||
AdlerChecksum adler = new AdlerChecksum(); |
||||
Assert.AreEqual(0, adler.Value); |
||||
|
||||
adler = new AdlerChecksum(1); |
||||
Assert.AreEqual( 1, adler.Value ); |
||||
|
||||
adler = new AdlerChecksum(556); |
||||
Assert.AreEqual( 556, adler.Value ); |
||||
} |
||||
|
||||
[Test] |
||||
public void Adler_Data() |
||||
{ |
||||
AdlerChecksum adler = new AdlerChecksum(1); |
||||
byte[] data = { 1,2,3,4,5,6,7 }; |
||||
adler.Update(data); |
||||
Assert.AreEqual( 0x5b001d, adler.Value ); |
||||
|
||||
adler = new AdlerChecksum(); |
||||
adler.Update("penguin"); |
||||
Assert.AreEqual(0x0bcf02f6, adler.Value ); |
||||
|
||||
adler = new AdlerChecksum(1); |
||||
adler.Update("penguin"); |
||||
Assert.AreEqual(0x0bd602f7, adler.Value); |
||||
|
||||
} |
||||
#endregion |
||||
} |
||||
|
||||
[TestFixture] |
||||
public class InfoTests |
||||
{ |
||||
#region Info tests |
||||
[Test] |
||||
public void Info_Version() |
||||
{ |
||||
Info info = new Info(); |
||||
Assert.AreEqual("1.2.13", Info.Version); |
||||
Assert.AreEqual(32, info.SizeOfUInt); |
||||
Assert.AreEqual(32, info.SizeOfULong); |
||||
Assert.AreEqual(32, info.SizeOfPointer); |
||||
Assert.AreEqual(32, info.SizeOfOffset); |
||||
} |
||||
#endregion |
||||
} |
||||
|
||||
[TestFixture] |
||||
public class DeflateInflateTests |
||||
{ |
||||
#region Deflate tests |
||||
[Test] |
||||
public void Deflate_Init() |
||||
{ |
||||
using (Deflater def = new Deflater(CompressLevel.Default)) |
||||
{ |
||||
} |
||||
} |
||||
|
||||
private ArrayList compressedData = new ArrayList(); |
||||
private uint adler1; |
||||
|
||||
private ArrayList uncompressedData = new ArrayList(); |
||||
private uint adler2; |
||||
|
||||
public void CDataAvail(byte[] data, int startIndex, int count) |
||||
{ |
||||
for (int i = 0; i < count; ++i) |
||||
compressedData.Add(data[i+startIndex]); |
||||
} |
||||
|
||||
[Test] |
||||
public void Deflate_Compress() |
||||
{ |
||||
compressedData.Clear(); |
||||
|
||||
byte[] testData = new byte[35000]; |
||||
for (int i = 0; i < testData.Length; ++i) |
||||
testData[i] = 5; |
||||
|
||||
using (Deflater def = new Deflater((CompressLevel)5)) |
||||
{ |
||||
def.DataAvailable += new DataAvailableHandler(CDataAvail); |
||||
def.Add(testData); |
||||
def.Finish(); |
||||
adler1 = def.Checksum; |
||||
} |
||||
} |
||||
#endregion |
||||
|
||||
#region Inflate tests |
||||
[Test] |
||||
public void Inflate_Init() |
||||
{ |
||||
using (Inflater inf = new Inflater()) |
||||
{ |
||||
} |
||||
} |
||||
|
||||
private void DDataAvail(byte[] data, int startIndex, int count) |
||||
{ |
||||
for (int i = 0; i < count; ++i) |
||||
uncompressedData.Add(data[i+startIndex]); |
||||
} |
||||
|
||||
[Test] |
||||
public void Inflate_Expand() |
||||
{ |
||||
uncompressedData.Clear(); |
||||
|
||||
using (Inflater inf = new Inflater()) |
||||
{ |
||||
inf.DataAvailable += new DataAvailableHandler(DDataAvail); |
||||
inf.Add((byte[])compressedData.ToArray(typeof(byte))); |
||||
inf.Finish(); |
||||
adler2 = inf.Checksum; |
||||
} |
||||
Assert.AreEqual( adler1, adler2 ); |
||||
} |
||||
#endregion |
||||
} |
||||
|
||||
[TestFixture] |
||||
public class GZipStreamTests |
||||
{ |
||||
#region GZipStream test |
||||
[Test] |
||||
public void GZipStream_WriteRead() |
||||
{ |
||||
using (GZipStream gzOut = new GZipStream("gzstream.gz", CompressLevel.Best)) |
||||
{ |
||||
BinaryWriter writer = new BinaryWriter(gzOut); |
||||
writer.Write("hi there"); |
||||
writer.Write(Math.PI); |
||||
writer.Write(42); |
||||
} |
||||
|
||||
using (GZipStream gzIn = new GZipStream("gzstream.gz")) |
||||
{ |
||||
BinaryReader reader = new BinaryReader(gzIn); |
||||
string s = reader.ReadString(); |
||||
Assert.AreEqual("hi there",s); |
||||
double d = reader.ReadDouble(); |
||||
Assert.AreEqual(Math.PI, d); |
||||
int i = reader.ReadInt32(); |
||||
Assert.AreEqual(42,i); |
||||
} |
||||
|
||||
} |
||||
#endregion |
||||
} |
||||
} |
||||
|
||||
#endif |
@ -0,0 +1,23 @@ |
||||
Boost Software License - Version 1.0 - August 17th, 2003 |
||||
|
||||
Permission is hereby granted, free of charge, to any person or organization |
||||
obtaining a copy of the software and accompanying documentation covered by |
||||
this license (the "Software") to use, reproduce, display, distribute, |
||||
execute, and transmit the Software, and to prepare derivative works of the |
||||
Software, and to permit third-parties to whom the Software is furnished to |
||||
do so, all subject to the following: |
||||
|
||||
The copyright notices in the Software and this entire statement, including |
||||
the above license grant, this restriction and the following disclaimer, |
||||
must be included in all copies of the Software, in whole or in part, and |
||||
all derivative works of the Software, unless such copies or derivative |
||||
works are solely in the form of machine-executable object code generated by |
||||
a source language processor. |
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
||||
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT |
||||
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE |
||||
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, |
||||
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
||||
DEALINGS IN THE SOFTWARE. |
@ -0,0 +1,58 @@ |
||||
This directory contains a .Net wrapper class library for the ZLib1.dll |
||||
|
||||
The wrapper includes support for inflating/deflating memory buffers, |
||||
.Net streaming wrappers for the gz streams part of zlib, and wrappers |
||||
for the checksum parts of zlib. See DotZLib/UnitTests.cs for examples. |
||||
|
||||
Directory structure: |
||||
-------------------- |
||||
|
||||
LICENSE_1_0.txt - License file. |
||||
readme.txt - This file. |
||||
DotZLib.chm - Class library documentation |
||||
DotZLib.build - NAnt build file |
||||
DotZLib.sln - Microsoft Visual Studio 2003 solution file |
||||
|
||||
DotZLib\*.cs - Source files for the class library |
||||
|
||||
Unit tests: |
||||
----------- |
||||
The file DotZLib/UnitTests.cs contains unit tests for use with NUnit 2.1 or higher. |
||||
To include unit tests in the build, define nunit before building. |
||||
|
||||
|
||||
Build instructions: |
||||
------------------- |
||||
|
||||
1. Using Visual Studio.Net 2003: |
||||
Open DotZLib.sln in VS.Net and build from there. Output file (DotZLib.dll) |
||||
will be found ./DotZLib/bin/release or ./DotZLib/bin/debug, depending on |
||||
you are building the release or debug version of the library. Check |
||||
DotZLib/UnitTests.cs for instructions on how to include unit tests in the |
||||
build. |
||||
|
||||
2. Using NAnt: |
||||
Open a command prompt with access to the build environment and run nant |
||||
in the same directory as the DotZLib.build file. |
||||
You can define 2 properties on the nant command-line to control the build: |
||||
debug={true|false} to toggle between release/debug builds (default=true). |
||||
nunit={true|false} to include or esclude unit tests (default=true). |
||||
Also the target clean will remove binaries. |
||||
Output file (DotZLib.dll) will be found in either ./DotZLib/bin/release |
||||
or ./DotZLib/bin/debug, depending on whether you are building the release |
||||
or debug version of the library. |
||||
|
||||
Examples: |
||||
nant -D:debug=false -D:nunit=false |
||||
will build a release mode version of the library without unit tests. |
||||
nant |
||||
will build a debug version of the library with unit tests |
||||
nant clean |
||||
will remove all previously built files. |
||||
|
||||
|
||||
--------------------------------- |
||||
Copyright (c) Henrik Ravn 2004 |
||||
|
||||
Use, modification and distribution are subject to the Boost Software License, Version 1.0. |
||||
(See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
@ -0,0 +1,574 @@ |
||||
/* |
||||
;uInt longest_match_x64(
|
||||
; deflate_state *s,
|
||||
; IPos cur_match); // current match
|
||||
|
||||
; gvmat64.S -- Asm portion of the optimized longest_match for 32 bits x86_64
|
||||
; (AMD64 on Athlon 64, Opteron, Phenom
|
||||
; and Intel EM64T on Pentium 4 with EM64T, Pentium D, Core 2 Duo, Core I5/I7)
|
||||
; this file is translation from gvmat64.asm to GCC 4.x (for Linux, Mac XCode)
|
||||
; Copyright (C) 1995-2010 Jean-loup Gailly, Brian Raiter and Gilles Vollant.
|
||||
;
|
||||
; File written by Gilles Vollant, by converting to assembly the longest_match
|
||||
; from Jean-loup Gailly in deflate.c of zLib and infoZip zip.
|
||||
; and by taking inspiration on asm686 with masm, optimised assembly code
|
||||
; from Brian Raiter, written 1998
|
||||
;
|
||||
; This software is provided 'as-is', without any express or implied
|
||||
; warranty. In no event will the authors be held liable for any damages
|
||||
; arising from the use of this software.
|
||||
;
|
||||
; Permission is granted to anyone to use this software for any purpose,
|
||||
; including commercial applications, and to alter it and redistribute it
|
||||
; freely, subject to the following restrictions:
|
||||
;
|
||||
; 1. The origin of this software must not be misrepresented; you must not
|
||||
; claim that you wrote the original software. If you use this software
|
||||
; in a product, an acknowledgment in the product documentation would be
|
||||
; appreciated but is not required.
|
||||
; 2. Altered source versions must be plainly marked as such, and must not be
|
||||
; misrepresented as being the original software
|
||||
; 3. This notice may not be removed or altered from any source distribution.
|
||||
;
|
||||
; http://www.zlib.net
|
||||
; http://www.winimage.com/zLibDll
|
||||
; http://www.muppetlabs.com/~breadbox/software/assembly.html
|
||||
;
|
||||
; to compile this file for zLib, I use option:
|
||||
; gcc -c -arch x86_64 gvmat64.S
|
||||
|
||||
|
||||
;uInt longest_match(s, cur_match)
|
||||
; deflate_state *s;
|
||||
; IPos cur_match; // current match /
|
||||
;
|
||||
; with XCode for Mac, I had strange error with some jump on intel syntax
|
||||
; this is why BEFORE_JMP and AFTER_JMP are used
|
||||
*/ |
||||
|
||||
|
||||
#define BEFORE_JMP .att_syntax |
||||
#define AFTER_JMP .intel_syntax noprefix |
||||
|
||||
#ifndef NO_UNDERLINE |
||||
# define match_init _match_init |
||||
# define longest_match _longest_match |
||||
#endif |
||||
|
||||
.intel_syntax noprefix
|
||||
|
||||
.globl match_init, longest_match |
||||
.text |
||||
longest_match: |
||||
|
||||
|
||||
|
||||
#define LocalVarsSize 96 |
||||
/* |
||||
; register used : rax,rbx,rcx,rdx,rsi,rdi,r8,r9,r10,r11,r12
|
||||
; free register : r14,r15
|
||||
; register can be saved : rsp
|
||||
*/ |
||||
|
||||
#define chainlenwmask (rsp + 8 - LocalVarsSize) |
||||
#define nicematch (rsp + 16 - LocalVarsSize) |
||||
|
||||
#define save_rdi (rsp + 24 - LocalVarsSize) |
||||
#define save_rsi (rsp + 32 - LocalVarsSize) |
||||
#define save_rbx (rsp + 40 - LocalVarsSize) |
||||
#define save_rbp (rsp + 48 - LocalVarsSize) |
||||
#define save_r12 (rsp + 56 - LocalVarsSize) |
||||
#define save_r13 (rsp + 64 - LocalVarsSize) |
||||
#define save_r14 (rsp + 72 - LocalVarsSize) |
||||
#define save_r15 (rsp + 80 - LocalVarsSize) |
||||
|
||||
|
||||
/* |
||||
; all the +4 offsets are due to the addition of pending_buf_size (in zlib
|
||||
; in the deflate_state structure since the asm code was first written
|
||||
; (if you compile with zlib 1.0.4 or older, remove the +4).
|
||||
; Note : these value are good with a 8 bytes boundary pack structure
|
||||
*/ |
||||
|
||||
#define MAX_MATCH 258 |
||||
#define MIN_MATCH 3 |
||||
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) |
||||
|
||||
/* |
||||
;;; Offsets for fields in the deflate_state structure. These numbers
|
||||
;;; are calculated from the definition of deflate_state, with the
|
||||
;;; assumption that the compiler will dword-align the fields. (Thus,
|
||||
;;; changing the definition of deflate_state could easily cause this
|
||||
;;; program to crash horribly, without so much as a warning at
|
||||
;;; compile time. Sigh.)
|
||||
|
||||
; all the +zlib1222add offsets are due to the addition of fields
|
||||
; in zlib in the deflate_state structure since the asm code was first written
|
||||
; (if you compile with zlib 1.0.4 or older, use "zlib1222add equ (-4)").
|
||||
; (if you compile with zlib between 1.0.5 and 1.2.2.1, use "zlib1222add equ 0").
|
||||
; if you compile with zlib 1.2.2.2 or later , use "zlib1222add equ 8").
|
||||
*/ |
||||
|
||||
|
||||
|
||||
/* you can check the structure offset by running |
||||
|
||||
#include <stdlib.h> |
||||
#include <stdio.h> |
||||
#include "deflate.h" |
||||
|
||||
void print_depl() |
||||
{ |
||||
deflate_state ds;
|
||||
deflate_state *s=&ds;
|
||||
printf("size pointer=%u\n",(int)sizeof(void*));
|
||||
|
||||
printf("#define dsWSize %u\n",(int)(((char*)&(s->w_size))-((char*)s))); |
||||
printf("#define dsWMask %u\n",(int)(((char*)&(s->w_mask))-((char*)s))); |
||||
printf("#define dsWindow %u\n",(int)(((char*)&(s->window))-((char*)s))); |
||||
printf("#define dsPrev %u\n",(int)(((char*)&(s->prev))-((char*)s))); |
||||
printf("#define dsMatchLen %u\n",(int)(((char*)&(s->match_length))-((char*)s))); |
||||
printf("#define dsPrevMatch %u\n",(int)(((char*)&(s->prev_match))-((char*)s))); |
||||
printf("#define dsStrStart %u\n",(int)(((char*)&(s->strstart))-((char*)s))); |
||||
printf("#define dsMatchStart %u\n",(int)(((char*)&(s->match_start))-((char*)s))); |
||||
printf("#define dsLookahead %u\n",(int)(((char*)&(s->lookahead))-((char*)s))); |
||||
printf("#define dsPrevLen %u\n",(int)(((char*)&(s->prev_length))-((char*)s))); |
||||
printf("#define dsMaxChainLen %u\n",(int)(((char*)&(s->max_chain_length))-((char*)s))); |
||||
printf("#define dsGoodMatch %u\n",(int)(((char*)&(s->good_match))-((char*)s))); |
||||
printf("#define dsNiceMatch %u\n",(int)(((char*)&(s->nice_match))-((char*)s))); |
||||
} |
||||
*/ |
||||
|
||||
#define dsWSize 68 |
||||
#define dsWMask 76 |
||||
#define dsWindow 80 |
||||
#define dsPrev 96 |
||||
#define dsMatchLen 144 |
||||
#define dsPrevMatch 148 |
||||
#define dsStrStart 156 |
||||
#define dsMatchStart 160 |
||||
#define dsLookahead 164 |
||||
#define dsPrevLen 168 |
||||
#define dsMaxChainLen 172 |
||||
#define dsGoodMatch 188 |
||||
#define dsNiceMatch 192 |
||||
|
||||
#define window_size [ rcx + dsWSize] |
||||
#define WMask [ rcx + dsWMask] |
||||
#define window_ad [ rcx + dsWindow] |
||||
#define prev_ad [ rcx + dsPrev] |
||||
#define strstart [ rcx + dsStrStart] |
||||
#define match_start [ rcx + dsMatchStart] |
||||
#define Lookahead [ rcx + dsLookahead] //; 0ffffffffh on infozip
|
||||
#define prev_length [ rcx + dsPrevLen] |
||||
#define max_chain_length [ rcx + dsMaxChainLen] |
||||
#define good_match [ rcx + dsGoodMatch] |
||||
#define nice_match [ rcx + dsNiceMatch] |
||||
|
||||
/* |
||||
; windows:
|
||||
; parameter 1 in rcx(deflate state s), param 2 in rdx (cur match)
|
||||
|
||||
; see http://weblogs.asp.net/oldnewthing/archive/2004/01/14/58579.aspx and
|
||||
; http://msdn.microsoft.com/library/en-us/kmarch/hh/kmarch/64bitAMD_8e951dd2-ee77-4728-8702-55ce4b5dd24a.xml.asp
|
||||
;
|
||||
; All registers must be preserved across the call, except for
|
||||
; rax, rcx, rdx, r8, r9, r10, and r11, which are scratch.
|
||||
|
||||
;
|
||||
; gcc on macosx-linux:
|
||||
; see http://www.x86-64.org/documentation/abi-0.99.pdf
|
||||
; param 1 in rdi, param 2 in rsi
|
||||
; rbx, rsp, rbp, r12 to r15 must be preserved
|
||||
|
||||
;;; Save registers that the compiler may be using, and adjust esp to
|
||||
;;; make room for our stack frame.
|
||||
|
||||
|
||||
;;; Retrieve the function arguments. r8d will hold cur_match
|
||||
;;; throughout the entire function. edx will hold the pointer to the
|
||||
;;; deflate_state structure during the function's setup (before
|
||||
;;; entering the main loop.
|
||||
|
||||
; ms: parameter 1 in rcx (deflate_state* s), param 2 in edx -> r8 (cur match)
|
||||
; mac: param 1 in rdi, param 2 rsi
|
||||
; this clear high 32 bits of r8, which can be garbage in both r8 and rdx
|
||||
*/ |
||||
mov [save_rbx],rbx |
||||
mov [save_rbp],rbp |
||||
|
||||
|
||||
mov rcx,rdi |
||||
|
||||
mov r8d,esi |
||||
|
||||
|
||||
mov [save_r12],r12 |
||||
mov [save_r13],r13 |
||||
mov [save_r14],r14 |
||||
mov [save_r15],r15 |
||||
|
||||
|
||||
//;;; uInt wmask = s->w_mask;
|
||||
//;;; unsigned chain_length = s->max_chain_length;
|
||||
//;;; if (s->prev_length >= s->good_match) {
|
||||
//;;; chain_length >>= 2;
|
||||
//;;; }
|
||||
|
||||
|
||||
mov edi, prev_length |
||||
mov esi, good_match |
||||
mov eax, WMask |
||||
mov ebx, max_chain_length |
||||
cmp edi, esi |
||||
jl LastMatchGood |
||||
shr ebx, 2 |
||||
LastMatchGood: |
||||
|
||||
//;;; chainlen is decremented once beforehand so that the function can
|
||||
//;;; use the sign flag instead of the zero flag for the exit test.
|
||||
//;;; It is then shifted into the high word, to make room for the wmask
|
||||
//;;; value, which it will always accompany.
|
||||
|
||||
dec ebx |
||||
shl ebx, 16 |
||||
or ebx, eax |
||||
|
||||
//;;; on zlib only
|
||||
//;;; if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
|
||||
|
||||
|
||||
|
||||
mov eax, nice_match |
||||
mov [chainlenwmask], ebx |
||||
mov r10d, Lookahead |
||||
cmp r10d, eax |
||||
cmovnl r10d, eax |
||||
mov [nicematch],r10d |
||||
|
||||
|
||||
|
||||
//;;; register Bytef *scan = s->window + s->strstart;
|
||||
mov r10, window_ad |
||||
mov ebp, strstart |
||||
lea r13, [r10 + rbp] |
||||
|
||||
//;;; Determine how many bytes the scan ptr is off from being
|
||||
//;;; dword-aligned.
|
||||
|
||||
mov r9,r13 |
||||
neg r13 |
||||
and r13,3 |
||||
|
||||
//;;; IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
|
||||
//;;; s->strstart - (IPos)MAX_DIST(s) : NIL;
|
||||
|
||||
|
||||
mov eax, window_size |
||||
sub eax, MIN_LOOKAHEAD |
||||
|
||||
|
||||
xor edi,edi |
||||
sub ebp, eax |
||||
|
||||
mov r11d, prev_length |
||||
|
||||
cmovng ebp,edi |
||||
|
||||
//;;; int best_len = s->prev_length;
|
||||
|
||||
|
||||
//;;; Store the sum of s->window + best_len in esi locally, and in esi.
|
||||
|
||||
lea rsi,[r10+r11] |
||||
|
||||
//;;; register ush scan_start = *(ushf*)scan;
|
||||
//;;; register ush scan_end = *(ushf*)(scan+best_len-1);
|
||||
//;;; Posf *prev = s->prev;
|
||||
|
||||
movzx r12d,word ptr [r9] |
||||
movzx ebx, word ptr [r9 + r11 - 1] |
||||
|
||||
mov rdi, prev_ad |
||||
|
||||
//;;; Jump into the main loop.
|
||||
|
||||
mov edx, [chainlenwmask] |
||||
|
||||
cmp bx,word ptr [rsi + r8 - 1] |
||||
jz LookupLoopIsZero |
||||
|
||||
|
||||
|
||||
LookupLoop1: |
||||
and r8d, edx |
||||
|
||||
movzx r8d, word ptr [rdi + r8*2] |
||||
cmp r8d, ebp |
||||
jbe LeaveNow |
||||
|
||||
|
||||
|
||||
sub edx, 0x00010000 |
||||
BEFORE_JMP |
||||
js LeaveNow |
||||
AFTER_JMP |
||||
|
||||
LoopEntry1: |
||||
cmp bx,word ptr [rsi + r8 - 1] |
||||
BEFORE_JMP |
||||
jz LookupLoopIsZero |
||||
AFTER_JMP |
||||
|
||||
LookupLoop2: |
||||
and r8d, edx |
||||
|
||||
movzx r8d, word ptr [rdi + r8*2] |
||||
cmp r8d, ebp |
||||
BEFORE_JMP |
||||
jbe LeaveNow |
||||
AFTER_JMP |
||||
sub edx, 0x00010000 |
||||
BEFORE_JMP |
||||
js LeaveNow |
||||
AFTER_JMP |
||||
|
||||
LoopEntry2: |
||||
cmp bx,word ptr [rsi + r8 - 1] |
||||
BEFORE_JMP |
||||
jz LookupLoopIsZero |
||||
AFTER_JMP |
||||
|
||||
LookupLoop4: |
||||
and r8d, edx |
||||
|
||||
movzx r8d, word ptr [rdi + r8*2] |
||||
cmp r8d, ebp |
||||
BEFORE_JMP |
||||
jbe LeaveNow |
||||
AFTER_JMP |
||||
sub edx, 0x00010000 |
||||
BEFORE_JMP |
||||
js LeaveNow |
||||
AFTER_JMP |
||||
|
||||
LoopEntry4: |
||||
|
||||
cmp bx,word ptr [rsi + r8 - 1] |
||||
BEFORE_JMP |
||||
jnz LookupLoop1 |
||||
jmp LookupLoopIsZero |
||||
AFTER_JMP |
||||
/* |
||||
;;; do {
|
||||
;;; match = s->window + cur_match;
|
||||
;;; if (*(ushf*)(match+best_len-1) != scan_end ||
|
||||
;;; *(ushf*)match != scan_start) continue;
|
||||
;;; [...]
|
||||
;;; } while ((cur_match = prev[cur_match & wmask]) > limit
|
||||
;;; && --chain_length != 0);
|
||||
;;;
|
||||
;;; Here is the inner loop of the function. The function will spend the
|
||||
;;; majority of its time in this loop, and majority of that time will
|
||||
;;; be spent in the first ten instructions.
|
||||
;;;
|
||||
;;; Within this loop:
|
||||
;;; ebx = scanend
|
||||
;;; r8d = curmatch
|
||||
;;; edx = chainlenwmask - i.e., ((chainlen << 16) | wmask)
|
||||
;;; esi = windowbestlen - i.e., (window + bestlen)
|
||||
;;; edi = prev
|
||||
;;; ebp = limit
|
||||
*/ |
||||
.balign 16
|
||||
LookupLoop: |
||||
and r8d, edx |
||||
|
||||
movzx r8d, word ptr [rdi + r8*2] |
||||
cmp r8d, ebp |
||||
BEFORE_JMP |
||||
jbe LeaveNow |
||||
AFTER_JMP |
||||
sub edx, 0x00010000 |
||||
BEFORE_JMP |
||||
js LeaveNow |
||||
AFTER_JMP |
||||
|
||||
LoopEntry: |
||||
|
||||
cmp bx,word ptr [rsi + r8 - 1] |
||||
BEFORE_JMP |
||||
jnz LookupLoop1 |
||||
AFTER_JMP |
||||
LookupLoopIsZero: |
||||
cmp r12w, word ptr [r10 + r8] |
||||
BEFORE_JMP |
||||
jnz LookupLoop1 |
||||
AFTER_JMP |
||||
|
||||
|
||||
//;;; Store the current value of chainlen.
|
||||
mov [chainlenwmask], edx |
||||
/* |
||||
;;; Point edi to the string under scrutiny, and esi to the string we
|
||||
;;; are hoping to match it up with. In actuality, esi and edi are
|
||||
;;; both pointed (MAX_MATCH_8 - scanalign) bytes ahead, and edx is
|
||||
;;; initialized to -(MAX_MATCH_8 - scanalign).
|
||||
*/ |
||||
lea rsi,[r8+r10] |
||||
mov rdx, 0xfffffffffffffef8 //; -(MAX_MATCH_8)
|
||||
lea rsi, [rsi + r13 + 0x0108] //;MAX_MATCH_8]
|
||||
lea rdi, [r9 + r13 + 0x0108] //;MAX_MATCH_8]
|
||||
|
||||
prefetcht1 [rsi+rdx] |
||||
prefetcht1 [rdi+rdx] |
||||
|
||||
/* |
||||
;;; Test the strings for equality, 8 bytes at a time. At the end,
|
||||
;;; adjust rdx so that it is offset to the exact byte that mismatched.
|
||||
;;;
|
||||
;;; We already know at this point that the first three bytes of the
|
||||
;;; strings match each other, and they can be safely passed over before
|
||||
;;; starting the compare loop. So what this code does is skip over 0-3
|
||||
;;; bytes, as much as necessary in order to dword-align the edi
|
||||
;;; pointer. (rsi will still be misaligned three times out of four.)
|
||||
;;;
|
||||
;;; It should be confessed that this loop usually does not represent
|
||||
;;; much of the total running time. Replacing it with a more
|
||||
;;; straightforward "rep cmpsb" would not drastically degrade
|
||||
;;; performance.
|
||||
*/ |
||||
|
||||
LoopCmps: |
||||
mov rax, [rsi + rdx] |
||||
xor rax, [rdi + rdx] |
||||
jnz LeaveLoopCmps |
||||
|
||||
mov rax, [rsi + rdx + 8] |
||||
xor rax, [rdi + rdx + 8] |
||||
jnz LeaveLoopCmps8 |
||||
|
||||
|
||||
mov rax, [rsi + rdx + 8+8] |
||||
xor rax, [rdi + rdx + 8+8] |
||||
jnz LeaveLoopCmps16 |
||||
|
||||
add rdx,8+8+8 |
||||
|
||||
BEFORE_JMP |
||||
jnz LoopCmps |
||||
jmp LenMaximum |
||||
AFTER_JMP |
||||
|
||||
LeaveLoopCmps16: add rdx,8 |
||||
LeaveLoopCmps8: add rdx,8 |
||||
LeaveLoopCmps: |
||||
|
||||
test eax, 0x0000FFFF |
||||
jnz LenLower |
||||
|
||||
test eax,0xffffffff |
||||
|
||||
jnz LenLower32 |
||||
|
||||
add rdx,4 |
||||
shr rax,32 |
||||
or ax,ax |
||||
BEFORE_JMP |
||||
jnz LenLower |
||||
AFTER_JMP |
||||
|
||||
LenLower32: |
||||
shr eax,16 |
||||
add rdx,2 |
||||
|
||||
LenLower:
|
||||
sub al, 1 |
||||
adc rdx, 0 |
||||
//;;; Calculate the length of the match. If it is longer than MAX_MATCH,
|
||||
//;;; then automatically accept it as the best possible match and leave.
|
||||
|
||||
lea rax, [rdi + rdx] |
||||
sub rax, r9 |
||||
cmp eax, MAX_MATCH |
||||
BEFORE_JMP |
||||
jge LenMaximum |
||||
AFTER_JMP |
||||
/* |
||||
;;; If the length of the match is not longer than the best match we
|
||||
;;; have so far, then forget it and return to the lookup loop.
|
||||
;///////////////////////////////////
|
||||
*/ |
||||
cmp eax, r11d |
||||
jg LongerMatch |
||||
|
||||
lea rsi,[r10+r11] |
||||
|
||||
mov rdi, prev_ad |
||||
mov edx, [chainlenwmask] |
||||
BEFORE_JMP |
||||
jmp LookupLoop |
||||
AFTER_JMP |
||||
/* |
||||
;;; s->match_start = cur_match;
|
||||
;;; best_len = len;
|
||||
;;; if (len >= nice_match) break;
|
||||
;;; scan_end = *(ushf*)(scan+best_len-1);
|
||||
*/ |
||||
LongerMatch: |
||||
mov r11d, eax |
||||
mov match_start, r8d |
||||
cmp eax, [nicematch] |
||||
BEFORE_JMP |
||||
jge LeaveNow |
||||
AFTER_JMP |
||||
|
||||
lea rsi,[r10+rax] |
||||
|
||||
movzx ebx, word ptr [r9 + rax - 1] |
||||
mov rdi, prev_ad |
||||
mov edx, [chainlenwmask] |
||||
BEFORE_JMP |
||||
jmp LookupLoop |
||||
AFTER_JMP |
||||
|
||||
//;;; Accept the current string, with the maximum possible length.
|
||||
|
||||
LenMaximum: |
||||
mov r11d,MAX_MATCH |
||||
mov match_start, r8d |
||||
|
||||
//;;; if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
|
||||
//;;; return s->lookahead;
|
||||
|
||||
LeaveNow: |
||||
mov eax, Lookahead |
||||
cmp r11d, eax |
||||
cmovng eax, r11d |
||||
|
||||
|
||||
|
||||
//;;; Restore the stack and return from whence we came.
|
||||
|
||||
|
||||
// mov rsi,[save_rsi] |
||||
// mov rdi,[save_rdi] |
||||
mov rbx,[save_rbx] |
||||
mov rbp,[save_rbp] |
||||
mov r12,[save_r12] |
||||
mov r13,[save_r13] |
||||
mov r14,[save_r14] |
||||
mov r15,[save_r15] |
||||
|
||||
|
||||
ret 0 |
||||
//; please don't remove this string !
|
||||
//; Your can freely use gvmat64 in any free or commercial app
|
||||
//; but it is far better don't remove the string in the binary!
|
||||
// db 0dh,0ah,"asm686 with masm, optimised assembly code from Brian Raiter, written 1998, converted to amd 64 by Gilles Vollant 2005",0dh,0ah,0 |
||||
|
||||
|
||||
match_init: |
||||
ret 0 |
||||
|
||||
|
@ -0,0 +1 @@ |
||||
See infback9.h for what this is and how to use it. |
@ -0,0 +1,615 @@ |
||||
/* infback9.c -- inflate deflate64 data using a call-back interface
|
||||
* Copyright (C) 1995-2008 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
#include "zutil.h" |
||||
#include "infback9.h" |
||||
#include "inftree9.h" |
||||
#include "inflate9.h" |
||||
|
||||
#define WSIZE 65536UL |
||||
|
||||
/*
|
||||
strm provides memory allocation functions in zalloc and zfree, or |
||||
Z_NULL to use the library memory allocation functions. |
||||
|
||||
window is a user-supplied window and output buffer that is 64K bytes. |
||||
*/ |
||||
int ZEXPORT inflateBack9Init_(strm, window, version, stream_size) |
||||
z_stream FAR *strm; |
||||
unsigned char FAR *window; |
||||
const char *version; |
||||
int stream_size; |
||||
{ |
||||
struct inflate_state FAR *state; |
||||
|
||||
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || |
||||
stream_size != (int)(sizeof(z_stream))) |
||||
return Z_VERSION_ERROR; |
||||
if (strm == Z_NULL || window == Z_NULL) |
||||
return Z_STREAM_ERROR; |
||||
strm->msg = Z_NULL; /* in case we return an error */ |
||||
if (strm->zalloc == (alloc_func)0) { |
||||
strm->zalloc = zcalloc; |
||||
strm->opaque = (voidpf)0; |
||||
} |
||||
if (strm->zfree == (free_func)0) strm->zfree = zcfree; |
||||
state = (struct inflate_state FAR *)ZALLOC(strm, 1, |
||||
sizeof(struct inflate_state)); |
||||
if (state == Z_NULL) return Z_MEM_ERROR; |
||||
Tracev((stderr, "inflate: allocated\n")); |
||||
strm->state = (voidpf)state; |
||||
state->window = window; |
||||
return Z_OK; |
||||
} |
||||
|
||||
/*
|
||||
Build and output length and distance decoding tables for fixed code |
||||
decoding. |
||||
*/ |
||||
#ifdef MAKEFIXED |
||||
#include <stdio.h> |
||||
|
||||
void makefixed9(void) |
||||
{ |
||||
unsigned sym, bits, low, size; |
||||
code *next, *lenfix, *distfix; |
||||
struct inflate_state state; |
||||
code fixed[544]; |
||||
|
||||
/* literal/length table */ |
||||
sym = 0; |
||||
while (sym < 144) state.lens[sym++] = 8; |
||||
while (sym < 256) state.lens[sym++] = 9; |
||||
while (sym < 280) state.lens[sym++] = 7; |
||||
while (sym < 288) state.lens[sym++] = 8; |
||||
next = fixed; |
||||
lenfix = next; |
||||
bits = 9; |
||||
inflate_table9(LENS, state.lens, 288, &(next), &(bits), state.work); |
||||
|
||||
/* distance table */ |
||||
sym = 0; |
||||
while (sym < 32) state.lens[sym++] = 5; |
||||
distfix = next; |
||||
bits = 5; |
||||
inflate_table9(DISTS, state.lens, 32, &(next), &(bits), state.work); |
||||
|
||||
/* write tables */ |
||||
puts(" /* inffix9.h -- table for decoding deflate64 fixed codes"); |
||||
puts(" * Generated automatically by makefixed9()."); |
||||
puts(" */"); |
||||
puts(""); |
||||
puts(" /* WARNING: this file should *not* be used by applications."); |
||||
puts(" It is part of the implementation of this library and is"); |
||||
puts(" subject to change. Applications should only use zlib.h."); |
||||
puts(" */"); |
||||
puts(""); |
||||
size = 1U << 9; |
||||
printf(" static const code lenfix[%u] = {", size); |
||||
low = 0; |
||||
for (;;) { |
||||
if ((low % 6) == 0) printf("\n "); |
||||
printf("{%u,%u,%d}", lenfix[low].op, lenfix[low].bits, |
||||
lenfix[low].val); |
||||
if (++low == size) break; |
||||
putchar(','); |
||||
} |
||||
puts("\n };"); |
||||
size = 1U << 5; |
||||
printf("\n static const code distfix[%u] = {", size); |
||||
low = 0; |
||||
for (;;) { |
||||
if ((low % 5) == 0) printf("\n "); |
||||
printf("{%u,%u,%d}", distfix[low].op, distfix[low].bits, |
||||
distfix[low].val); |
||||
if (++low == size) break; |
||||
putchar(','); |
||||
} |
||||
puts("\n };"); |
||||
} |
||||
#endif /* MAKEFIXED */ |
||||
|
||||
/* Macros for inflateBack(): */ |
||||
|
||||
/* Clear the input bit accumulator */ |
||||
#define INITBITS() \ |
||||
do { \
|
||||
hold = 0; \
|
||||
bits = 0; \
|
||||
} while (0) |
||||
|
||||
/* Assure that some input is available. If input is requested, but denied,
|
||||
then return a Z_BUF_ERROR from inflateBack(). */ |
||||
#define PULL() \ |
||||
do { \
|
||||
if (have == 0) { \
|
||||
have = in(in_desc, &next); \
|
||||
if (have == 0) { \
|
||||
next = Z_NULL; \
|
||||
ret = Z_BUF_ERROR; \
|
||||
goto inf_leave; \
|
||||
} \
|
||||
} \
|
||||
} while (0) |
||||
|
||||
/* Get a byte of input into the bit accumulator, or return from inflateBack()
|
||||
with an error if there is no input available. */ |
||||
#define PULLBYTE() \ |
||||
do { \
|
||||
PULL(); \
|
||||
have--; \
|
||||
hold += (unsigned long)(*next++) << bits; \
|
||||
bits += 8; \
|
||||
} while (0) |
||||
|
||||
/* Assure that there are at least n bits in the bit accumulator. If there is
|
||||
not enough available input to do that, then return from inflateBack() with |
||||
an error. */ |
||||
#define NEEDBITS(n) \ |
||||
do { \
|
||||
while (bits < (unsigned)(n)) \
|
||||
PULLBYTE(); \
|
||||
} while (0) |
||||
|
||||
/* Return the low n bits of the bit accumulator (n <= 16) */ |
||||
#define BITS(n) \ |
||||
((unsigned)hold & ((1U << (n)) - 1)) |
||||
|
||||
/* Remove n bits from the bit accumulator */ |
||||
#define DROPBITS(n) \ |
||||
do { \
|
||||
hold >>= (n); \
|
||||
bits -= (unsigned)(n); \
|
||||
} while (0) |
||||
|
||||
/* Remove zero to seven bits as needed to go to a byte boundary */ |
||||
#define BYTEBITS() \ |
||||
do { \
|
||||
hold >>= bits & 7; \
|
||||
bits -= bits & 7; \
|
||||
} while (0) |
||||
|
||||
/* Assure that some output space is available, by writing out the window
|
||||
if it's full. If the write fails, return from inflateBack() with a |
||||
Z_BUF_ERROR. */ |
||||
#define ROOM() \ |
||||
do { \
|
||||
if (left == 0) { \
|
||||
put = window; \
|
||||
left = WSIZE; \
|
||||
wrap = 1; \
|
||||
if (out(out_desc, put, (unsigned)left)) { \
|
||||
ret = Z_BUF_ERROR; \
|
||||
goto inf_leave; \
|
||||
} \
|
||||
} \
|
||||
} while (0) |
||||
|
||||
/*
|
||||
strm provides the memory allocation functions and window buffer on input, |
||||
and provides information on the unused input on return. For Z_DATA_ERROR |
||||
returns, strm will also provide an error message. |
||||
|
||||
in() and out() are the call-back input and output functions. When |
||||
inflateBack() needs more input, it calls in(). When inflateBack() has |
||||
filled the window with output, or when it completes with data in the |
||||
window, it calls out() to write out the data. The application must not |
||||
change the provided input until in() is called again or inflateBack() |
||||
returns. The application must not change the window/output buffer until |
||||
inflateBack() returns. |
||||
|
||||
in() and out() are called with a descriptor parameter provided in the |
||||
inflateBack() call. This parameter can be a structure that provides the |
||||
information required to do the read or write, as well as accumulated |
||||
information on the input and output such as totals and check values. |
||||
|
||||
in() should return zero on failure. out() should return non-zero on |
||||
failure. If either in() or out() fails, than inflateBack() returns a |
||||
Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it |
||||
was in() or out() that caused in the error. Otherwise, inflateBack() |
||||
returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format |
||||
error, or Z_MEM_ERROR if it could not allocate memory for the state. |
||||
inflateBack() can also return Z_STREAM_ERROR if the input parameters |
||||
are not correct, i.e. strm is Z_NULL or the state was not initialized. |
||||
*/ |
||||
int ZEXPORT inflateBack9(strm, in, in_desc, out, out_desc) |
||||
z_stream FAR *strm; |
||||
in_func in; |
||||
void FAR *in_desc; |
||||
out_func out; |
||||
void FAR *out_desc; |
||||
{ |
||||
struct inflate_state FAR *state; |
||||
z_const unsigned char FAR *next; /* next input */ |
||||
unsigned char FAR *put; /* next output */ |
||||
unsigned have; /* available input */ |
||||
unsigned long left; /* available output */ |
||||
inflate_mode mode; /* current inflate mode */ |
||||
int lastblock; /* true if processing last block */ |
||||
int wrap; /* true if the window has wrapped */ |
||||
unsigned char FAR *window; /* allocated sliding window, if needed */ |
||||
unsigned long hold; /* bit buffer */ |
||||
unsigned bits; /* bits in bit buffer */ |
||||
unsigned extra; /* extra bits needed */ |
||||
unsigned long length; /* literal or length of data to copy */ |
||||
unsigned long offset; /* distance back to copy string from */ |
||||
unsigned long copy; /* number of stored or match bytes to copy */ |
||||
unsigned char FAR *from; /* where to copy match bytes from */ |
||||
code const FAR *lencode; /* starting table for length/literal codes */ |
||||
code const FAR *distcode; /* starting table for distance codes */ |
||||
unsigned lenbits; /* index bits for lencode */ |
||||
unsigned distbits; /* index bits for distcode */ |
||||
code here; /* current decoding table entry */ |
||||
code last; /* parent table entry */ |
||||
unsigned len; /* length to copy for repeats, bits to drop */ |
||||
int ret; /* return code */ |
||||
static const unsigned short order[19] = /* permutation of code lengths */ |
||||
{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; |
||||
#include "inffix9.h" |
||||
|
||||
/* Check that the strm exists and that the state was initialized */ |
||||
if (strm == Z_NULL || strm->state == Z_NULL) |
||||
return Z_STREAM_ERROR; |
||||
state = (struct inflate_state FAR *)strm->state; |
||||
|
||||
/* Reset the state */ |
||||
strm->msg = Z_NULL; |
||||
mode = TYPE; |
||||
lastblock = 0; |
||||
wrap = 0; |
||||
window = state->window; |
||||
next = strm->next_in; |
||||
have = next != Z_NULL ? strm->avail_in : 0; |
||||
hold = 0; |
||||
bits = 0; |
||||
put = window; |
||||
left = WSIZE; |
||||
lencode = Z_NULL; |
||||
distcode = Z_NULL; |
||||
|
||||
/* Inflate until end of block marked as last */ |
||||
for (;;) |
||||
switch (mode) { |
||||
case TYPE: |
||||
/* determine and dispatch block type */ |
||||
if (lastblock) { |
||||
BYTEBITS(); |
||||
mode = DONE; |
||||
break; |
||||
} |
||||
NEEDBITS(3); |
||||
lastblock = BITS(1); |
||||
DROPBITS(1); |
||||
switch (BITS(2)) { |
||||
case 0: /* stored block */ |
||||
Tracev((stderr, "inflate: stored block%s\n", |
||||
lastblock ? " (last)" : "")); |
||||
mode = STORED; |
||||
break; |
||||
case 1: /* fixed block */ |
||||
lencode = lenfix; |
||||
lenbits = 9; |
||||
distcode = distfix; |
||||
distbits = 5; |
||||
Tracev((stderr, "inflate: fixed codes block%s\n", |
||||
lastblock ? " (last)" : "")); |
||||
mode = LEN; /* decode codes */ |
||||
break; |
||||
case 2: /* dynamic block */ |
||||
Tracev((stderr, "inflate: dynamic codes block%s\n", |
||||
lastblock ? " (last)" : "")); |
||||
mode = TABLE; |
||||
break; |
||||
case 3: |
||||
strm->msg = (char *)"invalid block type"; |
||||
mode = BAD; |
||||
} |
||||
DROPBITS(2); |
||||
break; |
||||
|
||||
case STORED: |
||||
/* get and verify stored block length */ |
||||
BYTEBITS(); /* go to byte boundary */ |
||||
NEEDBITS(32); |
||||
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { |
||||
strm->msg = (char *)"invalid stored block lengths"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
length = (unsigned)hold & 0xffff; |
||||
Tracev((stderr, "inflate: stored length %lu\n", |
||||
length)); |
||||
INITBITS(); |
||||
|
||||
/* copy stored block from input to output */ |
||||
while (length != 0) { |
||||
copy = length; |
||||
PULL(); |
||||
ROOM(); |
||||
if (copy > have) copy = have; |
||||
if (copy > left) copy = left; |
||||
zmemcpy(put, next, copy); |
||||
have -= copy; |
||||
next += copy; |
||||
left -= copy; |
||||
put += copy; |
||||
length -= copy; |
||||
} |
||||
Tracev((stderr, "inflate: stored end\n")); |
||||
mode = TYPE; |
||||
break; |
||||
|
||||
case TABLE: |
||||
/* get dynamic table entries descriptor */ |
||||
NEEDBITS(14); |
||||
state->nlen = BITS(5) + 257; |
||||
DROPBITS(5); |
||||
state->ndist = BITS(5) + 1; |
||||
DROPBITS(5); |
||||
state->ncode = BITS(4) + 4; |
||||
DROPBITS(4); |
||||
if (state->nlen > 286) { |
||||
strm->msg = (char *)"too many length symbols"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
Tracev((stderr, "inflate: table sizes ok\n")); |
||||
|
||||
/* get code length code lengths (not a typo) */ |
||||
state->have = 0; |
||||
while (state->have < state->ncode) { |
||||
NEEDBITS(3); |
||||
state->lens[order[state->have++]] = (unsigned short)BITS(3); |
||||
DROPBITS(3); |
||||
} |
||||
while (state->have < 19) |
||||
state->lens[order[state->have++]] = 0; |
||||
state->next = state->codes; |
||||
lencode = (code const FAR *)(state->next); |
||||
lenbits = 7; |
||||
ret = inflate_table9(CODES, state->lens, 19, &(state->next), |
||||
&(lenbits), state->work); |
||||
if (ret) { |
||||
strm->msg = (char *)"invalid code lengths set"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
Tracev((stderr, "inflate: code lengths ok\n")); |
||||
|
||||
/* get length and distance code code lengths */ |
||||
state->have = 0; |
||||
while (state->have < state->nlen + state->ndist) { |
||||
for (;;) { |
||||
here = lencode[BITS(lenbits)]; |
||||
if ((unsigned)(here.bits) <= bits) break; |
||||
PULLBYTE(); |
||||
} |
||||
if (here.val < 16) { |
||||
NEEDBITS(here.bits); |
||||
DROPBITS(here.bits); |
||||
state->lens[state->have++] = here.val; |
||||
} |
||||
else { |
||||
if (here.val == 16) { |
||||
NEEDBITS(here.bits + 2); |
||||
DROPBITS(here.bits); |
||||
if (state->have == 0) { |
||||
strm->msg = (char *)"invalid bit length repeat"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
len = (unsigned)(state->lens[state->have - 1]); |
||||
copy = 3 + BITS(2); |
||||
DROPBITS(2); |
||||
} |
||||
else if (here.val == 17) { |
||||
NEEDBITS(here.bits + 3); |
||||
DROPBITS(here.bits); |
||||
len = 0; |
||||
copy = 3 + BITS(3); |
||||
DROPBITS(3); |
||||
} |
||||
else { |
||||
NEEDBITS(here.bits + 7); |
||||
DROPBITS(here.bits); |
||||
len = 0; |
||||
copy = 11 + BITS(7); |
||||
DROPBITS(7); |
||||
} |
||||
if (state->have + copy > state->nlen + state->ndist) { |
||||
strm->msg = (char *)"invalid bit length repeat"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
while (copy--) |
||||
state->lens[state->have++] = (unsigned short)len; |
||||
} |
||||
} |
||||
|
||||
/* handle error breaks in while */ |
||||
if (mode == BAD) break; |
||||
|
||||
/* check for end-of-block code (better have one) */ |
||||
if (state->lens[256] == 0) { |
||||
strm->msg = (char *)"invalid code -- missing end-of-block"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
|
||||
/* build code tables -- note: do not change the lenbits or distbits
|
||||
values here (9 and 6) without reading the comments in inftree9.h |
||||
concerning the ENOUGH constants, which depend on those values */ |
||||
state->next = state->codes; |
||||
lencode = (code const FAR *)(state->next); |
||||
lenbits = 9; |
||||
ret = inflate_table9(LENS, state->lens, state->nlen, |
||||
&(state->next), &(lenbits), state->work); |
||||
if (ret) { |
||||
strm->msg = (char *)"invalid literal/lengths set"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
distcode = (code const FAR *)(state->next); |
||||
distbits = 6; |
||||
ret = inflate_table9(DISTS, state->lens + state->nlen, |
||||
state->ndist, &(state->next), &(distbits), |
||||
state->work); |
||||
if (ret) { |
||||
strm->msg = (char *)"invalid distances set"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
Tracev((stderr, "inflate: codes ok\n")); |
||||
mode = LEN; |
||||
|
||||
case LEN: |
||||
/* get a literal, length, or end-of-block code */ |
||||
for (;;) { |
||||
here = lencode[BITS(lenbits)]; |
||||
if ((unsigned)(here.bits) <= bits) break; |
||||
PULLBYTE(); |
||||
} |
||||
if (here.op && (here.op & 0xf0) == 0) { |
||||
last = here; |
||||
for (;;) { |
||||
here = lencode[last.val + |
||||
(BITS(last.bits + last.op) >> last.bits)]; |
||||
if ((unsigned)(last.bits + here.bits) <= bits) break; |
||||
PULLBYTE(); |
||||
} |
||||
DROPBITS(last.bits); |
||||
} |
||||
DROPBITS(here.bits); |
||||
length = (unsigned)here.val; |
||||
|
||||
/* process literal */ |
||||
if (here.op == 0) { |
||||
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? |
||||
"inflate: literal '%c'\n" : |
||||
"inflate: literal 0x%02x\n", here.val)); |
||||
ROOM(); |
||||
*put++ = (unsigned char)(length); |
||||
left--; |
||||
mode = LEN; |
||||
break; |
||||
} |
||||
|
||||
/* process end of block */ |
||||
if (here.op & 32) { |
||||
Tracevv((stderr, "inflate: end of block\n")); |
||||
mode = TYPE; |
||||
break; |
||||
} |
||||
|
||||
/* invalid code */ |
||||
if (here.op & 64) { |
||||
strm->msg = (char *)"invalid literal/length code"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
|
||||
/* length code -- get extra bits, if any */ |
||||
extra = (unsigned)(here.op) & 31; |
||||
if (extra != 0) { |
||||
NEEDBITS(extra); |
||||
length += BITS(extra); |
||||
DROPBITS(extra); |
||||
} |
||||
Tracevv((stderr, "inflate: length %lu\n", length)); |
||||
|
||||
/* get distance code */ |
||||
for (;;) { |
||||
here = distcode[BITS(distbits)]; |
||||
if ((unsigned)(here.bits) <= bits) break; |
||||
PULLBYTE(); |
||||
} |
||||
if ((here.op & 0xf0) == 0) { |
||||
last = here; |
||||
for (;;) { |
||||
here = distcode[last.val + |
||||
(BITS(last.bits + last.op) >> last.bits)]; |
||||
if ((unsigned)(last.bits + here.bits) <= bits) break; |
||||
PULLBYTE(); |
||||
} |
||||
DROPBITS(last.bits); |
||||
} |
||||
DROPBITS(here.bits); |
||||
if (here.op & 64) { |
||||
strm->msg = (char *)"invalid distance code"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
offset = (unsigned)here.val; |
||||
|
||||
/* get distance extra bits, if any */ |
||||
extra = (unsigned)(here.op) & 15; |
||||
if (extra != 0) { |
||||
NEEDBITS(extra); |
||||
offset += BITS(extra); |
||||
DROPBITS(extra); |
||||
} |
||||
if (offset > WSIZE - (wrap ? 0: left)) { |
||||
strm->msg = (char *)"invalid distance too far back"; |
||||
mode = BAD; |
||||
break; |
||||
} |
||||
Tracevv((stderr, "inflate: distance %lu\n", offset)); |
||||
|
||||
/* copy match from window to output */ |
||||
do { |
||||
ROOM(); |
||||
copy = WSIZE - offset; |
||||
if (copy < left) { |
||||
from = put + copy; |
||||
copy = left - copy; |
||||
} |
||||
else { |
||||
from = put - offset; |
||||
copy = left; |
||||
} |
||||
if (copy > length) copy = length; |
||||
length -= copy; |
||||
left -= copy; |
||||
do { |
||||
*put++ = *from++; |
||||
} while (--copy); |
||||
} while (length != 0); |
||||
break; |
||||
|
||||
case DONE: |
||||
/* inflate stream terminated properly -- write leftover output */ |
||||
ret = Z_STREAM_END; |
||||
if (left < WSIZE) { |
||||
if (out(out_desc, window, (unsigned)(WSIZE - left))) |
||||
ret = Z_BUF_ERROR; |
||||
} |
||||
goto inf_leave; |
||||
|
||||
case BAD: |
||||
ret = Z_DATA_ERROR; |
||||
goto inf_leave; |
||||
|
||||
default: /* can't happen, but makes compilers happy */ |
||||
ret = Z_STREAM_ERROR; |
||||
goto inf_leave; |
||||
} |
||||
|
||||
/* Return unused input */ |
||||
inf_leave: |
||||
strm->next_in = next; |
||||
strm->avail_in = have; |
||||
return ret; |
||||
} |
||||
|
||||
int ZEXPORT inflateBack9End(strm) |
||||
z_stream FAR *strm; |
||||
{ |
||||
if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) |
||||
return Z_STREAM_ERROR; |
||||
ZFREE(strm, strm->state); |
||||
strm->state = Z_NULL; |
||||
Tracev((stderr, "inflate: end\n")); |
||||
return Z_OK; |
||||
} |
@ -0,0 +1,37 @@ |
||||
/* infback9.h -- header for using inflateBack9 functions
|
||||
* Copyright (C) 2003 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
/*
|
||||
* This header file and associated patches provide a decoder for PKWare's |
||||
* undocumented deflate64 compression method (method 9). Use with infback9.c, |
||||
* inftree9.h, inftree9.c, and inffix9.h. These patches are not supported. |
||||
* This should be compiled with zlib, since it uses zutil.h and zutil.o. |
||||
* This code has not yet been tested on 16-bit architectures. See the |
||||
* comments in zlib.h for inflateBack() usage. These functions are used |
||||
* identically, except that there is no windowBits parameter, and a 64K |
||||
* window must be provided. Also if int's are 16 bits, then a zero for |
||||
* the third parameter of the "out" function actually means 65536UL. |
||||
* zlib.h must be included before this header file. |
||||
*/ |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm, |
||||
in_func in, void FAR *in_desc, |
||||
out_func out, void FAR *out_desc)); |
||||
ZEXTERN int ZEXPORT inflateBack9End OF((z_stream FAR *strm)); |
||||
ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm, |
||||
unsigned char FAR *window, |
||||
const char *version, |
||||
int stream_size)); |
||||
#define inflateBack9Init(strm, window) \ |
||||
inflateBack9Init_((strm), (window), \
|
||||
ZLIB_VERSION, sizeof(z_stream)) |
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
@ -0,0 +1,107 @@ |
||||
/* inffix9.h -- table for decoding deflate64 fixed codes
|
||||
* Generated automatically by makefixed9(). |
||||
*/ |
||||
|
||||
/* WARNING: this file should *not* be used by applications.
|
||||
It is part of the implementation of this library and is |
||||
subject to change. Applications should only use zlib.h. |
||||
*/ |
||||
|
||||
static const code lenfix[512] = { |
||||
{96,7,0},{0,8,80},{0,8,16},{132,8,115},{130,7,31},{0,8,112}, |
||||
{0,8,48},{0,9,192},{128,7,10},{0,8,96},{0,8,32},{0,9,160}, |
||||
{0,8,0},{0,8,128},{0,8,64},{0,9,224},{128,7,6},{0,8,88}, |
||||
{0,8,24},{0,9,144},{131,7,59},{0,8,120},{0,8,56},{0,9,208}, |
||||
{129,7,17},{0,8,104},{0,8,40},{0,9,176},{0,8,8},{0,8,136}, |
||||
{0,8,72},{0,9,240},{128,7,4},{0,8,84},{0,8,20},{133,8,227}, |
||||
{131,7,43},{0,8,116},{0,8,52},{0,9,200},{129,7,13},{0,8,100}, |
||||
{0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232}, |
||||
{128,7,8},{0,8,92},{0,8,28},{0,9,152},{132,7,83},{0,8,124}, |
||||
{0,8,60},{0,9,216},{130,7,23},{0,8,108},{0,8,44},{0,9,184}, |
||||
{0,8,12},{0,8,140},{0,8,76},{0,9,248},{128,7,3},{0,8,82}, |
||||
{0,8,18},{133,8,163},{131,7,35},{0,8,114},{0,8,50},{0,9,196}, |
||||
{129,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},{0,8,130}, |
||||
{0,8,66},{0,9,228},{128,7,7},{0,8,90},{0,8,26},{0,9,148}, |
||||
{132,7,67},{0,8,122},{0,8,58},{0,9,212},{130,7,19},{0,8,106}, |
||||
{0,8,42},{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244}, |
||||
{128,7,5},{0,8,86},{0,8,22},{65,8,0},{131,7,51},{0,8,118}, |
||||
{0,8,54},{0,9,204},{129,7,15},{0,8,102},{0,8,38},{0,9,172}, |
||||
{0,8,6},{0,8,134},{0,8,70},{0,9,236},{128,7,9},{0,8,94}, |
||||
{0,8,30},{0,9,156},{132,7,99},{0,8,126},{0,8,62},{0,9,220}, |
||||
{130,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, |
||||
{0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{133,8,131}, |
||||
{130,7,31},{0,8,113},{0,8,49},{0,9,194},{128,7,10},{0,8,97}, |
||||
{0,8,33},{0,9,162},{0,8,1},{0,8,129},{0,8,65},{0,9,226}, |
||||
{128,7,6},{0,8,89},{0,8,25},{0,9,146},{131,7,59},{0,8,121}, |
||||
{0,8,57},{0,9,210},{129,7,17},{0,8,105},{0,8,41},{0,9,178}, |
||||
{0,8,9},{0,8,137},{0,8,73},{0,9,242},{128,7,4},{0,8,85}, |
||||
{0,8,21},{144,8,3},{131,7,43},{0,8,117},{0,8,53},{0,9,202}, |
||||
{129,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133}, |
||||
{0,8,69},{0,9,234},{128,7,8},{0,8,93},{0,8,29},{0,9,154}, |
||||
{132,7,83},{0,8,125},{0,8,61},{0,9,218},{130,7,23},{0,8,109}, |
||||
{0,8,45},{0,9,186},{0,8,13},{0,8,141},{0,8,77},{0,9,250}, |
||||
{128,7,3},{0,8,83},{0,8,19},{133,8,195},{131,7,35},{0,8,115}, |
||||
{0,8,51},{0,9,198},{129,7,11},{0,8,99},{0,8,35},{0,9,166}, |
||||
{0,8,3},{0,8,131},{0,8,67},{0,9,230},{128,7,7},{0,8,91}, |
||||
{0,8,27},{0,9,150},{132,7,67},{0,8,123},{0,8,59},{0,9,214}, |
||||
{130,7,19},{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139}, |
||||
{0,8,75},{0,9,246},{128,7,5},{0,8,87},{0,8,23},{77,8,0}, |
||||
{131,7,51},{0,8,119},{0,8,55},{0,9,206},{129,7,15},{0,8,103}, |
||||
{0,8,39},{0,9,174},{0,8,7},{0,8,135},{0,8,71},{0,9,238}, |
||||
{128,7,9},{0,8,95},{0,8,31},{0,9,158},{132,7,99},{0,8,127}, |
||||
{0,8,63},{0,9,222},{130,7,27},{0,8,111},{0,8,47},{0,9,190}, |
||||
{0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80}, |
||||
{0,8,16},{132,8,115},{130,7,31},{0,8,112},{0,8,48},{0,9,193}, |
||||
{128,7,10},{0,8,96},{0,8,32},{0,9,161},{0,8,0},{0,8,128}, |
||||
{0,8,64},{0,9,225},{128,7,6},{0,8,88},{0,8,24},{0,9,145}, |
||||
{131,7,59},{0,8,120},{0,8,56},{0,9,209},{129,7,17},{0,8,104}, |
||||
{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},{0,9,241}, |
||||
{128,7,4},{0,8,84},{0,8,20},{133,8,227},{131,7,43},{0,8,116}, |
||||
{0,8,52},{0,9,201},{129,7,13},{0,8,100},{0,8,36},{0,9,169}, |
||||
{0,8,4},{0,8,132},{0,8,68},{0,9,233},{128,7,8},{0,8,92}, |
||||
{0,8,28},{0,9,153},{132,7,83},{0,8,124},{0,8,60},{0,9,217}, |
||||
{130,7,23},{0,8,108},{0,8,44},{0,9,185},{0,8,12},{0,8,140}, |
||||
{0,8,76},{0,9,249},{128,7,3},{0,8,82},{0,8,18},{133,8,163}, |
||||
{131,7,35},{0,8,114},{0,8,50},{0,9,197},{129,7,11},{0,8,98}, |
||||
{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, |
||||
{128,7,7},{0,8,90},{0,8,26},{0,9,149},{132,7,67},{0,8,122}, |
||||
{0,8,58},{0,9,213},{130,7,19},{0,8,106},{0,8,42},{0,9,181}, |
||||
{0,8,10},{0,8,138},{0,8,74},{0,9,245},{128,7,5},{0,8,86}, |
||||
{0,8,22},{65,8,0},{131,7,51},{0,8,118},{0,8,54},{0,9,205}, |
||||
{129,7,15},{0,8,102},{0,8,38},{0,9,173},{0,8,6},{0,8,134}, |
||||
{0,8,70},{0,9,237},{128,7,9},{0,8,94},{0,8,30},{0,9,157}, |
||||
{132,7,99},{0,8,126},{0,8,62},{0,9,221},{130,7,27},{0,8,110}, |
||||
{0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253}, |
||||
{96,7,0},{0,8,81},{0,8,17},{133,8,131},{130,7,31},{0,8,113}, |
||||
{0,8,49},{0,9,195},{128,7,10},{0,8,97},{0,8,33},{0,9,163}, |
||||
{0,8,1},{0,8,129},{0,8,65},{0,9,227},{128,7,6},{0,8,89}, |
||||
{0,8,25},{0,9,147},{131,7,59},{0,8,121},{0,8,57},{0,9,211}, |
||||
{129,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},{0,8,137}, |
||||
{0,8,73},{0,9,243},{128,7,4},{0,8,85},{0,8,21},{144,8,3}, |
||||
{131,7,43},{0,8,117},{0,8,53},{0,9,203},{129,7,13},{0,8,101}, |
||||
{0,8,37},{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235}, |
||||
{128,7,8},{0,8,93},{0,8,29},{0,9,155},{132,7,83},{0,8,125}, |
||||
{0,8,61},{0,9,219},{130,7,23},{0,8,109},{0,8,45},{0,9,187}, |
||||
{0,8,13},{0,8,141},{0,8,77},{0,9,251},{128,7,3},{0,8,83}, |
||||
{0,8,19},{133,8,195},{131,7,35},{0,8,115},{0,8,51},{0,9,199}, |
||||
{129,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, |
||||
{0,8,67},{0,9,231},{128,7,7},{0,8,91},{0,8,27},{0,9,151}, |
||||
{132,7,67},{0,8,123},{0,8,59},{0,9,215},{130,7,19},{0,8,107}, |
||||
{0,8,43},{0,9,183},{0,8,11},{0,8,139},{0,8,75},{0,9,247}, |
||||
{128,7,5},{0,8,87},{0,8,23},{77,8,0},{131,7,51},{0,8,119}, |
||||
{0,8,55},{0,9,207},{129,7,15},{0,8,103},{0,8,39},{0,9,175}, |
||||
{0,8,7},{0,8,135},{0,8,71},{0,9,239},{128,7,9},{0,8,95}, |
||||
{0,8,31},{0,9,159},{132,7,99},{0,8,127},{0,8,63},{0,9,223}, |
||||
{130,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143}, |
||||
{0,8,79},{0,9,255} |
||||
}; |
||||
|
||||
static const code distfix[32] = { |
||||
{128,5,1},{135,5,257},{131,5,17},{139,5,4097},{129,5,5}, |
||||
{137,5,1025},{133,5,65},{141,5,16385},{128,5,3},{136,5,513}, |
||||
{132,5,33},{140,5,8193},{130,5,9},{138,5,2049},{134,5,129}, |
||||
{142,5,32769},{128,5,2},{135,5,385},{131,5,25},{139,5,6145}, |
||||
{129,5,7},{137,5,1537},{133,5,97},{141,5,24577},{128,5,4}, |
||||
{136,5,769},{132,5,49},{140,5,12289},{130,5,13},{138,5,3073}, |
||||
{134,5,193},{142,5,49153} |
||||
}; |
@ -0,0 +1,47 @@ |
||||
/* inflate9.h -- internal inflate state definition
|
||||
* Copyright (C) 1995-2003 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
/* WARNING: this file should *not* be used by applications. It is
|
||||
part of the implementation of the compression library and is |
||||
subject to change. Applications should only use zlib.h. |
||||
*/ |
||||
|
||||
/* Possible inflate modes between inflate() calls */ |
||||
typedef enum { |
||||
TYPE, /* i: waiting for type bits, including last-flag bit */ |
||||
STORED, /* i: waiting for stored size (length and complement) */ |
||||
TABLE, /* i: waiting for dynamic block table lengths */ |
||||
LEN, /* i: waiting for length/lit code */ |
||||
DONE, /* finished check, done -- remain here until reset */ |
||||
BAD /* got a data error -- remain here until reset */ |
||||
} inflate_mode; |
||||
|
||||
/*
|
||||
State transitions between above modes - |
||||
|
||||
(most modes can go to the BAD mode -- not shown for clarity) |
||||
|
||||
Read deflate blocks: |
||||
TYPE -> STORED or TABLE or LEN or DONE |
||||
STORED -> TYPE |
||||
TABLE -> LENLENS -> CODELENS -> LEN |
||||
Read deflate codes: |
||||
LEN -> LEN or TYPE |
||||
*/ |
||||
|
||||
/* state maintained between inflate() calls. Approximately 7K bytes. */ |
||||
struct inflate_state { |
||||
/* sliding window */ |
||||
unsigned char FAR *window; /* allocated sliding window, if needed */ |
||||
/* dynamic table building */ |
||||
unsigned ncode; /* number of code length code lengths */ |
||||
unsigned nlen; /* number of length code lengths */ |
||||
unsigned ndist; /* number of distance code lengths */ |
||||
unsigned have; /* number of code lengths in lens[] */ |
||||
code FAR *next; /* next available space in codes[] */ |
||||
unsigned short lens[320]; /* temporary storage for code lengths */ |
||||
unsigned short work[288]; /* work area for code table building */ |
||||
code codes[ENOUGH]; /* space for code tables */ |
||||
}; |
@ -0,0 +1,324 @@ |
||||
/* inftree9.c -- generate Huffman trees for efficient decoding
|
||||
* Copyright (C) 1995-2022 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
#include "zutil.h" |
||||
#include "inftree9.h" |
||||
|
||||
#define MAXBITS 15 |
||||
|
||||
const char inflate9_copyright[] = |
||||
" inflate9 1.2.13 Copyright 1995-2022 Mark Adler "; |
||||
/*
|
||||
If you use the zlib library in a product, an acknowledgment is welcome |
||||
in the documentation of your product. If for some reason you cannot |
||||
include such an acknowledgment, I would appreciate that you keep this |
||||
copyright string in the executable of your product. |
||||
*/ |
||||
|
||||
/*
|
||||
Build a set of tables to decode the provided canonical Huffman code. |
||||
The code lengths are lens[0..codes-1]. The result starts at *table, |
||||
whose indices are 0..2^bits-1. work is a writable array of at least |
||||
lens shorts, which is used as a work area. type is the type of code |
||||
to be generated, CODES, LENS, or DISTS. On return, zero is success, |
||||
-1 is an invalid code, and +1 means that ENOUGH isn't enough. table |
||||
on return points to the next available entry's address. bits is the |
||||
requested root table index bits, and on return it is the actual root |
||||
table index bits. It will differ if the request is greater than the |
||||
longest code or if it is less than the shortest code. |
||||
*/ |
||||
int inflate_table9(type, lens, codes, table, bits, work) |
||||
codetype type; |
||||
unsigned short FAR *lens; |
||||
unsigned codes; |
||||
code FAR * FAR *table; |
||||
unsigned FAR *bits; |
||||
unsigned short FAR *work; |
||||
{ |
||||
unsigned len; /* a code's length in bits */ |
||||
unsigned sym; /* index of code symbols */ |
||||
unsigned min, max; /* minimum and maximum code lengths */ |
||||
unsigned root; /* number of index bits for root table */ |
||||
unsigned curr; /* number of index bits for current table */ |
||||
unsigned drop; /* code bits to drop for sub-table */ |
||||
int left; /* number of prefix codes available */ |
||||
unsigned used; /* code entries in table used */ |
||||
unsigned huff; /* Huffman code */ |
||||
unsigned incr; /* for incrementing code, index */ |
||||
unsigned fill; /* index for replicating entries */ |
||||
unsigned low; /* low bits for current root entry */ |
||||
unsigned mask; /* mask for low root bits */ |
||||
code this; /* table entry for duplication */ |
||||
code FAR *next; /* next available space in table */ |
||||
const unsigned short FAR *base; /* base value table to use */ |
||||
const unsigned short FAR *extra; /* extra bits table to use */ |
||||
int end; /* use base and extra for symbol > end */ |
||||
unsigned short count[MAXBITS+1]; /* number of codes of each length */ |
||||
unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ |
||||
static const unsigned short lbase[31] = { /* Length codes 257..285 base */ |
||||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, |
||||
19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, |
||||
131, 163, 195, 227, 3, 0, 0}; |
||||
static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
||||
128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
||||
130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
||||
133, 133, 133, 133, 144, 194, 65}; |
||||
static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
||||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
||||
65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, |
||||
4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153}; |
||||
static const unsigned short dext[32] = { /* Distance codes 0..31 extra */ |
||||
128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132, |
||||
133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138, |
||||
139, 139, 140, 140, 141, 141, 142, 142}; |
||||
|
||||
/*
|
||||
Process a set of code lengths to create a canonical Huffman code. The |
||||
code lengths are lens[0..codes-1]. Each length corresponds to the |
||||
symbols 0..codes-1. The Huffman code is generated by first sorting the |
||||
symbols by length from short to long, and retaining the symbol order |
||||
for codes with equal lengths. Then the code starts with all zero bits |
||||
for the first code of the shortest length, and the codes are integer |
||||
increments for the same length, and zeros are appended as the length |
||||
increases. For the deflate format, these bits are stored backwards |
||||
from their more natural integer increment ordering, and so when the |
||||
decoding tables are built in the large loop below, the integer codes |
||||
are incremented backwards. |
||||
|
||||
This routine assumes, but does not check, that all of the entries in |
||||
lens[] are in the range 0..MAXBITS. The caller must assure this. |
||||
1..MAXBITS is interpreted as that code length. zero means that that |
||||
symbol does not occur in this code. |
||||
|
||||
The codes are sorted by computing a count of codes for each length, |
||||
creating from that a table of starting indices for each length in the |
||||
sorted table, and then entering the symbols in order in the sorted |
||||
table. The sorted table is work[], with that space being provided by |
||||
the caller. |
||||
|
||||
The length counts are used for other purposes as well, i.e. finding |
||||
the minimum and maximum length codes, determining if there are any |
||||
codes at all, checking for a valid set of lengths, and looking ahead |
||||
at length counts to determine sub-table sizes when building the |
||||
decoding tables. |
||||
*/ |
||||
|
||||
/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ |
||||
for (len = 0; len <= MAXBITS; len++) |
||||
count[len] = 0; |
||||
for (sym = 0; sym < codes; sym++) |
||||
count[lens[sym]]++; |
||||
|
||||
/* bound code lengths, force root to be within code lengths */ |
||||
root = *bits; |
||||
for (max = MAXBITS; max >= 1; max--) |
||||
if (count[max] != 0) break; |
||||
if (root > max) root = max; |
||||
if (max == 0) return -1; /* no codes! */ |
||||
for (min = 1; min <= MAXBITS; min++) |
||||
if (count[min] != 0) break; |
||||
if (root < min) root = min; |
||||
|
||||
/* check for an over-subscribed or incomplete set of lengths */ |
||||
left = 1; |
||||
for (len = 1; len <= MAXBITS; len++) { |
||||
left <<= 1; |
||||
left -= count[len]; |
||||
if (left < 0) return -1; /* over-subscribed */ |
||||
} |
||||
if (left > 0 && (type == CODES || max != 1)) |
||||
return -1; /* incomplete set */ |
||||
|
||||
/* generate offsets into symbol table for each length for sorting */ |
||||
offs[1] = 0; |
||||
for (len = 1; len < MAXBITS; len++) |
||||
offs[len + 1] = offs[len] + count[len]; |
||||
|
||||
/* sort symbols by length, by symbol order within each length */ |
||||
for (sym = 0; sym < codes; sym++) |
||||
if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; |
||||
|
||||
/*
|
||||
Create and fill in decoding tables. In this loop, the table being |
||||
filled is at next and has curr index bits. The code being used is huff |
||||
with length len. That code is converted to an index by dropping drop |
||||
bits off of the bottom. For codes where len is less than drop + curr, |
||||
those top drop + curr - len bits are incremented through all values to |
||||
fill the table with replicated entries. |
||||
|
||||
root is the number of index bits for the root table. When len exceeds |
||||
root, sub-tables are created pointed to by the root entry with an index |
||||
of the low root bits of huff. This is saved in low to check for when a |
||||
new sub-table should be started. drop is zero when the root table is |
||||
being filled, and drop is root when sub-tables are being filled. |
||||
|
||||
When a new sub-table is needed, it is necessary to look ahead in the |
||||
code lengths to determine what size sub-table is needed. The length |
||||
counts are used for this, and so count[] is decremented as codes are |
||||
entered in the tables. |
||||
|
||||
used keeps track of how many table entries have been allocated from the |
||||
provided *table space. It is checked for LENS and DIST tables against |
||||
the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in |
||||
the initial root table size constants. See the comments in inftree9.h |
||||
for more information. |
||||
|
||||
sym increments through all symbols, and the loop terminates when |
||||
all codes of length max, i.e. all codes, have been processed. This |
||||
routine permits incomplete codes, so another loop after this one fills |
||||
in the rest of the decoding tables with invalid code markers. |
||||
*/ |
||||
|
||||
/* set up for code type */ |
||||
switch (type) { |
||||
case CODES: |
||||
base = extra = work; /* dummy value--not used */ |
||||
end = 19; |
||||
break; |
||||
case LENS: |
||||
base = lbase; |
||||
base -= 257; |
||||
extra = lext; |
||||
extra -= 257; |
||||
end = 256; |
||||
break; |
||||
default: /* DISTS */ |
||||
base = dbase; |
||||
extra = dext; |
||||
end = -1; |
||||
} |
||||
|
||||
/* initialize state for loop */ |
||||
huff = 0; /* starting code */ |
||||
sym = 0; /* starting code symbol */ |
||||
len = min; /* starting code length */ |
||||
next = *table; /* current table to fill in */ |
||||
curr = root; /* current table index bits */ |
||||
drop = 0; /* current bits to drop from code for index */ |
||||
low = (unsigned)(-1); /* trigger new sub-table when len > root */ |
||||
used = 1U << root; /* use root table entries */ |
||||
mask = used - 1; /* mask for comparing low */ |
||||
|
||||
/* check available table space */ |
||||
if ((type == LENS && used >= ENOUGH_LENS) || |
||||
(type == DISTS && used >= ENOUGH_DISTS)) |
||||
return 1; |
||||
|
||||
/* process all codes and make table entries */ |
||||
for (;;) { |
||||
/* create table entry */ |
||||
this.bits = (unsigned char)(len - drop); |
||||
if ((int)(work[sym]) < end) { |
||||
this.op = (unsigned char)0; |
||||
this.val = work[sym]; |
||||
} |
||||
else if ((int)(work[sym]) > end) { |
||||
this.op = (unsigned char)(extra[work[sym]]); |
||||
this.val = base[work[sym]]; |
||||
} |
||||
else { |
||||
this.op = (unsigned char)(32 + 64); /* end of block */ |
||||
this.val = 0; |
||||
} |
||||
|
||||
/* replicate for those indices with low len bits equal to huff */ |
||||
incr = 1U << (len - drop); |
||||
fill = 1U << curr; |
||||
do { |
||||
fill -= incr; |
||||
next[(huff >> drop) + fill] = this; |
||||
} while (fill != 0); |
||||
|
||||
/* backwards increment the len-bit code huff */ |
||||
incr = 1U << (len - 1); |
||||
while (huff & incr) |
||||
incr >>= 1; |
||||
if (incr != 0) { |
||||
huff &= incr - 1; |
||||
huff += incr; |
||||
} |
||||
else |
||||
huff = 0; |
||||
|
||||
/* go to next symbol, update count, len */ |
||||
sym++; |
||||
if (--(count[len]) == 0) { |
||||
if (len == max) break; |
||||
len = lens[work[sym]]; |
||||
} |
||||
|
||||
/* create new sub-table if needed */ |
||||
if (len > root && (huff & mask) != low) { |
||||
/* if first time, transition to sub-tables */ |
||||
if (drop == 0) |
||||
drop = root; |
||||
|
||||
/* increment past last table */ |
||||
next += 1U << curr; |
||||
|
||||
/* determine length of next table */ |
||||
curr = len - drop; |
||||
left = (int)(1 << curr); |
||||
while (curr + drop < max) { |
||||
left -= count[curr + drop]; |
||||
if (left <= 0) break; |
||||
curr++; |
||||
left <<= 1; |
||||
} |
||||
|
||||
/* check for enough space */ |
||||
used += 1U << curr; |
||||
if ((type == LENS && used >= ENOUGH_LENS) || |
||||
(type == DISTS && used >= ENOUGH_DISTS)) |
||||
return 1; |
||||
|
||||
/* point entry in root table to sub-table */ |
||||
low = huff & mask; |
||||
(*table)[low].op = (unsigned char)curr; |
||||
(*table)[low].bits = (unsigned char)root; |
||||
(*table)[low].val = (unsigned short)(next - *table); |
||||
} |
||||
} |
||||
|
||||
/*
|
||||
Fill in rest of table for incomplete codes. This loop is similar to the |
||||
loop above in incrementing huff for table indices. It is assumed that |
||||
len is equal to curr + drop, so there is no loop needed to increment |
||||
through high index bits. When the current sub-table is filled, the loop |
||||
drops back to the root table to fill in any remaining entries there. |
||||
*/ |
||||
this.op = (unsigned char)64; /* invalid code marker */ |
||||
this.bits = (unsigned char)(len - drop); |
||||
this.val = (unsigned short)0; |
||||
while (huff != 0) { |
||||
/* when done with sub-table, drop back to root table */ |
||||
if (drop != 0 && (huff & mask) != low) { |
||||
drop = 0; |
||||
len = root; |
||||
next = *table; |
||||
curr = root; |
||||
this.bits = (unsigned char)len; |
||||
} |
||||
|
||||
/* put invalid code marker in table */ |
||||
next[huff >> drop] = this; |
||||
|
||||
/* backwards increment the len-bit code huff */ |
||||
incr = 1U << (len - 1); |
||||
while (huff & incr) |
||||
incr >>= 1; |
||||
if (incr != 0) { |
||||
huff &= incr - 1; |
||||
huff += incr; |
||||
} |
||||
else |
||||
huff = 0; |
||||
} |
||||
|
||||
/* set return parameters */ |
||||
*table += used; |
||||
*bits = root; |
||||
return 0; |
||||
} |
@ -0,0 +1,61 @@ |
||||
/* inftree9.h -- header to use inftree9.c
|
||||
* Copyright (C) 1995-2008 Mark Adler |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
*/ |
||||
|
||||
/* WARNING: this file should *not* be used by applications. It is
|
||||
part of the implementation of the compression library and is |
||||
subject to change. Applications should only use zlib.h. |
||||
*/ |
||||
|
||||
/* Structure for decoding tables. Each entry provides either the
|
||||
information needed to do the operation requested by the code that |
||||
indexed that table entry, or it provides a pointer to another |
||||
table that indexes more bits of the code. op indicates whether |
||||
the entry is a pointer to another table, a literal, a length or |
||||
distance, an end-of-block, or an invalid code. For a table |
||||
pointer, the low four bits of op is the number of index bits of |
||||
that table. For a length or distance, the low four bits of op |
||||
is the number of extra bits to get after the code. bits is |
||||
the number of bits in this code or part of the code to drop off |
||||
of the bit buffer. val is the actual byte to output in the case |
||||
of a literal, the base length or distance, or the offset from |
||||
the current table to the next table. Each entry is four bytes. */ |
||||
typedef struct { |
||||
unsigned char op; /* operation, extra bits, table bits */ |
||||
unsigned char bits; /* bits in this part of the code */ |
||||
unsigned short val; /* offset in table or code value */ |
||||
} code; |
||||
|
||||
/* op values as set by inflate_table():
|
||||
00000000 - literal |
||||
0000tttt - table link, tttt != 0 is the number of table index bits |
||||
100eeeee - length or distance, eeee is the number of extra bits |
||||
01100000 - end of block |
||||
01000000 - invalid code |
||||
*/ |
||||
|
||||
/* Maximum size of the dynamic table. The maximum number of code structures is
|
||||
1446, which is the sum of 852 for literal/length codes and 594 for distance |
||||
codes. These values were found by exhaustive searches using the program |
||||
examples/enough.c found in the zlib distribution. The arguments to that |
||||
program are the number of symbols, the initial root table size, and the |
||||
maximum bit length of a code. "enough 286 9 15" for literal/length codes |
||||
returns returns 852, and "enough 32 6 15" for distance codes returns 594. |
||||
The initial root table size (9 or 6) is found in the fifth argument of the |
||||
inflate_table() calls in infback9.c. If the root table size is changed, |
||||
then these maximum sizes would be need to be recalculated and updated. */ |
||||
#define ENOUGH_LENS 852 |
||||
#define ENOUGH_DISTS 594 |
||||
#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) |
||||
|
||||
/* Type of code to build for inflate_table9() */ |
||||
typedef enum { |
||||
CODES, |
||||
LENS, |
||||
DISTS |
||||
} codetype; |
||||
|
||||
extern int inflate_table9 OF((codetype type, unsigned short FAR *lens, |
||||
unsigned codes, code FAR * FAR *table, |
||||
unsigned FAR *bits, unsigned short FAR *work)); |
@ -0,0 +1,24 @@ |
||||
|
||||
#include "zfstream.h" |
||||
|
||||
int main() { |
||||
|
||||
// Construct a stream object with this filebuffer. Anything sent
|
||||
// to this stream will go to standard out.
|
||||
gzofstream os( 1, ios::out ); |
||||
|
||||
// This text is getting compressed and sent to stdout.
|
||||
// To prove this, run 'test | zcat'.
|
||||
os << "Hello, Mommy" << endl; |
||||
|
||||
os << setcompressionlevel( Z_NO_COMPRESSION ); |
||||
os << "hello, hello, hi, ho!" << endl; |
||||
|
||||
setcompressionlevel( os, Z_DEFAULT_COMPRESSION ) |
||||
<< "I'm compressing again" << endl; |
||||
|
||||
os.close(); |
||||
|
||||
return 0; |
||||
|
||||
} |
@ -0,0 +1,329 @@ |
||||
|
||||
#include "zfstream.h" |
||||
|
||||
gzfilebuf::gzfilebuf() : |
||||
file(NULL), |
||||
mode(0), |
||||
own_file_descriptor(0) |
||||
{ } |
||||
|
||||
gzfilebuf::~gzfilebuf() { |
||||
|
||||
sync(); |
||||
if ( own_file_descriptor ) |
||||
close(); |
||||
|
||||
} |
||||
|
||||
gzfilebuf *gzfilebuf::open( const char *name, |
||||
int io_mode ) { |
||||
|
||||
if ( is_open() ) |
||||
return NULL; |
||||
|
||||
char char_mode[10]; |
||||
char *p = char_mode; |
||||
|
||||
if ( io_mode & ios::in ) { |
||||
mode = ios::in; |
||||
*p++ = 'r'; |
||||
} else if ( io_mode & ios::app ) { |
||||
mode = ios::app; |
||||
*p++ = 'a'; |
||||
} else { |
||||
mode = ios::out; |
||||
*p++ = 'w'; |
||||
} |
||||
|
||||
if ( io_mode & ios::binary ) { |
||||
mode |= ios::binary; |
||||
*p++ = 'b'; |
||||
} |
||||
|
||||
// Hard code the compression level
|
||||
if ( io_mode & (ios::out|ios::app )) { |
||||
*p++ = '9'; |
||||
} |
||||
|
||||
// Put the end-of-string indicator
|
||||
*p = '\0'; |
||||
|
||||
if ( (file = gzopen(name, char_mode)) == NULL ) |
||||
return NULL; |
||||
|
||||
own_file_descriptor = 1; |
||||
|
||||
return this; |
||||
|
||||
} |
||||
|
||||
gzfilebuf *gzfilebuf::attach( int file_descriptor, |
||||
int io_mode ) { |
||||
|
||||
if ( is_open() ) |
||||
return NULL; |
||||
|
||||
char char_mode[10]; |
||||
char *p = char_mode; |
||||
|
||||
if ( io_mode & ios::in ) { |
||||
mode = ios::in; |
||||
*p++ = 'r'; |
||||
} else if ( io_mode & ios::app ) { |
||||
mode = ios::app; |
||||
*p++ = 'a'; |
||||
} else { |
||||
mode = ios::out; |
||||
*p++ = 'w'; |
||||
} |
||||
|
||||
if ( io_mode & ios::binary ) { |
||||
mode |= ios::binary; |
||||
*p++ = 'b'; |
||||
} |
||||
|
||||
// Hard code the compression level
|
||||
if ( io_mode & (ios::out|ios::app )) { |
||||
*p++ = '9'; |
||||
} |
||||
|
||||
// Put the end-of-string indicator
|
||||
*p = '\0'; |
||||
|
||||
if ( (file = gzdopen(file_descriptor, char_mode)) == NULL ) |
||||
return NULL; |
||||
|
||||
own_file_descriptor = 0; |
||||
|
||||
return this; |
||||
|
||||
} |
||||
|
||||
gzfilebuf *gzfilebuf::close() { |
||||
|
||||
if ( is_open() ) { |
||||
|
||||
sync(); |
||||
gzclose( file ); |
||||
file = NULL; |
||||
|
||||
} |
||||
|
||||
return this; |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::setcompressionlevel( int comp_level ) { |
||||
|
||||
return gzsetparams(file, comp_level, -2); |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::setcompressionstrategy( int comp_strategy ) { |
||||
|
||||
return gzsetparams(file, -2, comp_strategy); |
||||
|
||||
} |
||||
|
||||
|
||||
streampos gzfilebuf::seekoff( streamoff off, ios::seek_dir dir, int which ) { |
||||
|
||||
return streampos(EOF); |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::underflow() { |
||||
|
||||
// If the file hasn't been opened for reading, error.
|
||||
if ( !is_open() || !(mode & ios::in) ) |
||||
return EOF; |
||||
|
||||
// if a buffer doesn't exists, allocate one.
|
||||
if ( !base() ) { |
||||
|
||||
if ( (allocate()) == EOF ) |
||||
return EOF; |
||||
setp(0,0); |
||||
|
||||
} else { |
||||
|
||||
if ( in_avail() ) |
||||
return (unsigned char) *gptr(); |
||||
|
||||
if ( out_waiting() ) { |
||||
if ( flushbuf() == EOF ) |
||||
return EOF; |
||||
} |
||||
|
||||
} |
||||
|
||||
// Attempt to fill the buffer.
|
||||
|
||||
int result = fillbuf(); |
||||
if ( result == EOF ) { |
||||
// disable get area
|
||||
setg(0,0,0); |
||||
return EOF; |
||||
} |
||||
|
||||
return (unsigned char) *gptr(); |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::overflow( int c ) { |
||||
|
||||
if ( !is_open() || !(mode & ios::out) ) |
||||
return EOF; |
||||
|
||||
if ( !base() ) { |
||||
if ( allocate() == EOF ) |
||||
return EOF; |
||||
setg(0,0,0); |
||||
} else { |
||||
if (in_avail()) { |
||||
return EOF; |
||||
} |
||||
if (out_waiting()) { |
||||
if (flushbuf() == EOF) |
||||
return EOF; |
||||
} |
||||
} |
||||
|
||||
int bl = blen(); |
||||
setp( base(), base() + bl); |
||||
|
||||
if ( c != EOF ) { |
||||
|
||||
*pptr() = c; |
||||
pbump(1); |
||||
|
||||
} |
||||
|
||||
return 0; |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::sync() { |
||||
|
||||
if ( !is_open() ) |
||||
return EOF; |
||||
|
||||
if ( out_waiting() ) |
||||
return flushbuf(); |
||||
|
||||
return 0; |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::flushbuf() { |
||||
|
||||
int n; |
||||
char *q; |
||||
|
||||
q = pbase(); |
||||
n = pptr() - q; |
||||
|
||||
if ( gzwrite( file, q, n) < n ) |
||||
return EOF; |
||||
|
||||
setp(0,0); |
||||
|
||||
return 0; |
||||
|
||||
} |
||||
|
||||
int gzfilebuf::fillbuf() { |
||||
|
||||
int required; |
||||
char *p; |
||||
|
||||
p = base(); |
||||
|
||||
required = blen(); |
||||
|
||||
int t = gzread( file, p, required ); |
||||
|
||||
if ( t <= 0) return EOF; |
||||
|
||||
setg( base(), base(), base()+t); |
||||
|
||||
return t; |
||||
|
||||
} |
||||
|
||||
gzfilestream_common::gzfilestream_common() : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ } |
||||
|
||||
gzfilestream_common::~gzfilestream_common() |
||||
{ } |
||||
|
||||
void gzfilestream_common::attach( int fd, int io_mode ) { |
||||
|
||||
if ( !buffer.attach( fd, io_mode) ) |
||||
clear( ios::failbit | ios::badbit ); |
||||
else |
||||
clear(); |
||||
|
||||
} |
||||
|
||||
void gzfilestream_common::open( const char *name, int io_mode ) { |
||||
|
||||
if ( !buffer.open( name, io_mode ) ) |
||||
clear( ios::failbit | ios::badbit ); |
||||
else |
||||
clear(); |
||||
|
||||
} |
||||
|
||||
void gzfilestream_common::close() { |
||||
|
||||
if ( !buffer.close() ) |
||||
clear( ios::failbit | ios::badbit ); |
||||
|
||||
} |
||||
|
||||
gzfilebuf *gzfilestream_common::rdbuf() |
||||
{ |
||||
return &buffer; |
||||
} |
||||
|
||||
gzifstream::gzifstream() : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
clear( ios::badbit ); |
||||
} |
||||
|
||||
gzifstream::gzifstream( const char *name, int io_mode ) : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
gzfilestream_common::open( name, io_mode ); |
||||
} |
||||
|
||||
gzifstream::gzifstream( int fd, int io_mode ) : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
gzfilestream_common::attach( fd, io_mode ); |
||||
} |
||||
|
||||
gzifstream::~gzifstream() { } |
||||
|
||||
gzofstream::gzofstream() : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
clear( ios::badbit ); |
||||
} |
||||
|
||||
gzofstream::gzofstream( const char *name, int io_mode ) : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
gzfilestream_common::open( name, io_mode ); |
||||
} |
||||
|
||||
gzofstream::gzofstream( int fd, int io_mode ) : |
||||
ios( gzfilestream_common::rdbuf() ) |
||||
{ |
||||
gzfilestream_common::attach( fd, io_mode ); |
||||
} |
||||
|
||||
gzofstream::~gzofstream() { } |
@ -0,0 +1,128 @@ |
||||
|
||||
#ifndef zfstream_h |
||||
#define zfstream_h |
||||
|
||||
#include <fstream.h> |
||||
#include "zlib.h" |
||||
|
||||
class gzfilebuf : public streambuf { |
||||
|
||||
public: |
||||
|
||||
gzfilebuf( ); |
||||
virtual ~gzfilebuf(); |
||||
|
||||
gzfilebuf *open( const char *name, int io_mode ); |
||||
gzfilebuf *attach( int file_descriptor, int io_mode ); |
||||
gzfilebuf *close(); |
||||
|
||||
int setcompressionlevel( int comp_level ); |
||||
int setcompressionstrategy( int comp_strategy ); |
||||
|
||||
inline int is_open() const { return (file !=NULL); } |
||||
|
||||
virtual streampos seekoff( streamoff, ios::seek_dir, int ); |
||||
|
||||
virtual int sync(); |
||||
|
||||
protected: |
||||
|
||||
virtual int underflow(); |
||||
virtual int overflow( int = EOF ); |
||||
|
||||
private: |
||||
|
||||
gzFile file; |
||||
short mode; |
||||
short own_file_descriptor; |
||||
|
||||
int flushbuf(); |
||||
int fillbuf(); |
||||
|
||||
}; |
||||
|
||||
class gzfilestream_common : virtual public ios { |
||||
|
||||
friend class gzifstream; |
||||
friend class gzofstream; |
||||
friend gzofstream &setcompressionlevel( gzofstream &, int ); |
||||
friend gzofstream &setcompressionstrategy( gzofstream &, int ); |
||||
|
||||
public: |
||||
virtual ~gzfilestream_common(); |
||||
|
||||
void attach( int fd, int io_mode ); |
||||
void open( const char *name, int io_mode ); |
||||
void close(); |
||||
|
||||
protected: |
||||
gzfilestream_common(); |
||||
|
||||
private: |
||||
gzfilebuf *rdbuf(); |
||||
|
||||
gzfilebuf buffer; |
||||
|
||||
}; |
||||
|
||||
class gzifstream : public gzfilestream_common, public istream { |
||||
|
||||
public: |
||||
|
||||
gzifstream(); |
||||
gzifstream( const char *name, int io_mode = ios::in ); |
||||
gzifstream( int fd, int io_mode = ios::in ); |
||||
|
||||
virtual ~gzifstream(); |
||||
|
||||
}; |
||||
|
||||
class gzofstream : public gzfilestream_common, public ostream { |
||||
|
||||
public: |
||||
|
||||
gzofstream(); |
||||
gzofstream( const char *name, int io_mode = ios::out ); |
||||
gzofstream( int fd, int io_mode = ios::out ); |
||||
|
||||
virtual ~gzofstream(); |
||||
|
||||
}; |
||||
|
||||
template<class T> class gzomanip { |
||||
friend gzofstream &operator<<(gzofstream &, const gzomanip<T> &); |
||||
public: |
||||
gzomanip(gzofstream &(*f)(gzofstream &, T), T v) : func(f), val(v) { } |
||||
private: |
||||
gzofstream &(*func)(gzofstream &, T); |
||||
T val; |
||||
}; |
||||
|
||||
template<class T> gzofstream &operator<<(gzofstream &s, const gzomanip<T> &m) |
||||
{ |
||||
return (*m.func)(s, m.val); |
||||
} |
||||
|
||||
inline gzofstream &setcompressionlevel( gzofstream &s, int l ) |
||||
{ |
||||
(s.rdbuf())->setcompressionlevel(l); |
||||
return s; |
||||
} |
||||
|
||||
inline gzofstream &setcompressionstrategy( gzofstream &s, int l ) |
||||
{ |
||||
(s.rdbuf())->setcompressionstrategy(l); |
||||
return s; |
||||
} |
||||
|
||||
inline gzomanip<int> setcompressionlevel(int l) |
||||
{ |
||||
return gzomanip<int>(&setcompressionlevel,l); |
||||
} |
||||
|
||||
inline gzomanip<int> setcompressionstrategy(int l) |
||||
{ |
||||
return gzomanip<int>(&setcompressionstrategy,l); |
||||
} |
||||
|
||||
#endif |
@ -0,0 +1,307 @@ |
||||
/*
|
||||
* |
||||
* Copyright (c) 1997 |
||||
* Christian Michelsen Research AS |
||||
* Advanced Computing |
||||
* Fantoftvegen 38, 5036 BERGEN, Norway |
||||
* http://www.cmr.no
|
||||
* |
||||
* Permission to use, copy, modify, distribute and sell this software |
||||
* and its documentation for any purpose is hereby granted without fee, |
||||
* provided that the above copyright notice appear in all copies and |
||||
* that both that copyright notice and this permission notice appear |
||||
* in supporting documentation. Christian Michelsen Research AS makes no |
||||
* representations about the suitability of this software for any |
||||
* purpose. It is provided "as is" without express or implied warranty. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef ZSTREAM__H |
||||
#define ZSTREAM__H |
||||
|
||||
/*
|
||||
* zstream.h - C++ interface to the 'zlib' general purpose compression library |
||||
* $Id: zstream.h 1.1 1997-06-25 12:00:56+02 tyge Exp tyge $ |
||||
*/ |
||||
|
||||
#include <strstream.h> |
||||
#include <string.h> |
||||
#include <stdio.h> |
||||
#include "zlib.h" |
||||
|
||||
#if defined(_WIN32) |
||||
# include <fcntl.h> |
||||
# include <io.h> |
||||
# define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY) |
||||
#else |
||||
# define SET_BINARY_MODE(file) |
||||
#endif |
||||
|
||||
class zstringlen { |
||||
public: |
||||
zstringlen(class izstream&); |
||||
zstringlen(class ozstream&, const char*); |
||||
size_t value() const { return val.word; } |
||||
private: |
||||
struct Val { unsigned char byte; size_t word; } val; |
||||
}; |
||||
|
||||
// ----------------------------- izstream -----------------------------
|
||||
|
||||
class izstream |
||||
{ |
||||
public: |
||||
izstream() : m_fp(0) {} |
||||
izstream(FILE* fp) : m_fp(0) { open(fp); } |
||||
izstream(const char* name) : m_fp(0) { open(name); } |
||||
~izstream() { close(); } |
||||
|
||||
/* Opens a gzip (.gz) file for reading.
|
||||
* open() can be used to read a file which is not in gzip format; |
||||
* in this case read() will directly read from the file without |
||||
* decompression. errno can be checked to distinguish two error |
||||
* cases (if errno is zero, the zlib error is Z_MEM_ERROR). |
||||
*/ |
||||
void open(const char* name) { |
||||
if (m_fp) close(); |
||||
m_fp = ::gzopen(name, "rb"); |
||||
} |
||||
|
||||
void open(FILE* fp) { |
||||
SET_BINARY_MODE(fp); |
||||
if (m_fp) close(); |
||||
m_fp = ::gzdopen(fileno(fp), "rb"); |
||||
} |
||||
|
||||
/* Flushes all pending input if necessary, closes the compressed file
|
||||
* and deallocates all the (de)compression state. The return value is |
||||
* the zlib error number (see function error() below). |
||||
*/ |
||||
int close() { |
||||
int r = ::gzclose(m_fp); |
||||
m_fp = 0; return r; |
||||
} |
||||
|
||||
/* Binary read the given number of bytes from the compressed file.
|
||||
*/ |
||||
int read(void* buf, size_t len) { |
||||
return ::gzread(m_fp, buf, len); |
||||
} |
||||
|
||||
/* Returns the error message for the last error which occurred on the
|
||||
* given compressed file. errnum is set to zlib error number. If an |
||||
* error occurred in the file system and not in the compression library, |
||||
* errnum is set to Z_ERRNO and the application may consult errno |
||||
* to get the exact error code. |
||||
*/ |
||||
const char* error(int* errnum) { |
||||
return ::gzerror(m_fp, errnum); |
||||
} |
||||
|
||||
gzFile fp() { return m_fp; } |
||||
|
||||
private: |
||||
gzFile m_fp; |
||||
}; |
||||
|
||||
/*
|
||||
* Binary read the given (array of) object(s) from the compressed file. |
||||
* If the input file was not in gzip format, read() copies the objects number |
||||
* of bytes into the buffer. |
||||
* returns the number of uncompressed bytes actually read |
||||
* (0 for end of file, -1 for error). |
||||
*/ |
||||
template <class T, class Items> |
||||
inline int read(izstream& zs, T* x, Items items) { |
||||
return ::gzread(zs.fp(), x, items*sizeof(T)); |
||||
} |
||||
|
||||
/*
|
||||
* Binary input with the '>' operator. |
||||
*/ |
||||
template <class T> |
||||
inline izstream& operator>(izstream& zs, T& x) { |
||||
::gzread(zs.fp(), &x, sizeof(T)); |
||||
return zs; |
||||
} |
||||
|
||||
|
||||
inline zstringlen::zstringlen(izstream& zs) { |
||||
zs > val.byte; |
||||
if (val.byte == 255) zs > val.word; |
||||
else val.word = val.byte; |
||||
} |
||||
|
||||
/*
|
||||
* Read length of string + the string with the '>' operator. |
||||
*/ |
||||
inline izstream& operator>(izstream& zs, char* x) { |
||||
zstringlen len(zs); |
||||
::gzread(zs.fp(), x, len.value()); |
||||
x[len.value()] = '\0'; |
||||
return zs; |
||||
} |
||||
|
||||
inline char* read_string(izstream& zs) { |
||||
zstringlen len(zs); |
||||
char* x = new char[len.value()+1]; |
||||
::gzread(zs.fp(), x, len.value()); |
||||
x[len.value()] = '\0'; |
||||
return x; |
||||
} |
||||
|
||||
// ----------------------------- ozstream -----------------------------
|
||||
|
||||
class ozstream |
||||
{ |
||||
public: |
||||
ozstream() : m_fp(0), m_os(0) { |
||||
} |
||||
ozstream(FILE* fp, int level = Z_DEFAULT_COMPRESSION) |
||||
: m_fp(0), m_os(0) { |
||||
open(fp, level); |
||||
} |
||||
ozstream(const char* name, int level = Z_DEFAULT_COMPRESSION) |
||||
: m_fp(0), m_os(0) { |
||||
open(name, level); |
||||
} |
||||
~ozstream() { |
||||
close(); |
||||
} |
||||
|
||||
/* Opens a gzip (.gz) file for writing.
|
||||
* The compression level parameter should be in 0..9 |
||||
* errno can be checked to distinguish two error cases |
||||
* (if errno is zero, the zlib error is Z_MEM_ERROR). |
||||
*/ |
||||
void open(const char* name, int level = Z_DEFAULT_COMPRESSION) { |
||||
char mode[4] = "wb\0"; |
||||
if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level; |
||||
if (m_fp) close(); |
||||
m_fp = ::gzopen(name, mode); |
||||
} |
||||
|
||||
/* open from a FILE pointer.
|
||||
*/ |
||||
void open(FILE* fp, int level = Z_DEFAULT_COMPRESSION) { |
||||
SET_BINARY_MODE(fp); |
||||
char mode[4] = "wb\0"; |
||||
if (level != Z_DEFAULT_COMPRESSION) mode[2] = '0'+level; |
||||
if (m_fp) close(); |
||||
m_fp = ::gzdopen(fileno(fp), mode); |
||||
} |
||||
|
||||
/* Flushes all pending output if necessary, closes the compressed file
|
||||
* and deallocates all the (de)compression state. The return value is |
||||
* the zlib error number (see function error() below). |
||||
*/ |
||||
int close() { |
||||
if (m_os) { |
||||
::gzwrite(m_fp, m_os->str(), m_os->pcount()); |
||||
delete[] m_os->str(); delete m_os; m_os = 0; |
||||
} |
||||
int r = ::gzclose(m_fp); m_fp = 0; return r; |
||||
} |
||||
|
||||
/* Binary write the given number of bytes into the compressed file.
|
||||
*/ |
||||
int write(const void* buf, size_t len) { |
||||
return ::gzwrite(m_fp, (voidp) buf, len); |
||||
} |
||||
|
||||
/* Flushes all pending output into the compressed file. The parameter
|
||||
* _flush is as in the deflate() function. The return value is the zlib |
||||
* error number (see function gzerror below). flush() returns Z_OK if |
||||
* the flush_ parameter is Z_FINISH and all output could be flushed. |
||||
* flush() should be called only when strictly necessary because it can |
||||
* degrade compression. |
||||
*/ |
||||
int flush(int _flush) { |
||||
os_flush(); |
||||
return ::gzflush(m_fp, _flush); |
||||
} |
||||
|
||||
/* Returns the error message for the last error which occurred on the
|
||||
* given compressed file. errnum is set to zlib error number. If an |
||||
* error occurred in the file system and not in the compression library, |
||||
* errnum is set to Z_ERRNO and the application may consult errno |
||||
* to get the exact error code. |
||||
*/ |
||||
const char* error(int* errnum) { |
||||
return ::gzerror(m_fp, errnum); |
||||
} |
||||
|
||||
gzFile fp() { return m_fp; } |
||||
|
||||
ostream& os() { |
||||
if (m_os == 0) m_os = new ostrstream; |
||||
return *m_os; |
||||
} |
||||
|
||||
void os_flush() { |
||||
if (m_os && m_os->pcount()>0) { |
||||
ostrstream* oss = new ostrstream; |
||||
oss->fill(m_os->fill()); |
||||
oss->flags(m_os->flags()); |
||||
oss->precision(m_os->precision()); |
||||
oss->width(m_os->width()); |
||||
::gzwrite(m_fp, m_os->str(), m_os->pcount()); |
||||
delete[] m_os->str(); delete m_os; m_os = oss; |
||||
} |
||||
} |
||||
|
||||
private: |
||||
gzFile m_fp; |
||||
ostrstream* m_os; |
||||
}; |
||||
|
||||
/*
|
||||
* Binary write the given (array of) object(s) into the compressed file. |
||||
* returns the number of uncompressed bytes actually written |
||||
* (0 in case of error). |
||||
*/ |
||||
template <class T, class Items> |
||||
inline int write(ozstream& zs, const T* x, Items items) { |
||||
return ::gzwrite(zs.fp(), (voidp) x, items*sizeof(T)); |
||||
} |
||||
|
||||
/*
|
||||
* Binary output with the '<' operator. |
||||
*/ |
||||
template <class T> |
||||
inline ozstream& operator<(ozstream& zs, const T& x) { |
||||
::gzwrite(zs.fp(), (voidp) &x, sizeof(T)); |
||||
return zs; |
||||
} |
||||
|
||||
inline zstringlen::zstringlen(ozstream& zs, const char* x) { |
||||
val.byte = 255; val.word = ::strlen(x); |
||||
if (val.word < 255) zs < (val.byte = val.word); |
||||
else zs < val; |
||||
} |
||||
|
||||
/*
|
||||
* Write length of string + the string with the '<' operator. |
||||
*/ |
||||
inline ozstream& operator<(ozstream& zs, const char* x) { |
||||
zstringlen len(zs, x); |
||||
::gzwrite(zs.fp(), (voidp) x, len.value()); |
||||
return zs; |
||||
} |
||||
|
||||
#ifdef _MSC_VER |
||||
inline ozstream& operator<(ozstream& zs, char* const& x) { |
||||
return zs < (const char*) x; |
||||
} |
||||
#endif |
||||
|
||||
/*
|
||||
* Ascii write with the << operator; |
||||
*/ |
||||
template <class T> |
||||
inline ostream& operator<<(ozstream& zs, const T& x) { |
||||
zs.os_flush(); |
||||
return zs.os() << x; |
||||
} |
||||
|
||||
#endif |
@ -0,0 +1,25 @@ |
||||
#include "zstream.h" |
||||
#include <math.h> |
||||
#include <stdlib.h> |
||||
#include <iomanip.h> |
||||
|
||||
void main() { |
||||
char h[256] = "Hello"; |
||||
char* g = "Goodbye"; |
||||
ozstream out("temp.gz"); |
||||
out < "This works well" < h < g; |
||||
out.close(); |
||||
|
||||
izstream in("temp.gz"); // read it back
|
||||
char *x = read_string(in), *y = new char[256], z[256]; |
||||
in > y > z; |
||||
in.close(); |
||||
cout << x << endl << y << endl << z << endl; |
||||
|
||||
out.open("temp.gz"); // try ascii output; zcat temp.gz to see the results
|
||||
out << setw(50) << setfill('#') << setprecision(20) << x << endl << y << endl << z << endl; |
||||
out << z << endl << y << endl << x << endl; |
||||
out << 1.1234567890123456789 << endl; |
||||
|
||||
delete[] x; delete[] y; |
||||
} |
@ -0,0 +1,35 @@ |
||||
These classes provide a C++ stream interface to the zlib library. It allows you |
||||
to do things like: |
||||
|
||||
gzofstream outf("blah.gz"); |
||||
outf << "These go into the gzip file " << 123 << endl; |
||||
|
||||
It does this by deriving a specialized stream buffer for gzipped files, which is |
||||
the way Stroustrup would have done it. :-> |
||||
|
||||
The gzifstream and gzofstream classes were originally written by Kevin Ruland |
||||
and made available in the zlib contrib/iostream directory. The older version still |
||||
compiles under gcc 2.xx, but not under gcc 3.xx, which sparked the development of |
||||
this version. |
||||
|
||||
The new classes are as standard-compliant as possible, closely following the |
||||
approach of the standard library's fstream classes. It compiles under gcc versions |
||||
3.2 and 3.3, but not under gcc 2.xx. This is mainly due to changes in the standard |
||||
library naming scheme. The new version of gzifstream/gzofstream/gzfilebuf differs |
||||
from the previous one in the following respects: |
||||
- added showmanyc |
||||
- added setbuf, with support for unbuffered output via setbuf(0,0) |
||||
- a few bug fixes of stream behavior |
||||
- gzipped output file opened with default compression level instead of maximum level |
||||
- setcompressionlevel()/strategy() members replaced by single setcompression() |
||||
|
||||
The code is provided "as is", with the permission to use, copy, modify, distribute |
||||
and sell it for any purpose without fee. |
||||
|
||||
Ludwig Schwardt |
||||
<schwardt@sun.ac.za> |
||||
|
||||
DSP Lab |
||||
Electrical & Electronic Engineering Department |
||||
University of Stellenbosch |
||||
South Africa |
@ -0,0 +1,17 @@ |
||||
Possible upgrades to gzfilebuf: |
||||
|
||||
- The ability to do putback (e.g. putbackfail) |
||||
|
||||
- The ability to seek (zlib supports this, but could be slow/tricky) |
||||
|
||||
- Simultaneous read/write access (does it make sense?) |
||||
|
||||
- Support for ios_base::ate open mode |
||||
|
||||
- Locale support? |
||||
|
||||
- Check public interface to see which calls give problems |
||||
(due to dependence on library internals) |
||||
|
||||
- Override operator<<(ostream&, gzfilebuf*) to allow direct copying |
||||
of stream buffer to stream ( i.e. os << is.rdbuf(); ) |
@ -0,0 +1,50 @@ |
||||
/*
|
||||
* Test program for gzifstream and gzofstream |
||||
* |
||||
* by Ludwig Schwardt <schwardt@sun.ac.za> |
||||
* original version by Kevin Ruland <kevin@rodin.wustl.edu> |
||||
*/ |
||||
|
||||
#include "zfstream.h" |
||||
#include <iostream> // for cout |
||||
|
||||
int main() { |
||||
|
||||
gzofstream outf; |
||||
gzifstream inf; |
||||
char buf[80]; |
||||
|
||||
outf.open("test1.txt.gz"); |
||||
outf << "The quick brown fox sidestepped the lazy canine\n" |
||||
<< 1.3 << "\nPlan " << 9 << std::endl; |
||||
outf.close(); |
||||
std::cout << "Wrote the following message to 'test1.txt.gz' (check with zcat or zless):\n" |
||||
<< "The quick brown fox sidestepped the lazy canine\n" |
||||
<< 1.3 << "\nPlan " << 9 << std::endl; |
||||
|
||||
std::cout << "\nReading 'test1.txt.gz' (buffered) produces:\n"; |
||||
inf.open("test1.txt.gz"); |
||||
while (inf.getline(buf,80,'\n')) { |
||||
std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n"; |
||||
} |
||||
inf.close(); |
||||
|
||||
outf.rdbuf()->pubsetbuf(0,0); |
||||
outf.open("test2.txt.gz"); |
||||
outf << setcompression(Z_NO_COMPRESSION) |
||||
<< "The quick brown fox sidestepped the lazy canine\n" |
||||
<< 1.3 << "\nPlan " << 9 << std::endl; |
||||
outf.close(); |
||||
std::cout << "\nWrote the same message to 'test2.txt.gz' in uncompressed form"; |
||||
|
||||
std::cout << "\nReading 'test2.txt.gz' (unbuffered) produces:\n"; |
||||
inf.rdbuf()->pubsetbuf(0,0); |
||||
inf.open("test2.txt.gz"); |
||||
while (inf.getline(buf,80,'\n')) { |
||||
std::cout << buf << "\t(" << inf.rdbuf()->in_avail() << " chars left in buffer)\n"; |
||||
} |
||||
inf.close(); |
||||
|
||||
return 0; |
||||
|
||||
} |
@ -0,0 +1,479 @@ |
||||
/*
|
||||
* A C++ I/O streams interface to the zlib gz* functions |
||||
* |
||||
* by Ludwig Schwardt <schwardt@sun.ac.za> |
||||
* original version by Kevin Ruland <kevin@rodin.wustl.edu> |
||||
* |
||||
* This version is standard-compliant and compatible with gcc 3.x. |
||||
*/ |
||||
|
||||
#include "zfstream.h" |
||||
#include <cstring> // for strcpy, strcat, strlen (mode strings) |
||||
#include <cstdio> // for BUFSIZ |
||||
|
||||
// Internal buffer sizes (default and "unbuffered" versions)
|
||||
#define BIGBUFSIZE BUFSIZ |
||||
#define SMALLBUFSIZE 1 |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
// Default constructor
|
||||
gzfilebuf::gzfilebuf() |
||||
: file(NULL), io_mode(std::ios_base::openmode(0)), own_fd(false), |
||||
buffer(NULL), buffer_size(BIGBUFSIZE), own_buffer(true) |
||||
{ |
||||
// No buffers to start with
|
||||
this->disable_buffer(); |
||||
} |
||||
|
||||
// Destructor
|
||||
gzfilebuf::~gzfilebuf() |
||||
{ |
||||
// Sync output buffer and close only if responsible for file
|
||||
// (i.e. attached streams should be left open at this stage)
|
||||
this->sync(); |
||||
if (own_fd) |
||||
this->close(); |
||||
// Make sure internal buffer is deallocated
|
||||
this->disable_buffer(); |
||||
} |
||||
|
||||
// Set compression level and strategy
|
||||
int |
||||
gzfilebuf::setcompression(int comp_level, |
||||
int comp_strategy) |
||||
{ |
||||
return gzsetparams(file, comp_level, comp_strategy); |
||||
} |
||||
|
||||
// Open gzipped file
|
||||
gzfilebuf* |
||||
gzfilebuf::open(const char *name, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
// Fail if file already open
|
||||
if (this->is_open()) |
||||
return NULL; |
||||
// Don't support simultaneous read/write access (yet)
|
||||
if ((mode & std::ios_base::in) && (mode & std::ios_base::out)) |
||||
return NULL; |
||||
|
||||
// Build mode string for gzopen and check it [27.8.1.3.2]
|
||||
char char_mode[6] = "\0\0\0\0\0"; |
||||
if (!this->open_mode(mode, char_mode)) |
||||
return NULL; |
||||
|
||||
// Attempt to open file
|
||||
if ((file = gzopen(name, char_mode)) == NULL) |
||||
return NULL; |
||||
|
||||
// On success, allocate internal buffer and set flags
|
||||
this->enable_buffer(); |
||||
io_mode = mode; |
||||
own_fd = true; |
||||
return this; |
||||
} |
||||
|
||||
// Attach to gzipped file
|
||||
gzfilebuf* |
||||
gzfilebuf::attach(int fd, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
// Fail if file already open
|
||||
if (this->is_open()) |
||||
return NULL; |
||||
// Don't support simultaneous read/write access (yet)
|
||||
if ((mode & std::ios_base::in) && (mode & std::ios_base::out)) |
||||
return NULL; |
||||
|
||||
// Build mode string for gzdopen and check it [27.8.1.3.2]
|
||||
char char_mode[6] = "\0\0\0\0\0"; |
||||
if (!this->open_mode(mode, char_mode)) |
||||
return NULL; |
||||
|
||||
// Attempt to attach to file
|
||||
if ((file = gzdopen(fd, char_mode)) == NULL) |
||||
return NULL; |
||||
|
||||
// On success, allocate internal buffer and set flags
|
||||
this->enable_buffer(); |
||||
io_mode = mode; |
||||
own_fd = false; |
||||
return this; |
||||
} |
||||
|
||||
// Close gzipped file
|
||||
gzfilebuf* |
||||
gzfilebuf::close() |
||||
{ |
||||
// Fail immediately if no file is open
|
||||
if (!this->is_open()) |
||||
return NULL; |
||||
// Assume success
|
||||
gzfilebuf* retval = this; |
||||
// Attempt to sync and close gzipped file
|
||||
if (this->sync() == -1) |
||||
retval = NULL; |
||||
if (gzclose(file) < 0) |
||||
retval = NULL; |
||||
// File is now gone anyway (postcondition [27.8.1.3.8])
|
||||
file = NULL; |
||||
own_fd = false; |
||||
// Destroy internal buffer if it exists
|
||||
this->disable_buffer(); |
||||
return retval; |
||||
} |
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ |
||||
|
||||
// Convert int open mode to mode string
|
||||
bool |
||||
gzfilebuf::open_mode(std::ios_base::openmode mode, |
||||
char* c_mode) const |
||||
{ |
||||
bool testb = mode & std::ios_base::binary; |
||||
bool testi = mode & std::ios_base::in; |
||||
bool testo = mode & std::ios_base::out; |
||||
bool testt = mode & std::ios_base::trunc; |
||||
bool testa = mode & std::ios_base::app; |
||||
|
||||
// Check for valid flag combinations - see [27.8.1.3.2] (Table 92)
|
||||
// Original zfstream hardcoded the compression level to maximum here...
|
||||
// Double the time for less than 1% size improvement seems
|
||||
// excessive though - keeping it at the default level
|
||||
// To change back, just append "9" to the next three mode strings
|
||||
if (!testi && testo && !testt && !testa) |
||||
strcpy(c_mode, "w"); |
||||
if (!testi && testo && !testt && testa) |
||||
strcpy(c_mode, "a"); |
||||
if (!testi && testo && testt && !testa) |
||||
strcpy(c_mode, "w"); |
||||
if (testi && !testo && !testt && !testa) |
||||
strcpy(c_mode, "r"); |
||||
// No read/write mode yet
|
||||
// if (testi && testo && !testt && !testa)
|
||||
// strcpy(c_mode, "r+");
|
||||
// if (testi && testo && testt && !testa)
|
||||
// strcpy(c_mode, "w+");
|
||||
|
||||
// Mode string should be empty for invalid combination of flags
|
||||
if (strlen(c_mode) == 0) |
||||
return false; |
||||
if (testb) |
||||
strcat(c_mode, "b"); |
||||
return true; |
||||
} |
||||
|
||||
// Determine number of characters in internal get buffer
|
||||
std::streamsize |
||||
gzfilebuf::showmanyc() |
||||
{ |
||||
// Calls to underflow will fail if file not opened for reading
|
||||
if (!this->is_open() || !(io_mode & std::ios_base::in)) |
||||
return -1; |
||||
// Make sure get area is in use
|
||||
if (this->gptr() && (this->gptr() < this->egptr())) |
||||
return std::streamsize(this->egptr() - this->gptr()); |
||||
else |
||||
return 0; |
||||
} |
||||
|
||||
// Fill get area from gzipped file
|
||||
gzfilebuf::int_type |
||||
gzfilebuf::underflow() |
||||
{ |
||||
// If something is left in the get area by chance, return it
|
||||
// (this shouldn't normally happen, as underflow is only supposed
|
||||
// to be called when gptr >= egptr, but it serves as error check)
|
||||
if (this->gptr() && (this->gptr() < this->egptr())) |
||||
return traits_type::to_int_type(*(this->gptr())); |
||||
|
||||
// If the file hasn't been opened for reading, produce error
|
||||
if (!this->is_open() || !(io_mode & std::ios_base::in)) |
||||
return traits_type::eof(); |
||||
|
||||
// Attempt to fill internal buffer from gzipped file
|
||||
// (buffer must be guaranteed to exist...)
|
||||
int bytes_read = gzread(file, buffer, buffer_size); |
||||
// Indicates error or EOF
|
||||
if (bytes_read <= 0) |
||||
{ |
||||
// Reset get area
|
||||
this->setg(buffer, buffer, buffer); |
||||
return traits_type::eof(); |
||||
} |
||||
// Make all bytes read from file available as get area
|
||||
this->setg(buffer, buffer, buffer + bytes_read); |
||||
|
||||
// Return next character in get area
|
||||
return traits_type::to_int_type(*(this->gptr())); |
||||
} |
||||
|
||||
// Write put area to gzipped file
|
||||
gzfilebuf::int_type |
||||
gzfilebuf::overflow(int_type c) |
||||
{ |
||||
// Determine whether put area is in use
|
||||
if (this->pbase()) |
||||
{ |
||||
// Double-check pointer range
|
||||
if (this->pptr() > this->epptr() || this->pptr() < this->pbase()) |
||||
return traits_type::eof(); |
||||
// Add extra character to buffer if not EOF
|
||||
if (!traits_type::eq_int_type(c, traits_type::eof())) |
||||
{ |
||||
*(this->pptr()) = traits_type::to_char_type(c); |
||||
this->pbump(1); |
||||
} |
||||
// Number of characters to write to file
|
||||
int bytes_to_write = this->pptr() - this->pbase(); |
||||
// Overflow doesn't fail if nothing is to be written
|
||||
if (bytes_to_write > 0) |
||||
{ |
||||
// If the file hasn't been opened for writing, produce error
|
||||
if (!this->is_open() || !(io_mode & std::ios_base::out)) |
||||
return traits_type::eof(); |
||||
// If gzipped file won't accept all bytes written to it, fail
|
||||
if (gzwrite(file, this->pbase(), bytes_to_write) != bytes_to_write) |
||||
return traits_type::eof(); |
||||
// Reset next pointer to point to pbase on success
|
||||
this->pbump(-bytes_to_write); |
||||
} |
||||
} |
||||
// Write extra character to file if not EOF
|
||||
else if (!traits_type::eq_int_type(c, traits_type::eof())) |
||||
{ |
||||
// If the file hasn't been opened for writing, produce error
|
||||
if (!this->is_open() || !(io_mode & std::ios_base::out)) |
||||
return traits_type::eof(); |
||||
// Impromptu char buffer (allows "unbuffered" output)
|
||||
char_type last_char = traits_type::to_char_type(c); |
||||
// If gzipped file won't accept this character, fail
|
||||
if (gzwrite(file, &last_char, 1) != 1) |
||||
return traits_type::eof(); |
||||
} |
||||
|
||||
// If you got here, you have succeeded (even if c was EOF)
|
||||
// The return value should therefore be non-EOF
|
||||
if (traits_type::eq_int_type(c, traits_type::eof())) |
||||
return traits_type::not_eof(c); |
||||
else |
||||
return c; |
||||
} |
||||
|
||||
// Assign new buffer
|
||||
std::streambuf* |
||||
gzfilebuf::setbuf(char_type* p, |
||||
std::streamsize n) |
||||
{ |
||||
// First make sure stuff is sync'ed, for safety
|
||||
if (this->sync() == -1) |
||||
return NULL; |
||||
// If buffering is turned off on purpose via setbuf(0,0), still allocate one...
|
||||
// "Unbuffered" only really refers to put [27.8.1.4.10], while get needs at
|
||||
// least a buffer of size 1 (very inefficient though, therefore make it bigger?)
|
||||
// This follows from [27.5.2.4.3]/12 (gptr needs to point at something, it seems)
|
||||
if (!p || !n) |
||||
{ |
||||
// Replace existing buffer (if any) with small internal buffer
|
||||
this->disable_buffer(); |
||||
buffer = NULL; |
||||
buffer_size = 0; |
||||
own_buffer = true; |
||||
this->enable_buffer(); |
||||
} |
||||
else |
||||
{ |
||||
// Replace existing buffer (if any) with external buffer
|
||||
this->disable_buffer(); |
||||
buffer = p; |
||||
buffer_size = n; |
||||
own_buffer = false; |
||||
this->enable_buffer(); |
||||
} |
||||
return this; |
||||
} |
||||
|
||||
// Write put area to gzipped file (i.e. ensures that put area is empty)
|
||||
int |
||||
gzfilebuf::sync() |
||||
{ |
||||
return traits_type::eq_int_type(this->overflow(), traits_type::eof()) ? -1 : 0; |
||||
} |
||||
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ |
||||
|
||||
// Allocate internal buffer
|
||||
void |
||||
gzfilebuf::enable_buffer() |
||||
{ |
||||
// If internal buffer required, allocate one
|
||||
if (own_buffer && !buffer) |
||||
{ |
||||
// Check for buffered vs. "unbuffered"
|
||||
if (buffer_size > 0) |
||||
{ |
||||
// Allocate internal buffer
|
||||
buffer = new char_type[buffer_size]; |
||||
// Get area starts empty and will be expanded by underflow as need arises
|
||||
this->setg(buffer, buffer, buffer); |
||||
// Setup entire internal buffer as put area.
|
||||
// The one-past-end pointer actually points to the last element of the buffer,
|
||||
// so that overflow(c) can safely add the extra character c to the sequence.
|
||||
// These pointers remain in place for the duration of the buffer
|
||||
this->setp(buffer, buffer + buffer_size - 1); |
||||
} |
||||
else |
||||
{ |
||||
// Even in "unbuffered" case, (small?) get buffer is still required
|
||||
buffer_size = SMALLBUFSIZE; |
||||
buffer = new char_type[buffer_size]; |
||||
this->setg(buffer, buffer, buffer); |
||||
// "Unbuffered" means no put buffer
|
||||
this->setp(0, 0); |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
// If buffer already allocated, reset buffer pointers just to make sure no
|
||||
// stale chars are lying around
|
||||
this->setg(buffer, buffer, buffer); |
||||
this->setp(buffer, buffer + buffer_size - 1); |
||||
} |
||||
} |
||||
|
||||
// Destroy internal buffer
|
||||
void |
||||
gzfilebuf::disable_buffer() |
||||
{ |
||||
// If internal buffer exists, deallocate it
|
||||
if (own_buffer && buffer) |
||||
{ |
||||
// Preserve unbuffered status by zeroing size
|
||||
if (!this->pbase()) |
||||
buffer_size = 0; |
||||
delete[] buffer; |
||||
buffer = NULL; |
||||
this->setg(0, 0, 0); |
||||
this->setp(0, 0); |
||||
} |
||||
else |
||||
{ |
||||
// Reset buffer pointers to initial state if external buffer exists
|
||||
this->setg(buffer, buffer, buffer); |
||||
if (buffer) |
||||
this->setp(buffer, buffer + buffer_size - 1); |
||||
else |
||||
this->setp(0, 0); |
||||
} |
||||
} |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
// Default constructor initializes stream buffer
|
||||
gzifstream::gzifstream() |
||||
: std::istream(NULL), sb() |
||||
{ this->init(&sb); } |
||||
|
||||
// Initialize stream buffer and open file
|
||||
gzifstream::gzifstream(const char* name, |
||||
std::ios_base::openmode mode) |
||||
: std::istream(NULL), sb() |
||||
{ |
||||
this->init(&sb); |
||||
this->open(name, mode); |
||||
} |
||||
|
||||
// Initialize stream buffer and attach to file
|
||||
gzifstream::gzifstream(int fd, |
||||
std::ios_base::openmode mode) |
||||
: std::istream(NULL), sb() |
||||
{ |
||||
this->init(&sb); |
||||
this->attach(fd, mode); |
||||
} |
||||
|
||||
// Open file and go into fail() state if unsuccessful
|
||||
void |
||||
gzifstream::open(const char* name, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
if (!sb.open(name, mode | std::ios_base::in)) |
||||
this->setstate(std::ios_base::failbit); |
||||
else |
||||
this->clear(); |
||||
} |
||||
|
||||
// Attach to file and go into fail() state if unsuccessful
|
||||
void |
||||
gzifstream::attach(int fd, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
if (!sb.attach(fd, mode | std::ios_base::in)) |
||||
this->setstate(std::ios_base::failbit); |
||||
else |
||||
this->clear(); |
||||
} |
||||
|
||||
// Close file
|
||||
void |
||||
gzifstream::close() |
||||
{ |
||||
if (!sb.close()) |
||||
this->setstate(std::ios_base::failbit); |
||||
} |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
// Default constructor initializes stream buffer
|
||||
gzofstream::gzofstream() |
||||
: std::ostream(NULL), sb() |
||||
{ this->init(&sb); } |
||||
|
||||
// Initialize stream buffer and open file
|
||||
gzofstream::gzofstream(const char* name, |
||||
std::ios_base::openmode mode) |
||||
: std::ostream(NULL), sb() |
||||
{ |
||||
this->init(&sb); |
||||
this->open(name, mode); |
||||
} |
||||
|
||||
// Initialize stream buffer and attach to file
|
||||
gzofstream::gzofstream(int fd, |
||||
std::ios_base::openmode mode) |
||||
: std::ostream(NULL), sb() |
||||
{ |
||||
this->init(&sb); |
||||
this->attach(fd, mode); |
||||
} |
||||
|
||||
// Open file and go into fail() state if unsuccessful
|
||||
void |
||||
gzofstream::open(const char* name, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
if (!sb.open(name, mode | std::ios_base::out)) |
||||
this->setstate(std::ios_base::failbit); |
||||
else |
||||
this->clear(); |
||||
} |
||||
|
||||
// Attach to file and go into fail() state if unsuccessful
|
||||
void |
||||
gzofstream::attach(int fd, |
||||
std::ios_base::openmode mode) |
||||
{ |
||||
if (!sb.attach(fd, mode | std::ios_base::out)) |
||||
this->setstate(std::ios_base::failbit); |
||||
else |
||||
this->clear(); |
||||
} |
||||
|
||||
// Close file
|
||||
void |
||||
gzofstream::close() |
||||
{ |
||||
if (!sb.close()) |
||||
this->setstate(std::ios_base::failbit); |
||||
} |
@ -0,0 +1,466 @@ |
||||
/*
|
||||
* A C++ I/O streams interface to the zlib gz* functions |
||||
* |
||||
* by Ludwig Schwardt <schwardt@sun.ac.za> |
||||
* original version by Kevin Ruland <kevin@rodin.wustl.edu> |
||||
* |
||||
* This version is standard-compliant and compatible with gcc 3.x. |
||||
*/ |
||||
|
||||
#ifndef ZFSTREAM_H |
||||
#define ZFSTREAM_H |
||||
|
||||
#include <istream> // not iostream, since we don't need cin/cout |
||||
#include <ostream> |
||||
#include "zlib.h" |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
/**
|
||||
* @brief Gzipped file stream buffer class. |
||||
* |
||||
* This class implements basic_filebuf for gzipped files. It doesn't yet support |
||||
* seeking (allowed by zlib but slow/limited), putback and read/write access |
||||
* (tricky). Otherwise, it attempts to be a drop-in replacement for the standard |
||||
* file streambuf. |
||||
*/ |
||||
class gzfilebuf : public std::streambuf |
||||
{ |
||||
public: |
||||
// Default constructor.
|
||||
gzfilebuf(); |
||||
|
||||
// Destructor.
|
||||
virtual |
||||
~gzfilebuf(); |
||||
|
||||
/**
|
||||
* @brief Set compression level and strategy on the fly. |
||||
* @param comp_level Compression level (see zlib.h for allowed values) |
||||
* @param comp_strategy Compression strategy (see zlib.h for allowed values) |
||||
* @return Z_OK on success, Z_STREAM_ERROR otherwise. |
||||
* |
||||
* Unfortunately, these parameters cannot be modified separately, as the |
||||
* previous zfstream version assumed. Since the strategy is seldom changed, |
||||
* it can default and setcompression(level) then becomes like the old |
||||
* setcompressionlevel(level). |
||||
*/ |
||||
int |
||||
setcompression(int comp_level, |
||||
int comp_strategy = Z_DEFAULT_STRATEGY); |
||||
|
||||
/**
|
||||
* @brief Check if file is open. |
||||
* @return True if file is open. |
||||
*/ |
||||
bool |
||||
is_open() const { return (file != NULL); } |
||||
|
||||
/**
|
||||
* @brief Open gzipped file. |
||||
* @param name File name. |
||||
* @param mode Open mode flags. |
||||
* @return @c this on success, NULL on failure. |
||||
*/ |
||||
gzfilebuf* |
||||
open(const char* name, |
||||
std::ios_base::openmode mode); |
||||
|
||||
/**
|
||||
* @brief Attach to already open gzipped file. |
||||
* @param fd File descriptor. |
||||
* @param mode Open mode flags. |
||||
* @return @c this on success, NULL on failure. |
||||
*/ |
||||
gzfilebuf* |
||||
attach(int fd, |
||||
std::ios_base::openmode mode); |
||||
|
||||
/**
|
||||
* @brief Close gzipped file. |
||||
* @return @c this on success, NULL on failure. |
||||
*/ |
||||
gzfilebuf* |
||||
close(); |
||||
|
||||
protected: |
||||
/**
|
||||
* @brief Convert ios open mode int to mode string used by zlib. |
||||
* @return True if valid mode flag combination. |
||||
*/ |
||||
bool |
||||
open_mode(std::ios_base::openmode mode, |
||||
char* c_mode) const; |
||||
|
||||
/**
|
||||
* @brief Number of characters available in stream buffer. |
||||
* @return Number of characters. |
||||
* |
||||
* This indicates number of characters in get area of stream buffer. |
||||
* These characters can be read without accessing the gzipped file. |
||||
*/ |
||||
virtual std::streamsize |
||||
showmanyc(); |
||||
|
||||
/**
|
||||
* @brief Fill get area from gzipped file. |
||||
* @return First character in get area on success, EOF on error. |
||||
* |
||||
* This actually reads characters from gzipped file to stream |
||||
* buffer. Always buffered. |
||||
*/ |
||||
virtual int_type |
||||
underflow(); |
||||
|
||||
/**
|
||||
* @brief Write put area to gzipped file. |
||||
* @param c Extra character to add to buffer contents. |
||||
* @return Non-EOF on success, EOF on error. |
||||
* |
||||
* This actually writes characters in stream buffer to |
||||
* gzipped file. With unbuffered output this is done one |
||||
* character at a time. |
||||
*/ |
||||
virtual int_type |
||||
overflow(int_type c = traits_type::eof()); |
||||
|
||||
/**
|
||||
* @brief Installs external stream buffer. |
||||
* @param p Pointer to char buffer. |
||||
* @param n Size of external buffer. |
||||
* @return @c this on success, NULL on failure. |
||||
* |
||||
* Call setbuf(0,0) to enable unbuffered output. |
||||
*/ |
||||
virtual std::streambuf* |
||||
setbuf(char_type* p, |
||||
std::streamsize n); |
||||
|
||||
/**
|
||||
* @brief Flush stream buffer to file. |
||||
* @return 0 on success, -1 on error. |
||||
* |
||||
* This calls underflow(EOF) to do the job. |
||||
*/ |
||||
virtual int |
||||
sync(); |
||||
|
||||
//
|
||||
// Some future enhancements
|
||||
//
|
||||
// virtual int_type uflow();
|
||||
// virtual int_type pbackfail(int_type c = traits_type::eof());
|
||||
// virtual pos_type
|
||||
// seekoff(off_type off,
|
||||
// std::ios_base::seekdir way,
|
||||
// std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
|
||||
// virtual pos_type
|
||||
// seekpos(pos_type sp,
|
||||
// std::ios_base::openmode mode = std::ios_base::in|std::ios_base::out);
|
||||
|
||||
private: |
||||
/**
|
||||
* @brief Allocate internal buffer. |
||||
* |
||||
* This function is safe to call multiple times. It will ensure |
||||
* that a proper internal buffer exists if it is required. If the |
||||
* buffer already exists or is external, the buffer pointers will be |
||||
* reset to their original state. |
||||
*/ |
||||
void |
||||
enable_buffer(); |
||||
|
||||
/**
|
||||
* @brief Destroy internal buffer. |
||||
* |
||||
* This function is safe to call multiple times. It will ensure |
||||
* that the internal buffer is deallocated if it exists. In any |
||||
* case, it will also reset the buffer pointers. |
||||
*/ |
||||
void |
||||
disable_buffer(); |
||||
|
||||
/**
|
||||
* Underlying file pointer. |
||||
*/ |
||||
gzFile file; |
||||
|
||||
/**
|
||||
* Mode in which file was opened. |
||||
*/ |
||||
std::ios_base::openmode io_mode; |
||||
|
||||
/**
|
||||
* @brief True if this object owns file descriptor. |
||||
* |
||||
* This makes the class responsible for closing the file |
||||
* upon destruction. |
||||
*/ |
||||
bool own_fd; |
||||
|
||||
/**
|
||||
* @brief Stream buffer. |
||||
* |
||||
* For simplicity this remains allocated on the free store for the |
||||
* entire life span of the gzfilebuf object, unless replaced by setbuf. |
||||
*/ |
||||
char_type* buffer; |
||||
|
||||
/**
|
||||
* @brief Stream buffer size. |
||||
* |
||||
* Defaults to system default buffer size (typically 8192 bytes). |
||||
* Modified by setbuf. |
||||
*/ |
||||
std::streamsize buffer_size; |
||||
|
||||
/**
|
||||
* @brief True if this object owns stream buffer. |
||||
* |
||||
* This makes the class responsible for deleting the buffer |
||||
* upon destruction. |
||||
*/ |
||||
bool own_buffer; |
||||
}; |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
/**
|
||||
* @brief Gzipped file input stream class. |
||||
* |
||||
* This class implements ifstream for gzipped files. Seeking and putback |
||||
* is not supported yet. |
||||
*/ |
||||
class gzifstream : public std::istream |
||||
{ |
||||
public: |
||||
// Default constructor
|
||||
gzifstream(); |
||||
|
||||
/**
|
||||
* @brief Construct stream on gzipped file to be opened. |
||||
* @param name File name. |
||||
* @param mode Open mode flags (forced to contain ios::in). |
||||
*/ |
||||
explicit |
||||
gzifstream(const char* name, |
||||
std::ios_base::openmode mode = std::ios_base::in); |
||||
|
||||
/**
|
||||
* @brief Construct stream on already open gzipped file. |
||||
* @param fd File descriptor. |
||||
* @param mode Open mode flags (forced to contain ios::in). |
||||
*/ |
||||
explicit |
||||
gzifstream(int fd, |
||||
std::ios_base::openmode mode = std::ios_base::in); |
||||
|
||||
/**
|
||||
* Obtain underlying stream buffer. |
||||
*/ |
||||
gzfilebuf* |
||||
rdbuf() const |
||||
{ return const_cast<gzfilebuf*>(&sb); } |
||||
|
||||
/**
|
||||
* @brief Check if file is open. |
||||
* @return True if file is open. |
||||
*/ |
||||
bool |
||||
is_open() { return sb.is_open(); } |
||||
|
||||
/**
|
||||
* @brief Open gzipped file. |
||||
* @param name File name. |
||||
* @param mode Open mode flags (forced to contain ios::in). |
||||
* |
||||
* Stream will be in state good() if file opens successfully; |
||||
* otherwise in state fail(). This differs from the behavior of |
||||
* ifstream, which never sets the state to good() and therefore |
||||
* won't allow you to reuse the stream for a second file unless |
||||
* you manually clear() the state. The choice is a matter of |
||||
* convenience. |
||||
*/ |
||||
void |
||||
open(const char* name, |
||||
std::ios_base::openmode mode = std::ios_base::in); |
||||
|
||||
/**
|
||||
* @brief Attach to already open gzipped file. |
||||
* @param fd File descriptor. |
||||
* @param mode Open mode flags (forced to contain ios::in). |
||||
* |
||||
* Stream will be in state good() if attach succeeded; otherwise |
||||
* in state fail(). |
||||
*/ |
||||
void |
||||
attach(int fd, |
||||
std::ios_base::openmode mode = std::ios_base::in); |
||||
|
||||
/**
|
||||
* @brief Close gzipped file. |
||||
* |
||||
* Stream will be in state fail() if close failed. |
||||
*/ |
||||
void |
||||
close(); |
||||
|
||||
private: |
||||
/**
|
||||
* Underlying stream buffer. |
||||
*/ |
||||
gzfilebuf sb; |
||||
}; |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
/**
|
||||
* @brief Gzipped file output stream class. |
||||
* |
||||
* This class implements ofstream for gzipped files. Seeking and putback |
||||
* is not supported yet. |
||||
*/ |
||||
class gzofstream : public std::ostream |
||||
{ |
||||
public: |
||||
// Default constructor
|
||||
gzofstream(); |
||||
|
||||
/**
|
||||
* @brief Construct stream on gzipped file to be opened. |
||||
* @param name File name. |
||||
* @param mode Open mode flags (forced to contain ios::out). |
||||
*/ |
||||
explicit |
||||
gzofstream(const char* name, |
||||
std::ios_base::openmode mode = std::ios_base::out); |
||||
|
||||
/**
|
||||
* @brief Construct stream on already open gzipped file. |
||||
* @param fd File descriptor. |
||||
* @param mode Open mode flags (forced to contain ios::out). |
||||
*/ |
||||
explicit |
||||
gzofstream(int fd, |
||||
std::ios_base::openmode mode = std::ios_base::out); |
||||
|
||||
/**
|
||||
* Obtain underlying stream buffer. |
||||
*/ |
||||
gzfilebuf* |
||||
rdbuf() const |
||||
{ return const_cast<gzfilebuf*>(&sb); } |
||||
|
||||
/**
|
||||
* @brief Check if file is open. |
||||
* @return True if file is open. |
||||
*/ |
||||
bool |
||||
is_open() { return sb.is_open(); } |
||||
|
||||
/**
|
||||
* @brief Open gzipped file. |
||||
* @param name File name. |
||||
* @param mode Open mode flags (forced to contain ios::out). |
||||
* |
||||
* Stream will be in state good() if file opens successfully; |
||||
* otherwise in state fail(). This differs from the behavior of |
||||
* ofstream, which never sets the state to good() and therefore |
||||
* won't allow you to reuse the stream for a second file unless |
||||
* you manually clear() the state. The choice is a matter of |
||||
* convenience. |
||||
*/ |
||||
void |
||||
open(const char* name, |
||||
std::ios_base::openmode mode = std::ios_base::out); |
||||
|
||||
/**
|
||||
* @brief Attach to already open gzipped file. |
||||
* @param fd File descriptor. |
||||
* @param mode Open mode flags (forced to contain ios::out). |
||||
* |
||||
* Stream will be in state good() if attach succeeded; otherwise |
||||
* in state fail(). |
||||
*/ |
||||
void |
||||
attach(int fd, |
||||
std::ios_base::openmode mode = std::ios_base::out); |
||||
|
||||
/**
|
||||
* @brief Close gzipped file. |
||||
* |
||||
* Stream will be in state fail() if close failed. |
||||
*/ |
||||
void |
||||
close(); |
||||
|
||||
private: |
||||
/**
|
||||
* Underlying stream buffer. |
||||
*/ |
||||
gzfilebuf sb; |
||||
}; |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
/**
|
||||
* @brief Gzipped file output stream manipulator class. |
||||
* |
||||
* This class defines a two-argument manipulator for gzofstream. It is used |
||||
* as base for the setcompression(int,int) manipulator. |
||||
*/ |
||||
template<typename T1, typename T2> |
||||
class gzomanip2 |
||||
{ |
||||
public: |
||||
// Allows insertor to peek at internals
|
||||
template <typename Ta, typename Tb> |
||||
friend gzofstream& |
||||
operator<<(gzofstream&, |
||||
const gzomanip2<Ta,Tb>&); |
||||
|
||||
// Constructor
|
||||
gzomanip2(gzofstream& (*f)(gzofstream&, T1, T2), |
||||
T1 v1, |
||||
T2 v2); |
||||
private: |
||||
// Underlying manipulator function
|
||||
gzofstream& |
||||
(*func)(gzofstream&, T1, T2); |
||||
|
||||
// Arguments for manipulator function
|
||||
T1 val1; |
||||
T2 val2; |
||||
}; |
||||
|
||||
/*****************************************************************************/ |
||||
|
||||
// Manipulator function thunks through to stream buffer
|
||||
inline gzofstream& |
||||
setcompression(gzofstream &gzs, int l, int s = Z_DEFAULT_STRATEGY) |
||||
{ |
||||
(gzs.rdbuf())->setcompression(l, s); |
||||
return gzs; |
||||
} |
||||
|
||||
// Manipulator constructor stores arguments
|
||||
template<typename T1, typename T2> |
||||
inline |
||||
gzomanip2<T1,T2>::gzomanip2(gzofstream &(*f)(gzofstream &, T1, T2), |
||||
T1 v1, |
||||
T2 v2) |
||||
: func(f), val1(v1), val2(v2) |
||||
{ } |
||||
|
||||
// Insertor applies underlying manipulator function to stream
|
||||
template<typename T1, typename T2> |
||||
inline gzofstream& |
||||
operator<<(gzofstream& s, const gzomanip2<T1,T2>& m) |
||||
{ return (*m.func)(s, m.val1, m.val2); } |
||||
|
||||
// Insert this onto stream to simplify setting of compression level
|
||||
inline gzomanip2<int,int> |
||||
setcompression(int l, int s = Z_DEFAULT_STRATEGY) |
||||
{ return gzomanip2<int,int>(&setcompression, l, s); } |
||||
|
||||
#endif // ZFSTREAM_H
|
@ -0,0 +1,29 @@ |
||||
CC=cc
|
||||
CFLAGS := $(CFLAGS) -O -I../..
|
||||
|
||||
UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
|
||||
ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a
|
||||
|
||||
.c.o: |
||||
$(CC) -c $(CFLAGS) $*.c
|
||||
|
||||
all: miniunz minizip |
||||
|
||||
miniunz: $(UNZ_OBJS) |
||||
$(CC) $(CFLAGS) -o $@ $(UNZ_OBJS)
|
||||
|
||||
minizip: $(ZIP_OBJS) |
||||
$(CC) $(CFLAGS) -o $@ $(ZIP_OBJS)
|
||||
|
||||
test: miniunz minizip |
||||
@rm -f test.*
|
||||
@echo hello hello hello > test.txt
|
||||
./minizip test test.txt
|
||||
./miniunz -l test.zip
|
||||
@mv test.txt test.old
|
||||
./miniunz test.zip
|
||||
@cmp test.txt test.old
|
||||
@rm -f test.*
|
||||
|
||||
clean: |
||||
/bin/rm -f *.o *~ minizip miniunz test.*
|
@ -0,0 +1,45 @@ |
||||
lib_LTLIBRARIES = libminizip.la
|
||||
|
||||
if COND_DEMOS |
||||
bin_PROGRAMS = miniunzip minizip
|
||||
endif |
||||
|
||||
zlib_top_srcdir = $(top_srcdir)/../..
|
||||
zlib_top_builddir = $(top_builddir)/../..
|
||||
|
||||
AM_CPPFLAGS = -I$(zlib_top_srcdir)
|
||||
AM_LDFLAGS = -L$(zlib_top_builddir)
|
||||
|
||||
if WIN32 |
||||
iowin32_src = iowin32.c
|
||||
iowin32_h = iowin32.h
|
||||
endif |
||||
|
||||
libminizip_la_SOURCES = \
|
||||
ioapi.c \
|
||||
mztools.c \
|
||||
unzip.c \
|
||||
zip.c \
|
||||
${iowin32_src}
|
||||
|
||||
libminizip_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -lz
|
||||
|
||||
minizip_includedir = $(includedir)/minizip
|
||||
minizip_include_HEADERS = \
|
||||
crypt.h \
|
||||
ioapi.h \
|
||||
mztools.h \
|
||||
unzip.h \
|
||||
zip.h \
|
||||
${iowin32_h}
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = minizip.pc
|
||||
|
||||
EXTRA_PROGRAMS = miniunzip minizip
|
||||
|
||||
miniunzip_SOURCES = miniunz.c
|
||||
miniunzip_LDADD = libminizip.la
|
||||
|
||||
minizip_SOURCES = minizip.c
|
||||
minizip_LDADD = libminizip.la -lz
|
@ -0,0 +1,6 @@ |
||||
|
||||
MiniZip 1.1 was derrived from MiniZip at version 1.01f |
||||
|
||||
Change in 1.0 (Okt 2009) |
||||
- **TODO - Add history** |
||||
|
@ -0,0 +1,74 @@ |
||||
MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson |
||||
|
||||
Introduction |
||||
--------------------- |
||||
MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html ) |
||||
|
||||
When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0. |
||||
All possible work was done for compatibility. |
||||
|
||||
|
||||
Background |
||||
--------------------- |
||||
When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 |
||||
support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ ) |
||||
|
||||
That was used as a starting point. And after that ZIP64 support was added to zip.c |
||||
some refactoring and code cleanup was also done. |
||||
|
||||
|
||||
Changed from MiniZip 1.0 to MiniZip 1.1 |
||||
--------------------------------------- |
||||
* Added ZIP64 support for unzip ( by Even Rouault ) |
||||
* Added ZIP64 support for zip ( by Mathias Svensson ) |
||||
* Reverted some changed that Even Rouault did. |
||||
* Bunch of patches received from Gulles Vollant that he received for MiniZip from various users. |
||||
* Added unzip patch for BZIP Compression method (patch create by Daniel Borca) |
||||
* Added BZIP Compress method for zip |
||||
* Did some refactoring and code cleanup |
||||
|
||||
|
||||
Credits |
||||
|
||||
Gilles Vollant - Original MiniZip author |
||||
Even Rouault - ZIP64 unzip Support |
||||
Daniel Borca - BZip Compression method support in unzip |
||||
Mathias Svensson - ZIP64 zip support |
||||
Mathias Svensson - BZip Compression method support in zip |
||||
|
||||
Resources |
||||
|
||||
ZipLayout http://result42.com/projects/ZipFileLayout |
||||
Command line tool for Windows that shows the layout and information of the headers in a zip archive. |
||||
Used when debugging and validating the creation of zip files using MiniZip64 |
||||
|
||||
|
||||
ZIP App Note http://www.pkware.com/documents/casestudies/APPNOTE.TXT |
||||
Zip File specification |
||||
|
||||
|
||||
Notes. |
||||
* To be able to use BZip compression method in zip64.c or unzip64.c the BZIP2 lib is needed and HAVE_BZIP2 need to be defined. |
||||
|
||||
License |
||||
---------------------------------------------------------- |
||||
Condition of use and distribution are the same than zlib : |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the authors be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
---------------------------------------------------------- |
||||
|
@ -0,0 +1,32 @@ |
||||
# -*- Autoconf -*- |
||||
# Process this file with autoconf to produce a configure script. |
||||
|
||||
AC_INIT([minizip], [1.2.13], [bugzilla.redhat.com]) |
||||
AC_CONFIG_SRCDIR([minizip.c]) |
||||
AM_INIT_AUTOMAKE([foreign]) |
||||
LT_INIT |
||||
|
||||
AC_MSG_CHECKING([whether to build example programs]) |
||||
AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs])) |
||||
AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes]) |
||||
if test "$enable_demos" = yes |
||||
then |
||||
AC_MSG_RESULT([yes]) |
||||
else |
||||
AC_MSG_RESULT([no]) |
||||
fi |
||||
|
||||
case "${host}" in |
||||
*-mingw* | mingw*) |
||||
WIN32="yes" |
||||
;; |
||||
*) |
||||
;; |
||||
esac |
||||
AM_CONDITIONAL([WIN32], [test "${WIN32}" = "yes"]) |
||||
|
||||
|
||||
AC_SUBST([HAVE_UNISTD_H], [0]) |
||||
AC_CHECK_HEADER([unistd.h], [HAVE_UNISTD_H=1], []) |
||||
AC_CONFIG_FILES([Makefile minizip.pc]) |
||||
AC_OUTPUT |
@ -0,0 +1,132 @@ |
||||
/* crypt.h -- base code for crypt/uncrypt ZIPfile
|
||||
|
||||
|
||||
Version 1.01e, February 12th, 2005 |
||||
|
||||
Copyright (C) 1998-2005 Gilles Vollant |
||||
|
||||
This code is a modified version of crypting code in Infozip distribution |
||||
|
||||
The encryption/decryption parts of this source code (as opposed to the |
||||
non-echoing password parts) were originally written in Europe. The |
||||
whole source package can be freely distributed, including from the USA. |
||||
(Prior to January 2000, re-export from the US was a violation of US law.) |
||||
|
||||
This encryption code is a direct transcription of the algorithm from |
||||
Roger Schlafly, described by Phil Katz in the file appnote.txt. This |
||||
file (appnote.txt) is distributed with the PKZIP program (even in the |
||||
version without encryption capabilities). |
||||
|
||||
If you don't need crypting in your application, just define symbols |
||||
NOCRYPT and NOUNCRYPT. |
||||
|
||||
This code support the "Traditional PKWARE Encryption". |
||||
|
||||
The new AES encryption added on Zip format by Winzip (see the page |
||||
http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
|
||||
Encryption is not supported. |
||||
*/ |
||||
|
||||
#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8)) |
||||
|
||||
/***********************************************************************
|
||||
* Return the next byte in the pseudo-random sequence |
||||
*/ |
||||
static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) |
||||
{ |
||||
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
|
||||
* unpredictable manner on 16-bit systems; not a problem |
||||
* with any known compiler so far, though */ |
||||
|
||||
(void)pcrc_32_tab; |
||||
temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2; |
||||
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff); |
||||
} |
||||
|
||||
/***********************************************************************
|
||||
* Update the encryption keys with the next byte of plain text |
||||
*/ |
||||
static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c) |
||||
{ |
||||
(*(pkeys+0)) = CRC32((*(pkeys+0)), c); |
||||
(*(pkeys+1)) += (*(pkeys+0)) & 0xff; |
||||
(*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; |
||||
{ |
||||
register int keyshift = (int)((*(pkeys+1)) >> 24); |
||||
(*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); |
||||
} |
||||
return c; |
||||
} |
||||
|
||||
|
||||
/***********************************************************************
|
||||
* Initialize the encryption keys and the random header according to |
||||
* the given password. |
||||
*/ |
||||
static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab) |
||||
{ |
||||
*(pkeys+0) = 305419896L; |
||||
*(pkeys+1) = 591751049L; |
||||
*(pkeys+2) = 878082192L; |
||||
while (*passwd != '\0') { |
||||
update_keys(pkeys,pcrc_32_tab,(int)*passwd); |
||||
passwd++; |
||||
} |
||||
} |
||||
|
||||
#define zdecode(pkeys,pcrc_32_tab,c) \ |
||||
(update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab))) |
||||
|
||||
#define zencode(pkeys,pcrc_32_tab,c,t) \ |
||||
(t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), (Byte)t^(c)) |
||||
|
||||
#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED |
||||
|
||||
#define RAND_HEAD_LEN 12 |
||||
/* "last resort" source for second part of crypt seed pattern */ |
||||
# ifndef ZCR_SEED2 |
||||
# define ZCR_SEED2 3141592654UL /* use PI as default pattern */ |
||||
# endif |
||||
|
||||
static unsigned crypthead(const char* passwd, /* password string */ |
||||
unsigned char* buf, /* where to write header */ |
||||
int bufSize, |
||||
unsigned long* pkeys, |
||||
const z_crc_t* pcrc_32_tab, |
||||
unsigned long crcForCrypting) |
||||
{ |
||||
unsigned n; /* index in random header */ |
||||
int t; /* temporary */ |
||||
int c; /* random byte */ |
||||
unsigned char header[RAND_HEAD_LEN-2]; /* random header */ |
||||
static unsigned calls = 0; /* ensure different random header each time */ |
||||
|
||||
if (bufSize<RAND_HEAD_LEN) |
||||
return 0; |
||||
|
||||
/* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
|
||||
* output of rand() to get less predictability, since rand() is |
||||
* often poorly implemented. |
||||
*/ |
||||
if (++calls == 1) |
||||
{ |
||||
srand((unsigned)(time(NULL) ^ ZCR_SEED2)); |
||||
} |
||||
init_keys(passwd, pkeys, pcrc_32_tab); |
||||
for (n = 0; n < RAND_HEAD_LEN-2; n++) |
||||
{ |
||||
c = (rand() >> 7) & 0xff; |
||||
header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t); |
||||
} |
||||
/* Encrypt random header (last two bytes is high word of crc) */ |
||||
init_keys(passwd, pkeys, pcrc_32_tab); |
||||
for (n = 0; n < RAND_HEAD_LEN-2; n++) |
||||
{ |
||||
buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t); |
||||
} |
||||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t); |
||||
buf[n++] = (unsigned char)zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t); |
||||
return n; |
||||
} |
||||
|
||||
#endif |
@ -0,0 +1,257 @@ |
||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
*/ |
||||
|
||||
#if defined(_WIN32) && (!(defined(_CRT_SECURE_NO_WARNINGS))) |
||||
#define _CRT_SECURE_NO_WARNINGS |
||||
#endif |
||||
|
||||
#if defined(__APPLE__) || defined(IOAPI_NO_64) |
||||
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
||||
#define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) |
||||
#else |
||||
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello64(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) |
||||
#endif |
||||
|
||||
|
||||
#include "ioapi.h" |
||||
|
||||
voidpf call_zopen64 (const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode) |
||||
{ |
||||
if (pfilefunc->zfile_func64.zopen64_file != NULL) |
||||
return (*(pfilefunc->zfile_func64.zopen64_file)) (pfilefunc->zfile_func64.opaque,filename,mode); |
||||
else |
||||
{ |
||||
return (*(pfilefunc->zopen32_file))(pfilefunc->zfile_func64.opaque,(const char*)filename,mode); |
||||
} |
||||
} |
||||
|
||||
long call_zseek64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin) |
||||
{ |
||||
if (pfilefunc->zfile_func64.zseek64_file != NULL) |
||||
return (*(pfilefunc->zfile_func64.zseek64_file)) (pfilefunc->zfile_func64.opaque,filestream,offset,origin); |
||||
else |
||||
{ |
||||
uLong offsetTruncated = (uLong)offset; |
||||
if (offsetTruncated != offset) |
||||
return -1; |
||||
else |
||||
return (*(pfilefunc->zseek32_file))(pfilefunc->zfile_func64.opaque,filestream,offsetTruncated,origin); |
||||
} |
||||
} |
||||
|
||||
ZPOS64_T call_ztell64 (const zlib_filefunc64_32_def* pfilefunc,voidpf filestream) |
||||
{ |
||||
if (pfilefunc->zfile_func64.zseek64_file != NULL) |
||||
return (*(pfilefunc->zfile_func64.ztell64_file)) (pfilefunc->zfile_func64.opaque,filestream); |
||||
else |
||||
{ |
||||
uLong tell_uLong = (uLong)(*(pfilefunc->ztell32_file))(pfilefunc->zfile_func64.opaque,filestream); |
||||
if ((tell_uLong) == MAXU32) |
||||
return (ZPOS64_T)-1; |
||||
else |
||||
return tell_uLong; |
||||
} |
||||
} |
||||
|
||||
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32) |
||||
{ |
||||
p_filefunc64_32->zfile_func64.zopen64_file = NULL; |
||||
p_filefunc64_32->zopen32_file = p_filefunc32->zopen_file; |
||||
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file; |
||||
p_filefunc64_32->zfile_func64.zread_file = p_filefunc32->zread_file; |
||||
p_filefunc64_32->zfile_func64.zwrite_file = p_filefunc32->zwrite_file; |
||||
p_filefunc64_32->zfile_func64.ztell64_file = NULL; |
||||
p_filefunc64_32->zfile_func64.zseek64_file = NULL; |
||||
p_filefunc64_32->zfile_func64.zclose_file = p_filefunc32->zclose_file; |
||||
p_filefunc64_32->zfile_func64.zerror_file = p_filefunc32->zerror_file; |
||||
p_filefunc64_32->zfile_func64.opaque = p_filefunc32->opaque; |
||||
p_filefunc64_32->zseek32_file = p_filefunc32->zseek_file; |
||||
p_filefunc64_32->ztell32_file = p_filefunc32->ztell_file; |
||||
} |
||||
|
||||
|
||||
|
||||
static voidpf ZCALLBACK fopen_file_func OF((voidpf opaque, const char* filename, int mode)); |
||||
static uLong ZCALLBACK fread_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); |
||||
static uLong ZCALLBACK fwrite_file_func OF((voidpf opaque, voidpf stream, const void* buf,uLong size)); |
||||
static ZPOS64_T ZCALLBACK ftell64_file_func OF((voidpf opaque, voidpf stream)); |
||||
static long ZCALLBACK fseek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); |
||||
static int ZCALLBACK fclose_file_func OF((voidpf opaque, voidpf stream)); |
||||
static int ZCALLBACK ferror_file_func OF((voidpf opaque, voidpf stream)); |
||||
|
||||
static voidpf ZCALLBACK fopen_file_func (voidpf opaque, const char* filename, int mode) |
||||
{ |
||||
FILE* file = NULL; |
||||
const char* mode_fopen = NULL; |
||||
(void)opaque; |
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) |
||||
mode_fopen = "rb"; |
||||
else |
||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING) |
||||
mode_fopen = "r+b"; |
||||
else |
||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE) |
||||
mode_fopen = "wb"; |
||||
|
||||
if ((filename!=NULL) && (mode_fopen != NULL)) |
||||
file = fopen(filename, mode_fopen); |
||||
return file; |
||||
} |
||||
|
||||
static voidpf ZCALLBACK fopen64_file_func (voidpf opaque, const void* filename, int mode) |
||||
{ |
||||
FILE* file = NULL; |
||||
const char* mode_fopen = NULL; |
||||
(void)opaque; |
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) |
||||
mode_fopen = "rb"; |
||||
else |
||||
if (mode & ZLIB_FILEFUNC_MODE_EXISTING) |
||||
mode_fopen = "r+b"; |
||||
else |
||||
if (mode & ZLIB_FILEFUNC_MODE_CREATE) |
||||
mode_fopen = "wb"; |
||||
|
||||
if ((filename!=NULL) && (mode_fopen != NULL)) |
||||
file = FOPEN_FUNC((const char*)filename, mode_fopen); |
||||
return file; |
||||
} |
||||
|
||||
|
||||
static uLong ZCALLBACK fread_file_func (voidpf opaque, voidpf stream, void* buf, uLong size) |
||||
{ |
||||
uLong ret; |
||||
(void)opaque; |
||||
ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
static uLong ZCALLBACK fwrite_file_func (voidpf opaque, voidpf stream, const void* buf, uLong size) |
||||
{ |
||||
uLong ret; |
||||
(void)opaque; |
||||
ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
static long ZCALLBACK ftell_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
long ret; |
||||
(void)opaque; |
||||
ret = ftell((FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
|
||||
static ZPOS64_T ZCALLBACK ftell64_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
ZPOS64_T ret; |
||||
(void)opaque; |
||||
ret = (ZPOS64_T)FTELLO_FUNC((FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
static long ZCALLBACK fseek_file_func (voidpf opaque, voidpf stream, uLong offset, int origin) |
||||
{ |
||||
int fseek_origin=0; |
||||
long ret; |
||||
(void)opaque; |
||||
switch (origin) |
||||
{ |
||||
case ZLIB_FILEFUNC_SEEK_CUR : |
||||
fseek_origin = SEEK_CUR; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_END : |
||||
fseek_origin = SEEK_END; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_SET : |
||||
fseek_origin = SEEK_SET; |
||||
break; |
||||
default: return -1; |
||||
} |
||||
ret = 0; |
||||
if (fseek((FILE *)stream, (long)offset, fseek_origin) != 0) |
||||
ret = -1; |
||||
return ret; |
||||
} |
||||
|
||||
static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T offset, int origin) |
||||
{ |
||||
int fseek_origin=0; |
||||
long ret; |
||||
(void)opaque; |
||||
switch (origin) |
||||
{ |
||||
case ZLIB_FILEFUNC_SEEK_CUR : |
||||
fseek_origin = SEEK_CUR; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_END : |
||||
fseek_origin = SEEK_END; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_SET : |
||||
fseek_origin = SEEK_SET; |
||||
break; |
||||
default: return -1; |
||||
} |
||||
ret = 0; |
||||
|
||||
if(FSEEKO_FUNC((FILE *)stream, (z_off_t)offset, fseek_origin) != 0) |
||||
ret = -1; |
||||
|
||||
return ret; |
||||
} |
||||
|
||||
|
||||
static int ZCALLBACK fclose_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
int ret; |
||||
(void)opaque; |
||||
ret = fclose((FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
static int ZCALLBACK ferror_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
int ret; |
||||
(void)opaque; |
||||
ret = ferror((FILE *)stream); |
||||
return ret; |
||||
} |
||||
|
||||
void fill_fopen_filefunc (pzlib_filefunc_def) |
||||
zlib_filefunc_def* pzlib_filefunc_def; |
||||
{ |
||||
pzlib_filefunc_def->zopen_file = fopen_file_func; |
||||
pzlib_filefunc_def->zread_file = fread_file_func; |
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func; |
||||
pzlib_filefunc_def->ztell_file = ftell_file_func; |
||||
pzlib_filefunc_def->zseek_file = fseek_file_func; |
||||
pzlib_filefunc_def->zclose_file = fclose_file_func; |
||||
pzlib_filefunc_def->zerror_file = ferror_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
||||
|
||||
void fill_fopen64_filefunc (zlib_filefunc64_def* pzlib_filefunc_def) |
||||
{ |
||||
pzlib_filefunc_def->zopen64_file = fopen64_file_func; |
||||
pzlib_filefunc_def->zread_file = fread_file_func; |
||||
pzlib_filefunc_def->zwrite_file = fwrite_file_func; |
||||
pzlib_filefunc_def->ztell64_file = ftell64_file_func; |
||||
pzlib_filefunc_def->zseek64_file = fseek64_file_func; |
||||
pzlib_filefunc_def->zclose_file = fclose_file_func; |
||||
pzlib_filefunc_def->zerror_file = ferror_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
@ -0,0 +1,210 @@ |
||||
/* ioapi.h -- IO base function header for compress/uncompress .zip
|
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
Changes |
||||
|
||||
Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this) |
||||
Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux. |
||||
More if/def section may be needed to support other platforms |
||||
Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. |
||||
(but you should use iowin32.c for windows instead) |
||||
|
||||
*/ |
||||
|
||||
#ifndef _ZLIBIOAPI64_H |
||||
#define _ZLIBIOAPI64_H |
||||
|
||||
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
||||
|
||||
// Linux needs this to support file operation on files larger then 4+GB
|
||||
// But might need better if/def to select just the platforms that needs them.
|
||||
|
||||
#ifndef __USE_FILE_OFFSET64 |
||||
#define __USE_FILE_OFFSET64 |
||||
#endif |
||||
#ifndef __USE_LARGEFILE64 |
||||
#define __USE_LARGEFILE64 |
||||
#endif |
||||
#ifndef _LARGEFILE64_SOURCE |
||||
#define _LARGEFILE64_SOURCE |
||||
#endif |
||||
#ifndef _FILE_OFFSET_BIT |
||||
#define _FILE_OFFSET_BIT 64 |
||||
#endif |
||||
|
||||
#endif |
||||
|
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include "zlib.h" |
||||
|
||||
#if defined(USE_FILE32API) |
||||
#define fopen64 fopen |
||||
#define ftello64 ftell |
||||
#define fseeko64 fseek |
||||
#else |
||||
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) |
||||
#define fopen64 fopen |
||||
#define ftello64 ftello |
||||
#define fseeko64 fseeko |
||||
#endif |
||||
#ifdef _MSC_VER |
||||
#define fopen64 fopen |
||||
#if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC))) |
||||
#define ftello64 _ftelli64 |
||||
#define fseeko64 _fseeki64 |
||||
#else // old MSC
|
||||
#define ftello64 ftell |
||||
#define fseeko64 fseek |
||||
#endif |
||||
#endif |
||||
#endif |
||||
|
||||
/*
|
||||
#ifndef ZPOS64_T |
||||
#ifdef _WIN32 |
||||
#define ZPOS64_T fpos_t |
||||
#else |
||||
#include <stdint.h> |
||||
#define ZPOS64_T uint64_t |
||||
#endif |
||||
#endif |
||||
*/ |
||||
|
||||
#ifdef HAVE_MINIZIP64_CONF_H |
||||
#include "mz64conf.h" |
||||
#endif |
||||
|
||||
/* a type choosen by DEFINE */ |
||||
#ifdef HAVE_64BIT_INT_CUSTOM |
||||
typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; |
||||
#else |
||||
#ifdef HAS_STDINT_H |
||||
#include "stdint.h" |
||||
typedef uint64_t ZPOS64_T; |
||||
#else |
||||
|
||||
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__) |
||||
typedef unsigned __int64 ZPOS64_T; |
||||
#else |
||||
typedef unsigned long long int ZPOS64_T; |
||||
#endif |
||||
#endif |
||||
#endif |
||||
|
||||
/* Maximum unsigned 32-bit value used as placeholder for zip64 */ |
||||
#ifndef MAXU32 |
||||
#define MAXU32 (0xffffffff) |
||||
#endif |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
|
||||
#define ZLIB_FILEFUNC_SEEK_CUR (1) |
||||
#define ZLIB_FILEFUNC_SEEK_END (2) |
||||
#define ZLIB_FILEFUNC_SEEK_SET (0) |
||||
|
||||
#define ZLIB_FILEFUNC_MODE_READ (1) |
||||
#define ZLIB_FILEFUNC_MODE_WRITE (2) |
||||
#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) |
||||
|
||||
#define ZLIB_FILEFUNC_MODE_EXISTING (4) |
||||
#define ZLIB_FILEFUNC_MODE_CREATE (8) |
||||
|
||||
|
||||
#ifndef ZCALLBACK |
||||
#if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) |
||||
#define ZCALLBACK CALLBACK |
||||
#else |
||||
#define ZCALLBACK |
||||
#endif |
||||
#endif |
||||
|
||||
|
||||
|
||||
|
||||
typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); |
||||
typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); |
||||
typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); |
||||
typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); |
||||
typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); |
||||
|
||||
typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); |
||||
typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); |
||||
|
||||
|
||||
/* here is the "old" 32 bits structure structure */ |
||||
typedef struct zlib_filefunc_def_s |
||||
{ |
||||
open_file_func zopen_file; |
||||
read_file_func zread_file; |
||||
write_file_func zwrite_file; |
||||
tell_file_func ztell_file; |
||||
seek_file_func zseek_file; |
||||
close_file_func zclose_file; |
||||
testerror_file_func zerror_file; |
||||
voidpf opaque; |
||||
} zlib_filefunc_def; |
||||
|
||||
typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream)); |
||||
typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); |
||||
typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode)); |
||||
|
||||
typedef struct zlib_filefunc64_def_s |
||||
{ |
||||
open64_file_func zopen64_file; |
||||
read_file_func zread_file; |
||||
write_file_func zwrite_file; |
||||
tell64_file_func ztell64_file; |
||||
seek64_file_func zseek64_file; |
||||
close_file_func zclose_file; |
||||
testerror_file_func zerror_file; |
||||
voidpf opaque; |
||||
} zlib_filefunc64_def; |
||||
|
||||
void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); |
||||
|
||||
/* now internal definition, only for zip.c and unzip.h */ |
||||
typedef struct zlib_filefunc64_32_def_s |
||||
{ |
||||
zlib_filefunc64_def zfile_func64; |
||||
open_file_func zopen32_file; |
||||
tell_file_func ztell32_file; |
||||
seek_file_func zseek32_file; |
||||
} zlib_filefunc64_32_def; |
||||
|
||||
|
||||
#define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) |
||||
#define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) |
||||
//#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream))
|
||||
//#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode))
|
||||
#define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) |
||||
#define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) |
||||
|
||||
voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)); |
||||
long call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)); |
||||
ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)); |
||||
|
||||
void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32); |
||||
|
||||
#define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode))) |
||||
#define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream))) |
||||
#define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode))) |
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
||||
|
||||
#endif |
@ -0,0 +1,467 @@ |
||||
/* iowin32.c -- IO base function header for compress/uncompress .zip
|
||||
Version 1.1, February 14h, 2010 |
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
*/ |
||||
|
||||
#include <stdlib.h> |
||||
|
||||
#include "zlib.h" |
||||
#include "ioapi.h" |
||||
#include "iowin32.h" |
||||
|
||||
#ifndef INVALID_HANDLE_VALUE |
||||
#define INVALID_HANDLE_VALUE (0xFFFFFFFF) |
||||
#endif |
||||
|
||||
#ifndef INVALID_SET_FILE_POINTER |
||||
#define INVALID_SET_FILE_POINTER ((DWORD)-1) |
||||
#endif |
||||
|
||||
|
||||
// see Include/shared/winapifamily.h in the Windows Kit
|
||||
#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) |
||||
|
||||
#if !defined(WINAPI_FAMILY_ONE_PARTITION) |
||||
#define WINAPI_FAMILY_ONE_PARTITION(PartitionSet, Partition) ((WINAPI_FAMILY & PartitionSet) == Partition) |
||||
#endif |
||||
|
||||
#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP) |
||||
#define IOWIN32_USING_WINRT_API 1 |
||||
#endif |
||||
#endif |
||||
|
||||
voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode)); |
||||
uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); |
||||
uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); |
||||
ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); |
||||
long ZCALLBACK win32_seek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); |
||||
int ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream)); |
||||
int ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream)); |
||||
|
||||
typedef struct |
||||
{ |
||||
HANDLE hf; |
||||
int error; |
||||
} WIN32FILE_IOWIN; |
||||
|
||||
|
||||
static void win32_translate_open_mode(int mode, |
||||
DWORD* lpdwDesiredAccess, |
||||
DWORD* lpdwCreationDisposition, |
||||
DWORD* lpdwShareMode, |
||||
DWORD* lpdwFlagsAndAttributes) |
||||
{ |
||||
*lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0; |
||||
|
||||
if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) |
||||
{ |
||||
*lpdwDesiredAccess = GENERIC_READ; |
||||
*lpdwCreationDisposition = OPEN_EXISTING; |
||||
*lpdwShareMode = FILE_SHARE_READ; |
||||
} |
||||
else if (mode & ZLIB_FILEFUNC_MODE_EXISTING) |
||||
{ |
||||
*lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; |
||||
*lpdwCreationDisposition = OPEN_EXISTING; |
||||
} |
||||
else if (mode & ZLIB_FILEFUNC_MODE_CREATE) |
||||
{ |
||||
*lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; |
||||
*lpdwCreationDisposition = CREATE_ALWAYS; |
||||
} |
||||
} |
||||
|
||||
static voidpf win32_build_iowin(HANDLE hFile) |
||||
{ |
||||
voidpf ret=NULL; |
||||
|
||||
if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE)) |
||||
{ |
||||
WIN32FILE_IOWIN w32fiow; |
||||
w32fiow.hf = hFile; |
||||
w32fiow.error = 0; |
||||
ret = malloc(sizeof(WIN32FILE_IOWIN)); |
||||
|
||||
if (ret==NULL) |
||||
CloseHandle(hFile); |
||||
else |
||||
*((WIN32FILE_IOWIN*)ret) = w32fiow; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode) |
||||
{ |
||||
const char* mode_fopen = NULL; |
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
||||
HANDLE hFile = NULL; |
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); |
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API |
||||
#ifdef UNICODE |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
{ |
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; |
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); |
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); |
||||
} |
||||
#endif |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); |
||||
#endif |
||||
|
||||
return win32_build_iowin(hFile); |
||||
} |
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode) |
||||
{ |
||||
const char* mode_fopen = NULL; |
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
||||
HANDLE hFile = NULL; |
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); |
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
{ |
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; |
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); |
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); |
||||
} |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); |
||||
#endif |
||||
|
||||
return win32_build_iowin(hFile); |
||||
} |
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode) |
||||
{ |
||||
const char* mode_fopen = NULL; |
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
||||
HANDLE hFile = NULL; |
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); |
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL); |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); |
||||
#endif |
||||
|
||||
return win32_build_iowin(hFile); |
||||
} |
||||
|
||||
|
||||
voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode) |
||||
{ |
||||
const char* mode_fopen = NULL; |
||||
DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; |
||||
HANDLE hFile = NULL; |
||||
|
||||
win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); |
||||
|
||||
#ifdef IOWIN32_USING_WINRT_API |
||||
#ifdef UNICODE |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
{ |
||||
WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; |
||||
MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); |
||||
hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); |
||||
} |
||||
#endif |
||||
#else |
||||
if ((filename!=NULL) && (dwDesiredAccess != 0)) |
||||
hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); |
||||
#endif |
||||
|
||||
return win32_build_iowin(hFile); |
||||
} |
||||
|
||||
|
||||
uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size) |
||||
{ |
||||
uLong ret=0; |
||||
HANDLE hFile = NULL; |
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf; |
||||
|
||||
if (hFile != NULL) |
||||
{ |
||||
if (!ReadFile(hFile, buf, size, &ret, NULL)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
if (dwErr == ERROR_HANDLE_EOF) |
||||
dwErr = 0; |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
} |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
|
||||
|
||||
uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size) |
||||
{ |
||||
uLong ret=0; |
||||
HANDLE hFile = NULL; |
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf; |
||||
|
||||
if (hFile != NULL) |
||||
{ |
||||
if (!WriteFile(hFile, buf, size, &ret, NULL)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
if (dwErr == ERROR_HANDLE_EOF) |
||||
dwErr = 0; |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
} |
||||
} |
||||
|
||||
return ret; |
||||
} |
||||
|
||||
static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos, DWORD dwMoveMethod) |
||||
{ |
||||
#ifdef IOWIN32_USING_WINRT_API |
||||
return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod); |
||||
#else |
||||
LONG lHigh = pos.HighPart; |
||||
DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod); |
||||
BOOL fOk = TRUE; |
||||
if (dwNewPos == 0xFFFFFFFF) |
||||
if (GetLastError() != NO_ERROR) |
||||
fOk = FALSE; |
||||
if ((newPos != NULL) && (fOk)) |
||||
{ |
||||
newPos->LowPart = dwNewPos; |
||||
newPos->HighPart = lHigh; |
||||
} |
||||
return fOk; |
||||
#endif |
||||
} |
||||
|
||||
long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) |
||||
{ |
||||
long ret=-1; |
||||
HANDLE hFile = NULL; |
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf; |
||||
if (hFile != NULL) |
||||
{ |
||||
LARGE_INTEGER pos; |
||||
pos.QuadPart = 0; |
||||
|
||||
if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
ret = -1; |
||||
} |
||||
else |
||||
ret=(long)pos.LowPart; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
ZPOS64_T ret= (ZPOS64_T)-1; |
||||
HANDLE hFile = NULL; |
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream)->hf; |
||||
|
||||
if (hFile) |
||||
{ |
||||
LARGE_INTEGER pos; |
||||
pos.QuadPart = 0; |
||||
|
||||
if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
ret = (ZPOS64_T)-1; |
||||
} |
||||
else |
||||
ret=pos.QuadPart; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
|
||||
long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin) |
||||
{ |
||||
DWORD dwMoveMethod=0xFFFFFFFF; |
||||
HANDLE hFile = NULL; |
||||
|
||||
long ret=-1; |
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf; |
||||
switch (origin) |
||||
{ |
||||
case ZLIB_FILEFUNC_SEEK_CUR : |
||||
dwMoveMethod = FILE_CURRENT; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_END : |
||||
dwMoveMethod = FILE_END; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_SET : |
||||
dwMoveMethod = FILE_BEGIN; |
||||
break; |
||||
default: return -1; |
||||
} |
||||
|
||||
if (hFile != NULL) |
||||
{ |
||||
LARGE_INTEGER pos; |
||||
pos.QuadPart = offset; |
||||
if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
ret = -1; |
||||
} |
||||
else |
||||
ret=0; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin) |
||||
{ |
||||
DWORD dwMoveMethod=0xFFFFFFFF; |
||||
HANDLE hFile = NULL; |
||||
long ret=-1; |
||||
|
||||
if (stream!=NULL) |
||||
hFile = ((WIN32FILE_IOWIN*)stream)->hf; |
||||
|
||||
switch (origin) |
||||
{ |
||||
case ZLIB_FILEFUNC_SEEK_CUR : |
||||
dwMoveMethod = FILE_CURRENT; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_END : |
||||
dwMoveMethod = FILE_END; |
||||
break; |
||||
case ZLIB_FILEFUNC_SEEK_SET : |
||||
dwMoveMethod = FILE_BEGIN; |
||||
break; |
||||
default: return -1; |
||||
} |
||||
|
||||
if (hFile) |
||||
{ |
||||
LARGE_INTEGER pos; |
||||
pos.QuadPart = offset; |
||||
if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod)) |
||||
{ |
||||
DWORD dwErr = GetLastError(); |
||||
((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; |
||||
ret = -1; |
||||
} |
||||
else |
||||
ret=0; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream) |
||||
{ |
||||
int ret=-1; |
||||
|
||||
if (stream!=NULL) |
||||
{ |
||||
HANDLE hFile; |
||||
hFile = ((WIN32FILE_IOWIN*)stream) -> hf; |
||||
if (hFile != NULL) |
||||
{ |
||||
CloseHandle(hFile); |
||||
ret=0; |
||||
} |
||||
free(stream); |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream) |
||||
{ |
||||
int ret=-1; |
||||
if (stream!=NULL) |
||||
{ |
||||
ret = ((WIN32FILE_IOWIN*)stream) -> error; |
||||
} |
||||
return ret; |
||||
} |
||||
|
||||
void fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def) |
||||
{ |
||||
pzlib_filefunc_def->zopen_file = win32_open_file_func; |
||||
pzlib_filefunc_def->zread_file = win32_read_file_func; |
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
||||
pzlib_filefunc_def->ztell_file = win32_tell_file_func; |
||||
pzlib_filefunc_def->zseek_file = win32_seek_file_func; |
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func; |
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
||||
|
||||
void fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) |
||||
{ |
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_func; |
||||
pzlib_filefunc_def->zread_file = win32_read_file_func; |
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; |
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; |
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func; |
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
||||
|
||||
|
||||
void fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) |
||||
{ |
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA; |
||||
pzlib_filefunc_def->zread_file = win32_read_file_func; |
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; |
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; |
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func; |
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
||||
|
||||
|
||||
void fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def) |
||||
{ |
||||
pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW; |
||||
pzlib_filefunc_def->zread_file = win32_read_file_func; |
||||
pzlib_filefunc_def->zwrite_file = win32_write_file_func; |
||||
pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; |
||||
pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; |
||||
pzlib_filefunc_def->zclose_file = win32_close_file_func; |
||||
pzlib_filefunc_def->zerror_file = win32_error_file_func; |
||||
pzlib_filefunc_def->opaque = NULL; |
||||
} |
@ -0,0 +1,28 @@ |
||||
/* iowin32.h -- IO base function header for compress/uncompress .zip
|
||||
Version 1.1, February 14h, 2010 |
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
*/ |
||||
|
||||
#include <windows.h> |
||||
|
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
void fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); |
||||
void fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
void fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
void fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
@ -0,0 +1,25 @@ |
||||
$ if f$search("ioapi.h_orig") .eqs. "" then copy ioapi.h ioapi.h_orig |
||||
$ open/write zdef vmsdefs.h |
||||
$ copy sys$input: zdef |
||||
$ deck |
||||
#define unix |
||||
#define fill_zlib_filefunc64_32_def_from_filefunc32 fillzffunc64from |
||||
#define Write_Zip64EndOfCentralDirectoryLocator Write_Zip64EoDLocator |
||||
#define Write_Zip64EndOfCentralDirectoryRecord Write_Zip64EoDRecord |
||||
#define Write_EndOfCentralDirectoryRecord Write_EoDRecord |
||||
$ eod |
||||
$ close zdef |
||||
$ copy vmsdefs.h,ioapi.h_orig ioapi.h |
||||
$ cc/include=[--]/prefix=all ioapi.c |
||||
$ cc/include=[--]/prefix=all miniunz.c |
||||
$ cc/include=[--]/prefix=all unzip.c |
||||
$ cc/include=[--]/prefix=all minizip.c |
||||
$ cc/include=[--]/prefix=all zip.c |
||||
$ link miniunz,unzip,ioapi,[--]libz.olb/lib |
||||
$ link minizip,zip,ioapi,[--]libz.olb/lib |
||||
$ mcr []minizip test minizip_info.txt |
||||
$ mcr []miniunz -l test.zip |
||||
$ rename minizip_info.txt; minizip_info.txt_old |
||||
$ mcr []miniunz test.zip |
||||
$ delete test.zip;* |
||||
$exit |
@ -0,0 +1,659 @@ |
||||
/*
|
||||
miniunz.c |
||||
Version 1.1, February 14h, 2010 |
||||
sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications of Unzip for Zip64 |
||||
Copyright (C) 2007-2008 Even Rouault |
||||
|
||||
Modifications for Zip64 support on both zip and unzip |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
*/ |
||||
|
||||
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
||||
#ifndef __USE_FILE_OFFSET64 |
||||
#define __USE_FILE_OFFSET64 |
||||
#endif |
||||
#ifndef __USE_LARGEFILE64 |
||||
#define __USE_LARGEFILE64 |
||||
#endif |
||||
#ifndef _LARGEFILE64_SOURCE |
||||
#define _LARGEFILE64_SOURCE |
||||
#endif |
||||
#ifndef _FILE_OFFSET_BIT |
||||
#define _FILE_OFFSET_BIT 64 |
||||
#endif |
||||
#endif |
||||
|
||||
#ifdef __APPLE__ |
||||
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
||||
#define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) |
||||
#else |
||||
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello64(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) |
||||
#endif |
||||
|
||||
|
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
#include <time.h> |
||||
#include <errno.h> |
||||
#include <fcntl.h> |
||||
#include <sys/stat.h> |
||||
|
||||
#ifdef _WIN32 |
||||
# include <direct.h> |
||||
# include <io.h> |
||||
#else |
||||
# include <unistd.h> |
||||
# include <utime.h> |
||||
#endif |
||||
|
||||
|
||||
#include "unzip.h" |
||||
|
||||
#define CASESENSITIVITY (0) |
||||
#define WRITEBUFFERSIZE (8192) |
||||
#define MAXFILENAME (256) |
||||
|
||||
#ifdef _WIN32 |
||||
#define USEWIN32IOAPI |
||||
#include "iowin32.h" |
||||
#endif |
||||
/*
|
||||
mini unzip, demo of unzip package |
||||
|
||||
usage : |
||||
Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir] |
||||
|
||||
list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT |
||||
if it exists |
||||
*/ |
||||
|
||||
|
||||
/* change_file_date : change the date/time of a file
|
||||
filename : the filename of the file where date/time must be modified |
||||
dosdate : the new date at the MSDos format (4 bytes) |
||||
tmu_date : the SAME new date at the tm_unz format */ |
||||
static void change_file_date(filename,dosdate,tmu_date) |
||||
const char *filename; |
||||
uLong dosdate; |
||||
tm_unz tmu_date; |
||||
{ |
||||
#ifdef _WIN32 |
||||
HANDLE hFile; |
||||
FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite; |
||||
|
||||
hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE, |
||||
0,NULL,OPEN_EXISTING,0,NULL); |
||||
GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite); |
||||
DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal); |
||||
LocalFileTimeToFileTime(&ftLocal,&ftm); |
||||
SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); |
||||
CloseHandle(hFile); |
||||
#else |
||||
#if defined(unix) || defined(__APPLE__) |
||||
(void)dosdate; |
||||
struct utimbuf ut; |
||||
struct tm newdate; |
||||
newdate.tm_sec = tmu_date.tm_sec; |
||||
newdate.tm_min=tmu_date.tm_min; |
||||
newdate.tm_hour=tmu_date.tm_hour; |
||||
newdate.tm_mday=tmu_date.tm_mday; |
||||
newdate.tm_mon=tmu_date.tm_mon; |
||||
if (tmu_date.tm_year > 1900) |
||||
newdate.tm_year=tmu_date.tm_year - 1900; |
||||
else |
||||
newdate.tm_year=tmu_date.tm_year ; |
||||
newdate.tm_isdst=-1; |
||||
|
||||
ut.actime=ut.modtime=mktime(&newdate); |
||||
utime(filename,&ut); |
||||
#endif |
||||
#endif |
||||
} |
||||
|
||||
|
||||
/* mymkdir and change_file_date are not 100 % portable
|
||||
As I don't know well Unix, I wait feedback for the unix portion */ |
||||
|
||||
static int mymkdir(dirname) |
||||
const char* dirname; |
||||
{ |
||||
int ret=0; |
||||
#ifdef _WIN32 |
||||
ret = _mkdir(dirname); |
||||
#elif unix |
||||
ret = mkdir (dirname,0775); |
||||
#elif __APPLE__ |
||||
ret = mkdir (dirname,0775); |
||||
#endif |
||||
return ret; |
||||
} |
||||
|
||||
static int makedir (newdir) |
||||
const char *newdir; |
||||
{ |
||||
char *buffer ; |
||||
char *p; |
||||
size_t len = strlen(newdir); |
||||
|
||||
if (len == 0) |
||||
return 0; |
||||
|
||||
buffer = (char*)malloc(len+1); |
||||
if (buffer==NULL) |
||||
{ |
||||
printf("Error allocating memory\n"); |
||||
return UNZ_INTERNALERROR; |
||||
} |
||||
strcpy(buffer,newdir); |
||||
|
||||
if (buffer[len-1] == '/') { |
||||
buffer[len-1] = '\0'; |
||||
} |
||||
if (mymkdir(buffer) == 0) |
||||
{ |
||||
free(buffer); |
||||
return 1; |
||||
} |
||||
|
||||
p = buffer+1; |
||||
while (1) |
||||
{ |
||||
char hold; |
||||
|
||||
while(*p && *p != '\\' && *p != '/') |
||||
p++; |
||||
hold = *p; |
||||
*p = 0; |
||||
if ((mymkdir(buffer) == -1) && (errno == ENOENT)) |
||||
{ |
||||
printf("couldn't create directory %s\n",buffer); |
||||
free(buffer); |
||||
return 0; |
||||
} |
||||
if (hold == 0) |
||||
break; |
||||
*p++ = hold; |
||||
} |
||||
free(buffer); |
||||
return 1; |
||||
} |
||||
|
||||
static void do_banner() |
||||
{ |
||||
printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n"); |
||||
printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); |
||||
} |
||||
|
||||
static void do_help() |
||||
{ |
||||
printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
|
||||
" -e Extract without pathname (junk paths)\n" \
|
||||
" -x Extract with pathname\n" \
|
||||
" -v list files\n" \
|
||||
" -l list files\n" \
|
||||
" -d directory to extract into\n" \
|
||||
" -o overwrite files without prompting\n" \
|
||||
" -p extract crypted file using password\n\n"); |
||||
} |
||||
|
||||
static void Display64BitsSize(ZPOS64_T n, int size_char) |
||||
{ |
||||
/* to avoid compatibility problem , we do here the conversion */ |
||||
char number[21]; |
||||
int offset=19; |
||||
int pos_string = 19; |
||||
number[20]=0; |
||||
for (;;) { |
||||
number[offset]=(char)((n%10)+'0'); |
||||
if (number[offset] != '0') |
||||
pos_string=offset; |
||||
n/=10; |
||||
if (offset==0) |
||||
break; |
||||
offset--; |
||||
} |
||||
{ |
||||
int size_display_string = 19-pos_string; |
||||
while (size_char > size_display_string) |
||||
{ |
||||
size_char--; |
||||
printf(" "); |
||||
} |
||||
} |
||||
|
||||
printf("%s",&number[pos_string]); |
||||
} |
||||
|
||||
static int do_list(uf) |
||||
unzFile uf; |
||||
{ |
||||
uLong i; |
||||
unz_global_info64 gi; |
||||
int err; |
||||
|
||||
err = unzGetGlobalInfo64(uf,&gi); |
||||
if (err!=UNZ_OK) |
||||
printf("error %d with zipfile in unzGetGlobalInfo \n",err); |
||||
printf(" Length Method Size Ratio Date Time CRC-32 Name\n"); |
||||
printf(" ------ ------ ---- ----- ---- ---- ------ ----\n"); |
||||
for (i=0;i<gi.number_entry;i++) |
||||
{ |
||||
char filename_inzip[256]; |
||||
unz_file_info64 file_info; |
||||
uLong ratio=0; |
||||
const char *string_method; |
||||
char charCrypt=' '; |
||||
err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); |
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzGetCurrentFileInfo\n",err); |
||||
break; |
||||
} |
||||
if (file_info.uncompressed_size>0) |
||||
ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size); |
||||
|
||||
/* display a '*' if the file is crypted */ |
||||
if ((file_info.flag & 1) != 0) |
||||
charCrypt='*'; |
||||
|
||||
if (file_info.compression_method==0) |
||||
string_method="Stored"; |
||||
else |
||||
if (file_info.compression_method==Z_DEFLATED) |
||||
{ |
||||
uInt iLevel=(uInt)((file_info.flag & 0x6)/2); |
||||
if (iLevel==0) |
||||
string_method="Defl:N"; |
||||
else if (iLevel==1) |
||||
string_method="Defl:X"; |
||||
else if ((iLevel==2) || (iLevel==3)) |
||||
string_method="Defl:F"; /* 2:fast , 3 : extra fast*/ |
||||
} |
||||
else |
||||
if (file_info.compression_method==Z_BZIP2ED) |
||||
{ |
||||
string_method="BZip2 "; |
||||
} |
||||
else |
||||
string_method="Unkn. "; |
||||
|
||||
Display64BitsSize(file_info.uncompressed_size,7); |
||||
printf(" %6s%c",string_method,charCrypt); |
||||
Display64BitsSize(file_info.compressed_size,7); |
||||
printf(" %3lu%% %2.2lu-%2.2lu-%2.2lu %2.2lu:%2.2lu %8.8lx %s\n", |
||||
ratio, |
||||
(uLong)file_info.tmu_date.tm_mon + 1, |
||||
(uLong)file_info.tmu_date.tm_mday, |
||||
(uLong)file_info.tmu_date.tm_year % 100, |
||||
(uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min, |
||||
(uLong)file_info.crc,filename_inzip); |
||||
if ((i+1)<gi.number_entry) |
||||
{ |
||||
err = unzGoToNextFile(uf); |
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzGoToNextFile\n",err); |
||||
break; |
||||
} |
||||
} |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
|
||||
static int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password) |
||||
unzFile uf; |
||||
const int* popt_extract_without_path; |
||||
int* popt_overwrite; |
||||
const char* password; |
||||
{ |
||||
char filename_inzip[256]; |
||||
char* filename_withoutpath; |
||||
char* p; |
||||
int err=UNZ_OK; |
||||
FILE *fout=NULL; |
||||
void* buf; |
||||
uInt size_buf; |
||||
|
||||
unz_file_info64 file_info; |
||||
err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); |
||||
|
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzGetCurrentFileInfo\n",err); |
||||
return err; |
||||
} |
||||
|
||||
size_buf = WRITEBUFFERSIZE; |
||||
buf = (void*)malloc(size_buf); |
||||
if (buf==NULL) |
||||
{ |
||||
printf("Error allocating memory\n"); |
||||
return UNZ_INTERNALERROR; |
||||
} |
||||
|
||||
p = filename_withoutpath = filename_inzip; |
||||
while ((*p) != '\0') |
||||
{ |
||||
if (((*p)=='/') || ((*p)=='\\')) |
||||
filename_withoutpath = p+1; |
||||
p++; |
||||
} |
||||
|
||||
if ((*filename_withoutpath)=='\0') |
||||
{ |
||||
if ((*popt_extract_without_path)==0) |
||||
{ |
||||
printf("creating directory: %s\n",filename_inzip); |
||||
mymkdir(filename_inzip); |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
const char* write_filename; |
||||
int skip=0; |
||||
|
||||
if ((*popt_extract_without_path)==0) |
||||
write_filename = filename_inzip; |
||||
else |
||||
write_filename = filename_withoutpath; |
||||
|
||||
err = unzOpenCurrentFilePassword(uf,password); |
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err); |
||||
} |
||||
|
||||
if (((*popt_overwrite)==0) && (err==UNZ_OK)) |
||||
{ |
||||
char rep=0; |
||||
FILE* ftestexist; |
||||
ftestexist = FOPEN_FUNC(write_filename,"rb"); |
||||
if (ftestexist!=NULL) |
||||
{ |
||||
fclose(ftestexist); |
||||
do |
||||
{ |
||||
char answer[128]; |
||||
int ret; |
||||
|
||||
printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename); |
||||
ret = scanf("%1s",answer); |
||||
if (ret != 1) |
||||
{ |
||||
exit(EXIT_FAILURE); |
||||
} |
||||
rep = answer[0] ; |
||||
if ((rep>='a') && (rep<='z')) |
||||
rep -= 0x20; |
||||
} |
||||
while ((rep!='Y') && (rep!='N') && (rep!='A')); |
||||
} |
||||
|
||||
if (rep == 'N') |
||||
skip = 1; |
||||
|
||||
if (rep == 'A') |
||||
*popt_overwrite=1; |
||||
} |
||||
|
||||
if ((skip==0) && (err==UNZ_OK)) |
||||
{ |
||||
fout=FOPEN_FUNC(write_filename,"wb"); |
||||
/* some zipfile don't contain directory alone before file */ |
||||
if ((fout==NULL) && ((*popt_extract_without_path)==0) && |
||||
(filename_withoutpath!=(char*)filename_inzip)) |
||||
{ |
||||
char c=*(filename_withoutpath-1); |
||||
*(filename_withoutpath-1)='\0'; |
||||
makedir(write_filename); |
||||
*(filename_withoutpath-1)=c; |
||||
fout=FOPEN_FUNC(write_filename,"wb"); |
||||
} |
||||
|
||||
if (fout==NULL) |
||||
{ |
||||
printf("error opening %s\n",write_filename); |
||||
} |
||||
} |
||||
|
||||
if (fout!=NULL) |
||||
{ |
||||
printf(" extracting: %s\n",write_filename); |
||||
|
||||
do |
||||
{ |
||||
err = unzReadCurrentFile(uf,buf,size_buf); |
||||
if (err<0) |
||||
{ |
||||
printf("error %d with zipfile in unzReadCurrentFile\n",err); |
||||
break; |
||||
} |
||||
if (err>0) |
||||
if (fwrite(buf,(unsigned)err,1,fout)!=1) |
||||
{ |
||||
printf("error in writing extracted file\n"); |
||||
err=UNZ_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
while (err>0); |
||||
if (fout) |
||||
fclose(fout); |
||||
|
||||
if (err==0) |
||||
change_file_date(write_filename,file_info.dosDate, |
||||
file_info.tmu_date); |
||||
} |
||||
|
||||
if (err==UNZ_OK) |
||||
{ |
||||
err = unzCloseCurrentFile (uf); |
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzCloseCurrentFile\n",err); |
||||
} |
||||
} |
||||
else |
||||
unzCloseCurrentFile(uf); /* don't lose the error */ |
||||
} |
||||
|
||||
free(buf); |
||||
return err; |
||||
} |
||||
|
||||
|
||||
static int do_extract(uf,opt_extract_without_path,opt_overwrite,password) |
||||
unzFile uf; |
||||
int opt_extract_without_path; |
||||
int opt_overwrite; |
||||
const char* password; |
||||
{ |
||||
uLong i; |
||||
unz_global_info64 gi; |
||||
int err; |
||||
|
||||
err = unzGetGlobalInfo64(uf,&gi); |
||||
if (err!=UNZ_OK) |
||||
printf("error %d with zipfile in unzGetGlobalInfo \n",err); |
||||
|
||||
for (i=0;i<gi.number_entry;i++) |
||||
{ |
||||
if (do_extract_currentfile(uf,&opt_extract_without_path, |
||||
&opt_overwrite, |
||||
password) != UNZ_OK) |
||||
break; |
||||
|
||||
if ((i+1)<gi.number_entry) |
||||
{ |
||||
err = unzGoToNextFile(uf); |
||||
if (err!=UNZ_OK) |
||||
{ |
||||
printf("error %d with zipfile in unzGoToNextFile\n",err); |
||||
break; |
||||
} |
||||
} |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
static int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password) |
||||
unzFile uf; |
||||
const char* filename; |
||||
int opt_extract_without_path; |
||||
int opt_overwrite; |
||||
const char* password; |
||||
{ |
||||
if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK) |
||||
{ |
||||
printf("file %s not found in the zipfile\n",filename); |
||||
return 2; |
||||
} |
||||
|
||||
if (do_extract_currentfile(uf,&opt_extract_without_path, |
||||
&opt_overwrite, |
||||
password) == UNZ_OK) |
||||
return 0; |
||||
else |
||||
return 1; |
||||
} |
||||
|
||||
|
||||
int main(argc,argv) |
||||
int argc; |
||||
char *argv[]; |
||||
{ |
||||
const char *zipfilename=NULL; |
||||
const char *filename_to_extract=NULL; |
||||
const char *password=NULL; |
||||
char filename_try[MAXFILENAME+16] = ""; |
||||
int i; |
||||
int ret_value=0; |
||||
int opt_do_list=0; |
||||
int opt_do_extract=1; |
||||
int opt_do_extract_withoutpath=0; |
||||
int opt_overwrite=0; |
||||
int opt_extractdir=0; |
||||
const char *dirname=NULL; |
||||
unzFile uf=NULL; |
||||
|
||||
do_banner(); |
||||
if (argc==1) |
||||
{ |
||||
do_help(); |
||||
return 0; |
||||
} |
||||
else |
||||
{ |
||||
for (i=1;i<argc;i++) |
||||
{ |
||||
if ((*argv[i])=='-') |
||||
{ |
||||
const char *p=argv[i]+1; |
||||
|
||||
while ((*p)!='\0') |
||||
{ |
||||
char c=*(p++); |
||||
if ((c=='l') || (c=='L')) |
||||
opt_do_list = 1; |
||||
if ((c=='v') || (c=='V')) |
||||
opt_do_list = 1; |
||||
if ((c=='x') || (c=='X')) |
||||
opt_do_extract = 1; |
||||
if ((c=='e') || (c=='E')) |
||||
opt_do_extract = opt_do_extract_withoutpath = 1; |
||||
if ((c=='o') || (c=='O')) |
||||
opt_overwrite=1; |
||||
if ((c=='d') || (c=='D')) |
||||
{ |
||||
opt_extractdir=1; |
||||
dirname=argv[i+1]; |
||||
} |
||||
|
||||
if (((c=='p') || (c=='P')) && (i+1<argc)) |
||||
{ |
||||
password=argv[i+1]; |
||||
i++; |
||||
} |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
if (zipfilename == NULL) |
||||
zipfilename = argv[i]; |
||||
else if ((filename_to_extract==NULL) && (!opt_extractdir)) |
||||
filename_to_extract = argv[i] ; |
||||
} |
||||
} |
||||
} |
||||
|
||||
if (zipfilename!=NULL) |
||||
{ |
||||
|
||||
# ifdef USEWIN32IOAPI |
||||
zlib_filefunc64_def ffunc; |
||||
# endif |
||||
|
||||
strncpy(filename_try, zipfilename,MAXFILENAME-1); |
||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */ |
||||
filename_try[ MAXFILENAME ] = '\0'; |
||||
|
||||
# ifdef USEWIN32IOAPI |
||||
fill_win32_filefunc64A(&ffunc); |
||||
uf = unzOpen2_64(zipfilename,&ffunc); |
||||
# else |
||||
uf = unzOpen64(zipfilename); |
||||
# endif |
||||
if (uf==NULL) |
||||
{ |
||||
strcat(filename_try,".zip"); |
||||
# ifdef USEWIN32IOAPI |
||||
uf = unzOpen2_64(filename_try,&ffunc); |
||||
# else |
||||
uf = unzOpen64(filename_try); |
||||
# endif |
||||
} |
||||
} |
||||
|
||||
if (uf==NULL) |
||||
{ |
||||
printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename); |
||||
return 1; |
||||
} |
||||
printf("%s opened\n",filename_try); |
||||
|
||||
if (opt_do_list==1) |
||||
ret_value = do_list(uf); |
||||
else if (opt_do_extract==1) |
||||
{ |
||||
#ifdef _WIN32 |
||||
if (opt_extractdir && _chdir(dirname)) |
||||
#else |
||||
if (opt_extractdir && chdir(dirname)) |
||||
#endif |
||||
{ |
||||
printf("Error changing into %s, aborting\n", dirname); |
||||
exit(-1); |
||||
} |
||||
|
||||
if (filename_to_extract == NULL) |
||||
ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password); |
||||
else |
||||
ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password); |
||||
} |
||||
|
||||
unzClose(uf); |
||||
|
||||
return ret_value; |
||||
} |
@ -0,0 +1,63 @@ |
||||
.\" Hey, EMACS: -*- nroff -*- |
||||
.TH miniunzip 1 "Nov 7, 2001" |
||||
.\" Please adjust this date whenever revising the manpage. |
||||
.\" |
||||
.\" Some roff macros, for reference: |
||||
.\" .nh disable hyphenation |
||||
.\" .hy enable hyphenation |
||||
.\" .ad l left justify |
||||
.\" .ad b justify to both left and right margins |
||||
.\" .nf disable filling |
||||
.\" .fi enable filling |
||||
.\" .br insert line break |
||||
.\" .sp <n> insert n+1 empty lines |
||||
.\" for manpage-specific macros, see man(7) |
||||
.SH NAME |
||||
miniunzip - uncompress and examine ZIP archives |
||||
.SH SYNOPSIS |
||||
.B miniunzip |
||||
.RI [ -exvlo ] |
||||
zipfile [ files_to_extract ] [-d tempdir] |
||||
.SH DESCRIPTION |
||||
.B minizip |
||||
is a simple tool which allows the extraction of compressed file |
||||
archives in the ZIP format used by the MS-DOS utility PKZIP. It was |
||||
written as a demonstration of the |
||||
.IR zlib (3) |
||||
library and therefore lack many of the features of the |
||||
.IR unzip (1) |
||||
program. |
||||
.SH OPTIONS |
||||
A number of options are supported. With the exception of |
||||
.BI \-d\ tempdir |
||||
these must be supplied before any |
||||
other arguments and are: |
||||
.TP |
||||
.BI \-l\ ,\ \-\-v |
||||
List the files in the archive without extracting them. |
||||
.TP |
||||
.B \-o |
||||
Overwrite files without prompting for confirmation. |
||||
.TP |
||||
.B \-x |
||||
Extract files (default). |
||||
.PP |
||||
The |
||||
.I zipfile |
||||
argument is the name of the archive to process. The next argument can be used |
||||
to specify a single file to extract from the archive. |
||||
|
||||
Lastly, the following option can be specified at the end of the command-line: |
||||
.TP |
||||
.BI \-d\ tempdir |
||||
Extract the archive in the directory |
||||
.I tempdir |
||||
rather than the current directory. |
||||
.SH SEE ALSO |
||||
.BR minizip (1), |
||||
.BR zlib (3), |
||||
.BR unzip (1). |
||||
.SH AUTHOR |
||||
This program was written by Gilles Vollant. This manual page was |
||||
written by Mark Brown <broonie@sirena.org.uk>. The -d tempdir option |
||||
was added by Dirk Eddelbuettel <edd@debian.org>. |
@ -0,0 +1,46 @@ |
||||
.\" Hey, EMACS: -*- nroff -*- |
||||
.TH minizip 1 "May 2, 2001" |
||||
.\" Please adjust this date whenever revising the manpage. |
||||
.\" |
||||
.\" Some roff macros, for reference: |
||||
.\" .nh disable hyphenation |
||||
.\" .hy enable hyphenation |
||||
.\" .ad l left justify |
||||
.\" .ad b justify to both left and right margins |
||||
.\" .nf disable filling |
||||
.\" .fi enable filling |
||||
.\" .br insert line break |
||||
.\" .sp <n> insert n+1 empty lines |
||||
.\" for manpage-specific macros, see man(7) |
||||
.SH NAME |
||||
minizip - create ZIP archives |
||||
.SH SYNOPSIS |
||||
.B minizip |
||||
.RI [ -o ] |
||||
zipfile [ " files" ... ] |
||||
.SH DESCRIPTION |
||||
.B minizip |
||||
is a simple tool which allows the creation of compressed file archives |
||||
in the ZIP format used by the MS-DOS utility PKZIP. It was written as |
||||
a demonstration of the |
||||
.IR zlib (3) |
||||
library and therefore lack many of the features of the |
||||
.IR zip (1) |
||||
program. |
||||
.SH OPTIONS |
||||
The first argument supplied is the name of the ZIP archive to create or |
||||
.RI -o |
||||
in which case it is ignored and the second argument treated as the |
||||
name of the ZIP file. If the ZIP file already exists it will be |
||||
overwritten. |
||||
.PP |
||||
Subsequent arguments specify a list of files to place in the ZIP |
||||
archive. If none are specified then an empty archive will be created. |
||||
.SH SEE ALSO |
||||
.BR miniunzip (1), |
||||
.BR zlib (3), |
||||
.BR zip (1). |
||||
.SH AUTHOR |
||||
This program was written by Gilles Vollant. This manual page was |
||||
written by Mark Brown <broonie@sirena.org.uk>. |
||||
|
@ -0,0 +1,521 @@ |
||||
/*
|
||||
minizip.c |
||||
Version 1.1, February 14h, 2010 |
||||
sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications of Unzip for Zip64 |
||||
Copyright (C) 2007-2008 Even Rouault |
||||
|
||||
Modifications for Zip64 support on both zip and unzip |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
*/ |
||||
|
||||
|
||||
#if (!defined(_WIN32)) && (!defined(WIN32)) && (!defined(__APPLE__)) |
||||
#ifndef __USE_FILE_OFFSET64 |
||||
#define __USE_FILE_OFFSET64 |
||||
#endif |
||||
#ifndef __USE_LARGEFILE64 |
||||
#define __USE_LARGEFILE64 |
||||
#endif |
||||
#ifndef _LARGEFILE64_SOURCE |
||||
#define _LARGEFILE64_SOURCE |
||||
#endif |
||||
#ifndef _FILE_OFFSET_BIT |
||||
#define _FILE_OFFSET_BIT 64 |
||||
#endif |
||||
#endif |
||||
|
||||
#ifdef __APPLE__ |
||||
// In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions
|
||||
#define FOPEN_FUNC(filename, mode) fopen(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin) |
||||
#else |
||||
#define FOPEN_FUNC(filename, mode) fopen64(filename, mode) |
||||
#define FTELLO_FUNC(stream) ftello64(stream) |
||||
#define FSEEKO_FUNC(stream, offset, origin) fseeko64(stream, offset, origin) |
||||
#endif |
||||
|
||||
|
||||
|
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
#include <time.h> |
||||
#include <errno.h> |
||||
#include <fcntl.h> |
||||
|
||||
#ifdef _WIN32 |
||||
# include <direct.h> |
||||
# include <io.h> |
||||
#else |
||||
# include <unistd.h> |
||||
# include <utime.h> |
||||
# include <sys/types.h> |
||||
# include <sys/stat.h> |
||||
#endif |
||||
|
||||
#include "zip.h" |
||||
|
||||
#ifdef _WIN32 |
||||
#define USEWIN32IOAPI |
||||
#include "iowin32.h" |
||||
#endif |
||||
|
||||
|
||||
|
||||
#define WRITEBUFFERSIZE (16384) |
||||
#define MAXFILENAME (256) |
||||
|
||||
#ifdef _WIN32 |
||||
static int filetime(f, tmzip, dt) |
||||
const char *f; /* name of file to get info on */ |
||||
tm_zip *tmzip; /* return value: access, modific. and creation times */ |
||||
uLong *dt; /* dostime */ |
||||
{ |
||||
int ret = 0; |
||||
{ |
||||
FILETIME ftLocal; |
||||
HANDLE hFind; |
||||
WIN32_FIND_DATAA ff32; |
||||
|
||||
hFind = FindFirstFileA(f,&ff32); |
||||
if (hFind != INVALID_HANDLE_VALUE) |
||||
{ |
||||
FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); |
||||
FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0); |
||||
FindClose(hFind); |
||||
ret = 1; |
||||
} |
||||
} |
||||
return ret; |
||||
} |
||||
#else |
||||
#if defined(unix) || defined(__APPLE__) |
||||
static int filetime(f, tmzip, dt) |
||||
const char *f; /* name of file to get info on */ |
||||
tm_zip *tmzip; /* return value: access, modific. and creation times */ |
||||
uLong *dt; /* dostime */ |
||||
{ |
||||
(void)dt; |
||||
int ret=0; |
||||
struct stat s; /* results of stat() */ |
||||
struct tm* filedate; |
||||
time_t tm_t=0; |
||||
|
||||
if (strcmp(f,"-")!=0) |
||||
{ |
||||
char name[MAXFILENAME+1]; |
||||
size_t len = strlen(f); |
||||
if (len > MAXFILENAME) |
||||
len = MAXFILENAME; |
||||
|
||||
strncpy(name, f,MAXFILENAME-1); |
||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */ |
||||
name[ MAXFILENAME ] = '\0'; |
||||
|
||||
if (name[len - 1] == '/') |
||||
name[len - 1] = '\0'; |
||||
/* not all systems allow stat'ing a file with / appended */ |
||||
if (stat(name,&s)==0) |
||||
{ |
||||
tm_t = s.st_mtime; |
||||
ret = 1; |
||||
} |
||||
} |
||||
filedate = localtime(&tm_t); |
||||
|
||||
tmzip->tm_sec = filedate->tm_sec; |
||||
tmzip->tm_min = filedate->tm_min; |
||||
tmzip->tm_hour = filedate->tm_hour; |
||||
tmzip->tm_mday = filedate->tm_mday; |
||||
tmzip->tm_mon = filedate->tm_mon ; |
||||
tmzip->tm_year = filedate->tm_year; |
||||
|
||||
return ret; |
||||
} |
||||
#else |
||||
uLong filetime(f, tmzip, dt) |
||||
const char *f; /* name of file to get info on */ |
||||
tm_zip *tmzip; /* return value: access, modific. and creation times */ |
||||
uLong *dt; /* dostime */ |
||||
{ |
||||
return 0; |
||||
} |
||||
#endif |
||||
#endif |
||||
|
||||
|
||||
|
||||
|
||||
static int check_exist_file(filename) |
||||
const char* filename; |
||||
{ |
||||
FILE* ftestexist; |
||||
int ret = 1; |
||||
ftestexist = FOPEN_FUNC(filename,"rb"); |
||||
if (ftestexist==NULL) |
||||
ret = 0; |
||||
else |
||||
fclose(ftestexist); |
||||
return ret; |
||||
} |
||||
|
||||
static void do_banner() |
||||
{ |
||||
printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n"); |
||||
printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n"); |
||||
} |
||||
|
||||
static void do_help() |
||||
{ |
||||
printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \
|
||||
" -o Overwrite existing file.zip\n" \
|
||||
" -a Append to existing file.zip\n" \
|
||||
" -0 Store only\n" \
|
||||
" -1 Compress faster\n" \
|
||||
" -9 Compress better\n\n" \
|
||||
" -j exclude path. store only the file name.\n\n"); |
||||
} |
||||
|
||||
/* calculate the CRC32 of a file,
|
||||
because to encrypt a file, we need known the CRC32 of the file before */ |
||||
static int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc) |
||||
{ |
||||
unsigned long calculate_crc=0; |
||||
int err=ZIP_OK; |
||||
FILE * fin = FOPEN_FUNC(filenameinzip,"rb"); |
||||
|
||||
unsigned long size_read = 0; |
||||
/* unsigned long total_read = 0; */ |
||||
if (fin==NULL) |
||||
{ |
||||
err = ZIP_ERRNO; |
||||
} |
||||
|
||||
if (err == ZIP_OK) |
||||
do |
||||
{ |
||||
err = ZIP_OK; |
||||
size_read = fread(buf,1,size_buf,fin); |
||||
if (size_read < size_buf) |
||||
if (feof(fin)==0) |
||||
{ |
||||
printf("error in reading %s\n",filenameinzip); |
||||
err = ZIP_ERRNO; |
||||
} |
||||
|
||||
if (size_read>0) |
||||
calculate_crc = crc32_z(calculate_crc,buf,size_read); |
||||
/* total_read += size_read; */ |
||||
|
||||
} while ((err == ZIP_OK) && (size_read>0)); |
||||
|
||||
if (fin) |
||||
fclose(fin); |
||||
|
||||
*result_crc=calculate_crc; |
||||
printf("file %s crc %lx\n", filenameinzip, calculate_crc); |
||||
return err; |
||||
} |
||||
|
||||
static int isLargeFile(const char* filename) |
||||
{ |
||||
int largeFile = 0; |
||||
ZPOS64_T pos = 0; |
||||
FILE* pFile = FOPEN_FUNC(filename, "rb"); |
||||
|
||||
if(pFile != NULL) |
||||
{ |
||||
FSEEKO_FUNC(pFile, 0, SEEK_END); |
||||
pos = (ZPOS64_T)FTELLO_FUNC(pFile); |
||||
|
||||
printf("File : %s is %lld bytes\n", filename, pos); |
||||
|
||||
if(pos >= 0xffffffff) |
||||
largeFile = 1; |
||||
|
||||
fclose(pFile); |
||||
} |
||||
|
||||
return largeFile; |
||||
} |
||||
|
||||
int main(argc,argv) |
||||
int argc; |
||||
char *argv[]; |
||||
{ |
||||
int i; |
||||
int opt_overwrite=0; |
||||
int opt_compress_level=Z_DEFAULT_COMPRESSION; |
||||
int opt_exclude_path=0; |
||||
int zipfilenamearg = 0; |
||||
char filename_try[MAXFILENAME+16]; |
||||
int zipok; |
||||
int err=0; |
||||
size_t size_buf=0; |
||||
void* buf=NULL; |
||||
const char* password=NULL; |
||||
|
||||
|
||||
do_banner(); |
||||
if (argc==1) |
||||
{ |
||||
do_help(); |
||||
return 0; |
||||
} |
||||
else |
||||
{ |
||||
for (i=1;i<argc;i++) |
||||
{ |
||||
if ((*argv[i])=='-') |
||||
{ |
||||
const char *p=argv[i]+1; |
||||
|
||||
while ((*p)!='\0') |
||||
{ |
||||
char c=*(p++); |
||||
if ((c=='o') || (c=='O')) |
||||
opt_overwrite = 1; |
||||
if ((c=='a') || (c=='A')) |
||||
opt_overwrite = 2; |
||||
if ((c>='0') && (c<='9')) |
||||
opt_compress_level = c-'0'; |
||||
if ((c=='j') || (c=='J')) |
||||
opt_exclude_path = 1; |
||||
|
||||
if (((c=='p') || (c=='P')) && (i+1<argc)) |
||||
{ |
||||
password=argv[i+1]; |
||||
i++; |
||||
} |
||||
} |
||||
} |
||||
else |
||||
{ |
||||
if (zipfilenamearg == 0) |
||||
{ |
||||
zipfilenamearg = i ; |
||||
} |
||||
} |
||||
} |
||||
} |
||||
|
||||
size_buf = WRITEBUFFERSIZE; |
||||
buf = (void*)malloc(size_buf); |
||||
if (buf==NULL) |
||||
{ |
||||
printf("Error allocating memory\n"); |
||||
return ZIP_INTERNALERROR; |
||||
} |
||||
|
||||
if (zipfilenamearg==0) |
||||
{ |
||||
zipok=0; |
||||
} |
||||
else |
||||
{ |
||||
int i,len; |
||||
int dot_found=0; |
||||
|
||||
zipok = 1 ; |
||||
strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1); |
||||
/* strncpy doesnt append the trailing NULL, of the string is too long. */ |
||||
filename_try[ MAXFILENAME ] = '\0'; |
||||
|
||||
len=(int)strlen(filename_try); |
||||
for (i=0;i<len;i++) |
||||
if (filename_try[i]=='.') |
||||
dot_found=1; |
||||
|
||||
if (dot_found==0) |
||||
strcat(filename_try,".zip"); |
||||
|
||||
if (opt_overwrite==2) |
||||
{ |
||||
/* if the file don't exist, we not append file */ |
||||
if (check_exist_file(filename_try)==0) |
||||
opt_overwrite=1; |
||||
} |
||||
else |
||||
if (opt_overwrite==0) |
||||
if (check_exist_file(filename_try)!=0) |
||||
{ |
||||
char rep=0; |
||||
do |
||||
{ |
||||
char answer[128]; |
||||
int ret; |
||||
printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try); |
||||
ret = scanf("%1s",answer); |
||||
if (ret != 1) |
||||
{ |
||||
exit(EXIT_FAILURE); |
||||
} |
||||
rep = answer[0] ; |
||||
if ((rep>='a') && (rep<='z')) |
||||
rep -= 0x20; |
||||
} |
||||
while ((rep!='Y') && (rep!='N') && (rep!='A')); |
||||
if (rep=='N') |
||||
zipok = 0; |
||||
if (rep=='A') |
||||
opt_overwrite = 2; |
||||
} |
||||
} |
||||
|
||||
if (zipok==1) |
||||
{ |
||||
zipFile zf; |
||||
int errclose; |
||||
# ifdef USEWIN32IOAPI |
||||
zlib_filefunc64_def ffunc; |
||||
fill_win32_filefunc64A(&ffunc); |
||||
zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc); |
||||
# else |
||||
zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0); |
||||
# endif |
||||
|
||||
if (zf == NULL) |
||||
{ |
||||
printf("error opening %s\n",filename_try); |
||||
err= ZIP_ERRNO; |
||||
} |
||||
else |
||||
printf("creating %s\n",filename_try); |
||||
|
||||
for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++) |
||||
{ |
||||
if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) && |
||||
((argv[i][1]=='o') || (argv[i][1]=='O') || |
||||
(argv[i][1]=='a') || (argv[i][1]=='A') || |
||||
(argv[i][1]=='p') || (argv[i][1]=='P') || |
||||
((argv[i][1]>='0') || (argv[i][1]<='9'))) && |
||||
(strlen(argv[i]) == 2))) |
||||
{ |
||||
FILE * fin; |
||||
size_t size_read; |
||||
const char* filenameinzip = argv[i]; |
||||
const char *savefilenameinzip; |
||||
zip_fileinfo zi; |
||||
unsigned long crcFile=0; |
||||
int zip64 = 0; |
||||
|
||||
zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour = |
||||
zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0; |
||||
zi.dosDate = 0; |
||||
zi.internal_fa = 0; |
||||
zi.external_fa = 0; |
||||
filetime(filenameinzip,&zi.tmz_date,&zi.dosDate); |
||||
|
||||
/*
|
||||
err = zipOpenNewFileInZip(zf,filenameinzip,&zi, |
||||
NULL,0,NULL,0,NULL / * comment * /, |
||||
(opt_compress_level != 0) ? Z_DEFLATED : 0, |
||||
opt_compress_level); |
||||
*/ |
||||
if ((password != NULL) && (err==ZIP_OK)) |
||||
err = getFileCrc(filenameinzip,buf,size_buf,&crcFile); |
||||
|
||||
zip64 = isLargeFile(filenameinzip); |
||||
|
||||
/* The path name saved, should not include a leading slash. */ |
||||
/*if it did, windows/xp and dynazip couldn't read the zip file. */ |
||||
savefilenameinzip = filenameinzip; |
||||
while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' ) |
||||
{ |
||||
savefilenameinzip++; |
||||
} |
||||
|
||||
/*should the zip file contain any path at all?*/ |
||||
if( opt_exclude_path ) |
||||
{ |
||||
const char *tmpptr; |
||||
const char *lastslash = 0; |
||||
for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++) |
||||
{ |
||||
if( *tmpptr == '\\' || *tmpptr == '/') |
||||
{ |
||||
lastslash = tmpptr; |
||||
} |
||||
} |
||||
if( lastslash != NULL ) |
||||
{ |
||||
savefilenameinzip = lastslash+1; // base filename follows last slash.
|
||||
} |
||||
} |
||||
|
||||
/**/ |
||||
err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi, |
||||
NULL,0,NULL,0,NULL /* comment*/, |
||||
(opt_compress_level != 0) ? Z_DEFLATED : 0, |
||||
opt_compress_level,0, |
||||
/* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */ |
||||
-MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, |
||||
password,crcFile, zip64); |
||||
|
||||
if (err != ZIP_OK) |
||||
printf("error in opening %s in zipfile\n",filenameinzip); |
||||
else |
||||
{ |
||||
fin = FOPEN_FUNC(filenameinzip,"rb"); |
||||
if (fin==NULL) |
||||
{ |
||||
err=ZIP_ERRNO; |
||||
printf("error in opening %s for reading\n",filenameinzip); |
||||
} |
||||
} |
||||
|
||||
if (err == ZIP_OK) |
||||
do |
||||
{ |
||||
err = ZIP_OK; |
||||
size_read = fread(buf,1,size_buf,fin); |
||||
if (size_read < size_buf) |
||||
if (feof(fin)==0) |
||||
{ |
||||
printf("error in reading %s\n",filenameinzip); |
||||
err = ZIP_ERRNO; |
||||
} |
||||
|
||||
if (size_read>0) |
||||
{ |
||||
err = zipWriteInFileInZip (zf,buf,(unsigned)size_read); |
||||
if (err<0) |
||||
{ |
||||
printf("error in writing %s in the zipfile\n", |
||||
filenameinzip); |
||||
} |
||||
|
||||
} |
||||
} while ((err == ZIP_OK) && (size_read>0)); |
||||
|
||||
if (fin) |
||||
fclose(fin); |
||||
|
||||
if (err<0) |
||||
err=ZIP_ERRNO; |
||||
else |
||||
{ |
||||
err = zipCloseFileInZip(zf); |
||||
if (err!=ZIP_OK) |
||||
printf("error in closing %s in the zipfile\n", |
||||
filenameinzip); |
||||
} |
||||
} |
||||
} |
||||
errclose = zipClose(zf,NULL); |
||||
if (errclose != ZIP_OK) |
||||
printf("error in closing %s\n",filename_try); |
||||
} |
||||
else |
||||
{ |
||||
do_help(); |
||||
} |
||||
|
||||
free(buf); |
||||
return 0; |
||||
} |
@ -0,0 +1,12 @@ |
||||
prefix=@prefix@ |
||||
exec_prefix=@exec_prefix@ |
||||
libdir=@libdir@ |
||||
includedir=@includedir@/minizip |
||||
|
||||
Name: minizip |
||||
Description: Minizip zip file manipulation library |
||||
Requires: |
||||
Version: @PACKAGE_VERSION@ |
||||
Libs: -L${libdir} -lminizip |
||||
Libs.private: -lz |
||||
Cflags: -I${includedir} |
@ -0,0 +1,291 @@ |
||||
/*
|
||||
Additional tools for Minizip |
||||
Code: Xavier Roche '2004 |
||||
License: Same as ZLIB (www.gzip.org) |
||||
*/ |
||||
|
||||
/* Code */ |
||||
#include <stdio.h> |
||||
#include <stdlib.h> |
||||
#include <string.h> |
||||
#include "zlib.h" |
||||
#include "unzip.h" |
||||
|
||||
#define READ_8(adr) ((unsigned char)*(adr)) |
||||
#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) |
||||
#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) ) |
||||
|
||||
#define WRITE_8(buff, n) do { \ |
||||
*((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
|
||||
} while(0) |
||||
#define WRITE_16(buff, n) do { \ |
||||
WRITE_8((unsigned char*)(buff), n); \
|
||||
WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
|
||||
} while(0) |
||||
#define WRITE_32(buff, n) do { \ |
||||
WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
|
||||
WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
|
||||
} while(0) |
||||
|
||||
extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) |
||||
const char* file; |
||||
const char* fileOut; |
||||
const char* fileOutTmp; |
||||
uLong* nRecovered; |
||||
uLong* bytesRecovered; |
||||
{ |
||||
int err = Z_OK; |
||||
FILE* fpZip = fopen(file, "rb"); |
||||
FILE* fpOut = fopen(fileOut, "wb"); |
||||
FILE* fpOutCD = fopen(fileOutTmp, "wb"); |
||||
if (fpZip != NULL && fpOut != NULL) { |
||||
int entries = 0; |
||||
uLong totalBytes = 0; |
||||
char header[30]; |
||||
char filename[1024]; |
||||
char extra[1024]; |
||||
int offset = 0; |
||||
int offsetCD = 0; |
||||
while ( fread(header, 1, 30, fpZip) == 30 ) { |
||||
int currentOffset = offset; |
||||
|
||||
/* File entry */ |
||||
if (READ_32(header) == 0x04034b50) { |
||||
unsigned int version = READ_16(header + 4); |
||||
unsigned int gpflag = READ_16(header + 6); |
||||
unsigned int method = READ_16(header + 8); |
||||
unsigned int filetime = READ_16(header + 10); |
||||
unsigned int filedate = READ_16(header + 12); |
||||
unsigned int crc = READ_32(header + 14); /* crc */ |
||||
unsigned int cpsize = READ_32(header + 18); /* compressed size */ |
||||
unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */ |
||||
unsigned int fnsize = READ_16(header + 26); /* file name length */ |
||||
unsigned int extsize = READ_16(header + 28); /* extra field length */ |
||||
filename[0] = extra[0] = '\0'; |
||||
|
||||
/* Header */ |
||||
if (fwrite(header, 1, 30, fpOut) == 30) { |
||||
offset += 30; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
|
||||
/* Filename */ |
||||
if (fnsize > 0) { |
||||
if (fnsize < sizeof(filename)) { |
||||
if (fread(filename, 1, fnsize, fpZip) == fnsize) { |
||||
if (fwrite(filename, 1, fnsize, fpOut) == fnsize) { |
||||
offset += fnsize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_STREAM_ERROR; |
||||
break; |
||||
} |
||||
|
||||
/* Extra field */ |
||||
if (extsize > 0) { |
||||
if (extsize < sizeof(extra)) { |
||||
if (fread(extra, 1, extsize, fpZip) == extsize) { |
||||
if (fwrite(extra, 1, extsize, fpOut) == extsize) { |
||||
offset += extsize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
/* Data */ |
||||
{ |
||||
int dataSize = cpsize; |
||||
if (dataSize == 0) { |
||||
dataSize = uncpsize; |
||||
} |
||||
if (dataSize > 0) { |
||||
char* data = malloc(dataSize); |
||||
if (data != NULL) { |
||||
if ((int)fread(data, 1, dataSize, fpZip) == dataSize) { |
||||
if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) { |
||||
offset += dataSize; |
||||
totalBytes += dataSize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
} |
||||
} else { |
||||
err = Z_ERRNO; |
||||
} |
||||
free(data); |
||||
if (err != Z_OK) { |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_MEM_ERROR; |
||||
break; |
||||
} |
||||
} |
||||
} |
||||
|
||||
/* Central directory entry */ |
||||
{ |
||||
char header[46]; |
||||
char* comment = ""; |
||||
int comsize = (int) strlen(comment); |
||||
WRITE_32(header, 0x02014b50); |
||||
WRITE_16(header + 4, version); |
||||
WRITE_16(header + 6, version); |
||||
WRITE_16(header + 8, gpflag); |
||||
WRITE_16(header + 10, method); |
||||
WRITE_16(header + 12, filetime); |
||||
WRITE_16(header + 14, filedate); |
||||
WRITE_32(header + 16, crc); |
||||
WRITE_32(header + 20, cpsize); |
||||
WRITE_32(header + 24, uncpsize); |
||||
WRITE_16(header + 28, fnsize); |
||||
WRITE_16(header + 30, extsize); |
||||
WRITE_16(header + 32, comsize); |
||||
WRITE_16(header + 34, 0); /* disk # */ |
||||
WRITE_16(header + 36, 0); /* int attrb */ |
||||
WRITE_32(header + 38, 0); /* ext attrb */ |
||||
WRITE_32(header + 42, currentOffset); |
||||
/* Header */ |
||||
if (fwrite(header, 1, 46, fpOutCD) == 46) { |
||||
offsetCD += 46; |
||||
|
||||
/* Filename */ |
||||
if (fnsize > 0) { |
||||
if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { |
||||
offsetCD += fnsize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} else { |
||||
err = Z_STREAM_ERROR; |
||||
break; |
||||
} |
||||
|
||||
/* Extra field */ |
||||
if (extsize > 0) { |
||||
if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { |
||||
offsetCD += extsize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
/* Comment field */ |
||||
if (comsize > 0) { |
||||
if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { |
||||
offsetCD += comsize; |
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
|
||||
} else { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
|
||||
/* Success */ |
||||
entries++; |
||||
|
||||
} else { |
||||
break; |
||||
} |
||||
} |
||||
|
||||
/* Final central directory */ |
||||
{ |
||||
int entriesZip = entries; |
||||
char header[22]; |
||||
char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools";
|
||||
int comsize = (int) strlen(comment); |
||||
if (entriesZip > 0xffff) { |
||||
entriesZip = 0xffff; |
||||
} |
||||
WRITE_32(header, 0x06054b50); |
||||
WRITE_16(header + 4, 0); /* disk # */ |
||||
WRITE_16(header + 6, 0); /* disk # */ |
||||
WRITE_16(header + 8, entriesZip); /* hack */ |
||||
WRITE_16(header + 10, entriesZip); /* hack */ |
||||
WRITE_32(header + 12, offsetCD); /* size of CD */ |
||||
WRITE_32(header + 16, offset); /* offset to CD */ |
||||
WRITE_16(header + 20, comsize); /* comment */ |
||||
|
||||
/* Header */ |
||||
if (fwrite(header, 1, 22, fpOutCD) == 22) { |
||||
|
||||
/* Comment field */ |
||||
if (comsize > 0) { |
||||
if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { |
||||
err = Z_ERRNO; |
||||
} |
||||
} |
||||
|
||||
} else { |
||||
err = Z_ERRNO; |
||||
} |
||||
} |
||||
|
||||
/* Final merge (file + central directory) */ |
||||
fclose(fpOutCD); |
||||
if (err == Z_OK) { |
||||
fpOutCD = fopen(fileOutTmp, "rb"); |
||||
if (fpOutCD != NULL) { |
||||
int nRead; |
||||
char buffer[8192]; |
||||
while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) { |
||||
if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) { |
||||
err = Z_ERRNO; |
||||
break; |
||||
} |
||||
} |
||||
fclose(fpOutCD); |
||||
} |
||||
} |
||||
|
||||
/* Close */ |
||||
fclose(fpZip); |
||||
fclose(fpOut); |
||||
|
||||
/* Wipe temporary file */ |
||||
(void)remove(fileOutTmp); |
||||
|
||||
/* Number of recovered entries */ |
||||
if (err == Z_OK) { |
||||
if (nRecovered != NULL) { |
||||
*nRecovered = entries; |
||||
} |
||||
if (bytesRecovered != NULL) { |
||||
*bytesRecovered = totalBytes; |
||||
} |
||||
} |
||||
} else { |
||||
err = Z_STREAM_ERROR; |
||||
} |
||||
return err; |
||||
} |
@ -0,0 +1,37 @@ |
||||
/*
|
||||
Additional tools for Minizip |
||||
Code: Xavier Roche '2004 |
||||
License: Same as ZLIB (www.gzip.org) |
||||
*/ |
||||
|
||||
#ifndef _zip_tools_H |
||||
#define _zip_tools_H |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
#ifndef _ZLIB_H |
||||
#include "zlib.h" |
||||
#endif |
||||
|
||||
#include "unzip.h" |
||||
|
||||
/* Repair a ZIP file (missing central directory)
|
||||
file: file to recover |
||||
fileOut: output file after recovery |
||||
fileOutTmp: temporary file name used for recovery |
||||
*/ |
||||
extern int ZEXPORT unzRepair(const char* file, |
||||
const char* fileOut, |
||||
const char* fileOutTmp, |
||||
uLong* nRecovered, |
||||
uLong* bytesRecovered); |
||||
|
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
||||
|
||||
|
||||
#endif |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,437 @@ |
||||
/* unzip.h -- IO for uncompress .zip files using zlib
|
||||
Version 1.1, February 14h, 2010 |
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications of Unzip for Zip64 |
||||
Copyright (C) 2007-2008 Even Rouault |
||||
|
||||
Modifications for Zip64 support on both zip and unzip |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
--------------------------------------------------------------------------------- |
||||
|
||||
Condition of use and distribution are the same than zlib : |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the authors be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
--------------------------------------------------------------------------------- |
||||
|
||||
Changes |
||||
|
||||
See header of unzip64.c |
||||
|
||||
*/ |
||||
|
||||
#ifndef _unz64_H |
||||
#define _unz64_H |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
#ifndef _ZLIB_H |
||||
#include "zlib.h" |
||||
#endif |
||||
|
||||
#ifndef _ZLIBIOAPI_H |
||||
#include "ioapi.h" |
||||
#endif |
||||
|
||||
#ifdef HAVE_BZIP2 |
||||
#include "bzlib.h" |
||||
#endif |
||||
|
||||
#define Z_BZIP2ED 12 |
||||
|
||||
#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) |
||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
||||
from (void*) without cast */ |
||||
typedef struct TagunzFile__ { int unused; } unzFile__; |
||||
typedef unzFile__ *unzFile; |
||||
#else |
||||
typedef voidp unzFile; |
||||
#endif |
||||
|
||||
|
||||
#define UNZ_OK (0) |
||||
#define UNZ_END_OF_LIST_OF_FILE (-100) |
||||
#define UNZ_ERRNO (Z_ERRNO) |
||||
#define UNZ_EOF (0) |
||||
#define UNZ_PARAMERROR (-102) |
||||
#define UNZ_BADZIPFILE (-103) |
||||
#define UNZ_INTERNALERROR (-104) |
||||
#define UNZ_CRCERROR (-105) |
||||
|
||||
/* tm_unz contain date/time info */ |
||||
typedef struct tm_unz_s |
||||
{ |
||||
int tm_sec; /* seconds after the minute - [0,59] */ |
||||
int tm_min; /* minutes after the hour - [0,59] */ |
||||
int tm_hour; /* hours since midnight - [0,23] */ |
||||
int tm_mday; /* day of the month - [1,31] */ |
||||
int tm_mon; /* months since January - [0,11] */ |
||||
int tm_year; /* years - [1980..2044] */ |
||||
} tm_unz; |
||||
|
||||
/* unz_global_info structure contain global data about the ZIPfile
|
||||
These data comes from the end of central dir */ |
||||
typedef struct unz_global_info64_s |
||||
{ |
||||
ZPOS64_T number_entry; /* total number of entries in
|
||||
the central dir on this disk */ |
||||
uLong size_comment; /* size of the global comment of the zipfile */ |
||||
} unz_global_info64; |
||||
|
||||
typedef struct unz_global_info_s |
||||
{ |
||||
uLong number_entry; /* total number of entries in
|
||||
the central dir on this disk */ |
||||
uLong size_comment; /* size of the global comment of the zipfile */ |
||||
} unz_global_info; |
||||
|
||||
/* unz_file_info contain information about a file in the zipfile */ |
||||
typedef struct unz_file_info64_s |
||||
{ |
||||
uLong version; /* version made by 2 bytes */ |
||||
uLong version_needed; /* version needed to extract 2 bytes */ |
||||
uLong flag; /* general purpose bit flag 2 bytes */ |
||||
uLong compression_method; /* compression method 2 bytes */ |
||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ |
||||
uLong crc; /* crc-32 4 bytes */ |
||||
ZPOS64_T compressed_size; /* compressed size 8 bytes */ |
||||
ZPOS64_T uncompressed_size; /* uncompressed size 8 bytes */ |
||||
uLong size_filename; /* filename length 2 bytes */ |
||||
uLong size_file_extra; /* extra field length 2 bytes */ |
||||
uLong size_file_comment; /* file comment length 2 bytes */ |
||||
|
||||
uLong disk_num_start; /* disk number start 2 bytes */ |
||||
uLong internal_fa; /* internal file attributes 2 bytes */ |
||||
uLong external_fa; /* external file attributes 4 bytes */ |
||||
|
||||
tm_unz tmu_date; |
||||
} unz_file_info64; |
||||
|
||||
typedef struct unz_file_info_s |
||||
{ |
||||
uLong version; /* version made by 2 bytes */ |
||||
uLong version_needed; /* version needed to extract 2 bytes */ |
||||
uLong flag; /* general purpose bit flag 2 bytes */ |
||||
uLong compression_method; /* compression method 2 bytes */ |
||||
uLong dosDate; /* last mod file date in Dos fmt 4 bytes */ |
||||
uLong crc; /* crc-32 4 bytes */ |
||||
uLong compressed_size; /* compressed size 4 bytes */ |
||||
uLong uncompressed_size; /* uncompressed size 4 bytes */ |
||||
uLong size_filename; /* filename length 2 bytes */ |
||||
uLong size_file_extra; /* extra field length 2 bytes */ |
||||
uLong size_file_comment; /* file comment length 2 bytes */ |
||||
|
||||
uLong disk_num_start; /* disk number start 2 bytes */ |
||||
uLong internal_fa; /* internal file attributes 2 bytes */ |
||||
uLong external_fa; /* external file attributes 4 bytes */ |
||||
|
||||
tm_unz tmu_date; |
||||
} unz_file_info; |
||||
|
||||
extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1, |
||||
const char* fileName2, |
||||
int iCaseSensitivity)); |
||||
/*
|
||||
Compare two filename (fileName1,fileName2). |
||||
If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) |
||||
If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi |
||||
or strcasecmp) |
||||
If iCaseSenisivity = 0, case sensitivity is defaut of your operating system |
||||
(like 1 on Unix, 2 on Windows) |
||||
*/ |
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen OF((const char *path)); |
||||
extern unzFile ZEXPORT unzOpen64 OF((const void *path)); |
||||
/*
|
||||
Open a Zip file. path contain the full pathname (by example, |
||||
on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer |
||||
"zlib/zlib113.zip". |
||||
If the zipfile cannot be opened (file don't exist or in not valid), the |
||||
return value is NULL. |
||||
Else, the return value is a unzFile Handle, usable with other function |
||||
of this unzip package. |
||||
the "64" function take a const void* pointer, because the path is just the |
||||
value passed to the open64_file_func callback. |
||||
Under Windows, if UNICODE is defined, using fill_fopen64_filefunc, the path |
||||
is a pointer to a wide unicode string (LPCTSTR is LPCWSTR), so const char* |
||||
does not describe the reality |
||||
*/ |
||||
|
||||
|
||||
extern unzFile ZEXPORT unzOpen2 OF((const char *path, |
||||
zlib_filefunc_def* pzlib_filefunc_def)); |
||||
/*
|
||||
Open a Zip file, like unzOpen, but provide a set of file low level API |
||||
for read/write the zip file (see ioapi.h) |
||||
*/ |
||||
|
||||
extern unzFile ZEXPORT unzOpen2_64 OF((const void *path, |
||||
zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
/*
|
||||
Open a Zip file, like unz64Open, but provide a set of file low level API |
||||
for read/write the zip file (see ioapi.h) |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzClose OF((unzFile file)); |
||||
/*
|
||||
Close a ZipFile opened with unzOpen. |
||||
If there is files inside the .Zip opened with unzOpenCurrentFile (see later), |
||||
these files MUST be closed with unzCloseCurrentFile before call unzClose. |
||||
return UNZ_OK if there is no problem. */ |
||||
|
||||
extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, |
||||
unz_global_info *pglobal_info)); |
||||
|
||||
extern int ZEXPORT unzGetGlobalInfo64 OF((unzFile file, |
||||
unz_global_info64 *pglobal_info)); |
||||
/*
|
||||
Write info about the ZipFile in the *pglobal_info structure. |
||||
No preparation of the structure is needed |
||||
return UNZ_OK if there is no problem. */ |
||||
|
||||
|
||||
extern int ZEXPORT unzGetGlobalComment OF((unzFile file, |
||||
char *szComment, |
||||
uLong uSizeBuf)); |
||||
/*
|
||||
Get the global comment string of the ZipFile, in the szComment buffer. |
||||
uSizeBuf is the size of the szComment buffer. |
||||
return the number of byte copied or an error code <0 |
||||
*/ |
||||
|
||||
|
||||
/***************************************************************************/ |
||||
/* Unzip package allow you browse the directory of the zipfile */ |
||||
|
||||
extern int ZEXPORT unzGoToFirstFile OF((unzFile file)); |
||||
/*
|
||||
Set the current file of the zipfile to the first file. |
||||
return UNZ_OK if there is no problem |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzGoToNextFile OF((unzFile file)); |
||||
/*
|
||||
Set the current file of the zipfile to the next file. |
||||
return UNZ_OK if there is no problem |
||||
return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest. |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzLocateFile OF((unzFile file, |
||||
const char *szFileName, |
||||
int iCaseSensitivity)); |
||||
/*
|
||||
Try locate the file szFileName in the zipfile. |
||||
For the iCaseSensitivity signification, see unzStringFileNameCompare |
||||
|
||||
return value : |
||||
UNZ_OK if the file is found. It becomes the current file. |
||||
UNZ_END_OF_LIST_OF_FILE if the file is not found |
||||
*/ |
||||
|
||||
|
||||
/* ****************************************** */ |
||||
/* Ryan supplied functions */ |
||||
/* unz_file_info contain information about a file in the zipfile */ |
||||
typedef struct unz_file_pos_s |
||||
{ |
||||
uLong pos_in_zip_directory; /* offset in zip file directory */ |
||||
uLong num_of_file; /* # of file */ |
||||
} unz_file_pos; |
||||
|
||||
extern int ZEXPORT unzGetFilePos( |
||||
unzFile file, |
||||
unz_file_pos* file_pos); |
||||
|
||||
extern int ZEXPORT unzGoToFilePos( |
||||
unzFile file, |
||||
unz_file_pos* file_pos); |
||||
|
||||
typedef struct unz64_file_pos_s |
||||
{ |
||||
ZPOS64_T pos_in_zip_directory; /* offset in zip file directory */ |
||||
ZPOS64_T num_of_file; /* # of file */ |
||||
} unz64_file_pos; |
||||
|
||||
extern int ZEXPORT unzGetFilePos64( |
||||
unzFile file, |
||||
unz64_file_pos* file_pos); |
||||
|
||||
extern int ZEXPORT unzGoToFilePos64( |
||||
unzFile file, |
||||
const unz64_file_pos* file_pos); |
||||
|
||||
/* ****************************************** */ |
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo64 OF((unzFile file, |
||||
unz_file_info64 *pfile_info, |
||||
char *szFileName, |
||||
uLong fileNameBufferSize, |
||||
void *extraField, |
||||
uLong extraFieldBufferSize, |
||||
char *szComment, |
||||
uLong commentBufferSize)); |
||||
|
||||
extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file, |
||||
unz_file_info *pfile_info, |
||||
char *szFileName, |
||||
uLong fileNameBufferSize, |
||||
void *extraField, |
||||
uLong extraFieldBufferSize, |
||||
char *szComment, |
||||
uLong commentBufferSize)); |
||||
/*
|
||||
Get Info about the current file |
||||
if pfile_info!=NULL, the *pfile_info structure will contain somes info about |
||||
the current file |
||||
if szFileName!=NULL, the filemane string will be copied in szFileName |
||||
(fileNameBufferSize is the size of the buffer) |
||||
if extraField!=NULL, the extra field information will be copied in extraField |
||||
(extraFieldBufferSize is the size of the buffer). |
||||
This is the Central-header version of the extra field |
||||
if szComment!=NULL, the comment string of the file will be copied in szComment |
||||
(commentBufferSize is the size of the buffer) |
||||
*/ |
||||
|
||||
|
||||
/** Addition for GDAL : START */ |
||||
|
||||
extern ZPOS64_T ZEXPORT unzGetCurrentFileZStreamPos64 OF((unzFile file)); |
||||
|
||||
/** Addition for GDAL : END */ |
||||
|
||||
|
||||
/***************************************************************************/ |
||||
/* for reading the content of the current zipfile, you can open it, read data
|
||||
from it, and close it (you can close it before reading all the file) |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile OF((unzFile file)); |
||||
/*
|
||||
Open for reading data the current file in the zipfile. |
||||
If there is no error, the return value is UNZ_OK. |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file, |
||||
const char* password)); |
||||
/*
|
||||
Open for reading data the current file in the zipfile. |
||||
password is a crypting password |
||||
If there is no error, the return value is UNZ_OK. |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file, |
||||
int* method, |
||||
int* level, |
||||
int raw)); |
||||
/*
|
||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) |
||||
if raw==1 |
||||
*method will receive method of compression, *level will receive level of |
||||
compression |
||||
note : you can set level parameter as NULL (if you did not want known level, |
||||
but you CANNOT set method parameter as NULL |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file, |
||||
int* method, |
||||
int* level, |
||||
int raw, |
||||
const char* password)); |
||||
/*
|
||||
Same than unzOpenCurrentFile, but open for read raw the file (not uncompress) |
||||
if raw==1 |
||||
*method will receive method of compression, *level will receive level of |
||||
compression |
||||
note : you can set level parameter as NULL (if you did not want known level, |
||||
but you CANNOT set method parameter as NULL |
||||
*/ |
||||
|
||||
|
||||
extern int ZEXPORT unzCloseCurrentFile OF((unzFile file)); |
||||
/*
|
||||
Close the file in zip opened with unzOpenCurrentFile |
||||
Return UNZ_CRCERROR if all the file was read but the CRC is not good |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzReadCurrentFile OF((unzFile file, |
||||
voidp buf, |
||||
unsigned len)); |
||||
/*
|
||||
Read bytes from the current file (opened by unzOpenCurrentFile) |
||||
buf contain buffer where data must be copied |
||||
len the size of buf. |
||||
|
||||
return the number of byte copied if somes bytes are copied |
||||
return 0 if the end of file was reached |
||||
return <0 with error code if there is an error |
||||
(UNZ_ERRNO for IO error, or zLib error for uncompress error) |
||||
*/ |
||||
|
||||
extern z_off_t ZEXPORT unztell OF((unzFile file)); |
||||
|
||||
extern ZPOS64_T ZEXPORT unztell64 OF((unzFile file)); |
||||
/*
|
||||
Give the current position in uncompressed data |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzeof OF((unzFile file)); |
||||
/*
|
||||
return 1 if the end of file was reached, 0 elsewhere |
||||
*/ |
||||
|
||||
extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file, |
||||
voidp buf, |
||||
unsigned len)); |
||||
/*
|
||||
Read extra field from the current file (opened by unzOpenCurrentFile) |
||||
This is the local-header version of the extra field (sometimes, there is |
||||
more info in the local-header version than in the central-header) |
||||
|
||||
if buf==NULL, it return the size of the local extra field |
||||
|
||||
if buf!=NULL, len is the size of the buffer, the extra header is copied in |
||||
buf. |
||||
the return value is the number of bytes copied in buf, or (if <0) |
||||
the error code |
||||
*/ |
||||
|
||||
/***************************************************************************/ |
||||
|
||||
/* Get the current file offset */ |
||||
extern ZPOS64_T ZEXPORT unzGetOffset64 (unzFile file); |
||||
extern uLong ZEXPORT unzGetOffset (unzFile file); |
||||
|
||||
/* Set the current file offset */ |
||||
extern int ZEXPORT unzSetOffset64 (unzFile file, ZPOS64_T pos); |
||||
extern int ZEXPORT unzSetOffset (unzFile file, uLong pos); |
||||
|
||||
|
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
||||
|
||||
#endif /* _unz64_H */ |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,367 @@ |
||||
/* zip.h -- IO on .zip files using zlib
|
||||
Version 1.1, February 14h, 2010 |
||||
part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
|
||||
|
||||
Modifications for Zip64 support |
||||
Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
|
||||
|
||||
For more info read MiniZip_info.txt |
||||
|
||||
--------------------------------------------------------------------------- |
||||
|
||||
Condition of use and distribution are the same than zlib : |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the authors be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
||||
--------------------------------------------------------------------------- |
||||
|
||||
Changes |
||||
|
||||
See header of zip.h |
||||
|
||||
*/ |
||||
|
||||
#ifndef _zip12_H |
||||
#define _zip12_H |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
//#define HAVE_BZIP2
|
||||
|
||||
#ifndef _ZLIB_H |
||||
#include "zlib.h" |
||||
#endif |
||||
|
||||
#ifndef _ZLIBIOAPI_H |
||||
#include "ioapi.h" |
||||
#endif |
||||
|
||||
#ifdef HAVE_BZIP2 |
||||
#include "bzlib.h" |
||||
#endif |
||||
|
||||
#define Z_BZIP2ED 12 |
||||
|
||||
#if defined(STRICTZIP) || defined(STRICTZIPUNZIP) |
||||
/* like the STRICT of WIN32, we define a pointer that cannot be converted
|
||||
from (void*) without cast */ |
||||
typedef struct TagzipFile__ { int unused; } zipFile__; |
||||
typedef zipFile__ *zipFile; |
||||
#else |
||||
typedef voidp zipFile; |
||||
#endif |
||||
|
||||
#define ZIP_OK (0) |
||||
#define ZIP_EOF (0) |
||||
#define ZIP_ERRNO (Z_ERRNO) |
||||
#define ZIP_PARAMERROR (-102) |
||||
#define ZIP_BADZIPFILE (-103) |
||||
#define ZIP_INTERNALERROR (-104) |
||||
|
||||
#ifndef DEF_MEM_LEVEL |
||||
# if MAX_MEM_LEVEL >= 8 |
||||
# define DEF_MEM_LEVEL 8 |
||||
# else |
||||
# define DEF_MEM_LEVEL MAX_MEM_LEVEL |
||||
# endif |
||||
#endif |
||||
/* default memLevel */ |
||||
|
||||
/* tm_zip contain date/time info */ |
||||
typedef struct tm_zip_s |
||||
{ |
||||
int tm_sec; /* seconds after the minute - [0,59] */ |
||||
int tm_min; /* minutes after the hour - [0,59] */ |
||||
int tm_hour; /* hours since midnight - [0,23] */ |
||||
int tm_mday; /* day of the month - [1,31] */ |
||||
int tm_mon; /* months since January - [0,11] */ |
||||
int tm_year; /* years - [1980..2044] */ |
||||
} tm_zip; |
||||
|
||||
typedef struct |
||||
{ |
||||
tm_zip tmz_date; /* date in understandable format */ |
||||
uLong dosDate; /* if dos_date == 0, tmu_date is used */ |
||||
/* uLong flag; */ /* general purpose bit flag 2 bytes */ |
||||
|
||||
uLong internal_fa; /* internal file attributes 2 bytes */ |
||||
uLong external_fa; /* external file attributes 4 bytes */ |
||||
} zip_fileinfo; |
||||
|
||||
typedef const char* zipcharpc; |
||||
|
||||
|
||||
#define APPEND_STATUS_CREATE (0) |
||||
#define APPEND_STATUS_CREATEAFTER (1) |
||||
#define APPEND_STATUS_ADDINZIP (2) |
||||
|
||||
extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append)); |
||||
extern zipFile ZEXPORT zipOpen64 OF((const void *pathname, int append)); |
||||
/*
|
||||
Create a zipfile. |
||||
pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on |
||||
an Unix computer "zlib/zlib113.zip". |
||||
if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip |
||||
will be created at the end of the file. |
||||
(useful if the file contain a self extractor code) |
||||
if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will |
||||
add files in existing zip (be sure you don't add file that doesn't exist) |
||||
If the zipfile cannot be opened, the return value is NULL. |
||||
Else, the return value is a zipFile Handle, usable with other function |
||||
of this zip package. |
||||
*/ |
||||
|
||||
/* Note : there is no delete function into a zipfile.
|
||||
If you want delete file into a zipfile, you must open a zipfile, and create another |
||||
Of couse, you can use RAW reading and writing to copy the file you did not want delte |
||||
*/ |
||||
|
||||
extern zipFile ZEXPORT zipOpen2 OF((const char *pathname, |
||||
int append, |
||||
zipcharpc* globalcomment, |
||||
zlib_filefunc_def* pzlib_filefunc_def)); |
||||
|
||||
extern zipFile ZEXPORT zipOpen2_64 OF((const void *pathname, |
||||
int append, |
||||
zipcharpc* globalcomment, |
||||
zlib_filefunc64_def* pzlib_filefunc_def)); |
||||
|
||||
extern zipFile ZEXPORT zipOpen3 OF((const void *pathname, |
||||
int append, |
||||
zipcharpc* globalcomment, |
||||
zlib_filefunc64_32_def* pzlib_filefunc64_32_def)); |
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level)); |
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip64 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int zip64)); |
||||
|
||||
/*
|
||||
Open a file in the ZIP for writing. |
||||
filename : the filename in zip (if NULL, '-' without quote will be used |
||||
*zipfi contain supplemental information |
||||
if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local |
||||
contains the extrafield data the the local header |
||||
if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global |
||||
contains the extrafield data the the local header |
||||
if comment != NULL, comment contain the comment string |
||||
method contain the compression method (0 for store, Z_DEFLATED for deflate) |
||||
level contain the level of compression (can be Z_DEFAULT_COMPRESSION) |
||||
zip64 is set to 1 if a zip64 extended information block should be added to the local file header. |
||||
this MUST be '1' if the uncompressed size is >= 0xffffffff. |
||||
|
||||
*/ |
||||
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw)); |
||||
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip2_64 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw, |
||||
int zip64)); |
||||
/*
|
||||
Same than zipOpenNewFileInZip, except if raw=1, we write raw file |
||||
*/ |
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw, |
||||
int windowBits, |
||||
int memLevel, |
||||
int strategy, |
||||
const char* password, |
||||
uLong crcForCrypting)); |
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip3_64 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw, |
||||
int windowBits, |
||||
int memLevel, |
||||
int strategy, |
||||
const char* password, |
||||
uLong crcForCrypting, |
||||
int zip64 |
||||
)); |
||||
|
||||
/*
|
||||
Same than zipOpenNewFileInZip2, except |
||||
windowBits,memLevel,,strategy : see parameter strategy in deflateInit2 |
||||
password : crypting password (NULL for no crypting) |
||||
crcForCrypting : crc of file to compress (needed for crypting) |
||||
*/ |
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip4 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw, |
||||
int windowBits, |
||||
int memLevel, |
||||
int strategy, |
||||
const char* password, |
||||
uLong crcForCrypting, |
||||
uLong versionMadeBy, |
||||
uLong flagBase |
||||
)); |
||||
|
||||
|
||||
extern int ZEXPORT zipOpenNewFileInZip4_64 OF((zipFile file, |
||||
const char* filename, |
||||
const zip_fileinfo* zipfi, |
||||
const void* extrafield_local, |
||||
uInt size_extrafield_local, |
||||
const void* extrafield_global, |
||||
uInt size_extrafield_global, |
||||
const char* comment, |
||||
int method, |
||||
int level, |
||||
int raw, |
||||
int windowBits, |
||||
int memLevel, |
||||
int strategy, |
||||
const char* password, |
||||
uLong crcForCrypting, |
||||
uLong versionMadeBy, |
||||
uLong flagBase, |
||||
int zip64 |
||||
)); |
||||
/*
|
||||
Same than zipOpenNewFileInZip4, except |
||||
versionMadeBy : value for Version made by field |
||||
flag : value for flag field (compression level info will be added) |
||||
*/ |
||||
|
||||
|
||||
extern int ZEXPORT zipWriteInFileInZip OF((zipFile file, |
||||
const void* buf, |
||||
unsigned len)); |
||||
/*
|
||||
Write data in the zipfile |
||||
*/ |
||||
|
||||
extern int ZEXPORT zipCloseFileInZip OF((zipFile file)); |
||||
/*
|
||||
Close the current file in the zipfile |
||||
*/ |
||||
|
||||
extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file, |
||||
uLong uncompressed_size, |
||||
uLong crc32)); |
||||
|
||||
extern int ZEXPORT zipCloseFileInZipRaw64 OF((zipFile file, |
||||
ZPOS64_T uncompressed_size, |
||||
uLong crc32)); |
||||
|
||||
/*
|
||||
Close the current file in the zipfile, for file opened with |
||||
parameter raw=1 in zipOpenNewFileInZip2 |
||||
uncompressed_size and crc32 are value for the uncompressed size |
||||
*/ |
||||
|
||||
extern int ZEXPORT zipClose OF((zipFile file, |
||||
const char* global_comment)); |
||||
/*
|
||||
Close the zipfile |
||||
*/ |
||||
|
||||
|
||||
extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short sHeader)); |
||||
/*
|
||||
zipRemoveExtraInfoBlock - Added by Mathias Svensson |
||||
|
||||
Remove extra information block from a extra information data for the local file header or central directory header |
||||
|
||||
It is needed to remove ZIP64 extra information blocks when before data is written if using RAW mode. |
||||
|
||||
0x0001 is the signature header for the ZIP64 extra information blocks |
||||
|
||||
usage. |
||||
Remove ZIP64 Extra information from a central director extra field data |
||||
zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001); |
||||
|
||||
Remove ZIP64 Extra information from a Local File Header extra field data |
||||
zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001); |
||||
*/ |
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
||||
|
||||
#endif /* _zip64_H */ |
@ -0,0 +1,599 @@ |
||||
(* example.c -- usage example of the zlib compression library |
||||
* Copyright (C) 1995-2003 Jean-loup Gailly. |
||||
* For conditions of distribution and use, see copyright notice in zlib.h |
||||
* |
||||
* Pascal translation |
||||
* Copyright (C) 1998 by Jacques Nomssi Nzali. |
||||
* For conditions of distribution and use, see copyright notice in readme.txt |
||||
* |
||||
* Adaptation to the zlibpas interface |
||||
* Copyright (C) 2003 by Cosmin Truta. |
||||
* For conditions of distribution and use, see copyright notice in readme.txt |
||||
*) |
||||
|
||||
program example; |
||||
|
||||
{$DEFINE TEST_COMPRESS} |
||||
{DO NOT $DEFINE TEST_GZIO} |
||||
{$DEFINE TEST_DEFLATE} |
||||
{$DEFINE TEST_INFLATE} |
||||
{$DEFINE TEST_FLUSH} |
||||
{$DEFINE TEST_SYNC} |
||||
{$DEFINE TEST_DICT} |
||||
|
||||
uses SysUtils, zlibpas; |
||||
|
||||
const TESTFILE = 'foo.gz'; |
||||
|
||||
(* "hello world" would be more standard, but the repeated "hello" |
||||
* stresses the compression code better, sorry... |
||||
*) |
||||
const hello: PChar = 'hello, hello!'; |
||||
|
||||
const dictionary: PChar = 'hello'; |
||||
|
||||
var dictId: LongInt; (* Adler32 value of the dictionary *) |
||||
|
||||
procedure CHECK_ERR(err: Integer; msg: String); |
||||
begin |
||||
if err <> Z_OK then |
||||
begin |
||||
WriteLn(msg, ' error: ', err); |
||||
Halt(1); |
||||
end; |
||||
end; |
||||
|
||||
procedure EXIT_ERR(const msg: String); |
||||
begin |
||||
WriteLn('Error: ', msg); |
||||
Halt(1); |
||||
end; |
||||
|
||||
(* =========================================================================== |
||||
* Test compress and uncompress |
||||
*) |
||||
{$IFDEF TEST_COMPRESS} |
||||
procedure test_compress(compr: Pointer; comprLen: LongInt; |
||||
uncompr: Pointer; uncomprLen: LongInt); |
||||
var err: Integer; |
||||
len: LongInt; |
||||
begin |
||||
len := StrLen(hello)+1; |
||||
|
||||
err := compress(compr, comprLen, hello, len); |
||||
CHECK_ERR(err, 'compress'); |
||||
|
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
err := uncompress(uncompr, uncomprLen, compr, comprLen); |
||||
CHECK_ERR(err, 'uncompress'); |
||||
|
||||
if StrComp(PChar(uncompr), hello) <> 0 then |
||||
EXIT_ERR('bad uncompress') |
||||
else |
||||
WriteLn('uncompress(): ', PChar(uncompr)); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test read/write of .gz files |
||||
*) |
||||
{$IFDEF TEST_GZIO} |
||||
procedure test_gzio(const fname: PChar; (* compressed file name *) |
||||
uncompr: Pointer; |
||||
uncomprLen: LongInt); |
||||
var err: Integer; |
||||
len: Integer; |
||||
zfile: gzFile; |
||||
pos: LongInt; |
||||
begin |
||||
len := StrLen(hello)+1; |
||||
|
||||
zfile := gzopen(fname, 'wb'); |
||||
if zfile = NIL then |
||||
begin |
||||
WriteLn('gzopen error'); |
||||
Halt(1); |
||||
end; |
||||
gzputc(zfile, 'h'); |
||||
if gzputs(zfile, 'ello') <> 4 then |
||||
begin |
||||
WriteLn('gzputs err: ', gzerror(zfile, err)); |
||||
Halt(1); |
||||
end; |
||||
{$IFDEF GZ_FORMAT_STRING} |
||||
if gzprintf(zfile, ', %s!', 'hello') <> 8 then |
||||
begin |
||||
WriteLn('gzprintf err: ', gzerror(zfile, err)); |
||||
Halt(1); |
||||
end; |
||||
{$ELSE} |
||||
if gzputs(zfile, ', hello!') <> 8 then |
||||
begin |
||||
WriteLn('gzputs err: ', gzerror(zfile, err)); |
||||
Halt(1); |
||||
end; |
||||
{$ENDIF} |
||||
gzseek(zfile, 1, SEEK_CUR); (* add one zero byte *) |
||||
gzclose(zfile); |
||||
|
||||
zfile := gzopen(fname, 'rb'); |
||||
if zfile = NIL then |
||||
begin |
||||
WriteLn('gzopen error'); |
||||
Halt(1); |
||||
end; |
||||
|
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
if gzread(zfile, uncompr, uncomprLen) <> len then |
||||
begin |
||||
WriteLn('gzread err: ', gzerror(zfile, err)); |
||||
Halt(1); |
||||
end; |
||||
if StrComp(PChar(uncompr), hello) <> 0 then |
||||
begin |
||||
WriteLn('bad gzread: ', PChar(uncompr)); |
||||
Halt(1); |
||||
end |
||||
else |
||||
WriteLn('gzread(): ', PChar(uncompr)); |
||||
|
||||
pos := gzseek(zfile, -8, SEEK_CUR); |
||||
if (pos <> 6) or (gztell(zfile) <> pos) then |
||||
begin |
||||
WriteLn('gzseek error, pos=', pos, ', gztell=', gztell(zfile)); |
||||
Halt(1); |
||||
end; |
||||
|
||||
if gzgetc(zfile) <> ' ' then |
||||
begin |
||||
WriteLn('gzgetc error'); |
||||
Halt(1); |
||||
end; |
||||
|
||||
if gzungetc(' ', zfile) <> ' ' then |
||||
begin |
||||
WriteLn('gzungetc error'); |
||||
Halt(1); |
||||
end; |
||||
|
||||
gzgets(zfile, PChar(uncompr), uncomprLen); |
||||
uncomprLen := StrLen(PChar(uncompr)); |
||||
if uncomprLen <> 7 then (* " hello!" *) |
||||
begin |
||||
WriteLn('gzgets err after gzseek: ', gzerror(zfile, err)); |
||||
Halt(1); |
||||
end; |
||||
if StrComp(PChar(uncompr), hello + 6) <> 0 then |
||||
begin |
||||
WriteLn('bad gzgets after gzseek'); |
||||
Halt(1); |
||||
end |
||||
else |
||||
WriteLn('gzgets() after gzseek: ', PChar(uncompr)); |
||||
|
||||
gzclose(zfile); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test deflate with small buffers |
||||
*) |
||||
{$IFDEF TEST_DEFLATE} |
||||
procedure test_deflate(compr: Pointer; comprLen: LongInt); |
||||
var c_stream: z_stream; (* compression stream *) |
||||
err: Integer; |
||||
len: LongInt; |
||||
begin |
||||
len := StrLen(hello)+1; |
||||
|
||||
c_stream.zalloc := NIL; |
||||
c_stream.zfree := NIL; |
||||
c_stream.opaque := NIL; |
||||
|
||||
err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION); |
||||
CHECK_ERR(err, 'deflateInit'); |
||||
|
||||
c_stream.next_in := hello; |
||||
c_stream.next_out := compr; |
||||
|
||||
while (c_stream.total_in <> len) and |
||||
(c_stream.total_out < comprLen) do |
||||
begin |
||||
c_stream.avail_out := 1; { force small buffers } |
||||
c_stream.avail_in := 1; |
||||
err := deflate(c_stream, Z_NO_FLUSH); |
||||
CHECK_ERR(err, 'deflate'); |
||||
end; |
||||
|
||||
(* Finish the stream, still forcing small buffers: *) |
||||
while TRUE do |
||||
begin |
||||
c_stream.avail_out := 1; |
||||
err := deflate(c_stream, Z_FINISH); |
||||
if err = Z_STREAM_END then |
||||
break; |
||||
CHECK_ERR(err, 'deflate'); |
||||
end; |
||||
|
||||
err := deflateEnd(c_stream); |
||||
CHECK_ERR(err, 'deflateEnd'); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test inflate with small buffers |
||||
*) |
||||
{$IFDEF TEST_INFLATE} |
||||
procedure test_inflate(compr: Pointer; comprLen : LongInt; |
||||
uncompr: Pointer; uncomprLen : LongInt); |
||||
var err: Integer; |
||||
d_stream: z_stream; (* decompression stream *) |
||||
begin |
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
d_stream.zalloc := NIL; |
||||
d_stream.zfree := NIL; |
||||
d_stream.opaque := NIL; |
||||
|
||||
d_stream.next_in := compr; |
||||
d_stream.avail_in := 0; |
||||
d_stream.next_out := uncompr; |
||||
|
||||
err := inflateInit(d_stream); |
||||
CHECK_ERR(err, 'inflateInit'); |
||||
|
||||
while (d_stream.total_out < uncomprLen) and |
||||
(d_stream.total_in < comprLen) do |
||||
begin |
||||
d_stream.avail_out := 1; (* force small buffers *) |
||||
d_stream.avail_in := 1; |
||||
err := inflate(d_stream, Z_NO_FLUSH); |
||||
if err = Z_STREAM_END then |
||||
break; |
||||
CHECK_ERR(err, 'inflate'); |
||||
end; |
||||
|
||||
err := inflateEnd(d_stream); |
||||
CHECK_ERR(err, 'inflateEnd'); |
||||
|
||||
if StrComp(PChar(uncompr), hello) <> 0 then |
||||
EXIT_ERR('bad inflate') |
||||
else |
||||
WriteLn('inflate(): ', PChar(uncompr)); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test deflate with large buffers and dynamic change of compression level |
||||
*) |
||||
{$IFDEF TEST_DEFLATE} |
||||
procedure test_large_deflate(compr: Pointer; comprLen: LongInt; |
||||
uncompr: Pointer; uncomprLen: LongInt); |
||||
var c_stream: z_stream; (* compression stream *) |
||||
err: Integer; |
||||
begin |
||||
c_stream.zalloc := NIL; |
||||
c_stream.zfree := NIL; |
||||
c_stream.opaque := NIL; |
||||
|
||||
err := deflateInit(c_stream, Z_BEST_SPEED); |
||||
CHECK_ERR(err, 'deflateInit'); |
||||
|
||||
c_stream.next_out := compr; |
||||
c_stream.avail_out := Integer(comprLen); |
||||
|
||||
(* At this point, uncompr is still mostly zeroes, so it should compress |
||||
* very well: |
||||
*) |
||||
c_stream.next_in := uncompr; |
||||
c_stream.avail_in := Integer(uncomprLen); |
||||
err := deflate(c_stream, Z_NO_FLUSH); |
||||
CHECK_ERR(err, 'deflate'); |
||||
if c_stream.avail_in <> 0 then |
||||
EXIT_ERR('deflate not greedy'); |
||||
|
||||
(* Feed in already compressed data and switch to no compression: *) |
||||
deflateParams(c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY); |
||||
c_stream.next_in := compr; |
||||
c_stream.avail_in := Integer(comprLen div 2); |
||||
err := deflate(c_stream, Z_NO_FLUSH); |
||||
CHECK_ERR(err, 'deflate'); |
||||
|
||||
(* Switch back to compressing mode: *) |
||||
deflateParams(c_stream, Z_BEST_COMPRESSION, Z_FILTERED); |
||||
c_stream.next_in := uncompr; |
||||
c_stream.avail_in := Integer(uncomprLen); |
||||
err := deflate(c_stream, Z_NO_FLUSH); |
||||
CHECK_ERR(err, 'deflate'); |
||||
|
||||
err := deflate(c_stream, Z_FINISH); |
||||
if err <> Z_STREAM_END then |
||||
EXIT_ERR('deflate should report Z_STREAM_END'); |
||||
|
||||
err := deflateEnd(c_stream); |
||||
CHECK_ERR(err, 'deflateEnd'); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test inflate with large buffers |
||||
*) |
||||
{$IFDEF TEST_INFLATE} |
||||
procedure test_large_inflate(compr: Pointer; comprLen: LongInt; |
||||
uncompr: Pointer; uncomprLen: LongInt); |
||||
var err: Integer; |
||||
d_stream: z_stream; (* decompression stream *) |
||||
begin |
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
d_stream.zalloc := NIL; |
||||
d_stream.zfree := NIL; |
||||
d_stream.opaque := NIL; |
||||
|
||||
d_stream.next_in := compr; |
||||
d_stream.avail_in := Integer(comprLen); |
||||
|
||||
err := inflateInit(d_stream); |
||||
CHECK_ERR(err, 'inflateInit'); |
||||
|
||||
while TRUE do |
||||
begin |
||||
d_stream.next_out := uncompr; (* discard the output *) |
||||
d_stream.avail_out := Integer(uncomprLen); |
||||
err := inflate(d_stream, Z_NO_FLUSH); |
||||
if err = Z_STREAM_END then |
||||
break; |
||||
CHECK_ERR(err, 'large inflate'); |
||||
end; |
||||
|
||||
err := inflateEnd(d_stream); |
||||
CHECK_ERR(err, 'inflateEnd'); |
||||
|
||||
if d_stream.total_out <> 2 * uncomprLen + comprLen div 2 then |
||||
begin |
||||
WriteLn('bad large inflate: ', d_stream.total_out); |
||||
Halt(1); |
||||
end |
||||
else |
||||
WriteLn('large_inflate(): OK'); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test deflate with full flush |
||||
*) |
||||
{$IFDEF TEST_FLUSH} |
||||
procedure test_flush(compr: Pointer; var comprLen : LongInt); |
||||
var c_stream: z_stream; (* compression stream *) |
||||
err: Integer; |
||||
len: Integer; |
||||
begin |
||||
len := StrLen(hello)+1; |
||||
|
||||
c_stream.zalloc := NIL; |
||||
c_stream.zfree := NIL; |
||||
c_stream.opaque := NIL; |
||||
|
||||
err := deflateInit(c_stream, Z_DEFAULT_COMPRESSION); |
||||
CHECK_ERR(err, 'deflateInit'); |
||||
|
||||
c_stream.next_in := hello; |
||||
c_stream.next_out := compr; |
||||
c_stream.avail_in := 3; |
||||
c_stream.avail_out := Integer(comprLen); |
||||
err := deflate(c_stream, Z_FULL_FLUSH); |
||||
CHECK_ERR(err, 'deflate'); |
||||
|
||||
Inc(PByteArray(compr)^[3]); (* force an error in first compressed block *) |
||||
c_stream.avail_in := len - 3; |
||||
|
||||
err := deflate(c_stream, Z_FINISH); |
||||
if err <> Z_STREAM_END then |
||||
CHECK_ERR(err, 'deflate'); |
||||
|
||||
err := deflateEnd(c_stream); |
||||
CHECK_ERR(err, 'deflateEnd'); |
||||
|
||||
comprLen := c_stream.total_out; |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test inflateSync() |
||||
*) |
||||
{$IFDEF TEST_SYNC} |
||||
procedure test_sync(compr: Pointer; comprLen: LongInt; |
||||
uncompr: Pointer; uncomprLen : LongInt); |
||||
var err: Integer; |
||||
d_stream: z_stream; (* decompression stream *) |
||||
begin |
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
d_stream.zalloc := NIL; |
||||
d_stream.zfree := NIL; |
||||
d_stream.opaque := NIL; |
||||
|
||||
d_stream.next_in := compr; |
||||
d_stream.avail_in := 2; (* just read the zlib header *) |
||||
|
||||
err := inflateInit(d_stream); |
||||
CHECK_ERR(err, 'inflateInit'); |
||||
|
||||
d_stream.next_out := uncompr; |
||||
d_stream.avail_out := Integer(uncomprLen); |
||||
|
||||
inflate(d_stream, Z_NO_FLUSH); |
||||
CHECK_ERR(err, 'inflate'); |
||||
|
||||
d_stream.avail_in := Integer(comprLen-2); (* read all compressed data *) |
||||
err := inflateSync(d_stream); (* but skip the damaged part *) |
||||
CHECK_ERR(err, 'inflateSync'); |
||||
|
||||
err := inflate(d_stream, Z_FINISH); |
||||
if err <> Z_DATA_ERROR then |
||||
EXIT_ERR('inflate should report DATA_ERROR'); |
||||
(* Because of incorrect adler32 *) |
||||
|
||||
err := inflateEnd(d_stream); |
||||
CHECK_ERR(err, 'inflateEnd'); |
||||
|
||||
WriteLn('after inflateSync(): hel', PChar(uncompr)); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test deflate with preset dictionary |
||||
*) |
||||
{$IFDEF TEST_DICT} |
||||
procedure test_dict_deflate(compr: Pointer; comprLen: LongInt); |
||||
var c_stream: z_stream; (* compression stream *) |
||||
err: Integer; |
||||
begin |
||||
c_stream.zalloc := NIL; |
||||
c_stream.zfree := NIL; |
||||
c_stream.opaque := NIL; |
||||
|
||||
err := deflateInit(c_stream, Z_BEST_COMPRESSION); |
||||
CHECK_ERR(err, 'deflateInit'); |
||||
|
||||
err := deflateSetDictionary(c_stream, dictionary, StrLen(dictionary)); |
||||
CHECK_ERR(err, 'deflateSetDictionary'); |
||||
|
||||
dictId := c_stream.adler; |
||||
c_stream.next_out := compr; |
||||
c_stream.avail_out := Integer(comprLen); |
||||
|
||||
c_stream.next_in := hello; |
||||
c_stream.avail_in := StrLen(hello)+1; |
||||
|
||||
err := deflate(c_stream, Z_FINISH); |
||||
if err <> Z_STREAM_END then |
||||
EXIT_ERR('deflate should report Z_STREAM_END'); |
||||
|
||||
err := deflateEnd(c_stream); |
||||
CHECK_ERR(err, 'deflateEnd'); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
(* =========================================================================== |
||||
* Test inflate with a preset dictionary |
||||
*) |
||||
{$IFDEF TEST_DICT} |
||||
procedure test_dict_inflate(compr: Pointer; comprLen: LongInt; |
||||
uncompr: Pointer; uncomprLen: LongInt); |
||||
var err: Integer; |
||||
d_stream: z_stream; (* decompression stream *) |
||||
begin |
||||
StrCopy(PChar(uncompr), 'garbage'); |
||||
|
||||
d_stream.zalloc := NIL; |
||||
d_stream.zfree := NIL; |
||||
d_stream.opaque := NIL; |
||||
|
||||
d_stream.next_in := compr; |
||||
d_stream.avail_in := Integer(comprLen); |
||||
|
||||
err := inflateInit(d_stream); |
||||
CHECK_ERR(err, 'inflateInit'); |
||||
|
||||
d_stream.next_out := uncompr; |
||||
d_stream.avail_out := Integer(uncomprLen); |
||||
|
||||
while TRUE do |
||||
begin |
||||
err := inflate(d_stream, Z_NO_FLUSH); |
||||
if err = Z_STREAM_END then |
||||
break; |
||||
if err = Z_NEED_DICT then |
||||
begin |
||||
if d_stream.adler <> dictId then |
||||
EXIT_ERR('unexpected dictionary'); |
||||
err := inflateSetDictionary(d_stream, dictionary, StrLen(dictionary)); |
||||
end; |
||||
CHECK_ERR(err, 'inflate with dict'); |
||||
end; |
||||
|
||||
err := inflateEnd(d_stream); |
||||
CHECK_ERR(err, 'inflateEnd'); |
||||
|
||||
if StrComp(PChar(uncompr), hello) <> 0 then |
||||
EXIT_ERR('bad inflate with dict') |
||||
else |
||||
WriteLn('inflate with dictionary: ', PChar(uncompr)); |
||||
end; |
||||
{$ENDIF} |
||||
|
||||
var compr, uncompr: Pointer; |
||||
comprLen, uncomprLen: LongInt; |
||||
|
||||
begin |
||||
if zlibVersion^ <> ZLIB_VERSION[1] then |
||||
EXIT_ERR('Incompatible zlib version'); |
||||
|
||||
WriteLn('zlib version: ', zlibVersion); |
||||
WriteLn('zlib compile flags: ', Format('0x%x', [zlibCompileFlags])); |
||||
|
||||
comprLen := 10000 * SizeOf(Integer); (* don't overflow on MSDOS *) |
||||
uncomprLen := comprLen; |
||||
GetMem(compr, comprLen); |
||||
GetMem(uncompr, uncomprLen); |
||||
if (compr = NIL) or (uncompr = NIL) then |
||||
EXIT_ERR('Out of memory'); |
||||
(* compr and uncompr are cleared to avoid reading uninitialized |
||||
* data and to ensure that uncompr compresses well. |
||||
*) |
||||
FillChar(compr^, comprLen, 0); |
||||
FillChar(uncompr^, uncomprLen, 0); |
||||
|
||||
{$IFDEF TEST_COMPRESS} |
||||
WriteLn('** Testing compress'); |
||||
test_compress(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
|
||||
{$IFDEF TEST_GZIO} |
||||
WriteLn('** Testing gzio'); |
||||
if ParamCount >= 1 then |
||||
test_gzio(ParamStr(1), uncompr, uncomprLen) |
||||
else |
||||
test_gzio(TESTFILE, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
|
||||
{$IFDEF TEST_DEFLATE} |
||||
WriteLn('** Testing deflate with small buffers'); |
||||
test_deflate(compr, comprLen); |
||||
{$ENDIF} |
||||
{$IFDEF TEST_INFLATE} |
||||
WriteLn('** Testing inflate with small buffers'); |
||||
test_inflate(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
|
||||
{$IFDEF TEST_DEFLATE} |
||||
WriteLn('** Testing deflate with large buffers'); |
||||
test_large_deflate(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
{$IFDEF TEST_INFLATE} |
||||
WriteLn('** Testing inflate with large buffers'); |
||||
test_large_inflate(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
|
||||
{$IFDEF TEST_FLUSH} |
||||
WriteLn('** Testing deflate with full flush'); |
||||
test_flush(compr, comprLen); |
||||
{$ENDIF} |
||||
{$IFDEF TEST_SYNC} |
||||
WriteLn('** Testing inflateSync'); |
||||
test_sync(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
comprLen := uncomprLen; |
||||
|
||||
{$IFDEF TEST_DICT} |
||||
WriteLn('** Testing deflate and inflate with preset dictionary'); |
||||
test_dict_deflate(compr, comprLen); |
||||
test_dict_inflate(compr, comprLen, uncompr, uncomprLen); |
||||
{$ENDIF} |
||||
|
||||
FreeMem(compr, comprLen); |
||||
FreeMem(uncompr, uncomprLen); |
||||
end. |
@ -0,0 +1,76 @@ |
||||
|
||||
This directory contains a Pascal (Delphi, Kylix) interface to the |
||||
zlib data compression library. |
||||
|
||||
|
||||
Directory listing |
||||
================= |
||||
|
||||
zlibd32.mak makefile for Borland C++ |
||||
example.pas usage example of zlib |
||||
zlibpas.pas the Pascal interface to zlib |
||||
readme.txt this file |
||||
|
||||
|
||||
Compatibility notes |
||||
=================== |
||||
|
||||
- Although the name "zlib" would have been more normal for the |
||||
zlibpas unit, this name is already taken by Borland's ZLib unit. |
||||
This is somehow unfortunate, because that unit is not a genuine |
||||
interface to the full-fledged zlib functionality, but a suite of |
||||
class wrappers around zlib streams. Other essential features, |
||||
such as checksums, are missing. |
||||
It would have been more appropriate for that unit to have a name |
||||
like "ZStreams", or something similar. |
||||
|
||||
- The C and zlib-supplied types int, uInt, long, uLong, etc. are |
||||
translated directly into Pascal types of similar sizes (Integer, |
||||
LongInt, etc.), to avoid namespace pollution. In particular, |
||||
there is no conversion of unsigned int into a Pascal unsigned |
||||
integer. The Word type is non-portable and has the same size |
||||
(16 bits) both in a 16-bit and in a 32-bit environment, unlike |
||||
Integer. Even if there is a 32-bit Cardinal type, there is no |
||||
real need for unsigned int in zlib under a 32-bit environment. |
||||
|
||||
- Except for the callbacks, the zlib function interfaces are |
||||
assuming the calling convention normally used in Pascal |
||||
(__pascal for DOS and Windows16, __fastcall for Windows32). |
||||
Since the cdecl keyword is used, the old Turbo Pascal does |
||||
not work with this interface. |
||||
|
||||
- The gz* function interfaces are not translated, to avoid |
||||
interfacing problems with the C runtime library. Besides, |
||||
gzprintf(gzFile file, const char *format, ...) |
||||
cannot be translated into Pascal. |
||||
|
||||
|
||||
Legal issues |
||||
============ |
||||
|
||||
The zlibpas interface is: |
||||
Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler. |
||||
Copyright (C) 1998 by Bob Dellaca. |
||||
Copyright (C) 2003 by Cosmin Truta. |
||||
|
||||
The example program is: |
||||
Copyright (C) 1995-2003 by Jean-loup Gailly. |
||||
Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali. |
||||
Copyright (C) 2003 by Cosmin Truta. |
||||
|
||||
This software is provided 'as-is', without any express or implied |
||||
warranty. In no event will the author be held liable for any damages |
||||
arising from the use of this software. |
||||
|
||||
Permission is granted to anyone to use this software for any purpose, |
||||
including commercial applications, and to alter it and redistribute it |
||||
freely, subject to the following restrictions: |
||||
|
||||
1. The origin of this software must not be misrepresented; you must not |
||||
claim that you wrote the original software. If you use this software |
||||
in a product, an acknowledgment in the product documentation would be |
||||
appreciated but is not required. |
||||
2. Altered source versions must be plainly marked as such, and must not be |
||||
misrepresented as being the original software. |
||||
3. This notice may not be removed or altered from any source distribution. |
||||
|
@ -0,0 +1,99 @@ |
||||
# Makefile for zlib
|
||||
# For use with Delphi and C++ Builder under Win32
|
||||
# Updated for zlib 1.2.x by Cosmin Truta
|
||||
|
||||
# ------------ Borland C++ ------------
|
||||
|
||||
# This project uses the Delphi (fastcall/register) calling convention:
|
||||
LOC = -DZEXPORT=__fastcall -DZEXPORTVA=__cdecl
|
||||
|
||||
CC = bcc32
|
||||
LD = bcc32
|
||||
AR = tlib
|
||||
# do not use "-pr" in CFLAGS
|
||||
CFLAGS = -a -d -k- -O2 $(LOC)
|
||||
LDFLAGS =
|
||||
|
||||
|
||||
# variables
|
||||
ZLIB_LIB = zlib.lib
|
||||
|
||||
OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj
|
||||
OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj
|
||||
OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj
|
||||
OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj
|
||||
|
||||
|
||||
# targets
|
||||
all: $(ZLIB_LIB) example.exe minigzip.exe |
||||
|
||||
.c.obj: |
||||
$(CC) -c $(CFLAGS) $*.c
|
||||
|
||||
adler32.obj: adler32.c zlib.h zconf.h |
||||
|
||||
compress.obj: compress.c zlib.h zconf.h |
||||
|
||||
crc32.obj: crc32.c zlib.h zconf.h crc32.h |
||||
|
||||
deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h |
||||
|
||||
gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
||||
|
||||
gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h |
||||
|
||||
infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h
|
||||
|
||||
inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \
|
||||
inffast.h inffixed.h
|
||||
|
||||
inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h |
||||
|
||||
trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h |
||||
|
||||
uncompr.obj: uncompr.c zlib.h zconf.h |
||||
|
||||
zutil.obj: zutil.c zutil.h zlib.h zconf.h |
||||
|
||||
example.obj: test/example.c zlib.h zconf.h |
||||
|
||||
minigzip.obj: test/minigzip.c zlib.h zconf.h |
||||
|
||||
|
||||
# For the sake of the old Borland make,
|
||||
# the command line is cut to fit in the MS-DOS 128 byte limit:
|
||||
$(ZLIB_LIB): $(OBJ1) $(OBJ2) |
||||
-del $(ZLIB_LIB)
|
||||
$(AR) $(ZLIB_LIB) $(OBJP1)
|
||||
$(AR) $(ZLIB_LIB) $(OBJP2)
|
||||
|
||||
|
||||
# testing
|
||||
test: example.exe minigzip.exe |
||||
example
|
||||
echo hello world | minigzip | minigzip -d
|
||||
|
||||
example.exe: example.obj $(ZLIB_LIB) |
||||
$(LD) $(LDFLAGS) example.obj $(ZLIB_LIB)
|
||||
|
||||
minigzip.exe: minigzip.obj $(ZLIB_LIB) |
||||
$(LD) $(LDFLAGS) minigzip.obj $(ZLIB_LIB)
|
||||
|
||||
|
||||
# cleanup
|
||||
clean: |
||||
-del *.obj
|
||||
-del *.exe
|
||||
-del *.lib
|
||||
-del *.tds
|
||||
-del zlib.bak
|
||||
-del foo.gz
|
||||
|
@ -0,0 +1,276 @@ |
||||
(* zlibpas -- Pascal interface to the zlib data compression library |
||||
* |
||||
* Copyright (C) 2003 Cosmin Truta. |
||||
* Derived from original sources by Bob Dellaca. |
||||
* For conditions of distribution and use, see copyright notice in readme.txt |
||||
*) |
||||
|
||||
unit zlibpas; |
||||
|
||||
interface |
||||
|
||||
const |
||||
ZLIB_VERSION = '1.2.13'; |
||||
ZLIB_VERNUM = $12a0; |
||||
|
||||
type |
||||
alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; |
||||
cdecl; |
||||
free_func = procedure(opaque, address: Pointer); |
||||
cdecl; |
||||
|
||||
in_func = function(opaque: Pointer; var buf: PByte): Integer; |
||||
cdecl; |
||||
out_func = function(opaque: Pointer; buf: PByte; size: Integer): Integer; |
||||
cdecl; |
||||
|
||||
z_streamp = ^z_stream; |
||||
z_stream = packed record |
||||
next_in: PChar; (* next input byte *) |
||||
avail_in: Integer; (* number of bytes available at next_in *) |
||||
total_in: LongInt; (* total nb of input bytes read so far *) |
||||
|
||||
next_out: PChar; (* next output byte should be put there *) |
||||
avail_out: Integer; (* remaining free space at next_out *) |
||||
total_out: LongInt; (* total nb of bytes output so far *) |
||||
|
||||
msg: PChar; (* last error message, NULL if no error *) |
||||
state: Pointer; (* not visible by applications *) |
||||
|
||||
zalloc: alloc_func; (* used to allocate the internal state *) |
||||
zfree: free_func; (* used to free the internal state *) |
||||
opaque: Pointer; (* private data object passed to zalloc and zfree *) |
||||
|
||||
data_type: Integer; (* best guess about the data type: ascii or binary *) |
||||
adler: LongInt; (* adler32 value of the uncompressed data *) |
||||
reserved: LongInt; (* reserved for future use *) |
||||
end; |
||||
|
||||
gz_headerp = ^gz_header; |
||||
gz_header = packed record |
||||
text: Integer; (* true if compressed data believed to be text *) |
||||
time: LongInt; (* modification time *) |
||||
xflags: Integer; (* extra flags (not used when writing a gzip file) *) |
||||
os: Integer; (* operating system *) |
||||
extra: PChar; (* pointer to extra field or Z_NULL if none *) |
||||
extra_len: Integer; (* extra field length (valid if extra != Z_NULL) *) |
||||
extra_max: Integer; (* space at extra (only when reading header) *) |
||||
name: PChar; (* pointer to zero-terminated file name or Z_NULL *) |
||||
name_max: Integer; (* space at name (only when reading header) *) |
||||
comment: PChar; (* pointer to zero-terminated comment or Z_NULL *) |
||||
comm_max: Integer; (* space at comment (only when reading header) *) |
||||
hcrc: Integer; (* true if there was or will be a header crc *) |
||||
done: Integer; (* true when done reading gzip header *) |
||||
end; |
||||
|
||||
(* constants *) |
||||
const |
||||
Z_NO_FLUSH = 0; |
||||
Z_PARTIAL_FLUSH = 1; |
||||
Z_SYNC_FLUSH = 2; |
||||
Z_FULL_FLUSH = 3; |
||||
Z_FINISH = 4; |
||||
Z_BLOCK = 5; |
||||
Z_TREES = 6; |
||||
|
||||
Z_OK = 0; |
||||
Z_STREAM_END = 1; |
||||
Z_NEED_DICT = 2; |
||||
Z_ERRNO = -1; |
||||
Z_STREAM_ERROR = -2; |
||||
Z_DATA_ERROR = -3; |
||||
Z_MEM_ERROR = -4; |
||||
Z_BUF_ERROR = -5; |
||||
Z_VERSION_ERROR = -6; |
||||
|
||||
Z_NO_COMPRESSION = 0; |
||||
Z_BEST_SPEED = 1; |
||||
Z_BEST_COMPRESSION = 9; |
||||
Z_DEFAULT_COMPRESSION = -1; |
||||
|
||||
Z_FILTERED = 1; |
||||
Z_HUFFMAN_ONLY = 2; |
||||
Z_RLE = 3; |
||||
Z_FIXED = 4; |
||||
Z_DEFAULT_STRATEGY = 0; |
||||
|
||||
Z_BINARY = 0; |
||||
Z_TEXT = 1; |
||||
Z_ASCII = 1; |
||||
Z_UNKNOWN = 2; |
||||
|
||||
Z_DEFLATED = 8; |
||||
|
||||
(* basic functions *) |
||||
function zlibVersion: PChar; |
||||
function deflateInit(var strm: z_stream; level: Integer): Integer; |
||||
function deflate(var strm: z_stream; flush: Integer): Integer; |
||||
function deflateEnd(var strm: z_stream): Integer; |
||||
function inflateInit(var strm: z_stream): Integer; |
||||
function inflate(var strm: z_stream; flush: Integer): Integer; |
||||
function inflateEnd(var strm: z_stream): Integer; |
||||
|
||||
(* advanced functions *) |
||||
function deflateInit2(var strm: z_stream; level, method, windowBits, |
||||
memLevel, strategy: Integer): Integer; |
||||
function deflateSetDictionary(var strm: z_stream; const dictionary: PChar; |
||||
dictLength: Integer): Integer; |
||||
function deflateCopy(var dest, source: z_stream): Integer; |
||||
function deflateReset(var strm: z_stream): Integer; |
||||
function deflateParams(var strm: z_stream; level, strategy: Integer): Integer; |
||||
function deflateTune(var strm: z_stream; good_length, max_lazy, nice_length, max_chain: Integer): Integer; |
||||
function deflateBound(var strm: z_stream; sourceLen: LongInt): LongInt; |
||||
function deflatePending(var strm: z_stream; var pending: Integer; var bits: Integer): Integer; |
||||
function deflatePrime(var strm: z_stream; bits, value: Integer): Integer; |
||||
function deflateSetHeader(var strm: z_stream; head: gz_header): Integer; |
||||
function inflateInit2(var strm: z_stream; windowBits: Integer): Integer; |
||||
function inflateSetDictionary(var strm: z_stream; const dictionary: PChar; |
||||
dictLength: Integer): Integer; |
||||
function inflateSync(var strm: z_stream): Integer; |
||||
function inflateCopy(var dest, source: z_stream): Integer; |
||||
function inflateReset(var strm: z_stream): Integer; |
||||
function inflateReset2(var strm: z_stream; windowBits: Integer): Integer; |
||||
function inflatePrime(var strm: z_stream; bits, value: Integer): Integer; |
||||
function inflateMark(var strm: z_stream): LongInt; |
||||
function inflateGetHeader(var strm: z_stream; var head: gz_header): Integer; |
||||
function inflateBackInit(var strm: z_stream; |
||||
windowBits: Integer; window: PChar): Integer; |
||||
function inflateBack(var strm: z_stream; in_fn: in_func; in_desc: Pointer; |
||||
out_fn: out_func; out_desc: Pointer): Integer; |
||||
function inflateBackEnd(var strm: z_stream): Integer; |
||||
function zlibCompileFlags: LongInt; |
||||
|
||||
(* utility functions *) |
||||
function compress(dest: PChar; var destLen: LongInt; |
||||
const source: PChar; sourceLen: LongInt): Integer; |
||||
function compress2(dest: PChar; var destLen: LongInt; |
||||
const source: PChar; sourceLen: LongInt; |
||||
level: Integer): Integer; |
||||
function compressBound(sourceLen: LongInt): LongInt; |
||||
function uncompress(dest: PChar; var destLen: LongInt; |
||||
const source: PChar; sourceLen: LongInt): Integer; |
||||
|
||||
(* checksum functions *) |
||||
function adler32(adler: LongInt; const buf: PChar; len: Integer): LongInt; |
||||
function adler32_combine(adler1, adler2, len2: LongInt): LongInt; |
||||
function crc32(crc: LongInt; const buf: PChar; len: Integer): LongInt; |
||||
function crc32_combine(crc1, crc2, len2: LongInt): LongInt; |
||||
|
||||
(* various hacks, don't look :) *) |
||||
function deflateInit_(var strm: z_stream; level: Integer; |
||||
const version: PChar; stream_size: Integer): Integer; |
||||
function inflateInit_(var strm: z_stream; const version: PChar; |
||||
stream_size: Integer): Integer; |
||||
function deflateInit2_(var strm: z_stream; |
||||
level, method, windowBits, memLevel, strategy: Integer; |
||||
const version: PChar; stream_size: Integer): Integer; |
||||
function inflateInit2_(var strm: z_stream; windowBits: Integer; |
||||
const version: PChar; stream_size: Integer): Integer; |
||||
function inflateBackInit_(var strm: z_stream; |
||||
windowBits: Integer; window: PChar; |
||||
const version: PChar; stream_size: Integer): Integer; |
||||
|
||||
|
||||
implementation |
||||
|
||||
{$L adler32.obj} |
||||
{$L compress.obj} |
||||
{$L crc32.obj} |
||||
{$L deflate.obj} |
||||
{$L infback.obj} |
||||
{$L inffast.obj} |
||||
{$L inflate.obj} |
||||
{$L inftrees.obj} |
||||
{$L trees.obj} |
||||
{$L uncompr.obj} |
||||
{$L zutil.obj} |
||||
|
||||
function adler32; external; |
||||
function adler32_combine; external; |
||||
function compress; external; |
||||
function compress2; external; |
||||
function compressBound; external; |
||||
function crc32; external; |
||||
function crc32_combine; external; |
||||
function deflate; external; |
||||
function deflateBound; external; |
||||
function deflateCopy; external; |
||||
function deflateEnd; external; |
||||
function deflateInit_; external; |
||||
function deflateInit2_; external; |
||||
function deflateParams; external; |
||||
function deflatePending; external; |
||||
function deflatePrime; external; |
||||
function deflateReset; external; |
||||
function deflateSetDictionary; external; |
||||
function deflateSetHeader; external; |
||||
function deflateTune; external; |
||||
function inflate; external; |
||||
function inflateBack; external; |
||||
function inflateBackEnd; external; |
||||
function inflateBackInit_; external; |
||||
function inflateCopy; external; |
||||
function inflateEnd; external; |
||||
function inflateGetHeader; external; |
||||
function inflateInit_; external; |
||||
function inflateInit2_; external; |
||||
function inflateMark; external; |
||||
function inflatePrime; external; |
||||
function inflateReset; external; |
||||
function inflateReset2; external; |
||||
function inflateSetDictionary; external; |
||||
function inflateSync; external; |
||||
function uncompress; external; |
||||
function zlibCompileFlags; external; |
||||
function zlibVersion; external; |
||||
|
||||
function deflateInit(var strm: z_stream; level: Integer): Integer; |
||||
begin |
||||
Result := deflateInit_(strm, level, ZLIB_VERSION, sizeof(z_stream)); |
||||
end; |
||||
|
||||
function deflateInit2(var strm: z_stream; level, method, windowBits, memLevel, |
||||
strategy: Integer): Integer; |
||||
begin |
||||
Result := deflateInit2_(strm, level, method, windowBits, memLevel, strategy, |
||||
ZLIB_VERSION, sizeof(z_stream)); |
||||
end; |
||||
|
||||
function inflateInit(var strm: z_stream): Integer; |
||||
begin |
||||
Result := inflateInit_(strm, ZLIB_VERSION, sizeof(z_stream)); |
||||
end; |
||||
|
||||
function inflateInit2(var strm: z_stream; windowBits: Integer): Integer; |
||||
begin |
||||
Result := inflateInit2_(strm, windowBits, ZLIB_VERSION, sizeof(z_stream)); |
||||
end; |
||||
|
||||
function inflateBackInit(var strm: z_stream; |
||||
windowBits: Integer; window: PChar): Integer; |
||||
begin |
||||
Result := inflateBackInit_(strm, windowBits, window, |
||||
ZLIB_VERSION, sizeof(z_stream)); |
||||
end; |
||||
|
||||
function _malloc(Size: Integer): Pointer; cdecl; |
||||
begin |
||||
GetMem(Result, Size); |
||||
end; |
||||
|
||||
procedure _free(Block: Pointer); cdecl; |
||||
begin |
||||
FreeMem(Block); |
||||
end; |
||||
|
||||
procedure _memset(P: Pointer; B: Byte; count: Integer); cdecl; |
||||
begin |
||||
FillChar(P^, count, B); |
||||
end; |
||||
|
||||
procedure _memcpy(dest, source: Pointer; count: Integer); cdecl; |
||||
begin |
||||
Move(source^, dest^, count); |
||||
end; |
||||
|
||||
end. |
@ -0,0 +1,42 @@ |
||||
CFLAGS=-O
|
||||
|
||||
puff: puff.o pufftest.o |
||||
|
||||
puff.o: puff.h |
||||
|
||||
pufftest.o: puff.h |
||||
|
||||
test: puff |
||||
puff zeros.raw
|
||||
|
||||
puft: puff.c puff.h pufftest.o |
||||
cc -fprofile-arcs -ftest-coverage -o puft puff.c pufftest.o
|
||||
|
||||
# puff full coverage test (should say 100%)
|
||||
cov: puft |
||||
@rm -f *.gcov *.gcda
|
||||
@puft -w zeros.raw 2>&1 | cat > /dev/null
|
||||
@echo '04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
|
||||
@echo '00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
|
||||
@echo '00 00 00 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 254
|
||||
@echo '00 01 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
|
||||
@echo '01 01 00 fe ff 0a' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
|
||||
@echo '02 7e ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
|
||||
@echo '02' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
|
||||
@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 2
|
||||
@echo '04 80 49 92 24 49 92 24 71 ff ff 93 11 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 249
|
||||
@echo '04 c0 81 08 00 00 00 00 20 7f eb 0b 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
|
||||
@echo '0b 00 00' | xxd -r -p | puft -f 2>&1 | cat > /dev/null
|
||||
@echo '1a 07' | xxd -r -p | puft 2> /dev/null || test $$? -eq 246
|
||||
@echo '0c c0 81 00 00 00 00 00 90 ff 6b 04' | xxd -r -p | puft 2> /dev/null || test $$? -eq 245
|
||||
@puft -f zeros.raw 2>&1 | cat > /dev/null
|
||||
@echo 'fc 00 00' | xxd -r -p | puft 2> /dev/null || test $$? -eq 253
|
||||
@echo '04 00 fe ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 252
|
||||
@echo '04 00 24 49' | xxd -r -p | puft 2> /dev/null || test $$? -eq 251
|
||||
@echo '04 80 49 92 24 49 92 24 0f b4 ff ff c3 84' | xxd -r -p | puft 2> /dev/null || test $$? -eq 248
|
||||
@echo '04 00 24 e9 ff ff' | xxd -r -p | puft 2> /dev/null || test $$? -eq 250
|
||||
@echo '04 00 24 e9 ff 6d' | xxd -r -p | puft 2> /dev/null || test $$? -eq 247
|
||||
@gcov -n puff.c
|
||||
|
||||
clean: |
||||
rm -f puff puft *.o *.gc*
|
@ -0,0 +1,63 @@ |
||||
Puff -- A Simple Inflate |
||||
3 Mar 2003 |
||||
Mark Adler |
||||
madler@alumni.caltech.edu |
||||
|
||||
What this is -- |
||||
|
||||
puff.c provides the routine puff() to decompress the deflate data format. It |
||||
does so more slowly than zlib, but the code is about one-fifth the size of the |
||||
inflate code in zlib, and written to be very easy to read. |
||||
|
||||
Why I wrote this -- |
||||
|
||||
puff.c was written to document the deflate format unambiguously, by virtue of |
||||
being working C code. It is meant to supplement RFC 1951, which formally |
||||
describes the deflate format. I have received many questions on details of the |
||||
deflate format, and I hope that reading this code will answer those questions. |
||||
puff.c is heavily commented with details of the deflate format, especially |
||||
those little nooks and cranies of the format that might not be obvious from a |
||||
specification. |
||||
|
||||
puff.c may also be useful in applications where code size or memory usage is a |
||||
very limited resource, and speed is not as important. |
||||
|
||||
How to use it -- |
||||
|
||||
Well, most likely you should just be reading puff.c and using zlib for actual |
||||
applications, but if you must ... |
||||
|
||||
Include puff.h in your code, which provides this prototype: |
||||
|
||||
int puff(unsigned char *dest, /* pointer to destination pointer */ |
||||
unsigned long *destlen, /* amount of output space */ |
||||
unsigned char *source, /* pointer to source data pointer */ |
||||
unsigned long *sourcelen); /* amount of input available */ |
||||
|
||||
Then you can call puff() to decompress a deflate stream that is in memory in |
||||
its entirety at source, to a sufficiently sized block of memory for the |
||||
decompressed data at dest. puff() is the only external symbol in puff.c The |
||||
only C library functions that puff.c needs are setjmp() and longjmp(), which |
||||
are used to simplify error checking in the code to improve readability. puff.c |
||||
does no memory allocation, and uses less than 2K bytes off of the stack. |
||||
|
||||
If destlen is not enough space for the uncompressed data, then inflate will |
||||
return an error without writing more than destlen bytes. Note that this means |
||||
that in order to decompress the deflate data successfully, you need to know |
||||
the size of the uncompressed data ahead of time. |
||||
|
||||
If needed, puff() can determine the size of the uncompressed data with no |
||||
output space. This is done by passing dest equal to (unsigned char *)0. Then |
||||
the initial value of *destlen is ignored and *destlen is set to the length of |
||||
the uncompressed data. So if the size of the uncompressed data is not known, |
||||
then two passes of puff() can be used--first to determine the size, and second |
||||
to do the actual inflation after allocating the appropriate memory. Not |
||||
pretty, but it works. (This is one of the reasons you should be using zlib.) |
||||
|
||||
The deflate format is self-terminating. If the deflate stream does not end |
||||
in *sourcelen bytes, puff() will return an error without reading at or past |
||||
endsource. |
||||
|
||||
On return, *sourcelen is updated to the amount of input data consumed, and |
||||
*destlen is updated to the size of the uncompressed data. See the comments |
||||
in puff.c for the possible return codes for puff(). |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue