| Message ID | 1485436265-12573-3-git-send-email-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 26, 2017 at 02:11:02PM +0100, Thomas Huth wrote: > This is a port of the following commit from the Linux kernel: > > commit fa64205df9dfd7b7662cc64a7e82115c00e428e5 > Author: Pasi Savanainen <pasi.savanainen@nixu.com> > Date: Thu Oct 4 17:13:29 2012 -0700 > > checkpatch: check utf-8 content from a commit log when it's missing from charset > > Check that a commit log doesn't contain UTF-8 when a mail header > explicitly defines a different charset, like > > 'Content-Type: text/plain; charset="us-ascii"' > > Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com> > Cc: Joe Perches <joe@perches.com> > Cc: Andy Whitcroft <apw@canonical.com> > Signed-off-by: Andrew Morton <akpm@linux-foundation.org> > Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> > > Note: I slightly updated the regex for the "Content-Type" line check > since most of the time, the character set does not seem to be given > in quotes. > > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > scripts/checkpatch.pl | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index 5da423a..0f88e3b 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -1097,6 +1097,8 @@ sub process { my $in_header_lines = 1; my $in_commit_log = 0; #Scanning lines before patch + my $non_utf8_charset = 0; + our @report = (); our $cnt_lines = 0; our $cnt_error = 0; @@ -1324,8 +1326,15 @@ sub process { $in_commit_log = 1; } -# Still not yet in a patch, check for any UTF-8 - if ($in_commit_log && $realfile =~ /^$/ && +# Check if there is UTF-8 in a commit log when a mail header has explicitly +# declined it, i.e defined some charset where it is missing. + if ($in_header_lines && + $rawline =~ /^Content-Type:.+charset=(.+)$/ && + $1 !~ /utf-8/i) { + $non_utf8_charset = 1; + } + + if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ && $rawline =~ /$NON_ASCII_UTF8/) { WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
This is a port of the following commit from the Linux kernel: commit fa64205df9dfd7b7662cc64a7e82115c00e428e5 Author: Pasi Savanainen <pasi.savanainen@nixu.com> Date: Thu Oct 4 17:13:29 2012 -0700 checkpatch: check utf-8 content from a commit log when it's missing from charset Check that a commit log doesn't contain UTF-8 when a mail header explicitly defines a different charset, like 'Content-Type: text/plain; charset="us-ascii"' Signed-off-by: Pasi Savanainen <pasi.savanainen@nixu.com> Cc: Joe Perches <joe@perches.com> Cc: Andy Whitcroft <apw@canonical.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Note: I slightly updated the regex for the "Content-Type" line check since most of the time, the character set does not seem to be given in quotes. Signed-off-by: Thomas Huth <thuth@redhat.com> --- scripts/checkpatch.pl | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)