X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=gpglist%2Fgpglist;h=542fcc6d9a6ebf82c8d737d92f0417fc3921b53d;hb=2f00a2a8a2e736cfa6521e6c513996acc6c0ce83;hp=58d5c1e691e0565b2d31c7bd28a0b91cf1a6f638;hpb=b91e73280982b084eee83d1b7f559fc409417067;p=pgp-tools.git

diff --git a/gpglist/gpglist b/gpglist/gpglist
index 58d5c1e..542fcc6 100755
--- a/gpglist/gpglist
+++ b/gpglist/gpglist
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+# $Id$
+
 # small script to show in an intuitive way who signed which of your user ids
 #
 # Copyright (c) 2004 Uli Martens <uli@youam.net>
@@ -30,10 +32,11 @@
 
 use strict;
 use warnings;
+use English;
 
 my $key=shift @ARGV;
-if ( $key eq "" ) {
-	die
+unless (defined $key) {
+	die "Usage: $PROGRAM_NAME <keyid>\n";
 }
 
 open SIGS, "gpg --fixed-list-mode --with-colons --list-sigs $key 2>/dev/null |"
@@ -44,40 +47,43 @@ 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;
 
+# XXX: Add an option for this
+my $c = 0;
+@uids = grep { ! defined $rev{$uids[$c++]} } @uids;
+
 my $n = scalar @uids -1;
 for ( my $a=0; $a <= $n; $a++ ) {
 	printf "|  " x ($a)
@@ -92,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";
 }