security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-26 01:52:45 +02:00
Code Activity

* pkclist.c (build_pk_list): Show all recipients rather than showing each

Browse Source 
recipient as they are added.
This commit is contained in:
David Shaw 2003-11-01 01:03:10 +00:00
parent ef3f432bc5
commit 71e1d13238
2 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2003-10-31 David Shaw <dshaw@jabberwocky.com>
* pkclist.c (build_pk_list): Show all recipients rather than
showing each recipient as they are added.
2003-10-30 David Shaw <dshaw@jabberwocky.com> 2003-10-30 David Shaw <dshaw@jabberwocky.com>
* misc.c (compress_algo_to_string, check_compress_algo): Add * misc.c (compress_algo_to_string, check_compress_algo): Add

53
g10/pkclist.c
View File

@ -857,12 +857,41 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
else if(backlog) { else if(backlog) {
answer=pop_strlist(&backlog); answer=pop_strlist(&backlog);
} }
else { else
{
PK_LIST iter;
tty_printf("\n");
tty_printf(_("Current recipients:\n"));
for(iter=pk_list;iter;iter=iter->next)
{
u32 keyid[2];
keyid_from_pk(iter->pk,keyid);
tty_printf("%4u%c/%08lX %s \"",
nbits_from_pk(iter->pk),
pubkey_letter(iter->pk->pubkey_algo),
(ulong)keyid[1],
datestr_from_pk(iter->pk));
if(iter->pk->user_id)
tty_print_utf8_string(iter->pk->user_id->name,
iter->pk->user_id->len);
else
{
size_t n;
char *p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n );
m_free(p);
}
tty_printf("\"\n");
}
answer = cpr_get_utf8("pklist.user_id.enter", answer = cpr_get_utf8("pklist.user_id.enter",
_("\nEnter the user ID. End with an empty line: ")); _("\nEnter the user ID. End with an empty line: "));
trim_spaces(answer); trim_spaces(answer);
cpr_kill_prompt(); cpr_kill_prompt();
} }
if( !answer || !*answer ) { if( !answer || !*answer ) {
m_free(answer); m_free(answer);
break; break;
@ -909,26 +938,6 @@ build_pk_list( STRLIST rcpts, PK_LIST *ret_pk_list, unsigned use )
} }
else { else {
PK_LIST r; PK_LIST r;
u32 keyid[2];
keyid_from_pk( pk, keyid);
tty_printf("Added %4u%c/%08lX %s \"",
nbits_from_pk( pk ),
pubkey_letter( pk->pubkey_algo ),
(ulong)keyid[1],
datestr_from_pk( pk ) );
if(pk->user_id)
tty_print_utf8_string(pk->user_id->name,
pk->user_id->len);
else
{
size_t n;
char *p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n );
m_free(p);
}
tty_printf("\"\n");
r = m_alloc( sizeof *r ); r = m_alloc( sizeof *r );
r->pk = pk; pk = NULL; r->pk = pk; pk = NULL;
r->next = pk_list; r->next = pk_list;