Commit 1e3300d8 by Vicent Marti

fnmatch: Fix compilation under Windows

parent e9c6571d
...@@ -100,7 +100,7 @@ p_fnmatch(const char *pattern, const char *string, int flags) ...@@ -100,7 +100,7 @@ p_fnmatch(const char *pattern, const char *string, int flags)
/* General case, use recursion. */ /* General case, use recursion. */
while ((test = *string) != EOS) { while ((test = *string) != EOS) {
if (!fnmatch(pattern, string, flags & ~FNM_PERIOD)) if (!p_fnmatch(pattern, string, flags & ~FNM_PERIOD))
return (0); return (0);
if (test == '/' && (flags & FNM_PATHNAME)) if (test == '/' && (flags & FNM_PATHNAME))
break; break;
...@@ -162,7 +162,7 @@ rangematch(const char *pattern, char test, int flags, char **newp) ...@@ -162,7 +162,7 @@ rangematch(const char *pattern, char test, int flags, char **newp)
* consistency with the regular expression syntax. * consistency with the regular expression syntax.
* J.T. Conklin (conklin@ngai.kaleida.com) * J.T. Conklin (conklin@ngai.kaleida.com)
*/ */
if ((negate = (*pattern == '!' || *pattern == '^'))) if ((negate = (*pattern == '!' || *pattern == '^')) != 0)
++pattern; ++pattern;
if (flags & FNM_CASEFOLD) if (flags & FNM_CASEFOLD)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment