Multiple locations within this patch series alter a case sensitive
string comparison call such as strcmp() to be a call to a string
comparison call that selects case comparison based on the global
ignore_case variable. Behaviorally, when core.ignorecase=false, the
*_icase() versions are functionally equivalent to their C runtime
counterparts. When core.ignorecase=true, the *_icase() versions perform
a case insensitive comparison.
Like Linus' earlier ignorecase patch, these may ignore filename
conventions on certain file systems. By isolating filename comparisons
to certain functions, support for those filename conventions may be more
easily met.
Signed-off-by: Joshua Jensen <jjensen@xxxxxxxxxxxxxxxxx>
---
dir.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
dir.h | 4 ++++
2 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/dir.c b/dir.c
index d1e5e5e..ffa410d 100644
--- a/dir.c
+++ b/dir.c
@@ -18,6 +18,68 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, in
int check_only, const struct path_simplify *simplify);
static int get_dtype(struct dirent *de, const char *path, int len);
+/* helper string functions with support for the ignore_case flag */
+int strcmp_icase(const char *a, const char *b)
+{
+ return ignore_case ? strcasecmp(a, b) : strcmp(a, b);
+}
+
+int strncmp_icase(const char *a, const char *b, size_t count)
+{
+ return ignore_case ? strncasecmp(a, b, count) : strncmp(a, b, count);
+}
+
+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);
+}
+
static int common_prefix(const char **pathspec)
{
const char *path, *slash, *next;
diff --git a/dir.h b/dir.h
index 278d84c..b3e2104 100644
--- a/dir.h
+++ b/dir.h
@@ -101,4 +101,8 @@ extern int remove_dir_recursively(struct strbuf *path, int flag);
/* tries to remove the path with empty directories along it, ignores ENOENT */
extern int remove_path(const char *path);
+extern int strcmp_icase(const char *a, const char *b);
+extern int strncmp_icase(const char *a, const char *b, size_t count);
+extern int fnmatch_icase(const char *pattern, const char *string, int flags);
+
#endif
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html