diff options
Diffstat (limited to 'scripts/checkpatch.pl')
| -rwxr-xr-x | scripts/checkpatch.pl | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 9b2a68d3a84..f2c4b20068d 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1603,13 +1603,20 @@ sub process { " 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("non-blank line after summary " . - "line\n" . $sublinenr . $here . - "\n" . $subjectline . "\n" . - $line . "\n"); + if (length($line) != 0) { + WARN("non-blank line after " . + "summary line\n" . + $sublinenr . $here . + "\n" . $subjectline . + "\n" . $line . "\n"); + } } } elsif ($line=~/^Subject: \[[^\]]*\] (.*)/) { $shorttext = CHECK_NEXT_SHORTTEXT; |