Properly convert --with-colons uid strings

git-svn-id: svn://svn.debian.org/pgp-tools/trunk@122 b513b33f-fedd-0310-b452-c3deb5f4c849

diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs
index 61c03be226cb3b160a30706f95a37ef44af7ca47..ba139f7be63a0c121de16668d6c39089b7eaf121 100755 (executable)
--- a/gpgsigs/gpgsigs
+++ b/gpgsigs/gpgsigs
@@ -155,7 +155,9 @@ while (<SIGS>) {
                next;
        }
        if ( m/^uid:(?:.*?:){8,8}(.*):/s ) {
-               $uid = myrecode($1, "UTF-8", $charset);
+               $uid = $1;
+               $uid =~ s/\\x([0-9a-f][0-9a-f])/ chr(hex($1)) /gie;
+               $uid = myrecode($uid, "UTF-8", $charset);
                next;
        }
        if ( m/^sig:(?:.*?:){3,3}([0-9A-F]{8})([0-9A-F]{8}):(?:.*?:){5,5}(.*?):/ ) {
@@ -226,6 +228,9 @@ sub print_tag
        my ($key, $uid) = @_;
        if (! defined $sigs->{$key}->{$uid}) {
                warn "uid '$uid' not found on key $key\n";
+               #for (keys %{ $sigs->{$key} }) {
+               #       print STDERR "only have $_\n";
+               #};
                return '(' . (' ' x @mykeys) . ')';
        }
        my $r = '(';