mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-29 02:22:45 +02:00
* pkclist.c (build_pk_list): Show all recipients rather than showing each
recipient as they are added.
This commit is contained in:
parent
ef3f432bc5
commit
71e1d13238
|
@ -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
|
||||||
|
|
|
@ -857,7 +857,36 @@ 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);
|
||||||
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user