diff options
| author | Claudio Fontana <sick_soul@users.sourceforge.net> | 2006-07-21 23:40:02 +0000 |
|---|---|---|
| committer | Claudio Fontana <sick_soul@users.sourceforge.net> | 2006-07-21 23:40:02 +0000 |
| commit | 9a72ecd6dc36eab0497dc428d10a6ad1dd87a19a (patch) | |
| tree | a528fd617cda36f619bc076429b0995bcda12e2c /lib/fnmatch.c | |
| parent | ee29ecd605b329c38ab4c6c6c89d6288693495de (diff) | |
| download | idutils-9a72ecd6dc36eab0497dc428d10a6ad1dd87a19a.tar.gz idutils-9a72ecd6dc36eab0497dc428d10a6ad1dd87a19a.tar.bz2 idutils-9a72ecd6dc36eab0497dc428d10a6ad1dd87a19a.zip | |
* upgraded gnulib
Diffstat (limited to 'lib/fnmatch.c')
| -rw-r--r-- | lib/fnmatch.c | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/lib/fnmatch.c b/lib/fnmatch.c index c5a4e40..bd41358 100644 --- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -86,34 +86,10 @@ extern int fnmatch (const char *pattern, const char *string, int flags); #if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU -# if defined STDC_HEADERS || !defined isascii -# define ISASCII(c) 1 -# else -# define ISASCII(c) isascii(c) -# endif - -# ifdef isblank -# define ISBLANK(c) (ISASCII (c) && isblank (c)) -# else -# define ISBLANK(c) ((c) == ' ' || (c) == '\t') -# endif -# ifdef isgraph -# define ISGRAPH(c) (ISASCII (c) && isgraph (c)) -# else -# define ISGRAPH(c) (ISASCII (c) && isprint (c) && !isspace (c)) +# if ! (defined isblank || HAVE_DECL_ISBLANK) +# define isblank(c) ((c) == ' ' || (c) == '\t') # endif -# define ISPRINT(c) (ISASCII (c) && isprint (c)) -# define ISDIGIT(c) (ISASCII (c) && isdigit (c)) -# define ISALNUM(c) (ISASCII (c) && isalnum (c)) -# define ISALPHA(c) (ISASCII (c) && isalpha (c)) -# define ISCNTRL(c) (ISASCII (c) && iscntrl (c)) -# define ISLOWER(c) (ISASCII (c) && islower (c)) -# define ISPUNCT(c) (ISASCII (c) && ispunct (c)) -# define ISSPACE(c) (ISASCII (c) && isspace (c)) -# define ISUPPER(c) (ISASCII (c) && isupper (c)) -# define ISXDIGIT(c) (ISASCII (c) && isxdigit (c)) - # define STREQ(s1, s2) ((strcmp (s1, s2) == 0)) # if defined _LIBC || WIDE_CHAR_SUPPORT @@ -169,11 +145,7 @@ static int posixly_correct; # endif /* Note that this evaluates C many times. */ -# ifdef _LIBC -# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c)) -# else -# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c)) -# endif +# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c)) # define CHAR char # define UCHAR unsigned char # define INT int |