Imported Upstream version 2.11

diff --git a/ChangeLog b/ChangeLog
index 636a14752a900e6db5a5bab727581c6cba01a991..a38d94c6677d5eeaa559d6889795fba36ec67661 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2010-01-05 12:05  Jochen Striepe
+
+       * t-prot: Release as v2.11.
+
+2010-01-05 12:01  Jochen Striepe
+
+       * contrib/filter_innd.pl: Command line default has changed, check
+       flags must be set now.
+
+2010-01-05 11:46  Jochen Striepe
+
+       * t-prot.1: Better explain ratio check value.
+
+2010-01-05 11:43  Jochen Striepe
+
+       * t-prot.1: Update copyright time stamp.
+
+2010-01-05 11:42  Jochen Striepe
+
+       * t-prot, t-prot.1: Fix initialization and command line parsing for
+       --check (this should work as advertised now). Make the ratio check
+       code a little easier to read. Add the default value for the ratio
+       check to the man page.
+
+2010-01-04 11:07  Jochen Striepe
+
+       * t-prot.1: Remove URLs to example scripts and configs. The files
+       are provided with the package.
+

 2009-12-30 21:34  Jochen Striepe
 
        * t-prot, t-prot.1: Fix last commit, release as t-prot v2.10.
 2009-12-30 21:34  Jochen Striepe
 
        * t-prot, t-prot.1: Fix last commit, release as t-prot v2.10.

diff --git a/contrib/filter_innd.pl b/contrib/filter_innd.pl
index 4df4bb9130b8a0ca7b5b3b6a9db24fb1e478808a..b7c8c449f792fb215b98ca1ecb75c53ca0f6b5fc 100644 (file)
--- a/contrib/filter_innd.pl
+++ b/contrib/filter_innd.pl
@@ -1,4 +1,4 @@
-# $Id: filter_innd.pl,v 1.5 2005/04/15 14:07:11 jochen Exp $
+# $Id: filter_innd.pl,v 1.6 2010/01/05 12:01:13 jochen Exp $

 # Copyright (c) 2004-2005 Jochen Striepe <t-prot@tolot.escape.de>
 #
 # This file is provided as an example how t-prot can be used for
 # Copyright (c) 2004-2005 Jochen Striepe <t-prot@tolot.escape.de>
 #
 # This file is provided as an example how t-prot can be used for


