diff options
| author | Werner Koch <wk@gnupg.org> | 2018-06-06 11:50:58 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-06-06 11:57:34 +0200 |
| commit | 257661d6ae0ca376df758c38fabab2316d10e3a9 (patch) | |
| tree | 0d88794c0cf6936b8bcb9ac667dafc1abb674748 /g10/import.c | |
| parent | g10: Remove bogus comment. (diff) | |
| download | gnupg2-257661d6ae0ca376df758c38fabab2316d10e3a9.tar.xz gnupg2-257661d6ae0ca376df758c38fabab2316d10e3a9.zip | |
gpg: New command --show-keys.
* g10/gpg.c (aShowKeys): New const.
(opts): New command --show-keys.
(main): Implement command.
* g10/import.c (import_keys_internal): Don't print stats in show-only
mode.
(import_one): Be silent in show-only mode.
--
Using
--import --import-options show-only
to look at a key is too cumbersome. Provide this shortcut and also
remove some diagnostic cruft in this case.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'g10/import.c')
| -rw-r--r-- | g10/import.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 9fc769df9..d35c720b7 100644 --- a/g10/import.c +++ b/g10/import.c @@ -494,7 +494,9 @@ import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames, if (!stats_handle) { - import_print_stats (stats); + if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN)) + != (IMPORT_SHOW | IMPORT_DRY_RUN)) + import_print_stats (stats); import_release_stats_handle (stats); } @@ -1653,6 +1655,10 @@ import_one (ctrl_t ctrl, int any_filter = 0; KEYDB_HANDLE hd = NULL; + /* If show-only is active we don't won't any extra output. */ + if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN))) + silent = 1; + /* Get the key and print some info about it. */ node = find_kbnode( keyblock, PKT_PUBLIC_KEY ); if (!node ) |