diff options
| author | Jim Meyering <jim@meyering.net> | 1994-12-10 05:25:15 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1994-12-10 05:25:15 +0000 |
| commit | 7f58bbba8882cbe89ca61fed1e40821d84573048 (patch) | |
| tree | f4df5da960b152d8a51171546b7b9566c43c7001 /src/system.h | |
| parent | 651ccf648dd03026ae62ededd4537fd54ffc913d (diff) | |
| download | coreutils-7f58bbba8882cbe89ca61fed1e40821d84573048.tar.xz | |
* [!HAVE_STRING_H]: Define strchr to index and strrchr to
rindex instead of the other way around.
* Include <ctype.h> and define IS* macros.
Diffstat (limited to 'src/system.h')
| -rw-r--r-- | src/system.h | 72 |
1 files changed, 51 insertions, 21 deletions
diff --git a/src/system.h b/src/system.h index f7b5fbc21..5e49683c2 100644 --- a/src/system.h +++ b/src/system.h @@ -149,22 +149,22 @@ struct utimbuf }; #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include <string.h> -#ifndef index -#define index strchr -#endif -#ifndef rindex -#define rindex strrchr -#endif -#ifndef bcopy -#define bcopy(from, to, len) memcpy ((to), (from), (len)) -#endif -#ifndef bzero -#define bzero(s, n) memset ((s), 0, (n)) -#endif +#ifdef HAVE_STRING_H +# include <string.h> +# ifndef bcopy +# define bcopy(from, to, len) memcpy ((to), (from), (len)) +# endif +# ifndef bzero +# define bzero(s, n) memset ((s), 0, (n)) +# endif #else -#include <strings.h> +# include <strings.h> +# ifndef strrchr +# define strrchr rindex +# endif +# ifndef strchr +# define strchr index +# endif #endif #include <errno.h> @@ -267,15 +267,45 @@ extern int errno; #endif #ifdef __GNUC__ -#undef alloca -#define alloca __builtin_alloca -#else -#ifdef HAVE_ALLOCA_H -#include <alloca.h> +# undef alloca +# define alloca __builtin_alloca #else -#ifndef _AIX +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifndef _AIX /* AIX alloca decl has to be the first thing in the file, bletch! */ char *alloca (); +# endif +# endif #endif + +#include <ctype.h> + +#if defined (STDC_HEADERS) || (!defined (isascii) && !defined (HAVE_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)) +#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)) |