diff options
| author | Eric Wong <e@80x24.org> | 2023-10-11 07:20:53 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2023-10-11 22:10:48 +0000 |
| commit | 770d8b3f465db89d80922c32d766b022cf4b31ed (patch) | |
| tree | 3bd60df35645436d0aaac95227fa372b1e6f73a9 /lib/PublicInbox/IMAP.pm | |
| parent | 3b7cdd9173bd0d74fc181b05c02d90b320d621ae (diff) | |
| download | public-inbox-770d8b3f465db89d80922c32d766b022cf4b31ed.tar.gz | |
Aside from our prior import bugs (fixed in a0c07cba0e5d8b6a (mda: drop leading "From " lines again, 2016-06-26)), we'll always have to be dealing with mutt piping messages to us and `git format-patch' output. So just share the regexp so we can use it everywhere. In may be desirable to allow importing messages with a leading "From " line for FUSE, even. Additionally, some instances of this regexp needlessly added optional `\r?' (CR) checks ahead of the `\n' (LF) element; but they're pointless anyways since [^\n]* is enough to exclude all non-LF bytes.
Diffstat (limited to 'lib/PublicInbox/IMAP.pm')
| -rw-r--r-- | lib/PublicInbox/IMAP.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/PublicInbox/IMAP.pm b/lib/PublicInbox/IMAP.pm index 3c64cefa..e4a9e304 100644 --- a/lib/PublicInbox/IMAP.pm +++ b/lib/PublicInbox/IMAP.pm @@ -664,7 +664,7 @@ sub op_eml_new { $_[4] = PublicInbox::Eml->new($_[3]) } # s/From / fixes old bug from import (pre-a0c07cba0e5d8b6a) sub to_crlf_full { ${$_[0]} =~ s/(?<!\r)\n/\r\n/sg; - ${$_[0]} =~ s/\A[\r\n]*From [^\r\n]*\r\n//s; + PublicInbox::Eml::strip_from(${$_[0]}); } sub op_crlf_bref { to_crlf_full($_[3]) } |