From: weasel Date: Mon, 25 Jul 2005 23:30:47 +0000 (+0000) Subject: Get rid of .* X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=bfa7adc260853c5f264047e4efc0288a8a9efcb9;p=pgp-tools.git Get rid of .* git-svn-id: svn://svn.debian.org/pgp-tools/trunk@145 b513b33f-fedd-0310-b452-c3deb5f4c849 --- diff --git a/gpglist/gpglist b/gpglist/gpglist index 42b4dce..e7308fe 100755 --- a/gpglist/gpglist +++ b/gpglist/gpglist @@ -50,27 +50,27 @@ my %ids; my %unknownID; my $longkey; while () { - 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; }