diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 11 | ||||
| -rw-r--r-- | g10/delkey.c | 2 | ||||
| -rw-r--r-- | g10/openfile.c | 4 | ||||
| -rw-r--r-- | g10/passphrase.c | 2 | ||||
| -rw-r--r-- | g10/pkclist.c | 6 | ||||
| -rw-r--r-- | g10/revoke.c | 4 | ||||
| -rw-r--r-- | g10/trustdb.c | 6 |
7 files changed, 23 insertions, 12 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 7d3ccbc75..aa3e38c04 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,14 @@ +Thu Sep 23 19:24:30 CEST 1999 Werner Koch <[email protected]> + + * openfile.c (open_outfile): Fixed the 8dot3 handling. + + * passphrase.c (passphrase_to_dek): Print uid using utf8 func. + * delkey.c (delete_key): Ditto. + * pkclist.c (show_paths,do_edit_ownertrust,do_we_trust): Ditto + (do_we_trust_pre): Ditto. + * trustdb.c (print_user_id,check_uidsigs): Ditto. + * revoke.c (gen_revoke,ask_revoke_sig): Ditto. + Thu Sep 23 09:52:58 CEST 1999 Werner Koch <[email protected]> * verify.c (print_file_status): New. diff --git a/g10/delkey.c b/g10/delkey.c index 8d4f1a5b0..a324fd631 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -124,7 +124,7 @@ delete_key( const char *username, int secret ) pubkey_letter( pk->pubkey_algo ), keyid[1], datestr_from_pk(pk) ); p = get_user_id( keyid, &n ); - tty_print_string( p, n ); + tty_print_utf8_string( p, n ); m_free(p); tty_printf("\n\n"); diff --git a/g10/openfile.c b/g10/openfile.c index 97a2e7f54..8c78670d7 100644 --- a/g10/openfile.c +++ b/g10/openfile.c @@ -190,10 +190,10 @@ open_outfile( const char *iname, int mode, IOBUF *a ) dot = strchr(buf, '.' ); if( dot && dot > buf && dot[1] && strlen(dot) <= 4 && CMP_FILENAME(newsfx, dot) ) { - strcpy(buf, newsfx ); + strcpy(dot, newsfx ); } else if( dot && !dot[1] ) /* don't duplicate a dot */ - strcpy( dot, newsfx ); + strcpy( dot, newsfx+1 ); else strcat( buf, newsfx ); #else diff --git a/g10/passphrase.c b/g10/passphrase.c index 6026ff7f9..bee78660f 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -159,7 +159,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, tty_printf(_("\nYou need a passphrase to unlock the secret key for\n" "user: \"") ); p = get_user_id( keyid, &n ); - tty_print_string( p, n ); + tty_print_utf8_string( p, n ); m_free(p); tty_printf("\"\n"); diff --git a/g10/pkclist.c b/g10/pkclist.c index fab2f13a7..4bf1fc4bf 100644 --- a/g10/pkclist.c +++ b/g10/pkclist.c @@ -149,7 +149,7 @@ show_paths( ulong lid, int only_first ) putchar(' '); p = get_user_id( keyid, &n ); - tty_print_string( p, n ), + tty_print_utf8_string( p, n ), m_free(p); tty_printf("\"\n"); free_public_key( pk ); @@ -203,7 +203,7 @@ do_edit_ownertrust( ulong lid, int mode, unsigned *new_trust, int defer_help ) nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), (ulong)keyid[1], datestr_from_pk( pk ) ); p = get_user_id( keyid, &n ); - tty_print_string( p, n ), + tty_print_utf8_string( p, n ), m_free(p); tty_printf("\"\n"); print_fpr( pk ); @@ -460,7 +460,7 @@ do_we_trust_pre( PKT_public_key *pk, int trustlevel ) nbits_from_pk( pk ), pubkey_letter( pk->pubkey_algo ), (ulong)keyid[1], datestr_from_pk( pk ) ); p = get_user_id( keyid, &n ); - tty_print_string( p, n ), + tty_print_utf8_string( p, n ), m_free(p); tty_printf("\"\n"); print_fpr( pk ); diff --git a/g10/revoke.c b/g10/revoke.c index d93c7a462..cc89409e2 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -113,7 +113,7 @@ gen_revoke( const char *uname ) { size_t n; char *p = get_user_id( sk_keyid, &n ); - tty_print_string( p, n ); + tty_print_utf8_string( p, n ); m_free(p); tty_printf("\n"); } @@ -243,7 +243,7 @@ ask_revoke_sig( KBNODE keyblock, KBNODE node, PKT_signature *sig ) ) { } tty_printf(_("user ID: \"")); - tty_print_string( unode->pkt->pkt.user_id->name, + tty_print_utf8_string( unode->pkt->pkt.user_id->name, unode->pkt->pkt.user_id->len, 0 ); tty_printf(_("\"\nsigned with your key %08lX at %s\n"), sig->keyid[1], datestr_from_sig(sig) ); diff --git a/g10/trustdb.c b/g10/trustdb.c index 96b77a4ef..42a45aa64 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -586,13 +586,13 @@ print_user_id( FILE *fp, const char *text, u32 *keyid ) p = get_user_id( keyid, &n ); if( fp ) { fprintf( fp, "%s \"", text ); - print_string( fp, p, n, 0 ); + print_utf8_string( fp, p, n ); putc('\"', fp); putc('\n', fp); } else { tty_printf( "%s \"", text ); - tty_print_string( p, n ); + tty_print_utf8_string( p, n ); tty_printf( "\"\n" ); } m_free(p); @@ -652,7 +652,7 @@ print_path( int pathlen, TN ME .........., FILE *fp, ulong highlight ) p = get_user_id( keyid, &n ); putc(' ', fp); putc('\"', fp); - print_string( fp, p, n > 40? 40:n, 0 ); + print_utf8_string( fp, p, n > 40? 40:n ); putc('\"', fp); m_free(p); putc('\n', fp ); |