@@ -51,7 +51,7 @@ sub filter_art {
                print OUT $foo;
                close OUT;
 
                print OUT $foo;
                close OUT;
 

-               open(IN, "/usr/bin/t-prot -m -t -p --body --check -i $f|")
+               open(IN, "/usr/bin/t-prot -m -t -p --body --check=ratio -i $f|")

                        || goto FINISH;
                $rval = <IN>;
                close IN;
                        || goto FINISH;
                $rval = <IN>;
                close IN;

diff --git a/contrib/t-prot-r1.267-gol.diff b/contrib/t-prot-r1.267-gol.diff
deleted file mode 100644 (file)
index 467ddf9..0000000
--- a/contrib/t-prot-r1.267-gol.diff
+++ /dev/null
@@ -1,187 +0,0 @@
---- t-prot     2009-12-30 22:34:16.000000000 +0100
-+++ t-prot-gol 2009-12-30 22:35:36.000000000 +0100
-@@ -4,7 +4,7 @@
- require 5.006;
- use strict;
- use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
--use Getopt::Mixed qw(nextOption);
-+use Getopt::Long qw(:config gnu_getopt no_ignore_case);
- use constant VER            => '2.10';
- use constant REV            => '';
- use constant REL            => q$Revision: 1.267 $=~m/(\d+(?:\.\d+)+)/;
-@@ -915,83 +915,82 @@
-     (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) = undef;
-+
- # 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 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; }
--    elsif ($opt eq 'bigq')  { 
--        if ($val !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); }
--        $bigqn = $1?$1:30; 
--        $bigqx = $2?$2:10;
--        if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); }
--    }
--    elsif ($opt eq 'body')  { $nohdr = 1; $hdrs = 1; }
--    elsif ($opt eq 'c')     { $cr = 1; }
--    elsif ($opt eq 'check') {
--        $check = 1;
--        while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) {
--            my $foo = $1;
-+if (!Getopt::Long::GetOptions(
-+    'a'             => \$ad,
-+    'A=s'           => \$ads,
-+    'bigq:s'        => \$_t1,
-+    'c'             => \$cr,
-+    'check:s'       => \$_t9,
-+    'debug|d'       => \$sysl,
-+    'diff'          => \$diff,
-+    'e'             => \$elli,
-+    'ftr-ad'        => \$ftr_ad,
-+    'ftr-ml'        => \$ftr_ml,
-+    'groupwise'     => \$gw,
-+    'help|h'        => \$_t2,
-+    'i=s'           => \$ifile,
-+    'k'             => \$kamm,
-+    'kminl=i'       => \$_t3,
-+    'kmaxl=i'       => \$_t4,
-+    'kdiff=i'       => \$_t5,
-+    'L=s'           => \$footers,
-+    'l'             => \$ml,
-+    'lax-security'  => \$lax,
-+    'locale=s'      => \$locale,
-+    'max-lines=i'   => \$maxlines,
-+    'ms-smart'      => \$ms_smart,
-+    'mua|M=s'       => \$_t7,
-+    'm'             => \$ms,
-+    'o=s'           => \$ofile,
-+    'P=s'           => \$boun,
-+    'p:s'           => \$_t8,
-+    'pgp-short'     => \$pgpshort,
-+    'pgp-move'      => \$pgpmove,
-+    'pgp-move-vrf'  => \$pgpmovevrf,
-+    'r'             => \$hdrs,
-+    'S:i'           => \$_t6,
-+    's'             => \$sig,
-+    'sigsmax:i'     => \$_ta,
-+    'spass'         => \$spass,
-+    't'             => \$trad,
-+    'version|v'     => \$_tb,
-+    'w'             => \$trsp
-+    )) {
-+    help();
-+}
- 
--            if ($foo =~ /^ratio=(0?\.\d+)$/) {
--                $check_ratio = $1?$1:1;
--            }
--        }
-+# clean up temp vals:
-+if (defined $_t1) {
-+    if ($_t1 !~ /^(?:(\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);
-+    # 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) {
-+    $check = 1;
-+    while ($_t9 && $_t9 =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) {
-+        my $foo = $1;
-+        if ($foo =~ /^ratio=(0?\.\d+)$/) { $check_ratio = $1?$1:1; }
-     }
--    elsif ($opt eq 'd')     { $sysl = 1; }
--    elsif ($opt eq 'diff')  { $diff = 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 'groupwise') { $gw = 1; }
--    elsif ($opt eq 'i')     { $ifile = $val; }
--    elsif ($opt eq 'k')     { $kamm = 1; }
--    elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }
--    elsif ($opt eq 'kmaxl') { $kmaxl = $val; $kamm = 1; }
--    elsif ($opt eq 'kdiff') { $kdiff = $val; $kamm = 1; }
--    elsif ($opt eq 'L')     { $footers = $val; }
--    elsif ($opt eq 'l')     { $ml = 1; }
--    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);
--
--        if ($mua eq 'mutt') {
--            # mutt still displays the message when ^C'ing pgp verification:
--            $SIG{'INT'} = 'sigint_handler';
--        }
--    }
--    elsif ($opt eq 'o')     { $ofile = $val; }
--    elsif ($opt eq 'P')     { $boun = $val; }
--    elsif ($opt eq 'p')     { $mda = $val ? $val : '1'; }
--    elsif ($opt eq 'pgp-short') { $pgpshort = 1; }
--    elsif ($opt eq 'pgp-move') { $pgpmove = 1; }
--    elsif ($opt eq 'pgp-move-vrf') { $pgpmovevrf = 1; }
--    elsif ($opt eq 'r')     { $hdrs = 1; }
--    elsif ($opt eq 'S')     { $lsig = $val ? $val : $maxsig; }
--    elsif ($opt eq 's')     { $sig = 1; }
--    elsif ($opt eq 'sigsmax') { $sign = $val ? $val : undef; }
--    elsif ($opt eq 'spass') { $spass = 1; }
--    elsif ($opt eq 't')     { $trad = 1; }
--    elsif ($opt eq 'v')     { version(); }
--    elsif ($opt eq 'w')     { $trsp = 1; }
--    else                    { help(); }
- }
--Getopt::Mixed::cleanup();
--if (($ml && $footers eq '')||    # no -l without -L
--    ($ad && $ads eq '')||        # no -a without -A
--    ($nohdr && $pgpshort)||      # --body and --pgp-short are like oil and water
--    ($ifile eq '')||             # no empty -i
--    ($ofile eq ''))              # no empty -o
--{ help(); }
--
-+if (defined $_ta) { $sign = $_ta ? $_ta : undef; }
-+if (defined $_tb) { version(); }
-+if ($ms_smart) { $ms = 1; }
- 
- if ($mua eq 'mutt') {
-     if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
-@@ -1053,11 +1052,15 @@
-                 m/^([^%]*)/;
-         }
-     }
--
--}
--else {
--    if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); }
- }
-+elsif ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); }
-+
-+if (($ml && $footers eq '')||    # no -l without -L
-+    ($ad && $ads eq '')||        # no -a without -A
-+    ($nohdr && $pgpshort)||      # --body and --pgp-short are like oil and water
-+    ($ifile eq '')||             # no empty -i
-+    ($ofile eq ''))              # no empty -o
-+{ help(); }
- 
- 
- # Read message:

