security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* options.h, g10.c (main), compress-bz2.c (init_uncompress): Add

Browse Source 
--bz2-compress-lowmem to set bzlib "small" flag for low memory (but slow)
decompression.
This commit is contained in:
David Shaw 2003-11-18 02:52:35 +00:00
parent 2e4ab6c669
commit dcf747d620
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2003-11-17 David Shaw <dshaw@jabberwocky.com>
* options.h, g10.c (main), compress-bz2.c (init_uncompress): Add
--bz2-compress-lowmem to set bzlib "small" flag for low memory
(but slow) decompression.
2003-11-15 David Shaw <dshaw@jabberwocky.com> 2003-11-15 David Shaw <dshaw@jabberwocky.com>
* compress.c (init_compress): Remove compress level 10 trick, * compress.c (init_compress): Remove compress level 10 trick,

2
g10/compress-bz2.c
View File

@ -100,7 +100,7 @@ init_uncompress( compress_filter_context_t *zfx, bz_stream *bzs )
{ {
int rc; int rc;
if((rc=BZ2_bzDecompressInit(bzs,0,0))!=BZ_OK) if((rc=BZ2_bzDecompressInit(bzs,0,opt.bz2_compress_lowmem))!=BZ_OK)
log_fatal("bz2lib problem: %d\n",rc); log_fatal("bz2lib problem: %d\n",rc);
zfx->inbufsize = 2048; zfx->inbufsize = 2048;

3
g10/g10.c
View File

@ -192,6 +192,7 @@ enum cmd_and_opt_values
oCompressAlgo, oCompressAlgo,
oCompressLevel, oCompressLevel,
oBZ2CompressLevel, oBZ2CompressLevel,
oBZ2CompressLowmem,
oPasswdFD, oPasswdFD,
#ifdef __riscos__ #ifdef __riscos__
oPasswdFile, oPasswdFile,
@ -423,6 +424,7 @@ static ARGPARSE_OPTS opts[] = {
{ oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") }, { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
{ oCompressLevel, "compress-level", 1, "@" }, { oCompressLevel, "compress-level", 1, "@" },
{ oBZ2CompressLevel, "bzip2-compress-level", 1, "@" }, { oBZ2CompressLevel, "bzip2-compress-level", 1, "@" },
{ oBZ2CompressLowmem, "bzip2-compress-lowmem", 0, "@" },
{ oTextmodeShort, NULL, 0, "@"}, { oTextmodeShort, NULL, 0, "@"},
{ oTextmode, "textmode", 0, N_("use canonical text mode")}, { oTextmode, "textmode", 0, N_("use canonical text mode")},
{ oNoTextmode, "no-textmode", 0, "@"}, { oNoTextmode, "no-textmode", 0, "@"},
@ -1790,6 +1792,7 @@ main( int argc, char **argv )
break; break;
case oCompressLevel: opt.compress_level = pargs.r.ret_int; break; case oCompressLevel: opt.compress_level = pargs.r.ret_int; break;
case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break; case oBZ2CompressLevel: opt.bz2_compress_level = pargs.r.ret_int; break;
case oBZ2CompressLowmem: opt.bz2_compress_lowmem=1; break;
case oPasswdFD: case oPasswdFD:
pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0); pwfd = iobuf_translate_file_handle (pargs.r.ret_int, 0);
opt.use_agent = 0; opt.use_agent = 0;

1
g10/options.h
View File

@ -70,6 +70,7 @@ struct {
int compress_algo; int compress_algo;
int compress_level; int compress_level;
int bz2_compress_level; int bz2_compress_level;
int bz2_compress_lowmem;
const char *def_secret_key; const char *def_secret_key;
char *def_recipient; char *def_recipient;
int def_recipient_self; int def_recipient_self;