[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/5] checkpatch: check utf-8 content from a comm
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH 2/5] checkpatch: check utf-8 content from a commit log when it's missing from charset |
Date: |
Thu, 19 Apr 2018 12:12:06 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
On 19.04.2018 11:11, Stefan Hajnoczi wrote:
> From: Pasi Savanainen <address@hidden>
>
> 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 <address@hidden>
> Cc: Joe Perches <address@hidden>
> Cc: Andy Whitcroft <address@hidden>
> Signed-off-by: Andrew Morton <address@hidden>
> Signed-off-by: Linus Torvalds <address@hidden>
> (cherry picked from commit fa64205df9dfd7b7662cc64a7e82115c00e428e5)
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
> scripts/checkpatch.pl | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 2d28db03a0..b2b088bab7 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -1185,6 +1185,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;
> @@ -1413,10 +1415,17 @@ 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="(.+)".*$/ &&
In my version of the patch, I removed the quotes:
https://patchwork.kernel.org/patch/9539231/
... but I guess I should likely follow up on that change with the kernel
folks first ...
> + $1 !~ /utf-8/i) {
> + $non_utf8_charset = 1;
> + }
> +
> + if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
> $rawline =~ /$NON_ASCII_UTF8/) {
> - CHK("UTF8_BEFORE_PATCH",
> + WARN("UTF8_BEFORE_PATCH",
> "8-bit UTF-8 used in possible commit log\n" .
> $herecurr);
Ah, here's the WARN instead of CHK ... in case you respin, you should do
that in the first patch already, I think.
In either case:
Reviewed-by: Thomas Huth <address@hidden>
- [Qemu-devel] [PATCH 0/5] checkpatch: backport UTF-8 fixes and MAINTAINERS check, Stefan Hajnoczi, 2018/04/19
- [Qemu-devel] [PATCH 2/5] checkpatch: check utf-8 content from a commit log when it's missing from charset, Stefan Hajnoczi, 2018/04/19
- Re: [Qemu-devel] [PATCH 2/5] checkpatch: check utf-8 content from a commit log when it's missing from charset,
Thomas Huth <=
- [Qemu-devel] [PATCH 1/5] checkpatch: add a --strict check for utf-8 in commit logs, Stefan Hajnoczi, 2018/04/19
- [Qemu-devel] [PATCH 5/5] checkpatch: reduce MAINTAINERS update message frequency, Stefan Hajnoczi, 2018/04/19
- [Qemu-devel] [PATCH 4/5] checkpatch: emit a warning on file add/move/delete, Stefan Hajnoczi, 2018/04/19
- [Qemu-devel] [PATCH 3/5] checkpatch: ignore email headers better, Stefan Hajnoczi, 2018/04/19
- Re: [Qemu-devel] [PATCH 0/5] checkpatch: backport UTF-8 fixes and MAINTAINERS check, no-reply, 2018/04/19