diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1996-08-12 04:03:50 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1996-08-12 04:03:50 +0000 |
| commit | 36a00a4b79dcbbdeffd85f82930c2f3227a19a18 (patch) | |
| tree | fe97691b8070bd7797e4a206eecafd6bd06ba338 | |
| parent | c73ac73fb4d4ea97a63663dcc28c8bef2b2794f7 (diff) | |
Notes
| -rw-r--r-- | lib/libc/gen/fnmatch.c | 5 | ||||
| -rw-r--r-- | sys/libkern/fnmatch.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c index 96cd341f14d0..3005184e3364 100644 --- a/lib/libc/gen/fnmatch.c +++ b/lib/libc/gen/fnmatch.c @@ -45,6 +45,7 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #include <fnmatch.h> #include <string.h> +#include "collate.h" #define EOS '\0' @@ -162,7 +163,9 @@ rangematch(pattern, test, flags) c2 = *pattern++; if (c2 == EOS) return (NULL); - if (c <= test && test <= c2) + if ( __collcmp(c, test) <= 0 + && __collcmp(test, c2) <= 0 + ) ok = 1; } else if (c == test) ok = 1; diff --git a/sys/libkern/fnmatch.c b/sys/libkern/fnmatch.c index 96cd341f14d0..3005184e3364 100644 --- a/sys/libkern/fnmatch.c +++ b/sys/libkern/fnmatch.c @@ -45,6 +45,7 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #include <fnmatch.h> #include <string.h> +#include "collate.h" #define EOS '\0' @@ -162,7 +163,9 @@ rangematch(pattern, test, flags) c2 = *pattern++; if (c2 == EOS) return (NULL); - if (c <= test && test <= c2) + if ( __collcmp(c, test) <= 0 + && __collcmp(test, c2) <= 0 + ) ok = 1; } else if (c == test) ok = 1; |