diff options
Diffstat (limited to 'glob')
| -rw-r--r-- | glob/ChangeLog | 4 | ||||
| -rw-r--r-- | glob/fnmatch.c | 13 |
2 files changed, 12 insertions, 5 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog index 6fa4365..592e7a0 100644 --- a/glob/ChangeLog +++ b/glob/ChangeLog @@ -1,3 +1,7 @@ +1999-09-06 Paul D. Smith <psmith@gnu.org> + + * fnmatch.c: Update to latest version from GLIBC. + 1999-07-21 Paul D. Smith <psmith@gnu.org> * glob.c, glob.h, fnmatch.c, fnmatch.h: Update to latest version diff --git a/glob/fnmatch.c b/glob/fnmatch.c index 4ad86ff..b1e1b94 100644 --- a/glob/fnmatch.c +++ b/glob/fnmatch.c @@ -132,18 +132,21 @@ extern int errno; # if !defined HAVE___STRCHRNUL && !defined _LIBC static char * __strchrnul (s, c) - register const char *s; + const char *s; int c; { - c = (unsigned char)c; - while (*s && *s != c) - ++s; - return (char *)s; + char *result = strchr (s, c); + if (result == NULL) + result = strchr (s, '\0'); + return result; } # endif /* Match STRING against the filename pattern PATTERN, returning zero if it matches, nonzero if not. */ +static int internal_fnmatch __P ((const char *pattern, const char *string, + int no_leading_period, int flags)) + internal_function; static int #ifdef _LIBC internal_function |