From b312e19565e5ee609e694c6c22c3760ebc6d28f0 Mon Sep 17 00:00:00 2001 From: Gerfried Fuchs Date: Wed, 17 Feb 2010 20:26:19 +0100 Subject: [PATCH] Imported Upstream version 1.99 --- ChangeLog | 17 +++++++++++++++-- TODO | 6 ++---- t-prot | 10 ++++++---- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 490681d..afad67e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2005-03-24 22:24 Jochen Striepe + + * t-prot: Release as v1.99. + +2005-03-22 16:10 Jochen Striepe + + * t-prot: Fix false positive for kammquote condition. + +2005-03-21 19:30 Jochen Striepe + + * t-prot: Fix missing range check when From: is the last header. + Thanks to Norbert Tretkowski for reporting. + 2005-03-01 15:20 Jochen Striepe * t-prot: Release as v1.98. @@ -1473,7 +1486,7 @@ Please note that Getopt::Mixed now is mandatory to run t-prot - you can get it at CPAN. The trade-off seems worthy IMHO - please drop an email to if you do not think so, so the - matter can be diskussed. :) + matter can be discussed. :) Updated manpage. @@ -1547,7 +1560,7 @@ 2002-01-29 14:57 Jochen Striepe - * t-prot: Remove goto. Patch by Gerfried Fuchs . + * t-prot: Remove goto. Patch by Gerfried Fuchs. 2002-01-28 20:34 Jochen Striepe diff --git a/TODO b/TODO index 321512f..5e74b10 100644 --- a/TODO +++ b/TODO @@ -11,9 +11,8 @@ email to . Known Bugs (more severe ones come first) ======================================== - * In raw multipart messages we snip MS-like TOFU even if there -is no relevant text above -- we will have to detect Boundaries and -Content-Type lines as for "$mua eq mutt" in t-prot, l.671. + +(none) Wishlist @@ -40,7 +39,6 @@ that you can turn it off with just one key stroke. It is definitely not t-prot's responsibility to make *everything* look good and readable. - Known Bugs for t-prot.sl (more severe ones come first) ====================================================== * Mailing list footers seem not always to be snipped correctly diff --git a/t-prot b/t-prot index 446c0eb..936928c 100755 --- a/t-prot +++ b/t-prot @@ -1,13 +1,13 @@ #!/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); -use constant VER => '1.98'; +use constant VER => '1.99'; 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'; @@ -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, + # * 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), @@ -248,6 +249,7 @@ sub decomb { ($$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)) && @@ -336,7 +338,7 @@ sub pgp { 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; } } -- 2.39.2