security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-14 18:31:03 +02:00
Code Activity

* g10.c (main): Alias --charset as --display-charset to help avoid the

Browse Source 
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.
This commit is contained in:
David Shaw 2004-06-01 20:17:37 +00:00
parent afb925dace
commit cd3e058f8b
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2004-06-01 David Shaw <dshaw@jabberwocky.com>
* 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.
2004-05-23 David Shaw <dshaw@jabberwocky.com> 2004-05-23 David Shaw <dshaw@jabberwocky.com>
* pkclist.c (do_edit_ownertrust): Fix kbnode leak. * pkclist.c (do_edit_ownertrust): Fix kbnode leak.

7
g10/g10.c
View File

@ -240,7 +240,7 @@ enum cmd_and_opt_values
oS2KDigest, oS2KDigest,
oS2KCipher, oS2KCipher,
oSimpleSKChecksum, oSimpleSKChecksum,
oCharset, oDisplayCharset,
oNotDashEscaped, oNotDashEscaped,
oEscapeFrom, oEscapeFrom,
oNoEscapeFrom, oNoEscapeFrom,
@ -440,7 +440,8 @@ static ARGPARSE_OPTS opts[] = {
{ oKeyServerOptions, "keyserver-options",2,"@"}, { oKeyServerOptions, "keyserver-options",2,"@"},
{ oImportOptions, "import-options",2,"@"}, { oImportOptions, "import-options",2,"@"},
{ oExportOptions, "export-options",2,"@"}, { oExportOptions, "export-options",2,"@"},
{ oCharset, "charset" , 2, N_("|NAME|set terminal charset to NAME") }, { oDisplayCharset, "display-charset", 2, N_("|NAME|set terminal charset to NAME") },
{ oDisplayCharset, "charset", 2, "@" },
{ oOptions, "options" , 2, N_("read options from file")}, { oOptions, "options" , 2, N_("read options from file")},
{ oDebug, "debug" ,4|16, "@"}, { oDebug, "debug" ,4|16, "@"},
@ -1822,7 +1823,7 @@ main( int argc, char **argv )
case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break; case oNoSecmemWarn: secmem_set_flags( secmem_get_flags() | 1 ); break;
case oNoPermissionWarn: opt.no_perm_warn=1; break; case oNoPermissionWarn: opt.no_perm_warn=1; break;
case oNoMDCWarn: opt.no_mdc_warn=1; break; case oNoMDCWarn: opt.no_mdc_warn=1; break;
case oCharset: case oDisplayCharset:
if( set_native_charset( pargs.r.ret_str ) ) if( set_native_charset( pargs.r.ret_str ) )
log_error(_("%s is not a valid character set\n"), log_error(_("%s is not a valid character set\n"),
pargs.r.ret_str); pargs.r.ret_str);

4
g10/parse-packet.c
View File

@ -2115,8 +2115,8 @@ parse_plaintext( IOBUF inp, int pkttype, unsigned long pktlen,
if( list_mode ) { if( list_mode ) {
printf(":literal data packet:\n" printf(":literal data packet:\n"
"\tmode %c, created %lu, name=\"", "\tmode %c (%X), created %lu, name=\"",
mode >= ' ' && mode <'z'? mode : '?', mode >= ' ' && mode <'z'? mode : '?', mode,
(ulong)pt->timestamp ); (ulong)pt->timestamp );
for(p=pt->name,i=0; i < namelen; p++, i++ ) { for(p=pt->name,i=0; i < namelen; p++, i++ ) {
if( *p >= ' ' && *p <= 'z' ) if( *p >= ' ' && *p <= 'z' )