#!/usr/bin/perl -w
-# $Id: t-prot,v 1.236 2005/04/25 16:35:56 jochen Exp $
+# $Id: t-prot,v 1.243 2005/05/27 10:00:35 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.101';
+use constant VER => '2.0';
use constant REV => '';
-use constant REL => q$Revision: 1.236 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL => q$Revision: 1.243 $=~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';
($$L[$x+1] !~ /^[\s^]/) &&
($$L[$x] !~ /-$/) &&
($$L[$x+1] !~ /^\Q[...]\E\s*$/) &&
- ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e.+?\a)?\[-- .* --]/) &&
+ ($mua ne 'mutt' || $$L[$x+1] !~ /^(?:\e[^\a]+\a)?\[-- /) &&
(length($$L[$x])+index($$L[$x+1], ' ')>$max ||
(index($$L[$x+1], ' ')<0 && length($$L[$x])+length($$L[$x+1])>$max)) &&
(length($$L[$x])+length($$L[$x+1])<$kmaxl) &&
my $ok = 0;
while ($X<$Z) {
- 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)
{ return 0; }
- if ($$L[$X] =~ /^gpg:\s\Q$gpg_bug/o)
- { return 0; }
- if ($$L[$X] =~ /^gpg:\s\Q$gpg_good/o)
+ if (index($$L[$X], "gpg: $gpg_good")==0)
{ $ok = 1; }
$X++;
}
for (my $x=0; $x<scalar(@$L); $x++) {
if ($$V[$x]) { next; }
- if ($$L[$x]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpoutstart\E)/o)
+ if ($$L[$x]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o)
{
my $from;
for (my $m=0; $m<scalar(@$H); $m++) {
- if ($$H[$m] =~ /^From:/) {
+ if (index($$H[$m], 'From:')==0) {
$from = $$H[$m];
$m++;
while (exists($$H[$m]) && $$H[$m] =~ /^\s/) { $from .= $$H[$m]; $m++; }
last;
}
}
- ($from) = $from=~m/([a-z\d][a-z_\d\+-\.]*\@(?:[a-z_\d\+-\.]+\.)+[a-z]{2,})/i;
+ ($from) = $from=~m/(\w[\w.+-]*@(?:[\w.+-]+\.)+[A-Za-z]{2,})/;
my $uid = 1;
for (my $i=$x+1; $i<scalar(@$L); $i++) {
- if ($pgpshort && $$L[$i] =~ /^gpg:\s\Q$gpg_aka/o) { $uid++; }
+ if ($pgpshort && index($$L[$i], "gpg: $gpg_aka")==0)
+ { $uid++; }
if ($pgpshort && $uid>1 &&
- $$L[$i] =~ /^gpg:\s\Q$gpg_aka/o && $$L[$i] !~ /\Q$from/)
+ index($$L[$i], "gpg: $gpg_aka")==0 &&
+ index($$L[$i], $from)<0)
{
splice(@$L, $i, 1);
splice(@$V, $i, 1);
$i--;
}
- elsif ($$L[$i]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpoutend\E)/o)
+ elsif ($$L[$i]=~/^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutend\E)/o)
{
if ($pgpmove ||
($pgpmovevrf && (!$sigint) && verified($L, $x+1, $i)))
}
}
elsif ($tmp &&
- $$L[$x]=~/^(?:\e.+?\a)?(?:\Q$mutt_pgpencrypted\E|\Q$mutt_pgpclearsigned\E|\Q$mutt_pgpsigned\E)/o)
+ $$L[$x] =~ /^
+ (?:\e[^\a]+\a)?
+ (?:\Q$mutt_pgpencrypted\E |
+ \Q$mutt_pgpclearsigned\E|
+ \Q$mutt_pgpsigned\E)
+ /ox)
{
splice(@$L, $x+1, 0, @{$tmp[$tmp]});
for (my $i=$x; $i<scalar(@{$tmp[$tmp]}); $i++) {
# not, we are done - non-text messages are not our business).
if ($mua ne 'mutt') {
for ($x=0; $x<scalar(@hdr); $x++) {
- if ($hdr[$x] =~ /^Content-Type:\s+(.*)$/i) {
+ if ($hdr[$x] =~ /^Content-[Tt]ype:\s+(.*)$/) {
my $foo = $1;
- if ($foo =~ /^multipart\//i) {
+ if ($foo =~ m!^multipart/!) {
undef $foo;
if ($hdr[$x] =~ /\Wboundary="([^"]+)"/i) { $foo = $1; }
my $bar = 'text/plain';
for ($x++; $x<@$lines && $$lines[$x]!~/^$/; $x++)
{
- if ($$lines[$x] =~ /^Content-Type:\s+(.*)/i) {
+ if ($$lines[$x] =~ /^Content-[Tt]ype:\s+(.*)/) {
$bar = $1;
}
}
if ($x>=scalar(@$lines)) { exit(EX_DATAERR); }
- if ($bar =~ /^text\/plain/i) {
+ if ($bar =~ m!^text/plain!) {
my $z;
for ($z=1; $x+$z<@$lines; $z++) {
if (index($$lines[$x+$z], '--'.$foo)==0) {
for ($x=0; $x<scalar(@$lines); $x++) {
if (!$vrb[$x]) {
$z++;
- if ($$lines[$x] =~ /^$indent/) { $y++; }
+ if (index($$lines[$x], $indent)==0) { $y++; }
}
}
$y = $y/$z;
if ($vrb[$x]) { next; }
# The following regexp's are quite ugly because for most users
# these lines are coloured using termcap... (bah!)
- if (($$lines[$x] =~ /^(?:\e.+?\a)?\Q$mutt_attachment\E(\d+)(?::.*)? \-\-\]/o &&
+ if (($$lines[$x] =~
+ /^(?:\e[^\a]+\a)?\Q$mutt_attachment\E(\d+)/o &&
(($1 ne '1') ||
($x<$#$lines &&
- $$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
- while (scalar(@$lines) && $$lines[$#$lines] =~ /^(?:\e.+?\a)?\s*$/) {
+ while (scalar(@$lines) && $$lines[$#$lines] =~
+ /^(?:\e[^\a]+\a)?\s*$/) {
unshift(@att, pop(@$lines));
}
# 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
+ !ox)
{
$x += 2;
while ($att[$x] !~ /^\s*$/) { $x++; }
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/)
+ if ($$lines[$x+$i] =~ /^-{3}\s+\S/ &&
+ $$lines[$x+$i+1] =~ /^\+{3}\s+\S/)
{
$sig = 0;
unshift(@sig, @$lines[$x..$#$lines]);
if ((!$k) && $$lines[$x] !~ /^\s*$/o &&
((!$mua) ||
($mua eq 'mutt' &&
- $$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))
{
if ($mua eq 'mutt' && (!$tmp) &&
- $$lines[$x] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
+ $$lines[$x] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpoutstart\E)/o) {
$tmp = 1;
} elsif ($mua eq 'mutt' && $tmp &&
- ($$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)) {
$tmp = 0;
} elsif (!$tmp) {
$k = 1;
my $p = 0; # levels of pgp signed parts
for (my $i=$x+1; $i<scalar(@$lines); $i++) {
- if ($$lines[$i] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigstart\E)/o) {
+ if ($$lines[$i] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigstart\E)/o) {
$p++;
}
}
if ($p) {
STAIRS: for (my $i=0; $i<scalar(@att); $i++) {
- if ($p==0 && $att[$i] =~ /^(?:\e.+?\a)?\[\-\-\ /o) {
+ if ($p==0 && $att[$i] =~ /^(?:\e[^\a]+\a)?\[-- /o) {
splice(@att, 0, $i);
unshift(@att, "\n");
goto CLEAN;
- } elsif ($att[$i] =~ /^(?:\e.+?\a)?(?:\Q$mutt_pgpclearsigned\E)/o) {
+ } elsif ($att[$i] =~
+ /^(?:\e[^\a]+\a)?(?:\Q$mutt_pgpclearsigned\E)/o) {
splice(@att, 0, $i+1);
$p--;
goto STAIRS;
# Care for punctuation abuse:
if ($elli) {
for ($x=0; $x<scalar(@$lines); $x++) {
- if (!$vrb[$x]) { $$lines[$x] =~ s/(([.?!])\2\2)\2+/$1/eg; }
+ if (!$vrb[$x]) { $$lines[$x] =~ s/(([.?!])\2\2)\2+/$1/g; }
}
}
Locale::gettext::textdomain('mutt');
($mutt_attachment) =
Locale::gettext::gettext("[-- Attachment #%d") =~
- m/^([^%]*)/o;
+ m/^([^%]*)/;
($mutt_contenttype) =
Locale::gettext::gettext("[-- Type: %s/%s, Encoding: %s, Size: %s --]\n") =~
- m/^([^%]*)/o;
+ m/^([^%]*)/;
($mutt_pgpsigned) =
Locale::gettext::gettext("[-- End of signed data --]\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($mutt_beginsigned) =
Locale::gettext::gettext("[-- The following data is signed --]\n\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($mutt_pgpclearsigned) =
Locale::gettext::gettext("[-- END PGP SIGNED MESSAGE --]\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($mutt_pgpclearsigstart) =
Locale::gettext::gettext("[-- BEGIN PGP SIGNED MESSAGE --]\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($mutt_pgpencrypted) =
Locale::gettext::gettext("[-- End of PGP/MIME encrypted data --]\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($mutt_pgpoutstart) =
Locale::gettext::gettext("[-- PGP output follows (current time: %c) --]\n") =~
- m/^([^%]*)/o;
+ m/^([^%]*)/;
($mutt_pgpoutend) =
Locale::gettext::gettext("[-- End of PGP output --]\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
Locale::gettext::textdomain('gnupg');
($gpg_WARNING) =
Locale::gettext::gettext("WARNING: using insecure random number generator!!\n") =~
- m/^(.*?: )/o;
+ m/^([^:]*: )/;
($gpg_Warning) =
Locale::gettext::gettext("WARNING: message was encrypted with a weak key in the symmetric cipher.\n") =~
- m/^(.*?: )/o;
+ m/^([^:]*: )/;
($gpg_Cantcheck) =
Locale::gettext::gettext("Can't check signature: %s\n") =~
- m/^([^%]*)/o;
+ m/^([^%]*)/;
($gpg_aka) =
Locale::gettext::gettext((' 'x16).'aka "%s"') =~
- m/^(.*?)["«%]/o;
+ m/^([^"«%]*)["«%]/;
($gpg_bad) =
Locale::gettext::gettext('BAD signature from "%s"') =~
- m/^(.*?)["«%]/o;
+ m/^([^"«%]*)["«%]/;
($gpg_expired) =
Locale::gettext::gettext("Note: This key has expired!\n") =~
- m/^(.*?)\n/mo;
+ m/^(.*)\n/m;
($gpg_good) =
Locale::gettext::gettext('Good signature from "%s"') =~
- m/^(.*?)["«%]/o;
+ m/^(([^"«%]*))["«%]/;
($gpg_bug) =
Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
- m/^([^%]*)/o;
+ m/^([^%]*)/;
}
}
projects / pkg / t-prot.git / blobdiff