From: Junio C Hamano <gitster@pobox.com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 04/11] grep/icase: avoid kwsset on literal non-ascii strings
Date: Thu, 23 Jun 2016 13:12:10 -0700 [thread overview]
Message-ID: <xmqq37o3is11.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20160623162907.23295-5-pclouds@gmail.com> ("Nguyễn Thái Ngọc Duy"'s message of "Thu, 23 Jun 2016 18:29:00 +0200")
Nguyễn Thái Ngọc Duy <pclouds@gmail.com> writes:
> static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
> {
> + int icase, ascii_only;
> int err;
>
> p->word_regexp = opt->word_regexp;
> p->ignore_case = opt->ignore_case;
> + icase = opt->regflags & REG_ICASE || p->ignore_case;
> + ascii_only = !has_non_ascii(p->pattern);
>
> if (opt->fixed) {
> p->fixed = 1;
> - } else if (is_fixed(p->pattern, p->patternlen))
> + } else if ((!icase || ascii_only) &&
> + is_fixed(p->pattern, p->patternlen))
> p->fixed = 1;
... we are not told to do "fixed" explicitly with "-F", and that is
safe for a literal pattern if the pattern is only ascii (with or
without -i) but not safe with "-i" when dealing with non-ascii
pattern.
Makes perfect sense.
> else
> p->fixed = 0;
> diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
> new file mode 100755
> index 0000000..b78a774
> --- /dev/null
> +++ b/t/t7812-grep-icase-non-ascii.sh
> @@ -0,0 +1,23 @@
> +#!/bin/sh
> +
> +test_description='grep icase on non-English locales'
> +
> +. ./lib-gettext.sh
> +
> +test_expect_success GETTEXT_LOCALE 'setup' '
> + test_write_lines "TILRAUN: Halló Heimur!" >file &&
> + git add file &&
> + LC_ALL="$is_IS_locale" &&
> + export LC_ALL
> +'
> +
> +test_have_prereq GETTEXT_LOCALE &&
> +test-regex "HALLÓ" "Halló" ICASE &&
> +test_set_prereq REGEX_LOCALE
> +
> +test_expect_success REGEX_LOCALE 'grep literal string, no -F' '
> + git grep -i "TILRAUN: Halló Heimur!" &&
> + git grep -i "TILRAUN: HALLÓ HEIMUR!"
> +'
> +
> +test_done
next prev parent reply other threads:[~2016-06-23 20:12 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-23 16:28 [PATCH 00/11] nd/icase updates Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 01/11] grep: break down an "if" stmt in preparation for next changes Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 02/11] test-regex: isolate the bug test code Nguyễn Thái Ngọc Duy
2016-06-23 16:28 ` [PATCH 03/11] test-regex: expose full regcomp() to the command line Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 04/11] grep/icase: avoid kwsset on literal non-ascii strings Nguyễn Thái Ngọc Duy
2016-06-23 20:12 ` Junio C Hamano [this message]
2016-06-23 16:29 ` [PATCH 05/11] grep/icase: avoid kwsset when -F is specified Nguyễn Thái Ngọc Duy
2016-06-23 20:25 ` Junio C Hamano
2016-06-23 16:29 ` [PATCH 06/11] grep/pcre: prepare locale-dependent tables for icase matching Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 07/11] gettext: add is_utf8_locale() Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 08/11] grep/pcre: support utf-8 Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 09/11] diffcore-pickaxe: "share" regex error handling code Nguyễn Thái Ngọc Duy
2016-06-23 19:16 ` Jeff King
2016-06-23 16:29 ` [PATCH 10/11] diffcore-pickaxe: support case insensitive match on non-ascii Nguyễn Thái Ngọc Duy
2016-06-23 16:29 ` [PATCH 11/11] grep.c: reuse "icase" variable Nguyễn Thái Ngọc Duy
2016-06-23 20:32 ` [PATCH 00/11] nd/icase updates Junio C Hamano
2016-06-25 5:22 ` [PATCH v2 00/12] " Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 01/12] grep: break down an "if" stmt in preparation for next changes Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 02/12] test-regex: isolate the bug test code Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 03/12] test-regex: expose full regcomp() to the command line Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 04/12] grep/icase: avoid kwsset on literal non-ascii strings Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 05/12] grep/icase: avoid kwsset when -F is specified Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 06/12] grep: rewrite an if/else condition to avoid duplicate expression Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 07/12] grep/pcre: prepare locale-dependent tables for icase matching Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 08/12] gettext: add is_utf8_locale() Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 09/12] grep/pcre: support utf-8 Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 10/12] diffcore-pickaxe: Add regcomp_or_die() Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 11/12] diffcore-pickaxe: support case insensitive match on non-ascii Nguyễn Thái Ngọc Duy
2016-06-25 5:22 ` [PATCH v2 12/12] grep.c: reuse "icase" variable Nguyễn Thái Ngọc Duy
2016-06-27 14:53 ` [PATCH v2 00/12] nd/icase updates Junio C Hamano
2016-06-27 15:00 ` Junio C Hamano
2016-06-30 15:45 ` Duy Nguyen
2016-07-01 18:18 ` Junio C Hamano
2016-07-01 18:46 ` Duy Nguyen
2016-07-01 18:54 ` Junio C Hamano
2016-07-01 19:11 ` Junio C Hamano
2016-07-01 19:40 ` Junio C Hamano
2016-07-01 20:06 ` Junio C Hamano
2016-07-01 20:07 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq37o3is11.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).