kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

wildmatch: make wildmatch's return value compatible with fnmatch 

wildmatch returns non-zero if matched, zero otherwise. This patch
makes it return zero if matches, non-zero otherwise, like fnmatch().

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2012-10-15 13:25:57 +07:00 committed by Junio C Hamano
parent f1cf7b7983
commit 3ae5396cf7
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test-wildmatch.c
View File

@ -4,9 +4,9 @@
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
if (!strcmp(argv[1], "wildmatch")) if (!strcmp(argv[1], "wildmatch"))
return wildmatch(argv[3], argv[2]) ? 0 : 1; return !!wildmatch(argv[3], argv[2]);
else if (!strcmp(argv[1], "iwildmatch")) else if (!strcmp(argv[1], "iwildmatch"))
return iwildmatch(argv[3], argv[2]) ? 0 : 1; return !!iwildmatch(argv[3], argv[2]);
else if (!strcmp(argv[1], "fnmatch")) else if (!strcmp(argv[1], "fnmatch"))
return !!fnmatch(argv[3], argv[2], FNM_PATHNAME); return !!fnmatch(argv[3], argv[2], FNM_PATHNAME);
else else

21
wildmatch.c
View File

@ -20,6 +20,9 @@ typedef unsigned char uchar;


#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1

#define NOMATCH 1
#define MATCH 0
#define ABORT_ALL -1 #define ABORT_ALL -1
#define ABORT_TO_STARSTAR -2 #define ABORT_TO_STARSTAR -2


@ -78,12 +81,12 @@ static int dowild(const uchar *p, const uchar *text)
/* FALLTHROUGH */ /* FALLTHROUGH */
default: default:
if (t_ch != p_ch) if (t_ch != p_ch)
return FALSE; return NOMATCH;
continue; continue;
case '?': case '?':
/* Match anything but '/'. */ /* Match anything but '/'. */
if (t_ch == '/') if (t_ch == '/')
return FALSE; return NOMATCH;
continue; continue;
case '*': case '*':
if (*++p == '*') { if (*++p == '*') {
@ -96,14 +99,14 @@ static int dowild(const uchar *p, const uchar *text)
* only if there are no more slash characters. */ * only if there are no more slash characters. */
if (!special) { if (!special) {
if (strchr((char*)text, '/') != NULL) if (strchr((char*)text, '/') != NULL)
return FALSE; return NOMATCH;
} }
return TRUE; return MATCH;
} }
while (1) { while (1) {
if (t_ch == '\0') if (t_ch == '\0')
break; break;
if ((matched = dowild(p, text)) != FALSE) { if ((matched = dowild(p, text)) != NOMATCH) {
if (!special || matched != ABORT_TO_STARSTAR) if (!special || matched != ABORT_TO_STARSTAR)
return matched; return matched;
} else if (!special && t_ch == '/') } else if (!special && t_ch == '/')
@ -202,18 +205,18 @@ static int dowild(const uchar *p, const uchar *text)
matched = TRUE; matched = TRUE;
} while (prev_ch = p_ch, (p_ch = *++p) != ']'); } while (prev_ch = p_ch, (p_ch = *++p) != ']');
if (matched == special || t_ch == '/') if (matched == special || t_ch == '/')
return FALSE; return NOMATCH;
continue; continue;
} }
} }


return *text ? FALSE : TRUE; return *text ? NOMATCH : MATCH;
} }


/* Match the "pattern" against the "text" string. */ /* Match the "pattern" against the "text" string. */
int wildmatch(const char *pattern, const char *text) int wildmatch(const char *pattern, const char *text)
{ {
return dowild((const uchar*)pattern, (const uchar*)text) == TRUE; return dowild((const uchar*)pattern, (const uchar*)text);
} }


/* Match the "pattern" against the forced-to-lower-case "text" string. */ /* Match the "pattern" against the forced-to-lower-case "text" string. */
@ -221,7 +224,7 @@ int iwildmatch(const char *pattern, const char *text)
{ {
int ret; int ret;
force_lower_case = 1; force_lower_case = 1;
ret = dowild((const uchar*)pattern, (const uchar*)text) == TRUE; ret = dowild((const uchar*)pattern, (const uchar*)text);
force_lower_case = 0; force_lower_case = 0;
return ret; return ret;
} }