mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* g10.c (main): Alias --charset as --display-charset to help avoid the
continuing confusion and make room for possible changes in devel. * parse-packet.c (parse_plaintext): Show the hex value for the literal packet mode since it may not be printable. * keygen.c (make_backsig): Make sure that the backsig was built successfully before we try and use it. * status.h, status.c (get_status_string), plaintext.c (handle_plaintext): New status tags PLAINTEXT and PLAINTEXT_LENGTH.
This commit is contained in:
parent
d60d73a53b
commit
2cba999f22
7 changed files with 101 additions and 60 deletions
|
@ -259,7 +259,7 @@ enum cmd_and_opt_values
|
|||
oS2KDigest,
|
||||
oS2KCipher,
|
||||
oSimpleSKChecksum,
|
||||
oCharset,
|
||||
oDisplayCharset,
|
||||
oNotDashEscaped,
|
||||
oEscapeFrom,
|
||||
oNoEscapeFrom,
|
||||
|
@ -477,7 +477,8 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oExportOptions, "export-options",2,"@"},
|
||||
{ oListOptions, "list-options",2,"@"},
|
||||
{ oVerifyOptions, "verify-options",2,"@"},
|
||||
{ oCharset, "charset", 2, "@"},
|
||||
{ oDisplayCharset, "display-charset", 2, "@"},
|
||||
{ oDisplayCharset, "charset", 2, "@"},
|
||||
{ oOptions, "options", 2, "@"},
|
||||
{ oDebug, "debug" ,4|16, "@"},
|
||||
{ oDebugAll, "debug-all" ,0, "@"},
|
||||
|
@ -2093,7 +2094,7 @@ main( int argc, char **argv )
|
|||
case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
|
||||
case oNoPermissionWarn: opt.no_perm_warn=1; break;
|
||||
case oNoMDCWarn: opt.no_mdc_warn=1; break;
|
||||
case oCharset:
|
||||
case oDisplayCharset:
|
||||
if( set_native_charset( pargs.r.ret_str ) )
|
||||
log_error(_("%s is not a valid character set\n"),
|
||||
pargs.r.ret_str);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue