[Pgp-tools-commit] r146 - trunk/gpglist

[Peter Palfrader]

Author: weasel
Date: 2005-07-25 23:36:38 +0000 (Mon, 25 Jul 2005)
New Revision: 146

Modified:
   trunk/gpglist/gpglist
Log:
Fix regexen
Do away with special User-Id-not-found list
handle IDs with key->UID, not UID->keyid


Modified: trunk/gpglist/gpglist
===================================================================
--- trunk/gpglist/gpglist	2005-07-25 23:30:47 UTC (rev 145)
+++ trunk/gpglist/gpglist	2005-07-25 23:36:38 UTC (rev 146)
@@ -47,36 +47,35 @@
 my %sigs;
 my %rev;
 my %ids;
-my %unknownID;
 my $longkey;
 while (<SIGS>) {
-	if ( m/^uid:.:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([:^]*):$/ ) {
+	if ( m/^uid:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):/ ) {
 		$uid = $1;
 		push @uids, $1;
 		next;
 	}
-	if ( m/^sig:[^:]*:[^:]*:[^:]*:([0-9A-F]*):[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:$/ ) {
-		$2 eq "[User id not found]" ? $unknownID{$1} = $1 : $ids{$2} = $1;
+	if ( m/^sig:[^:]*:[^:]*:[^:]*:([0-9A-F]*):[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):/ ) {
+		$ids{$1} = $2;
 		$sigs{$1}->{$uid} = "x" unless defined $sigs{$1}->{$uid};
 		next;
 	}
-	if ( m/^rev:[^:]*:[^:]*:[^:]*:([0-9A-F]*):[^:]*:[^:]*:[^:]*:[^:]*:([:^]*):[^:]*:$/ ) {
+	if ( m/^rev:[^:]*:[^:]*:[^:]*:([0-9A-F]*):/ ) {
 		$rev{$uid} = "x" if ($longkey eq $1);
 		$sigs{$1}->{$uid} = "R";
 		next;
 	}
-	if ( m/^uat:.:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([:^]*):$/ ) {
+	if ( m/^uat:.:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):/ ) {
 		$uid = "Photo ID";
 		push @uids, $uid;
 		next;
 	}
-	if ( m/^pub:[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:[^:]*:[^:]*:[^:]*:([:^]*):$/ ) {
+	if ( m/^pub:[^:]*:[^:]*:[^:]*:([^:]*):/ ) {
 		$longkey = $1;
 		next;
 	}
 	last if ( m/^(sub):/ );
 	next if ( m/^(tru):/ );
-	print STDERR "hi, i'm a bug. please report me to my owner";
+	print STDERR "hi, i'm a bug. please report me to my owner\n";
 	die "input: $_, key: $key";
 }
 close SIGS;
@@ -99,11 +98,7 @@
 }
 print "\n";
 
-for my $id (sort keys %ids) {
-	print((defined $sigs{$ids{$id}}->{$_} ? $sigs{$ids{$id}}->{$_} : " ") . "  ") for (@uids);
-	print $ids{$id}." $id\n";
-}
-for my $id (sort keys %unknownID) {
+for my $id (sort {$ids{$a} cmp $ids{$b}} keys %ids) {
 	print((defined $sigs{$id}->{$_} ? $sigs{$id}->{$_} : " ") . "  ") for (@uids);
-	print "$id [User id not found]\n";
+	print $id." $ids{$id}\n";
 }