Merge branch 'ja/i18n-fix'

diff --git a/t/helper/test-wildmatch.c b/t/helper/test-wildmatch.c
index 578b164fe603f11dfe67e25be36a6ab38aa6d645..2c103d1824cfc7f035aea4a6453c9706f9b4491e 100644 (file)
--- a/t/helper/test-wildmatch.c
+++ b/t/helper/test-wildmatch.c
@@ -1,6 +1,7 @@
+#include "test-tool.h"
 #include "cache.h"
 
-int main(int argc, char **argv)
+int cmd__wildmatch(int argc, const char **argv)
 {
        int i;
        for (i = 2; i < argc; i++) {
@@ -11,11 +12,13 @@ int main(int argc, char **argv)
                        argv[i] += 3;
        }
        if (!strcmp(argv[1], "wildmatch"))
-               return !!wildmatch(argv[3], argv[2], WM_PATHNAME, NULL);
+               return !!wildmatch(argv[3], argv[2], WM_PATHNAME);
        else if (!strcmp(argv[1], "iwildmatch"))
-               return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD, NULL);
+               return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD);
        else if (!strcmp(argv[1], "pathmatch"))
-               return !!wildmatch(argv[3], argv[2], 0, NULL);
+               return !!wildmatch(argv[3], argv[2], 0);
+       else if (!strcmp(argv[1], "ipathmatch"))
+               return !!wildmatch(argv[3], argv[2], WM_CASEFOLD);
        else
                return 1;
 }