mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Change some keyedit functions to allow printing to arbitrary streams.
* common/ttyio.c (tty_print_string): Add optional arg FP. Change all callers. (tty_print_utf8_string2): Ditto. * g10/keyedit.c (show_prefs): Ditto. (show_key_with_all_names_colon): Ditto. (show_names): Ditto. * g10/keylist.c (print_revokers): Ditto. (print_fingerprint): Ditto.
This commit is contained in:
parent
5c2a50cdc9
commit
4f50ec98dd
8 changed files with 251 additions and 183 deletions
|
@ -953,7 +953,7 @@ list_node( CTX c, KBNODE node )
|
|||
if( node->next && node->next->pkt->pkttype == PKT_RING_TRUST) {
|
||||
putchar('\n'); any=1;
|
||||
if( opt.fingerprint )
|
||||
print_fingerprint (pk, 0);
|
||||
print_fingerprint (NULL, pk, 0);
|
||||
printf("rtv:1:%u:\n",
|
||||
node->next->pkt->pkt.ring_trust->trustval );
|
||||
}
|
||||
|
@ -991,7 +991,7 @@ list_node( CTX c, KBNODE node )
|
|||
putchar(':');
|
||||
putchar('\n');
|
||||
if( opt.fingerprint && !any )
|
||||
print_fingerprint ( pk, 0 );
|
||||
print_fingerprint (NULL, pk, 0 );
|
||||
if( opt.with_colons
|
||||
&& node->next
|
||||
&& node->next->pkt->pkttype == PKT_RING_TRUST ) {
|
||||
|
@ -1030,7 +1030,7 @@ list_node( CTX c, KBNODE node )
|
|||
if( !any )
|
||||
putchar('\n');
|
||||
if( !mainkey && opt.fingerprint > 1 )
|
||||
print_fingerprint( pk, 0 );
|
||||
print_fingerprint (NULL, pk, 0);
|
||||
}
|
||||
else if( (mainkey = (node->pkt->pkttype == PKT_SECRET_KEY) )
|
||||
|| node->pkt->pkttype == PKT_SECRET_SUBKEY ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue