truncation: adjust limit, and fix handling so we can do that in one place

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/stump/bin/submission.pl b/stump/bin/submission.pl
index e1ca10453f51086bfa6110c787f2da878ec66e66..cb12a290cdcad7ce92c1b0838dabb8e3be1a0675 100755 (executable)
--- a/stump/bin/submission.pl
+++ b/stump/bin/submission.pl
@@ -351,9 +351,11 @@ sub readMessage {
        if (!m/^(?:References):/i) {
          push @unfolded, (m/^[^:]+:/ ? $& : '????')
            if s/\n(?=.)//g;
-         if (length $_ > 505) { #wtf
-           $_ = substr($_, 0, 500);
-           $_ =~ s/\n?$/\n/;
+         my $maxlen = 510;
+         if (length $_ > $maxlen+1) { # $maxlen plus one \n
+           chomp;
+           $_ = substr($_, 0, $maxlen);
+           $_ .= "\n";
            $readahead = $_;
            m/^[0-9a-z-]+/i;
            $_ = $warning->("Next header ($&) truncated!");