@matheusbsbs / matheus-bagliano / commits / 18547aacf5

grep/pcre: support utf-8

In the previous change in this function, we add locale support for single-byte encodings only. It looks like pcre only supports utf-* as multibyte encodings, the others are left in the cold (which is fine). We need to enable PCRE_UTF8 so pcre can find character boundary correctly. It's needed for case folding (when --ignore-case is used) or '*', '+' or similar syntax is used. The "has_non_ascii()" check is to be on the conservative side. If there's non-ascii in the pattern, the searched content could still be in utf-8, but we can treat it just like a byte stream and everything should work. If we force utf-8 based on locale only and pcre validates utf-8 and the file content is in non-utf8 encoding, things break. Noticed-by: Plamen Totev <plamen.totev@abv.bg> Helped-by: Plamen Totev <plamen.totev@abv.bg> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Jun 25, 2016 at 07:22 UTC 18547aacf5ced88bf83d85b03b2b7b3fc6aa3f6c

2 files changed +17

grep.c

@@ -329,6 +329,8 @@ static void compile_pcre_regexp(struct grep_pat *p, const struct grep_opt *opt)

329 p->pcre_tables = pcre_maketables();

330 options |= PCRE_CASELESS;

331 }

332 + if (is_utf8_locale() && has_non_ascii(p->pattern))

333 + options |= PCRE_UTF8;

334

335 p->pcre_regexp = pcre_compile(p->pattern, options, &error, &erroffset,

336 p->pcre_tables);

t/t7812-grep-icase-non-ascii.sh

+15

@@ -20,6 +20,21 @@ test_expect_success REGEX_LOCALE 'grep literal string, no -F' '

20 git grep -i "TILRAUN: HALLÓ HEIMUR!"

21 '

23 +test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 icase' '

24 + git grep --perl-regexp "TILRAUN: H.lló Heimur!" &&

25 + git grep --perl-regexp -i "TILRAUN: H.lló Heimur!" &&

26 + git grep --perl-regexp -i "TILRAUN: H.LLÓ HEIMUR!"

27 +'

28 +

29 +test_expect_success GETTEXT_LOCALE,LIBPCRE 'grep pcre utf-8 string with "+"' '

30 + test_write_lines "TILRAUN: Hallóó Heimur!" >file2 &&

31 + git add file2 &&

32 + git grep -l --perl-regexp "TILRAUN: H.lló+ Heimur!" >actual &&

33 + echo file >expected &&

34 + echo file2 >>expected &&

35 + test_cmp expected actual

36 +'

37 +

38 test_expect_success REGEX_LOCALE 'grep literal string, with -F' '

39 git grep --debug -i -F "TILRAUN: Halló Heimur!" 2>&1 >/dev/null |

40 grep fixed >debug1 &&