# 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';
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
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 $gw $ms $ms_smart $msg_quote
+ $msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $sig
+ $sigint $sign $spass $spass_prefix $sysl $trad $trsp
# command line can change them or they are used in rexexp's):
$0 =~ s!^.*/!!;
$maxsig = 4; # max. valid signature length
# command line can change them or they are used in rexexp's):
$0 =~ s!^.*/!!;
$maxsig = 4; # max. valid signature length
$indent = '>'; # Indent string, regexp to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
$indent = '>'; # Indent string, regexp to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
--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;
--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;
-e force ellipsis for excessive punctuation
--ftr-ad enable aggressive ad footer matching; requires -A
--ftr-ml enable aggressive mailing list footer matching; req. -L
-e force ellipsis for excessive punctuation
--ftr-ad enable aggressive ad footer matching; requires -A
--ftr-ml enable aggressive mailing list footer matching; req. -L
-h, --help show this short help and exit
-i=INFILE file to be read; '-' for STDIN (default)
-k try to fix \"Kammquotes\"
--kminl=n min. line length for wrapped line; requires -k
--kmaxl=n max. line length for wrapped line; requires -k
--kdiff=n max. length difference between wrapped lines; req. -k
-h, --help show this short help and exit
-i=INFILE file to be read; '-' for STDIN (default)
-k try to fix \"Kammquotes\"
--kminl=n min. line length for wrapped line; requires -k
--kmaxl=n max. line length for wrapped line; requires -k
--kdiff=n max. length difference between wrapped lines; req. -k
footers as signature
-l delete mailing list footer; requires -L
--lax-security use unsafe writing method; USE ON YOUR OWN RISK!
--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
footers as signature
-l delete mailing list footer; requires -L
--lax-security use unsafe writing method; USE ON YOUR OWN RISK!
--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
--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
--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
(index($$L[$x+1], $indent)!=0) &&
($$L[$x+1] !~ /^$/) &&
($$L[$x+1] !~ /^[\s^]/) &&
(index($$L[$x+1], $indent)!=0) &&
($$L[$x+1] !~ /^$/) &&
($$L[$x+1] !~ /^[\s^]/) &&
(length($$L[$x])+length($$L[$x+1])<$kmaxl) &&
(length($$L[$x])+length($$L[$x+1])>$kminl) &&
(length($$L[$x])-length($$L[$x+1])>$kdiff) &&
(length($$L[$x])+length($$L[$x+1])<$kmaxl) &&
(length($$L[$x])+length($$L[$x+1])>$kminl) &&
(length($$L[$x])-length($$L[$x+1])>$kdiff) &&
- if ($$L[$X] =~ /^gpg:\s(?:\Q$gpg_WARNING\E|\Q$gpg_Warning\E|\Q$gpg_bad\E|\Q$gpg_Cantcheck\E|\Q$gpg_expired\E)/o)
+ if (index($$L[$X], "gpg: $gpg_WARNING")==0 ||
+ index($$L[$X], "gpg: $gpg_Warning")==0 ||
+ index($$L[$X], "gpg: $gpg_bad")==0 ||
+ index($$L[$X], "gpg: $gpg_Cantcheck")==0 ||
+ index($$L[$X], "gpg: $gpg_expired")==0 ||
+ index($$L[$X], "gpg: $gpg_bug")==0)
{
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
{
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
my (@ads, @hdr, @bo1, @bo2, @ftr, @sig, @vrb, @att) =
((), (), (), (), (), (), (), (), ());
my (@ads, @hdr, @bo1, @bo2, @ftr, @sig, @vrb, @att) =
((), (), (), (), (), (), (), (), ());
- # First, remove and store lines we might need later...
+ # First, check msg length and stop processing if msg is too long:
+ if ((defined $maxlines) && (@$lines > $maxlines)) {
+ return;
+ }
+
+ # Remove and store lines we might need later...
# not, we are done - non-text messages are not our business).
if ($mua ne 'mutt') {
for ($x=0; $x<scalar(@hdr); $x++) {
# not, we are done - non-text messages are not our business).
if ($mua ne 'mutt') {
for ($x=0; $x<scalar(@hdr); $x++) {
my $z;
for ($z=1; $x+$z<@$lines; $z++) {
if (index($$lines[$x+$z], '--'.$foo)==0) {
my $z;
for ($z=1; $x+$z<@$lines; $z++) {
if (index($$lines[$x+$z], '--'.$foo)==0) {
if ($vrb[$x]) { next; }
# The following regexp's are quite ugly because for most users
# these lines are coloured using termcap... (bah!)
if ($vrb[$x]) { next; }
# The following regexp's are quite ugly because for most users
# these lines are coloured using termcap... (bah!)
- $$lines[$x+1] !~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)(?:text\/plain|application\/pgp)/io))) ||
- ($$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpsigned\E|\Q$mutt_pgpclearsigned\E|\Q$mutt_pgpencrypted\E)/o))
+ $$lines[$x+1] !~ m!^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_contenttype\E)
+ (?:text/plain|application/pgp)
+ !ox))) ||
+ ($$lines[$x] =~ /^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpsigned\E |
+ \Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpencrypted\E)
+ /ox))
{
# Strip attachments to prepare further processing
unshift(@att, @$lines[$x..$#$lines]);
splice(@$lines, $x);
# Try to fix trailing empty lines
{
# Strip attachments to prepare further processing
unshift(@att, @$lines[$x..$#$lines]);
splice(@$lines, $x);
# Try to fix trailing empty lines
# situations.
# The following regexp is quite ugly because for most
# users the line is coloured using termcap... (bah!)
# situations.
# The following regexp is quite ugly because for most
# users the line is coloured using termcap... (bah!)
- if ($att[$x]=~/^(?:\e.+?\a)?\Q$mutt_attachment\E\d+.* --\]/o &&
- $att[$x+1] =~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)message\/rfc822/o)
+ if ($att[$x] =~
+ /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E\d+/o &&
+ $att[$x+1] =~ m!^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_contenttype\E) (?:message/rfc822|multipart/alternative)
+ !ox)
- if ((!$vrb[$x]) && $$lines[$x] =~ /^-- $/) {
- if ($diff) {
- for (my $i=1; $x+$i+1<scalar(@$lines); $i++) {
- if ($$lines[$x+$i] =~ /^\-\-\-\s+\S/ &&
- $$lines[$x+$i+1] =~ /^\+\+\+\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 ($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);
# bloat this array if you want more internationalization:
my @tofu = ('Original Message',
# bloat this array if you want more internationalization:
my @tofu = ('Original Message',
'Ursprungliche Nachricht',
'Mensagem original',
'Ursprungligt meddelande',
'Ursprungliche Nachricht',
'Mensagem original',
'Ursprungligt meddelande',
- if ($$lines[$x] =~ /^-+\s?$tmp\s?-+/) {
+ if (($ms && $$lines[$x] =~ /^\s?-+\s?$tmp\s?-+/) ||
+ ($gw &&
+ ($$lines[$x] =~ /^>>>[^\<]+<[^\>]+> \d\d?\/\d\d?\/\d\d? \d\d?:\d\d [AP]M >>>/ ||
+ $$lines[$x] =~ /^>>> On [A-Z][a-z][a-z]?, [A-Z][a-z][a-z]? \d\d?, \d\d\d\d at [ \d]\d:\d\d [AP]M, in message/))) {
- $$lines[$x] !~ /^(?:\e.+?\a)?(?:\Q$mutt_attachment\E)/o &&
- $$lines[$x] !~ /^(?:\e.+?\a)?(?:\Q$mutt_contenttype\E)/o)) &&
- ((!$spass) || $$lines[$x]!~/^\Q$spass_prefix/o))
+ $$lines[$x] !~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_attachment\E)/o &&
+ $$lines[$x] !~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_contenttype\E)/o)) &&
+ ((!$spass) || index($$lines[$x], $spass_prefix)!=0))
- ($$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_beginsigned\E)/o ||
- $$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
+ ($$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_beginsigned\E)/o ||
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o)) {
# command line switches
($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
# command line switches
($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
- $ml, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $sig, $sigint,
- $spass, $trad, $trsp) =
+ $ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $sig,
+ $sigint, $spass, $trad, $trsp) =
(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
my $ifile = '-'; # use STDIN if nothing specified
# 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'.
(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
my $ifile = '-'; # use STDIN if nothing specified
# 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');
+ ' s t v w bigq:s body check:s debug>d diff ftr-ad ftr-ml groupwise'.
+ ' help>h 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; }
while (my ($opt, $val, $pretty) = nextOption()) {
if ($opt eq 'a') { $ad = 1; }
elsif ($opt eq 'A') { $ads = $val; }
elsif ($opt eq 'e') { $elli = 1; }
elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; }
elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; }
elsif ($opt eq 'e') { $elli = 1; }
elsif ($opt eq 'ftr-ad') { $ftr_ad = 1; $ad = 1; }
elsif ($opt eq 'ftr-ml') { $ftr_ml = 1; $ml = 1; }
elsif ($opt eq 'i') { $ifile = $val; }
elsif ($opt eq 'k') { $kamm = 1; }
elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }
elsif ($opt eq 'i') { $ifile = $val; }
elsif ($opt eq 'k') { $kamm = 1; }
elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }
elsif ($opt eq 'lax-security') { $lax = 1; }
elsif ($opt eq 'locale') { $locale = $val; }
elsif ($opt eq 'm') { $ms = 1; }
elsif ($opt eq 'lax-security') { $lax = 1; }
elsif ($opt eq 'locale') { $locale = $val; }
elsif ($opt eq 'm') { $ms = 1; }
Locale::gettext::textdomain('gnupg');
($gpg_WARNING) =
Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~
Locale::gettext::textdomain('gnupg');
($gpg_WARNING) =
Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~