#!/usr/bin/perl -w
-# $Id: t-prot,v 1.243 2005/05/27 10:00:35 jochen Exp $
+# $Id: t-prot,v 1.253 2007/03/09 15:06:04 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.0';
+use constant VER => '2.4';
use constant REV => '';
-use constant REL => q$Revision: 1.243 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.253 $=~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';
use vars qw(
$ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $diff $elli
$footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
- $lax $lsig $maxsig $mda $ml $ms $ms_smart $msg_quote $msg_ratio
- $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig $sigint
- $sign $spass $spass_prefix $sysl $trad $trsp
+ $lax $lsig $maxsig $maxlines $mda $ml $ms $ms_smart $msg_quote
+ $msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig
+ $sigint $sign $spass $spass_prefix $sysl $trad $trsp
$gpg_WARNING $gpg_Warning $gpg_Cantcheck $gpg_aka $gpg_bad
$gpg_expired $gpg_good $gpg_bug
# command line can change them or they are used in rexexp's):
$0 =~ s!^.*/!!;
$maxsig = 4; # max. valid signature length
+$maxlines = undef; # no limit of message lines
$indent = '>'; # Indent string, regexp to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
# help(): print help text and exit with appropriate exit code
sub help {
print "Usage: $0 [options]
- -a remove ad footers; requires -A
-A=DIRECTORY ad footer directory, treat ad footers as signature
+ -a remove ad footers; requires -A
--bigq[=n[,x]] remove all but x lines of quotes with more than n
lines; default is n=30 and x=10
--body input has no headers; does not work with --pgp-short;
--locale=LOCALE internationalization; currently only used with -Mmutt
-M, --mua=MUA turn on special treatment for some mail user agents
-m delete MS style TOFU; careful: might be too agressive
+ --max-lines=x maximum number of message lines
--ms-smart try to be smart with MS style TOFU; req. -Mmutt and -m
-o=OUTFILE file to be written to; '-' for STDOUT (default), 'NONE'
for no output at all
}
if ($F && scalar(@$L)) {
- if (!opendir(DIR, $F)) { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); }
+ if (!opendir(DIR, $F))
+ { print STDERR "Could not open $F: $!\n"; exit(EX_IOERR); }
my @feet = grep { /^[^.]/ && -f "$F/$_" } readdir DIR;
closedir DIR;
foreach my $f (@feet) {
- if (!open(IN, "$F/$f")) { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); }
+ if (!open(IN, "$F/$f"))
+ { print STDERR "Could not open $F/$f: $!\n"; exit(EX_IOERR); }
my @l = <IN>;
close IN;
if (index($$H[$m], 'From:')==0) {
$from = $$H[$m];
$m++;
- while (exists($$H[$m]) && $$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
+ while (exists($$H[$m]) && $$H[$m] =~ /^\s/)
+ { $from .= $$H[$m]; $m++; }
last;
}
}
# Remove headers:
if (!$nohdr) {
for ($x=0; $x<$#$lines; $x++) { if (@$lines[$x] =~ /^$/) { last; }; }
+
+ # check body length and stop processing silently if msg is too long:
+ if ((defined $maxlines) && (@$lines-$x > $maxlines)) {
+ return;
+ }
+
@hdr = @$lines[0..$x];
splice(@$lines, 0, $x+1);
}
+ elsif ((defined $maxlines) && (@$lines > $maxlines)) {
+ # check body length and stop processing silently if msg is too long:
+ return;
+ }
# remember the original body lines count
my $linecount = scalar(@$lines);
/^(?:\e[^\a]+\a)?\Q$mutt_attachment\E\d+/o &&
$att[$x+1] =~ m!^
(?:\e[^\a]+\a)?
- (?:\Q$mutt_contenttype\E) message/rfc822
+ (?:\Q$mutt_contenttype\E) (?:message/rfc822|multipart/alternative)
!ox)
{
$x += 2;
# Remove signature:
if (scalar(@$lines)) {
my $sn = 0;
+ my $chk_empty = 1;
+ my $empty = 0;
+
for ($x = $#$lines; $x>=0; $x--) {
- if ((!$vrb[$x]) && $$lines[$x] =~ /^-- $/) {
- if ($diff) {
- for (my $i=1; $x+$i+1<scalar(@$lines); $i++) {
- if ($$lines[$x+$i] =~ /^-{3}\s+\S/ &&
- $$lines[$x+$i+1] =~ /^\+{3}\s+\S/)
- {
- $sig = 0;
- unshift(@sig, @$lines[$x..$#$lines]);
- splice(@$lines, $x);
- last;
+ if (!$vrb[$x]) {
+ if ($$lines[$x] =~ /^-- $/) {
+ if ($diff) {
+ for (my $i=1; $x+$i+1<scalar(@$lines); $i++) {
+ if ($$lines[$x+$i] =~ /^-{3}\s+\S/ &&
+ $$lines[$x+$i+1] =~ /^\+{3}\s+\S/)
+ {
+ $sig = 0;
+ unshift(@sig, @$lines[$x..$#$lines]);
+ splice(@$lines, $x);
+ last;
+ }
+ }
+ if (scalar(@sig)) {
+ if (defined($sign) && ++$sn==$sign) { last; } else { next; }
}
}
- if (scalar(@sig)) {
- if (defined($sign) && ++$sn==$sign) { last; } else { next; }
- }
- }
- if ($sig || ($lsig && ($#$lines-$x>$lsig))) {
- if ($lsig && !$sig) {
- unshift(@sig, "[---=| Overlong signature removed by $0: " .
- (scalar(@$lines)-$x) . " lines snipped |=---]\n");
+ if ($sig || ($lsig && ($#$lines-$x-$empty>$lsig))) {
+ if ($lsig && !$sig) {
+ unshift(@sig, "[---=| Overlong signature removed by $0: " .
+ (scalar(@$lines)-$x) . " lines snipped |=---]\n");
+ }
+ splice(@$lines, $x);
}
- splice(@$lines, $x);
- }
- else {
- unshift(@sig, @$lines[$x..$#$lines]);
- splice(@$lines, $x);
+ else {
+ unshift(@sig, @$lines[$x..$#$lines]);
+ splice(@$lines, $x);
+ }
+ if (defined($sign) && ++$sn==$sign) { last; } else { next; }
}
- if (defined($sign) && ++$sn==$sign) { last; } else { next; }
+ # any trailing newlines?
+ elsif ($chk_empty && $$lines[$x] =~ /^\s*$/) { $empty++; }
+ elsif ($chk_empty) { $chk_empty = 0; }
}
}
}
if ($ms) {
# bloat this array if you want more internationalization:
my @tofu = ('Original Message',
+ 'Original-Nachricht',
'Ursprüngliche Nachricht',
'Ursprungliche Nachricht',
'Mensagem original',
# environment
-my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
+my $locale = $ENV{'LC_ALL'}?$ENV{'LC_ALL'}:
+ ($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
# command line switches
($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
# get command line params:
Getopt::Mixed::init('a A=s c d e h i=s k L=s l m M=s o=s P=s p:s r S:i'.
' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml help>h'.
- ' kminl=i kmaxl=i kdiff=i lax-security locale=s ms-smart mua>M'.
- ' pgp-short pgp-move pgp-move-vrf sigsmax:i spass version>v');
+ ' kminl=i kmaxl=i kdiff=i lax-security locale=s max-lines=i ms-smart'.
+ ' mua>M pgp-short pgp-move pgp-move-vrf sigsmax:i spass version>v');
while (my ($opt, $val, $pretty) = nextOption()) {
if ($opt eq 'a') { $ad = 1; }
elsif ($opt eq 'A') { $ads = $val; }
elsif ($opt eq 'lax-security') { $lax = 1; }
elsif ($opt eq 'locale') { $locale = $val; }
elsif ($opt eq 'm') { $ms = 1; }
+ elsif ($opt eq 'max-lines') { $maxlines = $val; }
elsif ($opt eq 'ms-smart') { $ms_smart = 1; $ms = 1; }
elsif ($opt eq 'M') {
$mua = lc($val);
# Read message:
-if (!open(IN, $ifile)) { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); }
+if (!open(IN, $ifile))
+ { print STDERR "Could not open $ifile: $!\n"; exit(EX_IOERR); }
my @message = <IN>;
close IN;