Merge branch 'upstream'

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

diff --git a/t-prot b/t-prot
index 446c0eb15c7e8151f668f69ebff319d676d16e40..936928c9a38720acaada34f0db0069d8317bc933 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
 #!/usr/bin/perl -w

-# $Id: t-prot,v 1.227 2005/03/01 15:20:49 jochen Exp $
+# $Id: t-prot,v 1.230 2005/03/24 22:24:29 jochen Exp $

 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Mixed qw(nextOption);

-use constant VER            => '1.98';
+use constant VER            => '1.99';

 use constant REV            => '';
 use constant REV            => '';

-use constant REL            => q$Revision: 1.227 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.230 $=~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';
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';


@@ -233,6 +233,7 @@ sub decomb {
         #   underlining some part of the line above (using '^')
         #   nor begin with a whitespace,
         # * the 1st line must not end with a hyphen,
         #   underlining some part of the line above (using '^')
         #   nor begin with a whitespace,
         # * the 1st line must not end with a hyphen,

+        # * the 2nd line must not indicate content was deleted,

         # * the 2nd line must not be some mutt(1) commentary,
         # * there must not be a valid word wrap to produce a longer
         #   1st line (if not quoted),
         # * the 2nd line must not be some mutt(1) commentary,
         # * there must not be a valid word wrap to produce a longer
         #   1st line (if not quoted),


@@ -248,6 +249,7 @@ sub decomb {
             ($$L[$x+1] !~ /^$/) &&
             ($$L[$x+1] !~ /^[\s^]/) &&
             ($$L[$x] !~ /-$/) &&
             ($$L[$x+1] !~ /^$/) &&
             ($$L[$x+1] !~ /^[\s^]/) &&
             ($$L[$x] !~ /-$/) &&

+            ($$L[$x+1] !~ /^\Q[...]\E\s*$/) &&

             ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) &&
             (length($$L[$x])+index($$L[$x+1], ' ')>$max ||
                 (index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) &&
             ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) &&
             (length($$L[$x])+index($$L[$x+1], ' ')>$max ||
                 (index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) &&


@@ -336,7 +338,7 @@ sub pgp {
                 if ($$H[$m] =~ /^From:/) {
                     $from = $$H[$m];
                     $m++;
                 if ($$H[$m] =~ /^From:/) {
                     $from = $$H[$m];
                     $m++;

-                    while ($$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
+                    while (exists($$H[$m]) && $$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }

                     last;
                 }
             }
                     last;
                 }
             }