[Pgp-tools-commit] r115 - trunk/gpgsigs

[Christoph Berg]

Author: myon-guest
Date: 2005-07-06 11:38:55 +0000 (Wed, 06 Jul 2005)
New Revision: 115

Modified:
   trunk/gpgsigs/gpgsigs
Log:
* fix b0rked GetOptions call
* print out which keyid we complain about


Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2005-07-06 11:37:05 UTC (rev 114)
+++ trunk/gpgsigs/gpgsigs	2005-07-06 11:38:55 UTC (rev 115)
@@ -59,9 +59,10 @@
 
 
 my ($fromcharset, $charset, $recv_keys);
+Getopt::Long::config('bundling');
 GetOptions(
-	f => \$fromcharset,
-	t => \$charset,
+	'-f=s' => \$fromcharset,
+	'-t=s' => \$charset,
 	r => \$recv_keys,
 	help => sub { usage(*STDOUT, 0); },
 	version => sub { version(*STDOUT); exit 0;},
@@ -142,8 +143,8 @@
 if (!@mykeys || scalar @ARGV) {
 	usage(*STDERR, 1);
 }
-if (!grep { /^([0-9A-F]{16,16}|[0-9A-F]{8,8})$/ } @mykeys) {
-	print STDERR "Invalid keyid given\n";
+foreach my $falsekey (grep { $_ !~ /^([0-9A-F]{16,16}|[0-9A-F]{8,8})$/ } @mykeys) {
+	print STDERR "Invalid keyid $falsekey given\n";
 	usage(*STDERR, 1);
 }