security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

* keyedit.c (show_key_with_all_names): Show names a little neater by

Browse Source 
putting the [revoked] or [expired] in the space used for the [validity].
There is also no point in showing "[unknown] [revoked]".
This commit is contained in:
David Shaw 2003-09-24 12:11:17 +00:00
parent 97dcb84cce
commit 0d8bd2eace
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2003-09-24 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (show_key_with_all_names): Show names a little neater
by putting the [revoked] or [expired] in the space used for the
[validity]. There is also no point in showing "[unknown]
[revoked]".
2003-09-23 David Shaw <dshaw@jabberwocky.com> 2003-09-23 David Shaw <dshaw@jabberwocky.com>
* sign.c (mk_notation_policy_etc): Capitalize "URL". * sign.c (mk_notation_policy_etc): Capitalize "URL".

26
g10/keyedit.c
View File

@ -2001,7 +2001,7 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
{ {
KBNODE node; KBNODE node;
int i, rc; int i, rc;
int do_warn = 0; int do_warn = 0, indent=0;
byte pk_version=0; byte pk_version=0;
PKT_public_key *primary=NULL; PKT_public_key *primary=NULL;
@ -2130,15 +2130,33 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
} }
/* the user ids */ /* the user ids */
for( node = keyblock; node; node = node->next )
{
if(node->pkt->pkttype == PKT_USER_ID
&& (node->pkt->pkt.user_id->is_revoked
|| node->pkt->pkt.user_id->is_expired))
{
indent=1;
break;
}
}
i = 0; i = 0;
for( node = keyblock; node; node = node->next ) { for( node = keyblock; node; node = node->next ) {
if( node->pkt->pkttype == PKT_USER_ID ) { if( node->pkt->pkttype == PKT_USER_ID ) {
PKT_user_id *uid = node->pkt->pkt.user_id; PKT_user_id *uid = node->pkt->pkt.user_id;
++i; ++i;
if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){ if( !only_marked || (only_marked && (node->flag & NODFLG_MARK_A))){
if(opt.list_options&LIST_SHOW_VALIDITY && primary) if(uid->is_revoked)
tty_printf("[%8.8s] ",_("revoked"));
else if(uid->is_expired)
tty_printf("[%8.8s] ",_("expired"));
else if(opt.list_options&LIST_SHOW_VALIDITY && primary)
tty_printf("[%8.8s] ", tty_printf("[%8.8s] ",
trust_value_to_string(get_validity(primary,uid))); trust_value_to_string(get_validity(primary,uid)));
else if(indent)
tty_printf(" ");
if( only_marked ) if( only_marked )
tty_printf(" "); tty_printf(" ");
else if( node->flag & NODFLG_SELUID ) else if( node->flag & NODFLG_SELUID )
@ -2147,10 +2165,6 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
tty_printf("(%d). ", i); tty_printf("(%d). ", i);
else else
tty_printf("(%d) ", i); tty_printf("(%d) ", i);
if ( uid->is_revoked )
tty_printf (_("[revoked] "));
if ( uid->is_expired )
tty_printf (_("[expired] "));
tty_print_utf8_string( uid->name, uid->len ); tty_print_utf8_string( uid->name, uid->len );
tty_printf("\n"); tty_printf("\n");
if( with_prefs ) if( with_prefs )