Don't complain about MIME headers.
When patches contain extended character sets, patches will contain
MIME headers after the subject line, which should not be confused
for a too-long summary line.
Signed-off-by: Gregory Bean <gbean@codeaurora.org>
(cherry picked from commit 8e6b9d3790595198a34320f1c3f4504cd258fed1)
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 653c772..b6d2977 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -2359,14 +2359,21 @@
" characters\n" . $herecurr);
}
} elsif ($shorttext == CHECK_NEXT_SHORTTEXT) {
- $shorttext = IN_SHORTTEXT;
+# The Subject line doesn't have to be the last header in the patch.
+# Avoid moving to the IN_SHORTTEXT state until clear of all headers.
+# Per RFC5322, continuation lines must be folded, so any left-justified
+# text which looks like a header is definitely a header.
+ if ($line!~/^[\x21-\x39\x3b-\x7e]+:/) {
+ $shorttext = IN_SHORTTEXT;
# Check for Subject line followed by a blank line.
- if (length($line) != 0) {
- WARN("NONBLANK_AFTER_SUMMARY",
- "non-blank line after summary " .
- "line\n" . $sublinenr . $here .
- "\n" . $subjectline . "\n" .
- $line . "\n");
+ if (length($line) != 0) {
+ WARN("NONBLANK_AFTER_SUMMARY",
+ "non-blank line after " .
+ "summary line\n" .
+ $sublinenr . $here .
+ "\n" . $subjectline .
+ "\n" . $line . "\n");
+ }
}
} elsif ($line=~/^Subject: \[[^\]]*\] (.*)/) {
$shorttext = CHECK_NEXT_SHORTTEXT;