[Pgp-tools-commit] r122 - trunk/gpgsigs

[Peter Palfrader]

Author: weasel
Date: 2005-07-06 12:22:02 +0000 (Wed, 06 Jul 2005)
New Revision: 122

Modified:
   trunk/gpgsigs/gpgsigs
Log:
Properly convert --with-colons uid strings

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2005-07-06 12:06:14 UTC (rev 121)
+++ trunk/gpgsigs/gpgsigs	2005-07-06 12:22:02 UTC (rev 122)
@@ -155,7 +155,9 @@
 		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 @@
 	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 = '(';