#!/usr/bin/perl -w
-# $Id: t-prot,v 1.298 2010/03/06 01:32:50 jochen Exp $
+# $Id: t-prot,v 1.307 2010/07/01 16:02:56 jochen Exp $
require 5.006;
use strict;
use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
use Getopt::Long qw(:config gnu_getopt no_ignore_case);
-use constant VER => '2.97';
+use constant VER => '2.99';
use constant REV => '';
-use constant REL => q$Revision: 1.298 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.307 $=~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 constant EX_BOUNCE => EX_UNAVAILABLE;
use vars qw(
$ad $ads $bigqn $bigqx $boun $check $check_ratio $cr $crshrink $diff $elli
- $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
+ $fixind $footers $ftr_ad $ftr_ml $hdrs $indent $kamm $kdiff $kminl $kmaxl
$lax $lsig $maxsig $maxlines $mda $ml $gw $ms $ms_smart $msg_quote
$msg_ratio $mua $nohdr $ofile $pgpshort $pgpmove $pgpmovevrf $reply
$sani $sig $sigint $sign $spass $spass_prefix $sysl $trad $trsp
$maxsig = 4; # max. valid signature length
$maxlines = undef; # no limit of message lines
$crshrink = 2; # multiple blank lines are shrunk to $crshrink lines
-$indent = '>'; # Indent string, regexp to identify a quoted line
+$indent = '>'; # Indent string to identify a quoted line
$kminl = 65; # see decomb() for details
$kmaxl = 80;
$kdiff = 20;
-d, --debug print notice to syslog when bouncing; requires -p
--diff tolerate diffs
-e force ellipsis for excessive punctuation
+ --fixind fix quotes to adhere to RFC 3676
--ftr-ad enable aggressive ad footer matching; requires -A
--ftr-ml enable aggressive mailing list footer matching; req. -L
--groupwise delete Novell Groupwise style TOFU
--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
+ -m delete MS style TOFU; careful: might be too aggressive
--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)
--pgp-short hide non-relevant pgp key uids; requires -Mmutt
-r delete mail header lines
--reply squeeze multiple reply prefixes in subject line
- -S[n] supress signatures with more than n lines (default $maxsig)
+ -S[n] suppress signatures with more than n lines (default $maxsig)
-s delete signature
--sani sanitize some header fields
--sigsmax[=n] max number of sigs tolerated, no value for unlimited
}
# debigq(): Finds big quotes (more than $n lines quoted) and deletes all
-# but $x lines of them.
+# but the last $x lines of them.
sub debigq {
my $L = shift; # array of message lines
my $V = shift; # array with verbatim list
}
}
+ # Fix quote markers to adhere to RFC 3676, this changes "> >" to ">> " (if
+ # the default $indent is used). The space after ">" is not mandatory by RFC
+ # but makes the result more readable.
+ if ($fixind) {
+ for ($x=0; $x<scalar(@$lines); $x++) {
+ if (!$vrb[$x] && index($$lines[$x], $indent)==0) {
+ # We match space at the beginning to prevent removal of spaces
+ # directly after the last quote mark.
+ $$lines[$x] =~ /^((\Q$indent\E| )*\Q$indent\E ?)(.*)$/;
+ my $tmp = $1;
+ my $len = length $1;
+ my $rest = $3; # if anything follows after the quote
+ $tmp =~ tr/ //d;
+ $tmp .= ' ' if $rest; # don't create trailing whitespace
+ substr($$lines[$x], 0, $len, $tmp);
+ }
+ }
+ }
+
# See if there is some Kammquoting to fix:
if ($kamm) { decomb($lines, \@vrb); }
for (my $i=$#$lines; $i>=0; $i--) {
if ($vrb[$i]) { last; }
- if ($$lines[$i] =~ /^$indent/o) {
+ if (index($$lines[$i], $indent)==0) {
$j++;
$k = $i;
}
# earlier -- the way it is done right now would screw up the verbatim
# list)
if ($cr) {
+ # When handling regular TOFU above we move the last empty line from
+ # the body to the signature. This prevents the correct removal of
+ # empty lines before a signature (one line less is removed than it
+ # should) when -c and -t are used. This fixes it.
+ if (scalar(@sig) && $sig[0] =~ /^\s*$/) {
+ push(@$lines, shift(@sig));
+ }
+
my $t = 0;
for ($x=scalar(@$lines)-1; $x>=0; $x--) {
if ((!$vrb[$x]) &&
($ENV{'LC_MESSAGES'}?$ENV{'LC_MESSAGES'}:$ENV{'LANG'});
# command line switches
-($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $footers, $lax,
+($ad, $ads, $bigqn, $bigqx, $check, $cr, $sysl, $diff, $elli, $fixind, $footers, $lax,
$ml, $gw, $ms, $ms_smart, $mda, $mua, $hdrs, $kamm, $lsig, $nohdr, $reply,
$sani, $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, 0, 0);
+ (0, 0, 0, 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
# temp vals:
-my ($_t1, $_t2, $_t3, $_t4, $_t5, $_t6, $_t7, $_t8, $_t9, $_ta, $_tb, $_tc,
- $_td) = undef;
+my ($_t_bigq, $_t_help, $_t_kminl, $_t_kmaxl, $_t_kdiff, $_t_maxsig, $_t_mua,
+ $_t_redir, $_t_check, $_t_sigsmax, $_t_ver, $_t_nohdr, $_t_cr) = undef;
# get command line params:
if (!Getopt::Long::GetOptions(
'a' => \$ad,
'A=s' => \$ads,
- 'bigq:s' => \$_t1,
- 'body' => \$_tc,
- 'c:i' => \$_td,
- 'check:s' => \$_t9,
+ 'bigq:s' => \$_t_bigq,
+ 'body' => \$_t_nohdr,
+ 'c:i' => \$_t_cr,
+ 'check:s' => \$_t_check,
'debug|d' => \$sysl,
'diff' => \$diff,
'e' => \$elli,
+ 'fixind' => \$fixind,
'ftr-ad' => \$ftr_ad,
'ftr-ml' => \$ftr_ml,
'groupwise' => \$gw,
- 'help|h' => \$_t2,
+ 'help|h' => \$_t_help,
'i=s' => \$ifile,
'k' => \$kamm,
- 'kminl=i' => \$_t3,
- 'kmaxl=i' => \$_t4,
- 'kdiff=i' => \$_t5,
+ 'kminl=i' => \$_t_kminl,
+ 'kmaxl=i' => \$_t_kmaxl,
+ 'kdiff=i' => \$_t_kdiff,
'L=s' => \$footers,
'l' => \$ml,
'lax-security' => \$lax,
'locale=s' => \$locale,
'max-lines:i' => \$maxlines,
'ms-smart' => \$ms_smart,
- 'mua|M=s' => \$_t7,
+ 'mua|M=s' => \$_t_mua,
'm' => \$ms,
'o=s' => \$ofile,
'P=s' => \$boun,
- 'p:s' => \$_t8,
+ 'p:s' => \$_t_redir,
'pgp-short' => \$pgpshort,
'pgp-move' => \$pgpmove,
'pgp-move-vrf' => \$pgpmovevrf,
'r' => \$hdrs,
'reply' => \$reply,
- 'S:i' => \$_t6,
+ 'S:i' => \$_t_maxsig,
's' => \$sig,
'sani' => \$sani,
- 'sigsmax:i' => \$_ta,
+ 'sigsmax:i' => \$_t_sigsmax,
'spass' => \$spass,
't' => \$trad,
- 'version|v' => \$_tb,
+ 'version|v' => \$_t_ver,
'w' => \$trsp
)) {
help();
}
# clean up temp vals:
-if (defined $_t1) {
- if ($_t1 !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); }
+if (defined $_t_bigq) {
+ if ($_t_bigq !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); }
$bigqn = $1?$1:30;
$bigqx = $2?$2:10;
if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); }
}
-if (defined $_t2) { help(); }
-if (defined $_t3) { $kminl = $_t3; $kamm = 1; }
-if (defined $_t4) { $kmaxl = $_t4; $kamm = 1; }
-if (defined $_t5) { $kdiff = $_t5; $kamm = 1; }
-if (defined $_t6) { $lsig = $_t6 ? $_t6 : $maxsig; }
-if (defined $_t7) {
- $mua = lc($_t7);
+if (defined $_t_help) { help(); }
+if (defined $_t_kminl) { $kminl = $_t_kminl; $kamm = 1; }
+if (defined $_t_kmaxl) { $kmaxl = $_t_kmaxl; $kamm = 1; }
+if (defined $_t_kdiff) { $kdiff = $_t_kdiff; $kamm = 1; }
+if (defined $_t_maxsig) { $lsig = $_t_maxsig ? $_t_maxsig : $maxsig; }
+if (defined $_t_mua) {
+ $mua = lc($_t_mua);
# mutt still displays the message when ^C'ing pgp verification:
if ($mua eq 'mutt') { $SIG{'INT'} = 'sigint_handler'; }
}
-if (defined $_t8) { $mda = $_t8 ? $_t8 : '1'; }
-if (defined $_t9) {
+if (defined $_t_redir) { $mda = $_t_redir ? $_t_redir : '1'; }
+if (defined $_t_check) {
$check = 1;
- while ($_t9 && $_t9 =~ /^([^,\s]+)(?:,(\S+))?$/) {
+ while ($_t_check && $_t_check =~ /^([^,\s]+)(?:,(\S+))?$/) {
my $foo = $1;
- $_t9 = $2;
+ $_t_check = $2;
if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { $check_ratio = $1?$1:0.75; }
}
}
-if (defined $_ta) { $sign = $_ta ? $_ta : undef; }
-if (defined $_tb) { version(); }
-if (defined $_tc) { $nohdr=1; $hdrs=1; }
-if (defined $_td) { $cr = $_td ? $_td : $crshrink; }
+if (defined $_t_sigsmax) { $sign = $_t_sigsmax ? $_t_sigsmax : undef; }
+if (defined $_t_ver) { version(); }
+if (defined $_t_nohdr) { $nohdr=1; $hdrs=1; }
+if (defined $_t_cr) { $cr = $_t_cr ? $_t_cr : $crshrink; }
if ($ms_smart) { $ms = 1; }
if ($mua eq 'mutt') {
projects / pkg / t-prot.git / blobdiff