diff --git a/contrib/t-prot-r1.269-gol.diff b/contrib/t-prot-r1.269-gol.diff
new file mode 100644 (file)
index 0000000..bef8f22
--- /dev/null
+++ b/contrib/t-prot-r1.269-gol.diff
@@ -0,0 +1,189 @@
+--- t-prot     2010-01-05 13:03:01.000000000 +0100
++++ t-prot-gol 2010-01-05 13:04:08.000000000 +0100
+@@ -4,7 +4,7 @@
+ require 5.006;
+ use strict;
+ use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
+-use Getopt::Mixed qw(nextOption);
++use Getopt::Long qw(:config gnu_getopt no_ignore_case);
+ use constant VER            => '2.11';
+ use constant REV            => '';
+ use constant REL            => q$Revision: 1.268 $=~m/(\d+(?:\.\d+)+)/;
+@@ -914,84 +914,83 @@
+     (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) = undef;
++
+ # 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 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; }
+-    elsif ($opt eq 'bigq')  { 
+-        if ($val !~ /^(?:(\d+)(?:,(\d+))?)?$/) { help(); }
+-        $bigqn = $1?$1:30; 
+-        $bigqx = $2?$2:10;
+-        if ($bigqn<=0 || $bigqx<=0 || $bigqn<=$bigqx) { help(); }
+-    }
+-    elsif ($opt eq 'body')  { $nohdr = 1; $hdrs = 1; }
+-    elsif ($opt eq 'c')     { $cr = 1; }
+-    elsif ($opt eq 'check') {
+-        $check = 1;
+-        while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) {
+-            my $foo = $1;
+-            $val = $2;
++if (!Getopt::Long::GetOptions(
++    'a'             => \$ad,
++    'A=s'           => \$ads,
++    'bigq:s'        => \$_t1,
++    'c'             => \$cr,
++    'check:s'       => \$_t9,
++    'debug|d'       => \$sysl,
++    'diff'          => \$diff,
++    'e'             => \$elli,
++    'ftr-ad'        => \$ftr_ad,
++    'ftr-ml'        => \$ftr_ml,
++    'groupwise'     => \$gw,
++    'help|h'        => \$_t2,
++    'i=s'           => \$ifile,
++    'k'             => \$kamm,
++    'kminl=i'       => \$_t3,
++    'kmaxl=i'       => \$_t4,
++    'kdiff=i'       => \$_t5,
++    'L=s'           => \$footers,
++    'l'             => \$ml,
++    'lax-security'  => \$lax,
++    'locale=s'      => \$locale,
++    'max-lines=i'   => \$maxlines,
++    'ms-smart'      => \$ms_smart,
++    'mua|M=s'       => \$_t7,
++    'm'             => \$ms,
++    'o=s'           => \$ofile,
++    'P=s'           => \$boun,
++    'p:s'           => \$_t8,
++    'pgp-short'     => \$pgpshort,
++    'pgp-move'      => \$pgpmove,
++    'pgp-move-vrf'  => \$pgpmovevrf,
++    'r'             => \$hdrs,
++    'S:i'           => \$_t6,
++    's'             => \$sig,
++    'sigsmax:i'     => \$_ta,
++    'spass'         => \$spass,
++    't'             => \$trad,
++    'version|v'     => \$_tb,
++    'w'             => \$trsp
++    )) {
++    help();
++}
+ 
+-            if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) {
+-                $check_ratio = $1?$1:0.75;
+-            }
+-        }
++# clean up temp vals:
++if (defined $_t1) {
++    if ($_t1 !~ /^(?:(\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);
++    # 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) {
++    $check = 1;
++    while ($_t9 && $_t9 =~ /^([^,\s]+)(?:,(\S+))?$/) {
++        my $foo = $1;
++        $_t9 = $2;
++        if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) { $check_ratio = $1?$1:0.75; }
+     }
+-    elsif ($opt eq 'd')     { $sysl = 1; }
+-    elsif ($opt eq 'diff')  { $diff = 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 'groupwise') { $gw = 1; }
+-    elsif ($opt eq 'i')     { $ifile = $val; }
+-    elsif ($opt eq 'k')     { $kamm = 1; }
+-    elsif ($opt eq 'kminl') { $kminl = $val; $kamm = 1; }
+-    elsif ($opt eq 'kmaxl') { $kmaxl = $val; $kamm = 1; }
+-    elsif ($opt eq 'kdiff') { $kdiff = $val; $kamm = 1; }
+-    elsif ($opt eq 'L')     { $footers = $val; }
+-    elsif ($opt eq 'l')     { $ml = 1; }
+-    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);
+-
+-        if ($mua eq 'mutt') {
+-            # mutt still displays the message when ^C'ing pgp verification:
+-            $SIG{'INT'} = 'sigint_handler';
+-        }
+-    }
+-    elsif ($opt eq 'o')     { $ofile = $val; }
+-    elsif ($opt eq 'P')     { $boun = $val; }
+-    elsif ($opt eq 'p')     { $mda = $val ? $val : '1'; }
+-    elsif ($opt eq 'pgp-short') { $pgpshort = 1; }
+-    elsif ($opt eq 'pgp-move') { $pgpmove = 1; }
+-    elsif ($opt eq 'pgp-move-vrf') { $pgpmovevrf = 1; }
+-    elsif ($opt eq 'r')     { $hdrs = 1; }
+-    elsif ($opt eq 'S')     { $lsig = $val ? $val : $maxsig; }
+-    elsif ($opt eq 's')     { $sig = 1; }
+-    elsif ($opt eq 'sigsmax') { $sign = $val ? $val : undef; }
+-    elsif ($opt eq 'spass') { $spass = 1; }
+-    elsif ($opt eq 't')     { $trad = 1; }
+-    elsif ($opt eq 'v')     { version(); }
+-    elsif ($opt eq 'w')     { $trsp = 1; }
+-    else                    { help(); }
+ }
+-Getopt::Mixed::cleanup();
+-if (($ml && $footers eq '')||    # no -l without -L
+-    ($ad && $ads eq '')||        # no -a without -A
+-    ($nohdr && $pgpshort)||      # --body and --pgp-short are like oil and water
+-    ($ifile eq '')||             # no empty -i
+-    ($ofile eq ''))              # no empty -o
+-{ help(); }
+-
++if (defined $_ta) { $sign = $_ta ? $_ta : undef; }
++if (defined $_tb) { version(); }
++if ($ms_smart) { $ms = 1; }
+ 
+ if ($mua eq 'mutt') {
+     if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
+@@ -1053,11 +1052,15 @@
+                 m/^([^%]*)/;
+         }
+     }
+-
+-}
+-else {
+-    if ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); }
+ }
++elsif ($ms_smart || $pgpshort || $pgpmove || $pgpmovevrf) { help(); }
++
++if (($ml && $footers eq '')||    # no -l without -L
++    ($ad && $ads eq '')||        # no -a without -A
++    ($nohdr && $pgpshort)||      # --body and --pgp-short are like oil and water
++    ($ifile eq '')||             # no empty -i
++    ($ofile eq ''))              # no empty -o
++{ help(); }
+ 
+ 
+ # Read message:

