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

Re: [PATCH v2 1/6] Add string comparison functions that respect the ignore_case variable.

From
Joshua Jensen <jjensen@workspacewhiz.com>
Date
Oct 3, 2010, 09:07 UTC
Message-ID
<4CA847D5.4000903@workspacewhiz.com>
In-Reply-To
<AANLkTikU7D5dWAc-04cVUnjPPrC7rjaqjPe_j3rEvn0u@mail.gmail.com>
  ----- Original Message -----
From: Ævar Arnfjörð Bjarmason
Date: 10/3/2010 2:30 AM
Show 76 quoted lines
> On Sun, Oct 3, 2010 at 04:32, Joshua Jensen<jjensen@workspacewhiz.com>  wrote
>> +int fnmatch_casefold(const char *pattern, const char *string, int flags)
>> +{
>> +       char lowerPatternBuf[MAX_PATH];
>> +       char lowerStringBuf[MAX_PATH];
>> +       char* lowerPattern;
>> +       char* lowerString;
>> +       size_t patternLen;
>> +       size_t stringLen;
>> +       char* out;
>> +       int ret;
>> +
>> +       /*
>> +        * Use the provided stack buffer, if possible.  If the string is too
>> +        * large, allocate buffer space.
>> +        */
>> +       patternLen = strlen(pattern);
>> +       if (patternLen + 1>  sizeof(lowerPatternBuf))
>> +               lowerPattern = xmalloc(patternLen + 1);
>> +       else
>> +               lowerPattern = lowerPatternBuf;
>> +
>> +       stringLen = strlen(string);
>> +       if (stringLen + 1>  sizeof(lowerStringBuf))
>> +               lowerString = xmalloc(stringLen + 1);
>> +       else
>> +               lowerString = lowerStringBuf;
>> +
>> +       /* Make the pattern and string lowercase to pass to fnmatch. */
>> +       for (out = lowerPattern; *pattern; ++out, ++pattern)
>> +               *out = tolower(*pattern);
>> +       *out = 0;
>> +
>> +       for (out = lowerString; *string; ++out, ++string)
>> +               *out = tolower(*string);
>> +       *out = 0;
>> +
>> +       ret = fnmatch(lowerPattern, lowerString, flags);
>> +
>> +       /* Free the pattern or string if it was allocated. */
>> +       if (lowerPattern != lowerPatternBuf)
>> +               free(lowerPattern);
>> +       if (lowerString != lowerStringBuf)
>> +               free(lowerString);
>> +       return ret;
>> +}
>> +
>> +int fnmatch_icase(const char *pattern, const char *string, int flags)
>> +{
>> +       return ignore_case ? fnmatch_casefold(pattern, string, flags) : fnmatch(pattern, string, flags);
>> +}
>
> I liked v1 of this patch better, although it obviously had portability
> issues. But I think it would be better to handle this with:
>
>      #ifndef FNM_CASEFOLD
>      int fnmatch_casefold(const char *pattern, const char *string, int flags)
>      {
>          ...
>      }
>      #endf
>
>      int fnmatch_icase(const char *pattern, const char *string, int flags)
>      {
>      #ifndef FNM_CASEFOLD
>             return ignore_case ? fnmatch_casefold(pattern, string,
> flags) : fnmatch(pattern, string, flags);
>      #else
>              return fnmatch(pattern, string, flags | (ignore_case ?
> FNM_CASEFOLD : 0));
>      #endif
>      }
>
> Or simply use fnmatch(..., FNM_CASEFOLD) everywhere and include
> compat/fnmatch/* on platforms like Solaris that don't have the GNU
> extension.

The real problem with compat/fnmatch is determining which random platforms need that support and updating the makefile accordingly. Further, the compat/fnmatch/* code would need to be rejigged somewhat, so there is no possible conflict (now or in the future) with the provided symbols. We discussed this as a potential problem developers would need to be aware of if the system fnmatch.h (or whatever it is called) gets #included.

Anyway, what you describe above creates two code paths. I would imagine that would be harder to debug; that is, on some platforms, it uses fnmatch_casefold and on others, it hands it off to fnmatch(..., FNM_CASEFOLD).

In any case, I'd like to find a solution to get this series working for everyone. I've been out of commission for a month (deploying Git to 80+ programmers at an organization, by the way), but I'm back now and can work this until it is complete.

Josh
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 4 of 45 in “Extensions of core.ignorecase=true support”
  1. 0/6 Extensions of core.ignorecase=true supportJoshua Jensen, Oct 3, 2010
  2. 1/6 Add string comparison functions that respect the ignore_case variable.Joshua Jensen, Oct 3, 2010
  3. Ævar Arnfjörð BjarmasonOct 3, 2010
  4. Joshua JensenOct 3, 2010
  5. 0/8 ab/icase-directory: jj/icase-directory with Makefile + configure checksÆvar Arnfjörð Bjarmason, Oct 3, 2010
  6. 1/8 Makefile & configure: add a NO_FNMATCH flagÆvar Arnfjörð Bjarmason, Oct 3, 2010
  7. 2/8 Makefile & configure: add a NO_FNMATCH_CASEFOLD flagÆvar Arnfjörð Bjarmason, Oct 3, 2010
  8. Johannes SixtOct 3, 2010
  9. 2/8 Makefile & configure: add a NO_FNMATCH_CASEFOLD flagÆvar Arnfjörð Bjarmason, Oct 4, 2010
  10. 3/8 Add string comparison functions that respect the ignore_case variable.Ævar Arnfjörð Bjarmason, Oct 3, 2010
  11. 4/8 Case insensitivity support for .gitignore via core.ignorecaseÆvar Arnfjörð Bjarmason, Oct 3, 2010
  12. 5/8 Add case insensitivity support for directories when using git statusÆvar Arnfjörð Bjarmason, Oct 3, 2010
  13. 6/8 Add case insensitivity support when using git ls-filesÆvar Arnfjörð Bjarmason, Oct 3, 2010
  14. Thomas AdamOct 3, 2010
  15. Johannes SixtOct 3, 2010
  16. Thomas AdamOct 3, 2010
  17. Jonathan NiederOct 4, 2010
  18. Ævar Arnfjörð BjarmasonOct 4, 2010
  19. Erik Faye-LundOct 4, 2010
  20. Joshua JensenOct 4, 2010
  21. Jonathan NiederOct 4, 2010
  22. Robin RosenbergOct 4, 2010
  23. Ævar Arnfjörð BjarmasonOct 4, 2010
  24. Erik Faye-LundOct 4, 2010
  25. Joshua JensenOct 4, 2010
  26. Jonathan NiederOct 4, 2010
  27. Ævar Arnfjörð BjarmasonOct 4, 2010
  28. Johannes SixtOct 4, 2010
  29. Ævar Arnfjörð BjarmasonOct 4, 2010
  30. 7/8 Support case folding for git add when core.ignorecase=trueÆvar Arnfjörð Bjarmason, Oct 3, 2010
  31. 8/8 Support case folding in git fast-import when core.ignorecase=trueÆvar Arnfjörð Bjarmason, Oct 3, 2010
  32. Junio C HamanoOct 7, 2010
  33. Joshua JensenOct 7, 2010
  34. 2/6 Case insensitivity support for .gitignore via core.ignorecaseJoshua Jensen, Oct 3, 2010
  35. 3/6 Add case insensitivity support for directories when using git statusJoshua Jensen, Oct 3, 2010
  36. 4/6 Add case insensitivity support when using git ls-filesJoshua Jensen, Oct 3, 2010
  37. 5/6 Support case folding for git add when core.ignorecase=trueJoshua Jensen, Oct 3, 2010
  38. 6/6 Support case folding in git fast-import when core.ignorecase=trueJoshua Jensen, Oct 3, 2010
  39. Sverre RabbelierOct 3, 2010
  40. Johannes SixtOct 3, 2010
  41. Junio C HamanoOct 3, 2010
  42. Robert BuckOct 3, 2010
  43. Johannes SixtOct 3, 2010
  44. Robert BuckOct 6, 2010
  45. Joshua JensenOct 6, 2010

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.