-# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Lazy MIME parser, it still slurps the full message but keeps short
my $hdr = substr($$ref, 0, $header_size_limit + 1);
hdr_truncate($hdr) if length($hdr) > $header_size_limit;
bless { hdr => \$hdr, crlf => $1 }, __PACKAGE__;
- } else { # nothing useful
- my $hdr = $$ref = '';
- bless { hdr => \$hdr, crlf => "\n" }, __PACKAGE__;
+ } else { # just a body w/o header?
+ my $hdr = '';
+ my $eol = ($$ref =~ /(\r?\n)/) ? $1 : "\n";
+ bless { hdr => \$hdr, crlf => $eol, bdy => $ref }, __PACKAGE__;
}
}
my $re = re_memo($_[1]);
my @v = (${ $_[0]->{hdr} } =~ /$re/g);
for (@v) {
+ utf8::decode($_); # SMTPUTF8
# for compatibility w/ Email::Simple::Header,
s/\s+\z//s;
s/\A\s+//s;
}
sub body_str_set {
- my ($self, $body_str) = @_;
+ my ($self, $str) = @_;
my $cs = ct($self)->{attributes}->{charset} //
croak('body_str was given, but no charset is defined');
my $enc = find_encoding($cs) // croak "unknown encoding `$cs'";
- $body_str = do {
- local $SIG{__WARN__} = \&croak;
- $enc->encode($body_str, Encode::FB_WARN);
+ my $tmp;
+ {
+ my @w;
+ local $SIG{__WARN__} = sub { push @w, @_ };
+ $tmp = $enc->encode($str, Encode::FB_WARN);
+ croak(@w) if @w;
};
- body_set($self, \$body_str);
+ body_set($self, \$tmp);
}
sub content_type { scalar header($_[0], 'Content-Type') }
$pfx .= ': ';
my $len = 78 - length($pfx);
@vals = map {;
+ utf8::encode(my $v = $_); # to bytes, support SMTPUTF8
# folding differs from Email::Simple::Header,
# we favor tabs for visibility (and space savings :P)
if (length($_) >= $len && (/\n[^ \t]/s || !/\n/s)) {
local $Text::Wrap::columns = $len;
local $Text::Wrap::huge = 'overflow';
- $pfx . wrap('', "\t", $_) . $self->{crlf};
+ $pfx . wrap('', "\t", $v) . $self->{crlf};
} else {
- $pfx . $_ . $self->{crlf};
+ $pfx . $v . $self->{crlf};
}
} @vals;
$$hdr =~ s!$re!shift(@vals) // ''!ge; # replace current headers, first
my $enc = find_encoding($cs) or croak "unknown encoding `$cs'";
my $tmp = body($self);
# workaround https://rt.cpan.org/Public/Bug/Display.html?id=139622
- local $SIG{__WARN__} = \&croak;
- $enc->decode($tmp, Encode::FB_WARN);
+ my @w;
+ local $SIG{__WARN__} = sub { push @w, @_ };
+ my $ret = $enc->decode($tmp, Encode::FB_WARN);
+ croak(@w) if @w;
+ $ret;
}
sub as_string {