security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

gpg: New option --no-compress as alias for -z0.

Browse Source
This commit is contained in:
Werner Koch 2023-06-15 13:58:35 +02:00
parent e9c337c0b9
commit 2178f35dff
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
doc/gpg.texi
View File

@ -1675,24 +1675,29 @@ prevent the creation of a @file{~/.gnupg} homedir.
@item -z @var{n} @item -z @var{n}
@itemx --compress-level @var{n} @itemx --compress-level @var{n}
@itemx --bzip2-compress-level @var{n} @itemx --bzip2-compress-level @var{n}
@itemx --no-compress
@opindex compress-level @opindex compress-level
@opindex bzip2-compress-level @opindex bzip2-compress-level
@opindex no-compress
Set compression level to @var{n} for the ZIP and ZLIB compression Set compression level to @var{n} for the ZIP and ZLIB compression
algorithms. The default is to use the default compression level of zlib algorithms. The default is to use the default compression level of zlib
(normally 6). @option{--bzip2-compress-level} sets the compression level (normally 6). @option{--bzip2-compress-level} sets the compression level
for the BZIP2 compression algorithm (defaulting to 6 as well). This is a for the BZIP2 compression algorithm (defaulting to 6 as well). This is a
different option from @option{--compress-level} since BZIP2 uses a different option from @option{--compress-level} since BZIP2 uses a
significant amount of memory for each additional compression level. significant amount of memory for each additional compression level.
@option{-z} sets both. A value of 0 for @var{n} disables compression.
A value of -1 forces compression using the default level. Option @option{-z} sets both. A value of 0 for @var{n} disables
compression. A value of -1 forces compression using the default
level. Option @option{--no-compress} is identical to @option{-z0}.
Except for the @option{--store} command compression is always used Except for the @option{--store} command compression is always used
unless @command{gpg} detects that the input is already compressed. To unless @command{gpg} detects that the input is already compressed. To
inhibit the use of compression use @option{-z0}; to force compression inhibit the use of compression use @option{-z0} or
use @option{-z-1} or option @option{z} with another compression level @option{--no-compress}; to force compression use @option{-z-1} or
than the default as indicated by -1. Note that this overriding of the option @option{z} with another compression level than the default as
default deection works only with @option{z} and not with the long indicated by -1. Note that this overriding of the default deection
variant of this option. works only with @option{z} and not with the long variant of this
option.
@item --bzip2-decompress-lowmem @item --bzip2-decompress-lowmem

7
g10/gpg.c
View File

@ -259,6 +259,7 @@ enum cmd_and_opt_values
oCipherAlgo, oCipherAlgo,
oDigestAlgo, oDigestAlgo,
oCertDigestAlgo, oCertDigestAlgo,
oNoCompress,
oCompressAlgo, oCompressAlgo,
oCompressLevel, oCompressLevel,
oBZ2CompressLevel, oBZ2CompressLevel,
@ -697,6 +698,7 @@ static gpgrt_opt_t opts[] = {
ARGPARSE_s_n (oLockOnce, "lock-once", "@"), ARGPARSE_s_n (oLockOnce, "lock-once", "@"),
ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"), ARGPARSE_s_n (oLockMultiple, "lock-multiple", "@"),
ARGPARSE_s_n (oLockNever, "lock-never", "@"), ARGPARSE_s_n (oLockNever, "lock-never", "@"),
ARGPARSE_s_n (oNoCompress, "no-compress", "@"),
ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"), ARGPARSE_s_s (oCompressAlgo,"compress-algo", "@"),
ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */ ARGPARSE_s_s (oCompressAlgo, "compression-algo", "@"), /* Alias */
ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"), ARGPARSE_s_n (oBZ2DecompressLowmem, "bzip2-decompress-lowmem", "@"),
@ -3238,6 +3240,11 @@ main (int argc, char **argv)
opt.compress_level = opt.bz2_compress_level = pargs.r.ret_int; opt.compress_level = opt.bz2_compress_level = pargs.r.ret_int;
opt.explicit_compress_option = 1; opt.explicit_compress_option = 1;
break; break;
case oNoCompress:
/* --no-compress is the same as -z0 */
opt.compress_level = opt.bz2_compress_level = 0;
opt.explicit_compress_option = 1;
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 oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break; case oBZ2DecompressLowmem: opt.bz2_decompress_lowmem=1; break;