Get rid of .*

[pgp-tools.git] / gpglist / gpglist

diff --git a/gpglist/gpglist b/gpglist/gpglist
index 1d253e372c8d9185285507e6f7d8a4aaae7ed190..e7308fee7eb260b2f76b97bb7fbdaa473824e5e0 100755 (executable)
--- a/gpglist/gpglist
+++ b/gpglist/gpglist
@@ -32,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 |"
@@ -49,27 +50,27 @@ 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]*):[^:]*:[^:]*:[^:]*:[^:]*:(.*):[^:]*:$/ ) {
+       if ( m/^sig:[^:]*:[^:]*:[^:]*:([0-9A-F]*):[^:]*:[^:]*:[^:]*:[^:]*:([^:]*):[^:]*:$/ ) {
                $2 eq "[User id not found]" ? $unknownID{$1} = $1 : $ids{$2} = $1;
                $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;
        }