mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
David Shaw
parent
8d82e1af00
commit
869c6bb7e4
12 changed files with 366 additions and 40 deletions
242
g10/compress-bz2.c
Normal file
242
g10/compress-bz2.c
Normal file
|
|
@ -0,0 +1,242 @@
|
|||
/* compress.c - bzip2 compress filter
|
||||
* Copyright (C) 2003 Free Software Foundation, Inc.
|
||||
*
|
||||
* This file is part of GnuPG.
|
||||
*
|
||||
* GnuPG 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.
|
||||
*
|
||||
* GnuPG 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 program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <string.h>
|
||||
#include <bzlib.h>
|
||||
|
||||
#include "util.h"
|
||||
#include "memory.h"
|
||||
#include "packet.h"
|
||||
#include "filter.h"
|
||||
#include "main.h"
|
||||
#include "options.h"
|
||||
|
||||
/* Note that the code in compress.c is nearly identical to the code
|
||||
here, so if you fix a bug here, look there to see if the matching
|
||||
bug needs to be fixed. I tried to have one set of functions that
|
||||
could do ZIP, ZLIB, and BZIP2, but it became dangerously unreadable
|
||||
with #ifdefs and if(algo) -dshaw */
|
||||
|
||||
static void
|
||||
init_compress( compress_filter_context_t *zfx, bz_stream *bzs )
|
||||
{
|
||||
int rc;
|
||||
int level;
|
||||
|
||||
if( opt.compress >= 0 && opt.compress <= 9 )
|
||||
level = opt.compress;
|
||||
else if( opt.compress == -1 )
|
||||
level = 6; /* no particular reason, but it seems reasonable */
|
||||
else if( opt.compress == 10 ) /* remove this ! */
|
||||
level = 0;
|
||||
else
|
||||
{
|
||||
log_error("invalid compression level; using default level\n");
|
||||
level = 6;
|
||||
}
|
||||
|
||||
if((rc=BZ2_bzCompressInit(bzs,level,0,0))!=BZ_OK)
|
||||
log_fatal("bz2lib problem: %d\n",rc);
|
||||
|
||||
zfx->outbufsize = 8192;
|
||||
zfx->outbuf = m_alloc( zfx->outbufsize );
|
||||
}
|
||||
|
||||
static int
|
||||
do_compress(compress_filter_context_t *zfx, bz_stream *bzs, int flush, IOBUF a)
|
||||
{
|
||||
int zrc;
|
||||
unsigned n;
|
||||
|
||||
do
|
||||
{
|
||||
bzs->next_out = zfx->outbuf;
|
||||
bzs->avail_out = zfx->outbufsize;
|
||||
if( DBG_FILTER )
|
||||
log_debug("enter bzCompress: avail_in=%u, avail_out=%u, flush=%d\n",
|
||||
(unsigned)bzs->avail_in, (unsigned)bzs->avail_out, flush );
|
||||
zrc = BZ2_bzCompress( bzs, flush );
|
||||
if( zrc == BZ_STREAM_END && flush == BZ_FINISH )
|
||||
;
|
||||
else if( zrc != BZ_RUN_OK && zrc != BZ_FINISH_OK )
|
||||
log_fatal("bz2lib deflate problem: rc=%d\n", zrc );
|
||||
|
||||
n = zfx->outbufsize - bzs->avail_out;
|
||||
if( DBG_FILTER )
|
||||
log_debug("leave bzCompress:"
|
||||
" avail_in=%u, avail_out=%u, n=%u, zrc=%d\n",
|
||||
(unsigned)bzs->avail_in, (unsigned)bzs->avail_out,
|
||||
(unsigned)n, zrc );
|
||||
|
||||
if( iobuf_write( a, zfx->outbuf, n ) )
|
||||
{
|
||||
log_debug("bzCompress: iobuf_write failed\n");
|
||||
return G10ERR_WRITE_FILE;
|
||||
}
|
||||
}
|
||||
while( bzs->avail_in || (flush == BZ_FINISH && zrc != BZ_STREAM_END) );
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
init_uncompress( compress_filter_context_t *zfx, bz_stream *bzs )
|
||||
{
|
||||
int rc;
|
||||
|
||||
if((rc=BZ2_bzDecompressInit(bzs,0,0))!=BZ_OK)
|
||||
log_fatal("bz2lib problem: %d\n",rc);
|
||||
|
||||
zfx->inbufsize = 2048;
|
||||
zfx->inbuf = m_alloc( zfx->inbufsize );
|
||||
bzs->avail_in = 0;
|
||||
}
|
||||
|
||||
static int
|
||||
do_uncompress( compress_filter_context_t *zfx, bz_stream *bzs,
|
||||
IOBUF a, size_t *ret_len )
|
||||
{
|
||||
int zrc;
|
||||
int rc=0;
|
||||
size_t n;
|
||||
int nread, count;
|
||||
int refill = !bzs->avail_in;
|
||||
|
||||
if( DBG_FILTER )
|
||||
log_debug("begin bzDecompress: avail_in=%u, avail_out=%u, inbuf=%u\n",
|
||||
(unsigned)bzs->avail_in, (unsigned)bzs->avail_out,
|
||||
(unsigned)zfx->inbufsize );
|
||||
do
|
||||
{
|
||||
if( bzs->avail_in < zfx->inbufsize && refill )
|
||||
{
|
||||
n = bzs->avail_in;
|
||||
if( !n )
|
||||
bzs->next_in = zfx->inbuf;
|
||||
count = zfx->inbufsize - n;
|
||||
nread = iobuf_read( a, zfx->inbuf + n, count );
|
||||
if( nread == -1 ) nread = 0;
|
||||
n += nread;
|
||||
bzs->avail_in = n;
|
||||
}
|
||||
|
||||
refill = 1;
|
||||
|
||||
if( DBG_FILTER )
|
||||
log_debug("enter bzDecompress: avail_in=%u, avail_out=%u\n",
|
||||
(unsigned)bzs->avail_in, (unsigned)bzs->avail_out);
|
||||
|
||||
zrc=BZ2_bzDecompress(bzs);
|
||||
if( DBG_FILTER )
|
||||
log_debug("leave bzDecompress: avail_in=%u, avail_out=%u, zrc=%d\n",
|
||||
(unsigned)bzs->avail_in, (unsigned)bzs->avail_out, zrc);
|
||||
if( zrc == BZ_STREAM_END )
|
||||
rc = -1; /* eof */
|
||||
else if( zrc != BZ_OK && zrc != BZ_PARAM_ERROR )
|
||||
log_fatal("bz2lib inflate problem: rc=%d\n", zrc );
|
||||
}
|
||||
while( bzs->avail_out && zrc != BZ_STREAM_END && zrc != BZ_PARAM_ERROR );
|
||||
|
||||
/* I'm not completely happy with the two uses of BZ_PARAM_ERROR
|
||||
here. The corresponding zlib function is Z_BUF_ERROR, which
|
||||
covers a narrower scope than BZ_PARAM_ERROR. -dshaw */
|
||||
|
||||
*ret_len = zfx->outbufsize - bzs->avail_out;
|
||||
if( DBG_FILTER )
|
||||
log_debug("do_uncompress: returning %u bytes\n", (unsigned)*ret_len );
|
||||
return rc;
|
||||
}
|
||||
|
||||
int
|
||||
compress_filter_bz2( void *opaque, int control,
|
||||
IOBUF a, byte *buf, size_t *ret_len)
|
||||
{
|
||||
size_t size = *ret_len;
|
||||
compress_filter_context_t *zfx = opaque;
|
||||
bz_stream *bzs = zfx->opaque;
|
||||
int rc=0;
|
||||
|
||||
if( control == IOBUFCTRL_UNDERFLOW )
|
||||
{
|
||||
if( !zfx->status )
|
||||
{
|
||||
bzs = zfx->opaque = m_alloc_clear( sizeof *bzs );
|
||||
init_uncompress( zfx, bzs );
|
||||
zfx->status = 1;
|
||||
}
|
||||
|
||||
bzs->next_out = buf;
|
||||
bzs->avail_out = size;
|
||||
zfx->outbufsize = size; /* needed only for calculation */
|
||||
rc = do_uncompress( zfx, bzs, a, ret_len );
|
||||
}
|
||||
else if( control == IOBUFCTRL_FLUSH )
|
||||
{
|
||||
if( !zfx->status )
|
||||
{
|
||||
PACKET pkt;
|
||||
PKT_compressed cd;
|
||||
|
||||
if( zfx->algo != COMPRESS_ALGO_BZIP2 )
|
||||
BUG();
|
||||
memset( &cd, 0, sizeof cd );
|
||||
cd.len = 0;
|
||||
cd.algorithm = zfx->algo;
|
||||
init_packet( &pkt );
|
||||
pkt.pkttype = PKT_COMPRESSED;
|
||||
pkt.pkt.compressed = &cd;
|
||||
if( build_packet( a, &pkt ))
|
||||
log_bug("build_packet(PKT_COMPRESSED) failed\n");
|
||||
bzs = zfx->opaque = m_alloc_clear( sizeof *bzs );
|
||||
init_compress( zfx, bzs );
|
||||
zfx->status = 2;
|
||||
}
|
||||
|
||||
bzs->next_in = buf;
|
||||
bzs->avail_in = size;
|
||||
rc = do_compress( zfx, bzs, BZ_RUN, a );
|
||||
}
|
||||
else if( control == IOBUFCTRL_FREE )
|
||||
{
|
||||
if( zfx->status == 1 )
|
||||
{
|
||||
BZ2_bzDecompressEnd(bzs);
|
||||
m_free(bzs);
|
||||
zfx->opaque = NULL;
|
||||
m_free(zfx->outbuf); zfx->outbuf = NULL;
|
||||
}
|
||||
else if( zfx->status == 2 )
|
||||
{
|
||||
bzs->next_in = buf;
|
||||
bzs->avail_in = 0;
|
||||
do_compress( zfx, bzs, BZ_FINISH, a );
|
||||
BZ2_bzCompressEnd(bzs);
|
||||
m_free(bzs);
|
||||
zfx->opaque = NULL;
|
||||
m_free(zfx->outbuf); zfx->outbuf = NULL;
|
||||
}
|
||||
if (zfx->release)
|
||||
zfx->release (zfx);
|
||||
}
|
||||
else if( control == IOBUFCTRL_DESC )
|
||||
*(char**)buf = "compress_filter";
|
||||
return rc;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue