diff options
| author | ache <ache@FreeBSD.org> | 1996-10-31 04:32:27 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1996-10-31 04:32:27 +0000 |
| commit | a96f64f92c7cab37e9d767c907b3f3a80a50b686 (patch) | |
| tree | 493c4284243fe4e0f57d2c4bdafb847d241a2b8d /lib | |
| parent | 411def8ac09fc48107b53ce379d05fb942f05e94 (diff) | |
| download | FreeBSD-src-a96f64f92c7cab37e9d767c907b3f3a80a50b686.zip FreeBSD-src-a96f64f92c7cab37e9d767c907b3f3a80a50b686.tar.gz | |
collate_range_cmp -> __collate_range_cmp
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/fnmatch.c | 7 | ||||
| -rw-r--r-- | lib/libc/gen/glob.c | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/libc/gen/fnmatch.c b/lib/libc/gen/fnmatch.c index 3bf9e17..f53963a 100644 --- a/lib/libc/gen/fnmatch.c +++ b/lib/libc/gen/fnmatch.c @@ -45,10 +45,11 @@ static char sccsid[] = "@(#)fnmatch.c 8.2 (Berkeley) 4/16/94"; #include <ctype.h> #include <fnmatch.h> -#include <locale.h> #include <string.h> #include <stdio.h> +#include "collate.h" + #define EOS '\0' static const char *rangematch __P((const char *, char, int)); @@ -186,8 +187,8 @@ rangematch(pattern, test, flags) if (flags & FNM_CASEFOLD) c2 = tolower((unsigned char)c2); - if ( collate_range_cmp(c, test) <= 0 - && collate_range_cmp(test, c2) <= 0 + if ( __collate_range_cmp(c, test) <= 0 + && __collate_range_cmp(test, c2) <= 0 ) ok = 1; } else if (c == test) diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c index a781019..1c55dc0 100644 --- a/lib/libc/gen/glob.c +++ b/lib/libc/gen/glob.c @@ -70,13 +70,14 @@ static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #include <dirent.h> #include <errno.h> #include <glob.h> -#include <locale.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include "collate.h" + #define DOLLAR '$' #define DOT '.' #define EOS '\0' @@ -703,8 +704,8 @@ match(name, pat, patend) ++pat; while (((c = *pat++) & M_MASK) != M_END) if ((*pat & M_MASK) == M_RNG) { - if ( collate_range_cmp(CHAR(c), CHAR(k)) <= 0 - && collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0 + if ( __collate_range_cmp(CHAR(c), CHAR(k)) <= 0 + && __collate_range_cmp(CHAR(k), CHAR(pat[1])) <= 0 ) ok = 1; pat += 2; |
