diff options
| author | David Shaw <[email protected]> | 2003-10-31 05:39:02 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-10-31 05:39:02 +0000 |
| commit | 869c6bb7e455c91680bad8c2649bcfcdacfc4e7d (patch) | |
| tree | 02e5d7eaacfbe5dfd6f5485b73c24f0332638877 /g10/export.c | |
| parent | * cipher.h: Add COMPRESS_ALGO_BZIP2. (diff) | |
| download | gnupg-869c6bb7e455c91680bad8c2649bcfcdacfc4e7d.tar.gz gnupg-869c6bb7e455c91680bad8c2649bcfcdacfc4e7d.zip | |
* misc.c (compress_algo_to_string, string_to_compress_algo,
check_compress_algo): Add bzip2.
* compress.c (compress_filter): Make static to help force the use of
push_compress_filter. Remove default algorithm setting since that is done
in push_compress_filter now.
* main.h: Use named algorithm.
* filter.h, compress.c (push_compress_filter, push_compress_filter2): New.
Figure out which is the appropriate compression filter to use, and push it
into place.
* compress.c (handle_compressed), encode.c (encode_simple, encode_crypt),
sign.c (sign_file, sign_symencrypt_file), import.c (read_block), export.c
(do_export): Use push_compress_filter instead of pushing the compression
filter ourselves.
* compress-bz2.c: New. Bzlib versions of the compression filter routines.
* Makefile.am: Include compress-bz2.c if bz2lib is available.
Diffstat (limited to 'g10/export.c')
| -rw-r--r-- | g10/export.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/export.c b/g10/export.c index 5783f6ac1..1545fafcd 100644 --- a/g10/export.c +++ b/g10/export.c @@ -114,9 +114,9 @@ do_export( STRLIST users, int secret, unsigned int options ) iobuf_push_filter( out, armor_filter, &afx ); } if( opt.compress_keys && opt.compress ) - iobuf_push_filter( out, compress_filter, &zfx ); - rc = do_export_stream( out, users, secret, NULL, options, &any ); + push_compress_filter(out,&zfx,opt.def_compress_algo); + rc = do_export_stream( out, users, secret, NULL, options, &any ); if( rc || !any ) iobuf_cancel(out); else |