aboutsummaryrefslogtreecommitdiff
path: root/posix/fnmatch.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-01-07 09:55:57 +0000
committerUlrich Drepper <drepper@redhat.com>1999-01-07 09:55:57 +0000
commit34992338178abc47897f10ce4fb12d204e682b14 (patch)
treee3af6863200bc3f7844813a493b15fd88e2350b1 /posix/fnmatch.c
parent1686c452338c6c942384425906d179b7438e184e (diff)
downloadglibc-34992338178abc47897f10ce4fb12d204e682b14.tar
glibc-34992338178abc47897f10ce4fb12d204e682b14.tar.gz
glibc-34992338178abc47897f10ce4fb12d204e682b14.tar.bz2
glibc-34992338178abc47897f10ce4fb12d204e682b14.zip
Update.
1999-01-07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/bits/select.h (__FD_ZERO): Remove early clobbers from c and D register output. 1999-01-07 Philip Blundell <philb@gnu.org> * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h: Fix bug in last change. 1999-01-07 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/alpha/bits/types.h: Correct type for __fsfilcnt_t. Patch by Bruce Elliott <bde@nwlink.com>. 1999-01-05 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * manual/conf.texi: Remove pointers from first @node. Move old @node spec inside comment. * manual/lang.texi: Likewise. * manual/libc-texinfo.sh: Also find `@node.*Top' in a comment. * manual/stdio.texi: Fix typo. 1999-01-04 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> * wcsmbs/btowc.c: Accept all values in the range [SCHAR_MIN .. UCHAR_MAX]. Local var buf renamed to result and its type changed from char[] to wchar_t to get proper alignment. * posix/fnmatch.c: Also cast the arguments of the other ctype functions to unsigned char. 1999-01-07 Ulrich Drepper <drepper@cygnus.com> * Rules: Add rules for empty.{o,os,op} back.
Diffstat (limited to 'posix/fnmatch.c')
-rw-r--r--posix/fnmatch.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
index 0f0648b210..dc389efa39 100644
--- a/posix/fnmatch.c
+++ b/posix/fnmatch.c
@@ -239,7 +239,7 @@ fnmatch (pattern, string, flags)
c = *p++;
for (;;)
{
- unsigned int fn = FOLD (*n);
+ unsigned char fn = FOLD ((unsigned char) *n);
if (!(flags & FNM_NOESCAPE) && c == '\\')
{
@@ -283,21 +283,21 @@ fnmatch (pattern, string, flags)
/* Invalid character class name. */
return FNM_NOMATCH;
- if (__iswctype (__btowc (*n), wt))
+ if (__iswctype (__btowc ((unsigned char) *n), wt))
goto matched;
# else
- if ((STREQ (str, "alnum") && ISALNUM (*n))
- || (STREQ (str, "alpha") && ISALPHA (*n))
- || (STREQ (str, "blank") && ISBLANK (*n))
- || (STREQ (str, "cntrl") && ISCNTRL (*n))
- || (STREQ (str, "digit") && ISDIGIT (*n))
- || (STREQ (str, "graph") && ISGRAPH (*n))
- || (STREQ (str, "lower") && ISLOWER (*n))
- || (STREQ (str, "print") && ISPRINT (*n))
- || (STREQ (str, "punct") && ISPUNCT (*n))
- || (STREQ (str, "space") && ISSPACE (*n))
- || (STREQ (str, "upper") && ISUPPER (*n))
- || (STREQ (str, "xdigit") && ISXDIGIT (*n)))
+ if ((STREQ (str, "alnum") && ISALNUM ((unsigned char) *n))
+ || (STREQ (str, "alpha") && ISALPHA ((unsigned char) *n))
+ || (STREQ (str, "blank") && ISBLANK ((unsigned char) *n))
+ || (STREQ (str, "cntrl") && ISCNTRL ((unsigned char) *n))
+ || (STREQ (str, "digit") && ISDIGIT ((unsigned char) *n))
+ || (STREQ (str, "graph") && ISGRAPH ((unsigned char) *n))
+ || (STREQ (str, "lower") && ISLOWER ((unsigned char) *n))
+ || (STREQ (str, "print") && ISPRINT ((unsigned char) *n))
+ || (STREQ (str, "punct") && ISPUNCT ((unsigned char) *n))
+ || (STREQ (str, "space") && ISSPACE ((unsigned char) *n))
+ || (STREQ (str, "upper") && ISUPPER ((unsigned char) *n))
+ || (STREQ (str, "xdigit") && ISXDIGIT ((unsigned char) *n)))
goto matched;
# endif
}