From: weasel <weasel@b513b33f-fedd-0310-b452-c3deb5f4c849>
Date: Mon, 25 Jul 2005 23:36:38 +0000 (+0000)
Subject: Fix regexen
X-Git-Url: https://git.sthu.org/?p=pgp-tools.git;a=commitdiff_plain;h=2f00a2a8a2e736cfa6521e6c513996acc6c0ce83

Fix regexen
Do away with special User-Id-not-found list
handle IDs with key->UID, not UID->keyid


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

diff --git a/gpglist/gpglist b/gpglist/gpglist
index e7308fe..542fcc6 100755
--- a/gpglist/gpglist
+++ b/gpglist/gpglist
@@ -47,36 +47,35 @@ my @uids;
 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 @@ for ( my $a=0; $a <= $n; $a++ ) {
 }
 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";
 }