Improve error messages and use a better regexp for detecting
printable characters in attachments.
if (recheck_type_ok($part)) {
push @keep, $part;
} elsif ($filter) {
- $filter->reject(TEXT_ONLY);
+ $filter->reject("Bad attachment: $part_type ".
+ TEXT_ONLY);
} else {
$rejected++;
}
if ($rejected == 0 && !@html) {
push @keep, $part;
}
+ } elsif ($filter) {
+ $filter->reject("unacceptable mime-type: $part_type ".
+ TEXT_ONLY);
} else {
- $filter->reject(TEXT_ONLY) if $filter;
# reject everything else, including non-PGP signatures
$rejected++;
}
sub recheck_type_ok {
my ($part) = @_;
my $s = $part->body;
- ((length($s) < 0x10000) &&
- ($s =~ /\A([\P{XPosixPrint}\f\n\r\t]+)\z/))
+ ((length($s) < 0x10000) && ($s =~ /\A([[:print:]\s]+)\z/s));
}
1;