* [PATCH 3/3] mbox_reader: do not chomp non-blank EOL
2021-02-12 7:05 6% [PATCH 0/3] MboxReader usage and changes Eric Wong
@ 2021-02-12 7:05 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-02-12 7:05 UTC (permalink / raw)
To: meta
It's conceivable some cases won't generate an empty line before
an mboxrd or mboxo From_ line. Ensure we can handle that case
and don't leave the Eml->{bdy} without a trailing LF character.
And drop an unnecessary alarm import while we're in the area.
---
lib/PublicInbox/MboxReader.pm | 2 +-
t/mbox_reader.t | 22 +++++++++++++++++++++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/MboxReader.pm b/lib/PublicInbox/MboxReader.pm
index 59ce4fb6..df7c78fa 100644
--- a/lib/PublicInbox/MboxReader.pm
+++ b/lib/PublicInbox/MboxReader.pm
@@ -26,7 +26,7 @@ sub _mbox_from {
}
@raw = grep /[^ \t\r\n]/s, @raw; # skip empty messages
while (defined(my $raw = shift @raw)) {
- $raw =~ s/\r?\n\z//s;
+ $raw =~ s/^\r?\n\z//ms;
$raw =~ s/$from_re/$1/gms;
my $eml = PublicInbox::Eml->new(\$raw);
$eml_cb->($eml, @arg);
diff --git a/t/mbox_reader.t b/t/mbox_reader.t
index 30a5e6e3..18d0fd68 100644
--- a/t/mbox_reader.t
+++ b/t/mbox_reader.t
@@ -74,9 +74,29 @@ for my $fmt (@mbox) { $check_fmt->($fmt) }
s/\n/\r\n/sg for (values %raw);
for my $fmt (@mbox) { $check_fmt->($fmt) }
+{
+ my $no_blank_eom = <<'EOM';
+From x@y Fri Oct 2 00:00:00 1993
+a: b
+
+body1
+From x@y Fri Oct 2 00:00:00 1993
+c: d
+
+body2
+EOM
+ # chop($no_blank_eom) eq "\n" or BAIL_OUT 'broken LF';
+ for my $variant (qw(mboxrd mboxo)) {
+ my @x;
+ open my $fh, '<', \$no_blank_eom or BAIL_OUT 'PerlIO::scalar';
+ $reader->$variant($fh, sub { push @x, shift });
+ is_deeply($x[0]->{bdy}, \"body1\n", 'LF preserved in 1st');
+ is_deeply($x[1]->{bdy}, \"body2\n", 'no LF added in 2nd');
+ }
+}
+
SKIP: {
use PublicInbox::Spawn qw(popen_rd);
- use Time::HiRes qw(alarm);
my $fh = popen_rd([ $^X, '-E', <<'' ]);
say "From x@y Fri Oct 2 00:00:00 1993";
print "a: b\n\n", "x" x 70000, "\n\n";
^ permalink raw reply related [relevance 7%]
* [PATCH 0/3] MboxReader usage and changes
@ 2021-02-12 7:05 6% Eric Wong
2021-02-12 7:05 7% ` [PATCH 3/3] mbox_reader: do not chomp non-blank EOL Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-02-12 7:05 UTC (permalink / raw)
To: meta
*** BLURB HERE ***
Eric Wong (3):
filter/vger: kill trailing newlines aggressively
import_mbox: use MboxReader
mbox_reader: do not chomp non-blank EOL
lib/PublicInbox/Filter/Vger.pm | 2 +-
lib/PublicInbox/InboxWritable.pm | 44 +++++++-------------------------
lib/PublicInbox/MboxReader.pm | 2 +-
t/mbox_reader.t | 22 +++++++++++++++-
4 files changed, 32 insertions(+), 38 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-02-12 7:05 6% [PATCH 0/3] MboxReader usage and changes Eric Wong
2021-02-12 7:05 7% ` [PATCH 3/3] mbox_reader: do not chomp non-blank EOL Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).