Imported Upstream version 2.14

[pkg/t-prot.git] / t-prot

diff --git a/t-prot b/t-prot
index 364af8e3746f2de28860b14d398154983de75af8..21b5d21f91806e46a6ef5d4d31fa39d6d5872165 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.277 2010/02/06 03:29:23 jochen Exp $
+# $Id: t-prot,v 1.280 2010/02/11 11:10:47 jochen Exp $
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);
-use constant VER            => '2.13';
+use constant VER            => '2.14';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.277 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.280 $=~m/(\d+(?:\.\d+)+)/;
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
@@ -126,8 +126,7 @@ sub help {
   --pgp-move-vrf  move pgp output if verified and good; requires -Mmutt
   --pgp-short     hide non-relevant pgp key uids; requires -Mmutt
   -r              delete mail header lines
-  -S[=n]          supress signatures with more than n lines; 
-                  default is $maxsig if n not specified
+  -S[=n]          supress signatures with more than n lines (default $maxsig)
   -s              delete signature
   --sigsmax[=n]   max number of sigs tolerated, no value for unlimited
   --spass         enable SpamAssassin workaround
@@ -360,19 +359,16 @@ sub pgp {
             my $uid = 1;
 
             for (my $i=$x+1; $i<scalar(@$L); $i++) {
-                if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0)
-                    { $uid++; }
-
-                if ($pgpshort && $uid>1 &&
-                    index($$L[$i], "gpg: $gpg_aka")==0 &&
-                    index($$L[$i], $from)<0)
-                { 
-                    splice(@$L, $i, 1);
-                    splice(@$V, $i, 1);
-                    $i--;
+                if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0) {
+                    $uid++;
+
+                    if ($uid>1 && index($$L[$i], $from)<0) { 
+                        splice(@$L, $i, 1);
+                        splice(@$V, $i, 1);
+                        $i--;
+                    }
                 }
-                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o)
-                {
+                elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o) {
                     if ($pgpmove ||
                         ($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
                     {