diff options
| -rw-r--r-- | g10/ChangeLog | 9 | ||||
| -rw-r--r-- | g10/g10.c | 7 | ||||
| -rw-r--r-- | g10/parse-packet.c | 4 |
3 files changed, 15 insertions, 5 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index e88fb8414..822150399 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,12 @@ +2004-06-01 David Shaw <[email protected]> + + * 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 <[email protected]> * pkclist.c (do_edit_ownertrust): Fix kbnode leak. @@ -240,7 +240,7 @@ enum cmd_and_opt_values oS2KDigest, oS2KCipher, oSimpleSKChecksum, - oCharset, + oDisplayCharset, oNotDashEscaped, oEscapeFrom, oNoEscapeFrom, @@ -440,7 +440,8 @@ static ARGPARSE_OPTS opts[] = { { oKeyServerOptions, "keyserver-options",2,"@"}, { oImportOptions, "import-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")}, { oDebug, "debug" ,4|16, "@"}, @@ -1822,7 +1823,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); diff --git a/g10/parse-packet.c b/g10/parse-packet.c index 954a42aae..f9c4d16c2 100644 --- a/g10/parse-packet.c +++ b/g10/parse-packet.c @@ -2115,8 +2115,8 @@ parse_plaintext( IOBUF inp, int pkttype, unsigned long pktlen, if( list_mode ) { printf(":literal data packet:\n" - "\tmode %c, created %lu, name=\"", - mode >= ' ' && mode <'z'? mode : '?', + "\tmode %c (%X), created %lu, name=\"", + mode >= ' ' && mode <'z'? mode : '?', mode, (ulong)pt->timestamp ); for(p=pt->name,i=0; i < namelen; p++, i++ ) { if( *p >= ' ' && *p <= 'z' ) |