dd77d58795
The include of wildmatch.h in git-compat-util.h was added incebcab189a(Makefile: add USE_WILDMATCH to use wildmatch as fnmatch, 2013-01-01) as a way to be able to compile-time force any calls to fnmatch() to instead invoke wildmatch(). The defines and inline function were removed in70a8fc999d(stop using fnmatch (either native or compat), 2014-02-15), and this include in git-compat-util.h has been unnecessary ever since. Remove the include from git-compat-util.h, but add it to the .c files that had omitted the direct #include they needed. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
25 lines
755 B
C
25 lines
755 B
C
#include "test-tool.h"
|
|
#include "wildmatch.h"
|
|
|
|
int cmd__wildmatch(int argc, const char **argv)
|
|
{
|
|
int i;
|
|
for (i = 2; i < argc; i++) {
|
|
if (argv[i][0] == '/')
|
|
die("Forward slash is not allowed at the beginning of the\n"
|
|
"pattern because Windows does not like it. Use `XXX/' instead.");
|
|
else if (!strncmp(argv[i], "XXX/", 4))
|
|
argv[i] += 3;
|
|
}
|
|
if (!strcmp(argv[1], "wildmatch"))
|
|
return !!wildmatch(argv[3], argv[2], WM_PATHNAME);
|
|
else if (!strcmp(argv[1], "iwildmatch"))
|
|
return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD);
|
|
else if (!strcmp(argv[1], "pathmatch"))
|
|
return !!wildmatch(argv[3], argv[2], 0);
|
|
else if (!strcmp(argv[1], "ipathmatch"))
|
|
return !!wildmatch(argv[3], argv[2], WM_CASEFOLD);
|
|
else
|
|
return 1;
|
|
}
|