X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fuserspec.c;h=c6a49fae2745c113d3fc29205259889d092fb6b4;hb=6aae241f16ed2dbe57475cb4c8b3a5b1ca1e9699;hp=c5ac3096c475a35b3e623db87f4f422da542bb65;hpb=cfb5e51faef97f4735e772e8ef0ab6161c3eba25;p=gnulib.git diff --git a/lib/userspec.c b/lib/userspec.c index c5ac3096c..c6a49fae2 100644 --- a/lib/userspec.c +++ b/lib/userspec.c @@ -63,9 +63,12 @@ struct group *getgrnam (); struct group *getgrgid (); #endif -#ifdef _POSIX_SOURCE -#define endpwent() -#define endgrent() +#ifndef HAVE_ENDGRENT +# define endgrent() ((void) 0) +#endif + +#ifndef HAVE_ENDPWENT +# define endpwent() ((void) 0) #endif /* Perform the equivalent of the statement `dest = strdup (src);', @@ -88,7 +91,7 @@ char *strdup (); otherwise return 0. */ static int -isnumber (str) +is_number (str) const char *str; { for (; *str; str++) @@ -156,7 +159,7 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg) if (pwd == NULL) { - if (!isnumber (u)) + if (!is_number (u)) error_msg = "invalid user"; else { @@ -202,7 +205,7 @@ parse_user_spec (spec_arg, uid, gid, username_arg, groupname_arg) grp = getgrnam (g); if (grp == NULL) { - if (!isnumber (g)) + if (!is_number (g)) error_msg = "invalid group"; else *gid = atoi (g);