use wildmatch() directly without fnmatch() wrapper

pclouds · gitster · commit eb07894fe036 · 2014-02-20T14:15:46.000-08:00
Make it clear that we don't use fnmatch() anymore.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/apply.c b/builtin/apply.c
@@ -4152,7 +4152,7 @@ static int use_patch(struct patch *p)
 	/* See if it matches any of exclude/include rule */
 	for (i = 0; i < limit_by_name.nr; i++) {
 		struct string_list_item *it = &limit_by_name.items[i];
-		if (!fnmatch(it->string, pathname, 0))
+		if (!wildmatch(it->string, pathname, 0, NULL))
 			return (it->util != NULL);
 	}
 
diff --git a/builtin/branch.c b/builtin/branch.c
@@ -315,7 +315,7 @@ static int match_patterns(const char **pattern, const char *refname)
 	if (!*pattern)
 		return 1; /* no pattern always matches */
 	while (*pattern) {
-		if (!fnmatch(*pattern, refname, 0))
+		if (!wildmatch(*pattern, refname, 0, NULL))
 			return 1;
 		pattern++;
 	}
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -150,7 +150,7 @@ static int get_name(const char *path, const unsigned char *sha1, int flag, void
 		return 0;
 
 	/* Accept only tags that match the pattern, if given */
-	if (pattern && (!is_tag || fnmatch(pattern, path + 10, 0)))
+	if (pattern && (!is_tag || wildmatch(pattern, path + 10, 0, NULL)))
 		return 0;
 
 	/* Is it annotated? */
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
@@ -864,7 +864,7 @@ static int grab_single_ref(const char *refname, const unsigned char *sha1, int f
 			     refname[plen] == '/' ||
 			     p[plen-1] == '/'))
 				break;
