diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-26 17:46:26 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-26 17:46:26 +0000 |
commit | e40f378821be25ae4667d311cf3bf3374fe63e0d (patch) | |
tree | bcd9b6cf0548c272f139b6a6346a8fd5be617aa8 /mdk-stage1/mar/mar.h | |
parent | d3ca588c33736f23f22a66e41985f9d5c62305e4 (diff) | |
download | drakx-e40f378821be25ae4667d311cf3bf3374fe63e0d.tar drakx-e40f378821be25ae4667d311cf3bf3374fe63e0d.tar.gz drakx-e40f378821be25ae4667d311cf3bf3374fe63e0d.tar.bz2 drakx-e40f378821be25ae4667d311cf3bf3374fe63e0d.tar.xz drakx-e40f378821be25ae4667d311cf3bf3374fe63e0d.zip |
mar now uses bzlib, no more zlib
Diffstat (limited to 'mdk-stage1/mar/mar.h')
-rw-r--r-- | mdk-stage1/mar/mar.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/mdk-stage1/mar/mar.h b/mdk-stage1/mar/mar.h index e9633ab92..672d7ded8 100644 --- a/mdk-stage1/mar/mar.h +++ b/mdk-stage1/mar/mar.h @@ -15,7 +15,7 @@ /* * mar - The Mandrake Archiver * - * An archiver that supports compression (through zlib). + * An archiver that supports compression (through bzlib). * * Designed to be small so these bad designs are inside: * . archive and compression are mixed together @@ -36,14 +36,13 @@ #include <errno.h> #include <unistd.h> -#include <zlib.h> +#include <bzlib.h> /* * Format of a mar file: * - * int crc32 \ * ASCIIZ filename \ | - * int file_length | repeated | gzipped + * int file_length | repeated | bzipped * int pointer_in_archive / | * char 0 | * raw_files_data / @@ -60,12 +59,11 @@ struct mar_element struct mar_stream { - int crc32; /* crc32 of the mar stream; it is the addition of all the 8-bit char's from the stream */ struct mar_element * first_element; /* pointer to the first element inside the mar stream */ - gzFile mar_gzfile; /* associated gzFile (opened) */ + BZFILE * mar_zfile; /* associated zfile (opened) */ }; -int gz_errnum; +int z_errnum; #define DEBUG_MAR(x) |