diff options
| author | David Shaw <[email protected]> | 2003-11-15 22:31:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2003-11-15 22:31:58 +0000 |
| commit | 995d71258998eb6ed80a08cb5ad8c8bd03f13afb (patch) | |
| tree | 486e8ad5b1e39f5c2063d82f5555a395be86f4a8 /g10/misc.c | |
| parent | * encode.c (encode_simple), sign.c (sign_symencrypt_file): Properly use (diff) | |
| download | gnupg-995d71258998eb6ed80a08cb5ad8c8bd03f13afb.tar.gz gnupg-995d71258998eb6ed80a08cb5ad8c8bd03f13afb.zip | |
* options.h, g10.c (main), compress.c (init_compress), compress-bz2.c
(init_compress): Add --compress-level and --bzip2-compress-level. -z sets
them both. Change various callers.
Diffstat (limited to 'g10/misc.c')
| -rw-r--r-- | g10/misc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/g10/misc.c b/g10/misc.c index 49a84d905..5583787e8 100644 --- a/g10/misc.c +++ b/g10/misc.c @@ -575,6 +575,8 @@ string_to_compress_algo(const char *string) { if(ascii_strcasecmp(string,"uncompressed")==0) return 0; + else if(ascii_strcasecmp(string,"none")==0) + return 0; else if(ascii_strcasecmp(string,"zip")==0) return 1; else if(ascii_strcasecmp(string,"zlib")==0) @@ -623,13 +625,13 @@ default_cipher_algo(void) } /* There is no default_digest_algo function, but see - sign.c:hash_for */ + sign.c:hash_for() */ int default_compress_algo(void) { - if(opt.def_compress_algo!=-1) - return opt.def_compress_algo; + if(opt.compress_algo!=-1) + return opt.compress_algo; else if(opt.personal_compress_prefs) return opt.personal_compress_prefs[0].value; else |