lockfile: allow reopening a closed but still locked file

diff --git a/test-wildmatch.c b/test-wildmatch.c
index 74c08644eebbea411dce0603d7c87f144d0e1446..578b164fe603f11dfe67e25be36a6ab38aa6d645 100644 (file)
--- a/test-wildmatch.c
+++ b/test-wildmatch.c
@@ -1,14 +1,21 @@
 #include "cache.h"
-#include "wildmatch.h"
 
 int main(int argc, 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], 0);
+               return !!wildmatch(argv[3], argv[2], WM_PATHNAME, NULL);
        else if (!strcmp(argv[1], "iwildmatch"))
-               return !!wildmatch(argv[3], argv[2], FNM_CASEFOLD);
-       else if (!strcmp(argv[1], "fnmatch"))
-               return !!fnmatch(argv[3], argv[2], FNM_PATHNAME);
+               return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD, NULL);
+       else if (!strcmp(argv[1], "pathmatch"))
+               return !!wildmatch(argv[3], argv[2], 0, NULL);
        else
                return 1;
 }