git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v6 01/11] grep: allow -F -i combination

From
Duy Nguyen <pclouds@gmail.com>
Date
Jun 18, 2016, 00:07 UTC
Message-ID
<CACsJy8CKWpLwn=ffEce8TxKuQGk+-2-374DyRmLnE1uP_5NQiw@mail.gmail.com>
In-Reply-To
<xmqqk2hnzdkc.fsf@gitster.mtv.corp.google.com>
On Sat, Jun 18, 2016 at 4:54 AM, Junio C Hamano <gitster@pobox.com> wrote:
Show 49 quoted lines
> Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
>
>> -F means "no regex", not "case sensitive" so it should not override -i
>
> That logic is flawed, isn't it?
>
> "-F" means "no regex", so it should not touch opt.regflags at all.
>
>> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
>> ---
>>  builtin/grep.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/builtin/grep.c b/builtin/grep.c
>> index 5526fd7..4be0df5 100644
>> --- a/builtin/grep.c
>> +++ b/builtin/grep.c
>> @@ -809,7 +809,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
>>
>>       if (!opt.pattern_list)
>>               die(_("no pattern given."));
>> -     if (!opt.fixed && opt.ignore_case)
>> +     if (opt.ignore_case)
>>               opt.regflags |= REG_ICASE;
>>
>>       compile_grep_patterns(&opt);
>
> In grep.c, we do this:
>
> static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
> {
>         int err;
>
>         p->word_regexp = opt->word_regexp;
>         p->ignore_case = opt->ignore_case;
>
>         if (opt->fixed || is_fixed(p->pattern, p->patternlen))
>                 p->fixed = 1;
>         else
>                 p->fixed = 0;
>
>         if (p->fixed) {
>                 if (opt->regflags & REG_ICASE || p->ignore_case)
>                         p->kws = kwsalloc(tolower_trans_tbl);
>                 else
>
> It is possible that your later changes _depend_ on having REG_ICASE
> set in opt->regflags, but if that is why this commit is needed, then
> you are going in a wrong direction.

Yeah.. some commits down the line, we need to avoid kws (because it can't deal with non-ascii) and fall back to regex after all special chars are quoted. Will fix.

-- 
Duy
Previous: Junio C HamanoNext: Nguyễn Thái Ngọc Duy
Message 22 of 56 in “Fix icase grep on non-ascii”
  1. 00/10 Fix icase grep on non-asciiNguyễn Thái Ngọc Duy, Jan 28, 2016
  2. 01/10 grep: allow -F -i combinationNguyễn Thái Ngọc Duy, Jan 28, 2016
  3. 02/10 grep: break down an "if" stmt in preparation for next changesNguyễn Thái Ngọc Duy, Jan 28, 2016
  4. 03/10 test-regex: expose full regcomp() to the command lineNguyễn Thái Ngọc Duy, Jan 28, 2016
  5. Eric SunshineJan 29, 2016
  6. Ramsay JonesJan 29, 2016
  7. 04/10 grep/icase: avoid kwsset on literal non-ascii stringsNguyễn Thái Ngọc Duy, Jan 28, 2016
  8. Eric SunshineJan 29, 2016
  9. Eric SunshineJan 29, 2016
  10. 05/10 grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy, Jan 28, 2016
  11. Eric SunshineJan 29, 2016
  12. 06/10 grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy, Jan 28, 2016
  13. 07/10 gettext: add is_utf8_locale()Nguyễn Thái Ngọc Duy, Jan 28, 2016
  14. 08/10 grep/pcre: support utf-8Nguyễn Thái Ngọc Duy, Jan 28, 2016
  15. 09/10 diffcore-pickaxe: "share" regex error handling codeNguyễn Thái Ngọc Duy, Jan 28, 2016
  16. 10/10 diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy, Jan 28, 2016
  17. Eric SunshineJan 29, 2016
  18. Junio C HamanoJan 28, 2016
  19. 00/11 Fix icase grep on non-asciiNguyễn Thái Ngọc Duy, Feb 6, 2016
  20. 01/11 grep: allow -F -i combinationNguyễn Thái Ngọc Duy, Feb 6, 2016
  21. Junio C HamanoJun 17, 2016
  22. Duy NguyenJun 18, 2016
  23. 02/11 grep: break down an "if" stmt in preparation for next changesNguyễn Thái Ngọc Duy, Feb 6, 2016
  24. Junio C HamanoFeb 9, 2016
  25. 03/11 test-regex: isolate the bug test codeNguyễn Thái Ngọc Duy, Feb 6, 2016
  26. 04/11 test-regex: expose full regcomp() to the command lineNguyễn Thái Ngọc Duy, Feb 6, 2016
  27. Eric SunshineFeb 7, 2016
  28. Junio C HamanoFeb 9, 2016
  29. 05/11 grep/icase: avoid kwsset on literal non-ascii stringsNguyễn Thái Ngọc Duy, Feb 6, 2016
  30. 06/11 grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy, Feb 6, 2016
  31. 07/11 grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy, Feb 6, 2016
  32. 08/11 gettext: add is_utf8_locale()Nguyễn Thái Ngọc Duy, Feb 6, 2016
  33. 09/11 grep/pcre: support utf-8Nguyễn Thái Ngọc Duy, Feb 6, 2016
  34. 10/11 diffcore-pickaxe: "share" regex error handling codeNguyễn Thái Ngọc Duy, Feb 6, 2016
  35. 11/11 diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy, Feb 6, 2016
  36. Eric SunshineFeb 7, 2016
  37. 00/12 nd/icase updatesNguyễn Thái Ngọc Duy, Feb 14, 2016
  38. 01/12 grep: allow -F -i combinationNguyễn Thái Ngọc Duy, Feb 14, 2016
  39. 02/12 grep: break down an "if" stmt in preparation for next changesNguyễn Thái Ngọc Duy, Feb 14, 2016
  40. 03/12 test-regex: isolate the bug test codeNguyễn Thái Ngọc Duy, Feb 14, 2016
  41. 04/12 test-regex: expose full regcomp() to the command lineNguyễn Thái Ngọc Duy, Feb 14, 2016
  42. 05/12 grep/icase: avoid kwsset on literal non-ascii stringsNguyễn Thái Ngọc Duy, Feb 14, 2016
  43. 06/12 grep/icase: avoid kwsset when -F is specifiedNguyễn Thái Ngọc Duy, Feb 14, 2016
  44. 07/12 grep/pcre: prepare locale-dependent tables for icase matchingNguyễn Thái Ngọc Duy, Feb 14, 2016
  45. 08/12 gettext: add is_utf8_locale()Nguyễn Thái Ngọc Duy, Feb 14, 2016
  46. 09/12 grep/pcre: support utf-8Nguyễn Thái Ngọc Duy, Feb 14, 2016
  47. 10/12 diffcore-pickaxe: "share" regex error handling codeNguyễn Thái Ngọc Duy, Feb 14, 2016
  48. 11/12 diffcore-pickaxe: support case insensitive match on non-asciiNguyễn Thái Ngọc Duy, Feb 14, 2016
  49. 12/12 grep.c: reuse "icase" variableNguyễn Thái Ngọc Duy, Feb 14, 2016
  50. Junio C HamanoJun 17, 2016
  51. Duy NguyenJun 18, 2016
  52. Duy NguyenJun 22, 2016
  53. Junio C HamanoJun 22, 2016
  54. Duy NguyenJun 22, 2016
  55. Junio C HamanoJun 22, 2016
  56. Junio C HamanoJun 22, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.