diff --git a/t-prot b/t-prot
index e2b36cff8acaa8b236ddc84531a46a835117e7de..441cd90e074baca84affc7e7c4746136c4a121ff 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.267 2009/12/30 21:34:16 jochen Exp $
+# $Id: t-prot,v 1.269 2010/01/05 12:05:03 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            => '2.10';
+use constant VER            => '2.11';

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

-use constant REL            => q$Revision: 1.267 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.269 $=~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';


@@ -54,7 +54,7 @@ $ftr_ad         = undef;  # too hard on performance to be default
 $ftr_ml         = undef;  # too hard on performance to be default
 $ofile          = '-';    # use STDOUT if nothing is specified
 $spass_prefix   = 'SPAM: ';
 $ftr_ml         = undef;  # too hard on performance to be default
 $ofile          = '-';    # use STDOUT if nothing is specified
 $spass_prefix   = 'SPAM: ';

-$check_ratio    = .75;    # 3/4 tofu is enough not to accept the message
+$check_ratio    = 0;      # off by default

 $msg_quote      = "Blocked by $0: This message has been rejected because of a full quote. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
 $msg_ratio      = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
 # end of user adjusted vals
 $msg_quote      = "Blocked by $0: This message has been rejected because of a full quote. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
 $msg_ratio      = "Blocked by $0: This message has been rejected because of excessive quoting. Please see http://learn.to/quote/ and http://www.escape.de/users/tolot/mutt/ for more info. Have a nice day!\n";
 # end of user adjusted vals


@@ -549,9 +549,8 @@ sub process_msg {
                 if (index($$lines[$x], $indent)==0) { $y++; }
             }
         }
                 if (index($$lines[$x], $indent)==0) { $y++; }
             }
         }

-        $y = $y/$z;

 
 

-        if ($y>=$check_ratio) {
+        if ($y/$z>=$check_ratio) {

             print $msg_ratio;
             exit EX_UNAVAILABLE;
         }
             print $msg_ratio;
             exit EX_UNAVAILABLE;
         }


@@ -934,11 +933,12 @@ while (my ($opt, $val, $pretty) = nextOption()) {
     elsif ($opt eq 'c')     { $cr = 1; }
     elsif ($opt eq 'check') {
         $check = 1;
     elsif ($opt eq 'c')     { $cr = 1; }
     elsif ($opt eq 'check') {
         $check = 1;

-        while ($val && $val =~ s/^([^,\s]+)(?:,(\S+))?$/$2/) {
+        while ($val && $val =~ /^([^,\s]+)(?:,(\S+))?$/) {

             my $foo = $1;
             my $foo = $1;

+            $val = $2;

 
 

-            if ($foo =~ /^ratio=(0?\.\d+)$/) {
-                $check_ratio = $1?$1:1;
+            if ($foo =~ /^ratio(?:=(0?\.\d+))?$/) {
+                $check_ratio = $1?$1:0.75;

             }
         }
     }
             }
         }
     }

diff --git a/t-prot.1 b/t-prot.1
index c9055332224d9523a5803058491df1134b3fa858..2d517c6793fa41eafb8941b78b22e26a0a524fed 100644 (file)
--- a/t-prot.1
+++ b/t-prot.1
@@ -1,6 +1,6 @@
-.\" $Id: t-prot.1,v 1.139 2009/12/30 21:34:16 jochen Exp $
+.\" $Id: t-prot.1,v 1.143 2010/01/05 11:46:38 jochen Exp $

 .\"
 .\"

-.TH T-PROT "1" "December 2009" "T-PROT"
+.TH T-PROT "1" "January 2010" "T-PROT"

 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 2822 messages
 .SH SYNOPSIS
 .SH NAME
 t-prot \- TOFU Protection - Display Filter for RFC 2822 messages
 .SH SYNOPSIS


@@ -21,11 +21,9 @@ initially designed to cope with the output of the MUA mutt (which
 is the reason for not using standard CPAN modules for handling
 messages).
 .PP
 is the reason for not using standard CPAN modules for handling
 messages).
 .PP

-For easy usage, you can download a file to be included in your ~/.muttrc:
-.I http://www.escape.de/users/tolot/mutt/t\-prot/muttrc.t\-prot
-.br
-And here is an example S-Lang macro to use t-prot from within slrn:
-.I http://www.escape.de/users/tolot/mutt/t\-prot/t\-prot.sl
+For easy usage, you can include the file muttrc.t\-prot in your
+~/.muttrc. Also coming with the t-prot package is the example S-Lang
+macro t\-prot.sl for using t-prot from within slrn.

 .SH OPTIONS
 .TP
 .BR "\-A" =DIRECTORY
 .SH OPTIONS
 .TP
 .BR "\-A" =DIRECTORY


@@ -89,7 +87,8 @@ following (right now just one flag):
 .IR ratio [=n]
 .br
 If the quoting ratio is n or more, the message is rejected. Must be
 .IR ratio [=n]
 .br
 If the quoting ratio is n or more, the message is rejected. Must be

-between 0 and 1, or else it is entirely disabled.
+between 0 and 1, or else it is entirely disabled. Default is 0.75
+(i.e., three quarters are quoted).

 .TP
 .B "\-d, \-\-debug"
 "debug":
 .TP
 .B "\-d, \-\-debug"
 "debug":


@@ -556,7 +555,7 @@ Written by Jochen Striepe <t\-prot@tolot.escape.de>.
 All of the documentation and software included in the t-prot releases
 is copyrighted by Jochen Striepe (except when explicitly stated otherwise).
 .PP
 All of the documentation and software included in the t-prot releases
 is copyrighted by Jochen Striepe (except when explicitly stated otherwise).
 .PP

-Copyright \(co 2001-2009 Jochen Striepe. All rights reserved.                     
+Copyright \(co 2001-2010 Jochen Striepe. All rights reserved.                     

 .PP
 Redistribution and use, with or without modification, are permitted
 provided that the following conditions are met:
 .PP
 Redistribution and use, with or without modification, are permitted
 provided that the following conditions are met: