diff options
| author | Jim Meyering <jim@meyering.net> | 1995-05-13 13:25:42 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1995-05-13 13:25:42 +0000 |
| commit | 7ce06ceca7d2d1ded70035175710879e9d0d9771 (patch) | |
| tree | 086c552648cd55b82811775ca012296610672794 /lib | |
| parent | 8a7a1fda12f30dd82b62a72aa6345f3a7cf5af94 (diff) | |
| download | coreutils-7ce06ceca7d2d1ded70035175710879e9d0d9771.tar.xz | |
(parse_user_spec): Use strchr, not index.
[!HAVE_STRING_H]: Define strchr in terms of index, not the other way around.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/userspec.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/lib/userspec.c b/lib/userspec.c index 67f158333..c5ac3096c 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -22,17 +22,17 @@ #endif #ifdef __GNUC__ -#define alloca __builtin_alloca +# define alloca __builtin_alloca #else -#ifdef HAVE_ALLOCA_H -#include <alloca.h> -#else -#ifdef _AIX +# ifdef HAVE_ALLOCA_H +# include <alloca.h> +# else +# ifdef _AIX #pragma alloca -#else +# else char *alloca (); -#endif -#endif +# endif +# endif #endif #include <stdio.h> @@ -40,21 +40,21 @@ char *alloca (); #include <pwd.h> #include <grp.h> -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) -#include <string.h> -#ifndef index -#define index strchr -#endif +#ifdef HAVE_STRING_H +# include <string.h> #else -#include <strings.h> +# include <strings.h> +# ifndef strchr +# define strchr index +# endif #endif #ifdef STDC_HEADERS -#include <stdlib.h> +# include <stdlib.h> #endif #ifdef HAVE_UNISTD_H -#include <unistd.h> +# include <unistd.h> #endif #ifndef _POSIX_VERSION @@ -131,9 +131,9 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg) V_STRDUP (spec, spec_arg); /* Find the separator if there is one. */ - separator = index (spec, ':'); + separator = strchr (spec, ':'); if (separator == NULL) - separator = index (spec, '.'); + separator = strchr (spec, '.'); /* Replace separator with a NUL. */ if (separator != NULL) |