exclude: do strcmp as much as possible before fnmatch

this also avoids calling fnmatch() if the non-wildcard prefix is
longer than basename

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/dir.c b/dir.c
index bbf958ccfd817c033d1b42ef02394435f9bea858..94fe9f875c7bb998f62c3fefba94f5820311f252 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -341,8 +341,7 @@ void add_exclude(const char *string, const char *base,
        x->flags = flags;
        if (!strchr(string, '/'))
                x->flags |= EXC_FLAG_NODIR;
        x->flags = flags;
        if (!strchr(string, '/'))
                x->flags |= EXC_FLAG_NODIR;

-       if (no_wildcard(string))
-               x->flags |= EXC_FLAG_NOWILDCARD;
+       x->nowildcardlen = simple_length(string);

        if (*string == '*' && no_wildcard(string+1))
                x->flags |= EXC_FLAG_ENDSWITH;
        ALLOC_GROW(which->excludes, which->nr + 1, which->alloc);
        if (*string == '*' && no_wildcard(string+1))
                x->flags |= EXC_FLAG_ENDSWITH;
        ALLOC_GROW(which->excludes, which->nr + 1, which->alloc);


@@ -518,8 +517,9 @@ int excluded_from_list(const char *pathname,
 
        for (i = el->nr - 1; 0 <= i; i--) {
                struct exclude *x = el->excludes[i];
 
        for (i = el->nr - 1; 0 <= i; i--) {
                struct exclude *x = el->excludes[i];

-               const char *exclude = x->pattern;
+               const char *name, *exclude = x->pattern;

                int to_exclude = x->to_exclude;
                int to_exclude = x->to_exclude;

+               int namelen, prefix = x->nowildcardlen;

 
                if (x->flags & EXC_FLAG_MUSTBEDIR) {
                        if (*dtype == DT_UNKNOWN)
 
                if (x->flags & EXC_FLAG_MUSTBEDIR) {
                        if (*dtype == DT_UNKNOWN)


@@ -530,7 +530,7 @@ int excluded_from_list(const char *pathname,
 
                if (x->flags & EXC_FLAG_NODIR) {
                        /* match basename */
 
                if (x->flags & EXC_FLAG_NODIR) {
                        /* match basename */

-                       if (x->flags & EXC_FLAG_NOWILDCARD) {
+                       if (prefix == x->patternlen) {

                                if (!strcmp_icase(exclude, basename))
                                        return to_exclude;
                        } else if (x->flags & EXC_FLAG_ENDSWITH) {
                                if (!strcmp_icase(exclude, basename))
                                        return to_exclude;
                        } else if (x->flags & EXC_FLAG_ENDSWITH) {


@@ -544,26 +544,37 @@ int excluded_from_list(const char *pathname,
                        continue;
                }
 
                        continue;
                }
 

-

                /* match with FNM_PATHNAME:
                 * exclude has base (baselen long) implicitly in front of it.
                 */
                /* match with FNM_PATHNAME:
                 * exclude has base (baselen long) implicitly in front of it.
                 */

-               if (*exclude == '/')
+               if (*exclude == '/') {

                        exclude++;
                        exclude++;

+                       prefix--;
+               }

 
                if (pathlen < x->baselen ||
                    (x->baselen && pathname[x->baselen-1] != '/') ||
                    strncmp_icase(pathname, x->base, x->baselen))
                        continue;
 
 
                if (pathlen < x->baselen ||
                    (x->baselen && pathname[x->baselen-1] != '/') ||
                    strncmp_icase(pathname, x->base, x->baselen))
                        continue;
 

-               if (x->flags & EXC_FLAG_NOWILDCARD) {
-                       if (!strcmp_icase(exclude, pathname + x->baselen))
-                               return to_exclude;
-               } else {
-                       if (fnmatch_icase(exclude, pathname+x->baselen,
-                                         FNM_PATHNAME) == 0)
-                               return to_exclude;
+               namelen = x->baselen ? pathlen - x->baselen : pathlen;
+               name = pathname + pathlen  - namelen;
+
+               /* if the non-wildcard part is longer than the
+                  remaining pathname, surely it cannot match */
+               if (prefix > namelen)
+                       continue;
+
+               if (prefix) {
+                       if (strncmp_icase(exclude, name, prefix))
+                               continue;
+                       exclude += prefix;
+                       name    += prefix;
+                       namelen -= prefix;

                }
                }

+
+               if (!namelen || !fnmatch_icase(exclude, name, FNM_PATHNAME))
+                       return to_exclude;

        }
        return -1; /* undecided */
 }
        }
        return -1; /* undecided */
 }

diff --git a/dir.h b/dir.h
index 58b6fc7c86df1bd5ac6f072672027a1474732ac6..39fc145b6617b0460a0db28f40412573c73bc4aa 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -7,7 +7,6 @@ struct dir_entry {
 };
 
 #define EXC_FLAG_NODIR 1
 };
 
 #define EXC_FLAG_NODIR 1

-#define EXC_FLAG_NOWILDCARD 2

 #define EXC_FLAG_ENDSWITH 4
 #define EXC_FLAG_MUSTBEDIR 8
 
 #define EXC_FLAG_ENDSWITH 4
 #define EXC_FLAG_MUSTBEDIR 8
 


@@ -17,6 +16,7 @@ struct exclude_list {
        struct exclude {
                const char *pattern;
                int patternlen;
        struct exclude {
                const char *pattern;
                int patternlen;

+               int nowildcardlen;

                const char *base;
                int baselen;
                int to_exclude;
                const char *base;
                int baselen;
                int to_exclude;