diff options
| author | David Shaw <[email protected]> | 2004-03-03 05:47:51 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-03 05:47:51 +0000 |
| commit | 2d7fe1d3a1eaaf77957a6726280136a6dd02691b (patch) | |
| tree | 73be1a1760719399e4766a94a01c4dc05b47fe0d /g10/g10.c | |
| parent | * packet.h, free-packet.c (free_encrypted, free_plaintext), parse-packet.c (diff) | |
| download | gnupg-2d7fe1d3a1eaaf77957a6726280136a6dd02691b.tar.gz gnupg-2d7fe1d3a1eaaf77957a6726280136a6dd02691b.zip | |
* options.h, g10.c (main): Add a more flexible --keyid-format option to
replace the list-option (and eventually verify-option) show-long-keyids.
The format can be short, long, 0xshort, and 0xlong.
* keydb.h, keyid.c (keystr, keystrlen): New functions to generate a
printable keyid.
* keyedit.c (print_and_check_one_sig, show_key_with_all_names), keylist.c
(list_keyblock_print): Use new keystr() function here to print keyids.
Diffstat (limited to '')
| -rw-r--r-- | g10/g10.c | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -335,6 +335,7 @@ enum cmd_and_opt_values oNoMangleDosFilenames, oEnableProgressFilter, oMultifile, + oKeyidFormat, oReaderPort, octapiDriver, @@ -665,6 +666,7 @@ static ARGPARSE_OPTS opts[] = { { oNoMangleDosFilenames, "no-mangle-dos-filenames", 0, "@" }, { oEnableProgressFilter, "enable-progress-filter", 0, "@" }, { oMultifile, "multifile", 0, "@" }, + { oKeyidFormat, "keyid-format", 2, "@" }, { oReaderPort, "reader-port", 2, "@"}, { octapiDriver, "ctapi-driver", 2, "@"}, @@ -1447,6 +1449,7 @@ main( int argc, char **argv ) opt.mangle_dos_filenames=0; opt.min_cert_level=2; set_screen_dimensions(); + opt.keyid_format=KF_SHORT; #if defined (_WIN32) set_homedir ( read_w32_registry_string( NULL, "Software\\GNU\\GnuPG", "HomeDir" )); @@ -2115,7 +2118,6 @@ main( int argc, char **argv ) {"show-notations",LIST_SHOW_NOTATIONS,NULL}, {"show-keyserver-urls",LIST_SHOW_KEYSERVER_URLS,NULL}, {"show-validity",LIST_SHOW_VALIDITY,NULL}, - {"show-long-keyids",LIST_SHOW_LONG_KEYIDS,NULL}, {"show-unusable-uids",LIST_SHOW_UNUSABLE_UIDS,NULL}, {"show-unusable-subkeys",LIST_SHOW_UNUSABLE_SUBKEYS,NULL}, {"show-keyring",LIST_SHOW_KEYRING,NULL}, @@ -2279,6 +2281,18 @@ main( int argc, char **argv ) case oNoMangleDosFilenames: opt.mangle_dos_filenames = 0; break; case oEnableProgressFilter: opt.enable_progress_filter = 1; break; case oMultifile: multifile=1; break; + case oKeyidFormat: + if(ascii_strcasecmp(pargs.r.ret_str,"short")==0) + opt.keyid_format=KF_SHORT; + else if(ascii_strcasecmp(pargs.r.ret_str,"long")==0) + opt.keyid_format=KF_LONG; + else if(ascii_strcasecmp(pargs.r.ret_str,"0xshort")==0) + opt.keyid_format=KF_0xSHORT; + else if(ascii_strcasecmp(pargs.r.ret_str,"0xlong")==0) + opt.keyid_format=KF_0xLONG; + else + log_error("unknown keyid-format \"%s\"\n",pargs.r.ret_str); + break; default : pargs.err = configfp? 1:2; break; } |