Nguyễn Thái Ngọc Duy <pclo...@gmail.com> writes:
> match_basename's declaration in dir.h does not have any description to
> discourage the use of this function elsewhere as this function is
> highly tied to how excluded_from_list and path_matches work.
If you do want to discourage, please explicitly describe it as such.
I actually think it should have an API description. The meaning of
its parameters and how you would formulate them is fairly clear and
this is a good example of a simple-and-stupid function that is
designed to do one thing and do it well.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
> ---
> attr.c | 15 ++++-----------
> dir.c | 37 ++++++++++++++++++++++++-------------
> dir.h | 2 ++
> 3 files changed, 30 insertions(+), 24 deletions(-)
>
> diff --git a/attr.c b/attr.c
> index 0964033..a28ce0d 100644
> --- a/attr.c
> +++ b/attr.c
> @@ -663,17 +663,10 @@ static int path_matches(const char *pathname, int
> pathlen,
> int namelen;
>
> if (pat->flags & EXC_FLAG_NODIR) {
> - if (prefix == pat->patternlen &&
> - !strcmp_icase(pattern, basename))
> - return 1;
> -
> - if (pat->flags & EXC_FLAG_ENDSWITH &&
> - pat->patternlen - 1 <= pathlen &&
> - !strcmp_icase(pattern + 1, pathname +
> - pathlen - pat->patternlen + 1))
> - return 1;
> -
> - return (fnmatch_icase(pattern, basename, 0) == 0);
> + return match_basename(basename,
> + pathlen - (basename - pathname),
> + pattern, prefix,
> + pat->patternlen, pat->flags);
> }
> /*
> * match with FNM_PATHNAME; the pattern has base implicitly
> diff --git a/dir.c b/dir.c
> index 0f4aea6..42c42cd 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -530,6 +530,25 @@ static void prep_exclude(struct dir_struct *dir, const
> char *base, int baselen)
> dir->basebuf[baselen] = '\0';
> }
>
> +int match_basename(const char *basename, int basenamelen,
> + const char *pattern, int prefix, int patternlen,
> + int flags)
> +{
> + if (prefix == patternlen) {
> + if (!strcmp_icase(pattern, basename))
> + return 1;
> + } else if (flags & EXC_FLAG_ENDSWITH) {
> + if (patternlen - 1 <= basenamelen &&
> + !strcmp_icase(pattern + 1,
> + basename + basenamelen - patternlen + 1))
> + return 1;
> + } else {
> + if (fnmatch_icase(pattern, basename, 0) == 0)
> + return 1;
> + }
> + return 0;
> +}
> +
> /* Scan the list and let the last match determine the fate.
> * Return 1 for exclude, 0 for include and -1 for undecided.
> */
> @@ -556,19 +575,11 @@ int excluded_from_list(const char *pathname,
> }
>
> if (x->flags & EXC_FLAG_NODIR) {
> - /* match basename */
> - if (prefix == x->patternlen) {
> - if (!strcmp_icase(exclude, basename))
> - return to_exclude;
> - } else if (x->flags & EXC_FLAG_ENDSWITH) {
> - int len = pathlen - (basename - pathname);
> - if (x->patternlen - 1 <= len &&
> - !strcmp_icase(exclude + 1, basename + len -
> x->patternlen + 1))
> - return to_exclude;
> - } else {
> - if (fnmatch_icase(exclude, basename, 0) == 0)
> - return to_exclude;
> - }
> + if (match_basename(basename,
> + pathlen - (basename - pathname),
> + exclude, prefix, x->patternlen,
> + x->flags))
> + return to_exclude;
> continue;
> }
>
> diff --git a/dir.h b/dir.h
> index fd5c2aa..d416c5a 100644
> --- a/dir.h
> +++ b/dir.h
> @@ -78,6 +78,8 @@ extern int read_directory(struct dir_struct *, const char
> *path, int len, const
>
> extern int excluded_from_list(const char *pathname, int pathlen, const char
> *basename,
> int *dtype, struct exclude_list *el);
> +extern int match_basename(const char *, int,
> + const char *, int, int, int);
> struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char
> *pathname, int len);
>
> /*
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