-			if (!fnmatch(p, refname, FNM_PATHNAME))
+			if (!wildmatch(p, refname, WM_PATHNAME, NULL))
 				break;
 		}
 		if (!*pattern)
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
@@ -22,7 +22,7 @@ static int tail_match(const char **pattern, const char *path)
 	if (snprintf(pathbuf, sizeof(pathbuf), "/%s", path) > sizeof(pathbuf))
 		return error("insanely long ref %.*s...", 20, path);
 	while ((p = *(pattern++)) != NULL) {
-		if (!fnmatch(p, pathbuf, 0))
+		if (!wildmatch(p, pathbuf, 0, NULL))
 			return 1;
 	}
 	return 0;
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
@@ -87,7 +87,7 @@ static int subpath_matches(const char *path, const char *filter)
 	const char *subpath = path;
 
 	while (subpath) {
-		if (!fnmatch(filter, subpath, 0))
+		if (!wildmatch(filter, subpath, 0, NULL))
 			return subpath - path;
 		subpath = strchr(subpath, '/');
 		if (subpath)
diff --git a/builtin/reflog.c b/builtin/reflog.c
@@ -561,7 +561,7 @@ static void set_reflog_expiry_param(struct cmd_reflog_expire_cb *cb, int slot, c
 		return; /* both given explicitly -- nothing to tweak */
 
 	for (ent = reflog_expire_cfg; ent; ent = ent->next) {
-		if (!fnmatch(ent->pattern, ref, 0)) {
+		if (!wildmatch(ent->pattern, ref, 0, NULL)) {
 			if (!(slot & EXPIRE_TOTAL))
 				cb->expire_total = ent->expire_total;
 			if (!(slot & EXPIRE_UNREACH))
diff --git a/builtin/replace.c b/builtin/replace.c
@@ -36,7 +36,7 @@ static int show_reference(const char *refname, const unsigned char *sha1,
 {
 	struct show_data *data = cb_data;
 
-	if (!fnmatch(data->pattern, refname, 0)) {
+	if (!wildmatch(data->pattern, refname, 0, NULL)) {
 		if (data->format == REPLACE_FORMAT_SHORT)
 			printf("%s\n", refname);
 		else if (data->format == REPLACE_FORMAT_MEDIUM)
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
@@ -450,7 +450,7 @@ static int append_matching_ref(const char *refname, const unsigned char *sha1, i
 			slash--;
 	if (!*tail)
 		return 0;
-	if (fnmatch(match_ref_pattern, tail, 0))
+	if (wildmatch(match_ref_pattern, tail, 0, NULL))
 		return 0;
 	if (starts_with(refname, "refs/heads/"))
 		return append_head_ref(refname, sha1, flag, cb_data);
diff --git a/builtin/tag.c b/builtin/tag.c
@@ -42,7 +42,7 @@ static int match_pattern(const char **patterns, const char *ref)
 	if (!*patterns)
 		return 1;
 	for (; *patterns; patterns++)
-		if (!fnmatch(*patterns, ref, 0))
+		if (!wildmatch(*patterns, ref, 0, NULL))
 			return 1;
 	return 0;
 }
diff --git a/diffcore-order.c b/diffcore-order.c
@@ -73,7 +73,7 @@ static int match_order(const char *path)
 		strbuf_addstr(&p, path);
 		while (p.buf[0]) {
 			char *cp;
-			if (!fnmatch(order[i], p.buf, 0))
+			if (!wildmatch(order[i], p.buf, 0, NULL))
 				return i;
 			cp = strrchr(p.buf, '/');
 			if (!cp)
diff --git a/dir.c b/dir.c
@@ -49,7 +49,9 @@ int strncmp_icase(const char *a, const char *b, size_t count)
 
 int fnmatch_icase(const char *pattern, const char *string, int flags)
 {
-	return fnmatch(pattern, string, flags | (ignore_case ? FNM_CASEFOLD : 0));
+	return wildmatch(pattern, string,
+			 flags | (ignore_case ? WM_CASEFOLD : 0),
+			 NULL);
 }
 
 inline int git_fnmatch(const struct pathspec_item *item,
@@ -58,7 +60,7 @@ inline int git_fnmatch(const struct pathspec_item *item,
 {
 	if (prefix > 0) {
 		if (ps_strncmp(item, pattern, string, prefix))
-			return FNM_NOMATCH;
+			return WM_NOMATCH;
 		pattern += prefix;
 		string += prefix;
 	}
@@ -76,8 +78,9 @@ inline int git_fnmatch(const struct pathspec_item *item,
 				 NULL);
 	else
 		/* wildmatch has not learned no FNM_PATHNAME mode yet */
-		return fnmatch(pattern, string,
-			       item->magic & PATHSPEC_ICASE ? FNM_CASEFOLD : 0);
+		return wildmatch(pattern, string,
+				 item->magic & PATHSPEC_ICASE ? WM_CASEFOLD : 0,
+				 NULL);
 }
 
 static int fnmatch_icase_mem(const char *pattern, int patternlen,
diff --git a/refs.c b/refs.c
@@ -1477,7 +1477,7 @@ static int filter_refs(const char *refname, const unsigned char *sha1, int flags
 		       void *data)
 {
 	struct ref_filter *filter = (struct ref_filter *)data;
-	if (fnmatch(filter->pattern, refname, 0))
+	if (wildmatch(filter->pattern, refname, 0, NULL))
 		return 0;
 	return filter->fn(refname, sha1, flags, filter->cb_data);
 }
diff --git a/revision.c b/revision.c
@@ -1191,7 +1191,7 @@ int ref_excluded(struct string_list *ref_excludes, const char *path)
 	if (!ref_excludes)
 		return 0;
 	for_each_string_list_item(item, ref_excludes) {
-		if (!fnmatch(item->string, path, 0))
+		if (!wildmatch(item->string, path, 0, NULL))
 			return 1;
 	}
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -4152,7 +4152,7 @@ static int use_patch(struct patch *p)`
`4152`	`4152`	`/* See if it matches any of exclude/include rule */`
`4153`	`4153`	`for (i = 0; i < limit_by_name.nr; i++) {`
`4154`	`4154`	`struct string_list_item *it = &limit_by_name.items[i];`
`4155`		`- if (!fnmatch(it->string, pathname, 0))`
	`4155`	`+ if (!wildmatch(it->string, pathname, 0, NULL))`
`4156`	`4156`	`return (it->util != NULL);`
`4157`	`4157`	`}`
`4158`	`4158`
Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ static int match_patterns(const char *pattern, const char refname)`
`315`	`315`	`if (!*pattern)`
`316`	`316`	`return 1; /* no pattern always matches */`
`317`	`317`	`while (*pattern) {`
`318`		`- if (!fnmatch(*pattern, refname, 0))`
	`318`	`+ if (!wildmatch(*pattern, refname, 0, NULL))`
`319`	`319`	`return 1;`
`320`	`320`	`pattern++;`
`321`	`321`	`}`
Original file line number	Diff line number	Diff line change
`@@ -864,7 +864,7 @@ static int grab_single_ref(const char refname, const unsigned char sha1, int f`
`864`	`864`	`refname[plen] == '/' \|\|`
`865`	`865`	`p[plen-1] == '/'))`
`866`	`866`	`break;`
`867`		`- if (!fnmatch(p, refname, FNM_PATHNAME))`
	`867`	`+ if (!wildmatch(p, refname, WM_PATHNAME, NULL))`
`868`	`868`	`break;`
`869`	`869`	`}`
`870`	`870`	`if (!*pattern)`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ static int tail_match(const char *pattern, const char path)`
`22`	`22`	`if (snprintf(pathbuf, sizeof(pathbuf), "/%s", path) > sizeof(pathbuf))`
`23`	`23`	`return error("insanely long ref %.*s...", 20, path);`
`24`	`24`	`while ((p = *(pattern++)) != NULL) {`
`25`		`- if (!fnmatch(p, pathbuf, 0))`
	`25`	`+ if (!wildmatch(p, pathbuf, 0, NULL))`
`26`	`26`	`return 1;`
`27`	`27`	`}`
`28`	`28`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ static int show_reference(const char refname, const unsigned char sha1,`
`36`	`36`	`{`
`37`	`37`	`struct show_data *data = cb_data;`
`38`	`38`
`39`		`- if (!fnmatch(data->pattern, refname, 0)) {`
	`39`	`+ if (!wildmatch(data->pattern, refname, 0, NULL)) {`
`40`	`40`	`if (data->format == REPLACE_FORMAT_SHORT)`
`41`	`41`	`printf("%s\n", refname);`
`42`	`42`	`else if (data->format == REPLACE_FORMAT_MEDIUM)`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ static int match_pattern(const char *patterns, const char ref)`
`42`	`42`	`if (!*patterns)`
`43`	`43`	`return 1;`
`44`	`44`	`for (; *patterns; patterns++)`
`45`		`- if (!fnmatch(*patterns, ref, 0))`
	`45`	`+ if (!wildmatch(*patterns, ref, 0, NULL))`
`46`	`46`	`return 1;`
`47`	`47`	`return 0;`
`48`	`48`	`}`