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

[Peter Palfrader]

Author: weasel
Date: 2005-07-25 23:30:47 +0000 (Mon, 25 Jul 2005)
New Revision: 145

Modified:
   trunk/gpglist/gpglist
Log:
Get rid of .*

Modified: trunk/gpglist/gpglist
===================================================================
--- trunk/gpglist/gpglist	2005-07-25 23:28:47 UTC (rev 144)
+++ trunk/gpglist/gpglist	2005-07-25 23:30:47 UTC (rev 145)
@@ -50,27 +50,27 @@
 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;
 	}